Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: enable multiple-type toggle-group in shadcn-ui examples #753

Merged
merged 3 commits into from
Sep 10, 2024
Merged

chore: enable multiple-type toggle-group in shadcn-ui examples #753

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fec2e60
chore: enable multiple-type toggle-group in shadcn-ui examples
pwli0755 Aug 28, 2024
9ba244a
fix auto revalidate
Aug 28, 2024
29dcf9e
revert console error log
pwli0755 Aug 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions examples/shadcn-ui/src/App.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ const UserSubscriptionSchema = z.object({
accountType: z.enum(['personal', 'business'], {
required_error: 'You must select an account type',
}),
accountTypes: z.array(z.enum(['personal', 'business'])).min(1,'You must select at least one account type'),
interests: z
.array(z.string())
.min(3, 'You must select at least three interest'),
Expand Down Expand Up @@ -164,6 +165,22 @@ function App() {
<FieldError>{fields.accountType.errors}</FieldError>
)}
</Field>
<Field>
<Label htmlFor={fields.accountTypes.id}>Account types</Label>
<ToggleGroupConform
type="multiple"
meta={fields.accountTypes}
items={[
{ value: 'personal', label: 'Personal' },
{ value: 'business', label: 'Business' },
{ value: 'business2', label: 'Business2' },
]}
/>
{fields.accountTypes.allErrors && (
<FieldError>{
Object.values(fields.accountTypes.allErrors).flat()}</FieldError>
)}
</Field>
<Field>
<fieldset>Interests</fieldset>
<CheckboxGroupConform
Expand Down
28 changes: 24 additions & 4 deletions examples/shadcn-ui/src/components/conform/ToggleGroup.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,19 +6,20 @@ import { ComponentProps, ElementRef, useRef } from 'react';
import { ToggleGroup, ToggleGroupItem } from '@/components/ui/toggle-group';

export const ToggleGroupConform = ({
type = 'single',
meta,
items,
...props
}: {
items: Array<{ value: string; label: string }>;
meta: FieldMetadata<string>;
meta: FieldMetadata<string | string[]>;
} & Omit<ComponentProps<typeof ToggleGroup>, 'defaultValue'>) => {
const toggleGroupRef = useRef<ElementRef<typeof ToggleGroup>>(null);
const control = useControl(meta);
const control = useControl<string | string[]>(meta);

return (
<>
<input
{type === 'single' ? <input
name={meta.name}
ref={control.register}
className="sr-only"
Expand All @@ -27,9 +28,28 @@ export const ToggleGroupConform = ({
onFocus={() => {
toggleGroupRef.current?.focus();
}}
/>
/> : <select
multiple
name={meta.name}
className="sr-only"
ref={control.register}
onFocus={() => {
toggleGroupRef.current?.focus();
}}
defaultValue={meta.initialValue}
tabIndex={-1}
>
{items.map((item) => (
<option value={item.value} key={item.value}>
{item.label}
</option>
))}
</select>
}

<ToggleGroup
{...props}
type={type}
ref={toggleGroupRef}
value={control.value}
onValueChange={(value) => {
Expand Down