Skip to content

Commit

Permalink
Merge branch 'latest' into docs/fix-sso-kit-package
Browse files Browse the repository at this point in the history
  • Loading branch information
web-padawan authored Sep 27, 2024
2 parents b3733de + 70d23c1 commit 1c958fc
Show file tree
Hide file tree
Showing 7 changed files with 58 additions and 95 deletions.
4 changes: 2 additions & 2 deletions articles/hilla/guides/routing.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -140,12 +140,12 @@ export default function MainLayout() {
<header className="flex flex-col gap-m">
<h1 className="text-l m-0">My application</h1>
<SideNav onNavigate={({path}) => path && navigate(path)} location={location}>
<SideNavItem path="/example"></SideNavItem>
<SideNavItem path="/example" />
</SideNav>
</header>
</div>
<DrawerToggle slot="navbar" aria-label="Menu toggle"></DrawerToggle>
<DrawerToggle slot="navbar" aria-label="Menu toggle" />
<Suspense fallback={<ProgressBar indeterminate={true} className="m-0" />}>
<Outlet />
Expand Down
2 changes: 1 addition & 1 deletion articles/hilla/lit/guides/forms/binder-load.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ export default function PersonView() {
return (
<section>
<TextField label="Full name" {...field(model.fullName)}></TextField>
<TextField label="Full name" {...field(model.fullName)} />
<Button onClick={submit}>Save</Button>
</section>
);
Expand Down
32 changes: 16 additions & 16 deletions articles/hilla/lit/guides/forms/binder-validation.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,9 @@ export default function EmployeeView() {
return (
<>
<TextField label="Username" {...field(model.username)}></TextField>
<TextField label="Title" {...field(model.title)}></TextField>
<EmailField label="Email" {...field(model.email)}></EmailField>
<TextField label="Username" {...field(model.username)} />
<TextField label="Title" {...field(model.title)} />
<EmailField label="Email" {...field(model.email)} />
</>
);
Expand Down Expand Up @@ -194,7 +194,7 @@ export default function ProfileView() {
return (
<>
<PasswordField label="Password" {...field(model.password)}></PasswordField>
<PasswordField label="Password" {...field(model.password)} />
<Button onClick={submit}>Submit</Button>
</>
);
Expand Down Expand Up @@ -329,11 +329,11 @@ export default function ProfileView() {
}, []);
return (
<>
<PasswordField label="Password" {...field(model.password)}></PasswordField>
<PasswordField label="Repeat password" {...field(model.repeatPassword)}></PasswordField>
</>
);
<>
<PasswordField label="Password" {...field(model.password)} />
<PasswordField label="Repeat password" {...field(model.repeatPassword)} />
</>
);
}
----
endif::hilla-react[]
Expand Down Expand Up @@ -464,13 +464,13 @@ export default function ProfileView() {
}, []);
return (
<>
<TextField label="Name" {...field(model.name)}></TextField>
<TextField label="Username" {...field(model.username)}></TextField>
<IntegerField label="Age" {...field(model.age)}></IntegerField>
<EmailField label="Email" {...field(model.email)}></EmailField>
</>
);
<>
<TextField label="Name" {...field(model.name)} />
<TextField label="Username" {...field(model.username)} />
<IntegerField label="Age" {...field(model.age)} />
<EmailField label="Email" {...field(model.email)} />
</>
);
}
----
endif::hilla-react[]
Expand Down
2 changes: 1 addition & 1 deletion articles/hilla/lit/guides/forms/binder.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ export default function PersonView() {
const { model, field } = useForm(PersonModel);
return (
<TextField label="Full name" {...field(model.fullName)}></TextField>
<TextField label="Full name" {...field(model.fullName)} />
);
}
Expand Down
4 changes: 2 additions & 2 deletions articles/hilla/lit/guides/forms/binding-arrays.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ export default function GroupFormView() {
<>
{model.people.map(personBinder => (
<div>
<TextField label="Full name" {...field(personBinder.model.fullName)}></TextField>
<TextField label="Full name" {...field(personBinder.model.fullName)} />
<strong>Full name:</strong>
{personBinder.value.fullName}
</div>
Expand Down Expand Up @@ -162,7 +162,7 @@ export default function GroupFormView() {
<>
{model.people.map(personBinder => (
<div>
<TextField label="Full name" {...field(personBinder.model.fullName)}></TextField>
<TextField label="Full name" {...field(personBinder.model.fullName)} />
<Button onClick={() => personBinder.removeSelf()}>Delete</Button>
</div>
))}
Expand Down
107 changes: 35 additions & 72 deletions articles/hilla/lit/guides/forms/vaadin-components.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -133,26 +133,12 @@ const { model, field } = useForm(MyEntityModel);
...
return (
<>
<TextField label="string"
{...field(model.myTextField)}>
</TextField>
<PasswordField label="password"
{...field(model.myPasswordField)}>
</PasswordField>
<IntegerField label="integer"
{...field(model.myIntegerField)}
stepButtonsVisible>
</IntegerField>
<NumberField label="number"
{...field(model.myDoubleField)}
stepButtonsVisible>
</NumberField>
<EmailField label="email"
{...field(model.myEmailField)}>
</EmailField>
<TextArea label="textarea"
{...field(model.myTextField)}>
</TextArea>
<TextField label="string" {...field(model.myTextField)} />
<PasswordField label="password" {...field(model.myPasswordField)} />
<IntegerField label="integer" {...field(model.myIntegerField)} stepButtonsVisible />
<NumberField label="number" {...field(model.myDoubleField)} stepButtonsVisible />
<EmailField label="email" {...field(model.myEmailField)} />
<TextArea label="textarea" {...field(model.myTextField)} />
</>
);
----
Expand Down Expand Up @@ -222,12 +208,8 @@ const { model, field } = useForm(MyEntityModel);
...
return (
<>
<Checkbox label="checkbox"
{...field(model.myBooleanField)}>
</Checkbox>
<RadioButton label="radio-button"
{...field(model.myBooleanField)}>
</RadioButton>
<Checkbox label="checkbox" {...field(model.myBooleanField)} />
<RadioButton label="radio-button" {...field(model.myBooleanField)} />
</>
);
----
Expand Down Expand Up @@ -272,10 +254,11 @@ const { model, field } = useForm(MyEntityModel);
const selectItems = [{label: "True", value: "true"}, {label: "False", value: "false"}];
...
return (
<Select label="select"
{...field(model.myBooleanField)}
items={selectItems}>
</Select>
<Select
label="select"
{...field(model.myBooleanField)}
items={selectItems}
/>
);
----
endif::hilla-react[]
Expand Down Expand Up @@ -381,24 +364,19 @@ useEffect(() => {
...
return (
<>
<ComboBox label="combo-box"
{...field(model.mySingleSelectionField)}
items={myOptions.value}>
</ComboBox>
<RadioGroup label="radio-group"
{...field(model.mySingleSelectionField)}>
<ComboBox
label="combo-box"
{...field(model.mySingleSelectionField)}
items={myOptions.value}
/>
<RadioGroup label="radio-group" {...field(model.mySingleSelectionField)}>
{myOptions.value.map(option => (
<RadioButton value={option}
label={option}>
</RadioButton>
<RadioButton value={option} label={option} />
))}
</RadioGroup>
<ListBox label="list-box"
{...field(model.mySingleSelectionField)}>
<ListBox label="list-box" {...field(model.mySingleSelectionField)}>
{myOptions.value.map(option => (
<Item value={option}
label={option}>
</Item>
<Item value={option} label={option} />
))}
</ListBox>
</>
Expand Down Expand Up @@ -471,13 +449,10 @@ useEffect(() => {
}, []);
...
return (
<Select label="select"
{...field(model.mySelectField)}>
{myOptions.value.map(option => (
<Item value={option}
label={option}>
</Item>
))}
<Select label="select" {...field(model.mySelectField)}>
{myOptions.value.map((option) => (
<Item value={option} label={option} />
))}
</Select>
);
----
Expand Down Expand Up @@ -531,17 +506,12 @@ useEffect(() => {
...
return (
<>
<CheckboxGroup label="check-group"
{...field(model.myListField)}>
{myOptions.value.map(option => (
<Checkbox value={option}
label={option}>
</Checkbox>
))}
<CheckboxGroup label="check-group" {...field(model.myListField)}>
{myOptions.value.map((option) => (
<Checkbox value={option} label={option} />
))}
</CheckboxGroup>
<MultiSelectComboBox label=""
items={myOptions.value}>
</MultiSelectComboBox>
<MultiSelectComboBox label="multi-select" items={myOptions.value} />
</>
);
----
Expand Down Expand Up @@ -588,15 +558,9 @@ import {DateTimePicker} from "@vaadin/react-components/DateTimePicker.js";
...
return (
<>
<DatePicker label="date"
{...field(model.mySelectField)}>
</DatePicker>
<TimePicker label="time"
{...field(model.mySelectField)}>
</TimePicker>
<DateTimePicker label="date-time"
{...field(model.mySelectField)}>
</DateTimePicker>
<DatePicker label="date" {...field(model.myDateField)} />
<TimePicker label="time" {...field(model.myTimeField)} />
<DateTimePicker label="date-time" {...field(model.myDateTimeField)} />
</>
);
----
Expand Down Expand Up @@ -644,8 +608,7 @@ import {TextField} from "@vaadin/react-components/TextField.js";
...
return (
<CustomField {...field(model.myTextField)}>
<TextField label="custom-field">
</TextField>
<TextField label="custom-field" />
</CustomField>
);
----
Expand Down
2 changes: 1 addition & 1 deletion articles/hilla/lit/start/basics/index.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -733,7 +733,7 @@ export default function TodoView() {
<TextField
label="Task"
{...field(model.task)}
></TextField>
/>
<Button
theme="primary"
disabled={invalid}
Expand Down

0 comments on commit 1c958fc

Please sign in to comment.