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

AutoForm : Fix disabled from field config #943

Merged
merged 10 commits into from
Jan 23, 2025
Merged

AutoForm : Fix disabled from field config #943

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
5bca440
fix: switch from placeholder: to data-placeholder: prefix class for S…
damienroche Nov 5, 2024
4ed4c6a
chore: build registry
sadeghbarati Nov 9, 2024
097c07c
Merge branch 'unovue:dev' into dev
damienroche Dec 2, 2024
8ce4378
Merge branch 'unovue:dev' into dev
damienroche Dec 5, 2024
cb116f5
fix: disabled prop for input
damienroche Dec 5, 2024
3c990aa
fix: update default AutFormFieldInput
damienroche Dec 17, 2024
86d265d
fix: disabled on field number
damienroche Dec 17, 2024
0c77d19
fix: add disabled support for boolean
damienroche Dec 17, 2024
f468403
fix: support disabled for date + enum
damienroche Dec 17, 2024
7f1a4d5
fix: support disabled on file
damienroche Dec 17, 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
4 changes: 2 additions & 2 deletions apps/www/src/lib/registry/default/ui/auto-form/AutoFormFieldBoolean.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { FormControl, FormDescription, FormField, FormItem, FormMessage } from '
import { Switch } from '@/lib/registry/default/ui/switch'
import { computed } from 'vue'
import AutoFormLabel from './AutoFormLabel.vue'
import { beautifyObjectName } from './utils'
import { beautifyObjectName, maybeBooleanishToBoolean } from './utils'

const props = defineProps<FieldProps>()

Expand All @@ -21,7 +21,7 @@ const booleanComponent = computed(() => props.config?.component === 'switch' ? S
<component
:is="booleanComponent"
v-bind="{ ...slotProps.componentField }"
:disabled="disabled"
:disabled="maybeBooleanishToBoolean(config?.inputProps?.disabled) ?? disabled"
:checked="slotProps.componentField.modelValue"
@update:checked="slotProps.componentField['onUpdate:modelValue']"
/>
Expand Down
4 changes: 2 additions & 2 deletions apps/www/src/lib/registry/default/ui/auto-form/AutoFormFieldDate.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import { cn } from '@/lib/utils'
import { DateFormatter, getLocalTimeZone } from '@internationalized/date'
import { CalendarIcon } from 'lucide-vue-next'
import AutoFormLabel from './AutoFormLabel.vue'
import { beautifyObjectName } from './utils'
import { beautifyObjectName, maybeBooleanishToBoolean } from './utils'

defineProps<FieldProps>()

Expand All @@ -28,7 +28,7 @@ const df = new DateFormatter('en-US', {
<slot v-bind="slotProps">
<div>
<Popover>
<PopoverTrigger as-child :disabled="disabled">
<PopoverTrigger as-child :disabled="maybeBooleanishToBoolean(config?.inputProps?.disabled) ?? disabled">
<Button
variant="outline"
:class="cn(
Expand Down
6 changes: 3 additions & 3 deletions apps/www/src/lib/registry/default/ui/auto-form/AutoFormFieldEnum.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { Label } from '@/lib/registry/default/ui/label'
import { RadioGroup, RadioGroupItem } from '@/lib/registry/default/ui/radio-group'
import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@/lib/registry/default/ui/select'
import AutoFormLabel from './AutoFormLabel.vue'
import { beautifyObjectName } from './utils'
import { beautifyObjectName, maybeBooleanishToBoolean } from './utils'

defineProps<FieldProps & {
options?: string[]
Expand All @@ -20,14 +20,14 @@ defineProps<FieldProps & {
</AutoFormLabel>
<FormControl>
<slot v-bind="slotProps">
<RadioGroup v-if="config?.component === 'radio'" :disabled="disabled" :orientation="'vertical'" v-bind="{ ...slotProps.componentField }">
<RadioGroup v-if="config?.component === 'radio'" :disabled="maybeBooleanishToBoolean(config?.inputProps?.disabled) ?? disabled" :orientation="'vertical'" v-bind="{ ...slotProps.componentField }">
<div v-for="(option, index) in options" :key="option" class="mb-2 flex items-center gap-3 space-y-0">
<RadioGroupItem :id="`${option}-${index}`" :value="option" />
<Label :for="`${option}-${index}`">{{ beautifyObjectName(option) }}</Label>
</div>
</RadioGroup>

<Select v-else :disabled="disabled" v-bind="{ ...slotProps.componentField }">
<Select v-else :disabled="maybeBooleanishToBoolean(config?.inputProps?.disabled) ?? disabled" v-bind="{ ...slotProps.componentField }">
<SelectTrigger class="w-full">
<SelectValue :placeholder="config?.inputProps?.placeholder" />
</SelectTrigger>
Expand Down
2 changes: 1 addition & 1 deletion apps/www/src/lib/registry/default/ui/auto-form/AutoFormFieldFile.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ async function parseFileAsString(file: File | undefined): Promise<string> {
v-if="!inputFile"
type="file"
v-bind="{ ...config?.inputProps }"
:disabled="disabled"
:disabled="config?.inputProps?.disabled ?? disabled"
@change="async (ev: InputEvent) => {
const file = (ev.target as HTMLInputElement).files?.[0]
inputFile = file
Expand Down
2 changes: 1 addition & 1 deletion apps/www/src/lib/registry/default/ui/auto-form/AutoFormFieldInput.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ const inputComponent = computed(() => props.config?.component === 'textarea' ? T
:is="inputComponent"
type="text"
v-bind="{ ...slotProps.componentField, ...config?.inputProps }"
:disabled="disabled"
:disabled="config?.inputProps?.disabled ?? disabled"
/>
</slot>
</FormControl>
Expand Down
2 changes: 1 addition & 1 deletion apps/www/src/lib/registry/default/ui/auto-form/AutoFormFieldNumber.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ defineProps<FieldProps>()
</AutoFormLabel>
<FormControl>
<slot v-bind="slotProps">
<Input type="number" v-bind="{ ...slotProps.componentField, ...config?.inputProps }" :disabled="disabled" />
<Input type="number" v-bind="{ ...slotProps.componentField, ...config?.inputProps }" :disabled="config?.inputProps?.disabled ?? disabled" />
</slot>
</FormControl>
<FormDescription v-if="config?.description">
Expand Down
17 changes: 17 additions & 0 deletions apps/www/src/lib/registry/default/ui/auto-form/utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,3 +169,20 @@ export function getFromPath<TValue = unknown, TFallback = TValue>(

return resolvedValue as TValue | undefined
}

type Booleanish = boolean | 'true' | 'false'

export function booleanishToBoolean(value: Booleanish) {
switch (value) {
case 'true':
case true:
return true
case 'false':
case false:
return false
}
}

export function maybeBooleanishToBoolean(value?: Booleanish) {
return value ? booleanishToBoolean(value) : undefined
}
4 changes: 2 additions & 2 deletions apps/www/src/lib/registry/new-york/ui/auto-form/AutoFormFieldBoolean.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { FormControl, FormDescription, FormField, FormItem, FormMessage } from '
import { Switch } from '@/lib/registry/new-york/ui/switch'
import { computed } from 'vue'
import AutoFormLabel from './AutoFormLabel.vue'
import { beautifyObjectName } from './utils'
import { beautifyObjectName, maybeBooleanishToBoolean } from './utils'

const props = defineProps<FieldProps>()

Expand All @@ -21,7 +21,7 @@ const booleanComponent = computed(() => props.config?.component === 'switch' ? S
<component
:is="booleanComponent"
v-bind="{ ...slotProps.componentField }"
:disabled="disabled"
:disabled="maybeBooleanishToBoolean(config?.inputProps?.disabled) ?? disabled"
:checked="slotProps.componentField.modelValue"
@update:checked="slotProps.componentField['onUpdate:modelValue']"
/>
Expand Down
4 changes: 2 additions & 2 deletions apps/www/src/lib/registry/new-york/ui/auto-form/AutoFormFieldDate.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import { cn } from '@/lib/utils'
import { DateFormatter, getLocalTimeZone } from '@internationalized/date'
import { CalendarIcon } from '@radix-icons/vue'
import AutoFormLabel from './AutoFormLabel.vue'
import { beautifyObjectName } from './utils'
import { beautifyObjectName, maybeBooleanishToBoolean } from './utils'

defineProps<FieldProps>()

Expand All @@ -28,7 +28,7 @@ const df = new DateFormatter('en-US', {
<slot v-bind="slotProps">
<div>
<Popover>
<PopoverTrigger as-child :disabled="disabled">
<PopoverTrigger as-child :disabled="maybeBooleanishToBoolean(config?.inputProps?.disabled) ?? disabled">
<Button
variant="outline"
:class="cn(
Expand Down
6 changes: 3 additions & 3 deletions apps/www/src/lib/registry/new-york/ui/auto-form/AutoFormFieldEnum.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { Label } from '@/lib/registry/new-york/ui/label'
import { RadioGroup, RadioGroupItem } from '@/lib/registry/new-york/ui/radio-group'
import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@/lib/registry/new-york/ui/select'
import AutoFormLabel from './AutoFormLabel.vue'
import { beautifyObjectName } from './utils'
import { beautifyObjectName, maybeBooleanishToBoolean } from './utils'

defineProps<FieldProps & {
options?: string[]
Expand All @@ -20,14 +20,14 @@ defineProps<FieldProps & {
</AutoFormLabel>
<FormControl>
<slot v-bind="slotProps">
<RadioGroup v-if="config?.component === 'radio'" :disabled="disabled" :orientation="'vertical'" v-bind="{ ...slotProps.componentField }">
<RadioGroup v-if="config?.component === 'radio'" :disabled="maybeBooleanishToBoolean(config?.inputProps?.disabled) ?? disabled" :orientation="'vertical'" v-bind="{ ...slotProps.componentField }">
<div v-for="(option, index) in options" :key="option" class="mb-2 flex items-center gap-3 space-y-0">
<RadioGroupItem :id="`${option}-${index}`" :value="option" />
<Label :for="`${option}-${index}`">{{ beautifyObjectName(option) }}</Label>
</div>
</RadioGroup>

<Select v-else :disabled="disabled" v-bind="{ ...slotProps.componentField }">
<Select v-else :disabled="maybeBooleanishToBoolean(config?.inputProps?.disabled) ?? disabled" v-bind="{ ...slotProps.componentField }">
<SelectTrigger class="w-full">
<SelectValue :placeholder="config?.inputProps?.placeholder" />
</SelectTrigger>
Expand Down
2 changes: 1 addition & 1 deletion apps/www/src/lib/registry/new-york/ui/auto-form/AutoFormFieldFile.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ async function parseFileAsString(file: File | undefined): Promise<string> {
v-if="!inputFile"
type="file"
v-bind="{ ...config?.inputProps }"
:disabled="disabled"
:disabled="config?.inputProps?.disabled ?? disabled"
@change="async (ev: InputEvent) => {
const file = (ev.target as HTMLInputElement).files?.[0]
inputFile = file
Expand Down
2 changes: 1 addition & 1 deletion apps/www/src/lib/registry/new-york/ui/auto-form/AutoFormFieldInput.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ const inputComponent = computed(() => props.config?.component === 'textarea' ? T
:is="inputComponent"
type="text"
v-bind="{ ...slotProps.componentField, ...config?.inputProps }"
:disabled="disabled"
:disabled="config?.inputProps?.disabled ?? disabled"
/>
</slot>
</FormControl>
Expand Down
2 changes: 1 addition & 1 deletion apps/www/src/lib/registry/new-york/ui/auto-form/AutoFormFieldNumber.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ defineProps<FieldProps>()
</AutoFormLabel>
<FormControl>
<slot v-bind="slotProps">
<Input type="number" v-bind="{ ...slotProps.componentField, ...config?.inputProps }" :disabled="disabled" />
<Input type="number" v-bind="{ ...slotProps.componentField, ...config?.inputProps }" :disabled="config?.inputProps?.disabled ?? disabled" />
</slot>
</FormControl>
<FormDescription v-if="config?.description">
Expand Down
17 changes: 17 additions & 0 deletions apps/www/src/lib/registry/new-york/ui/auto-form/utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,3 +169,20 @@ export function getFromPath<TValue = unknown, TFallback = TValue>(

return resolvedValue as TValue | undefined
}

type Booleanish = boolean | 'true' | 'false'

export function booleanishToBoolean(value: Booleanish) {
switch (value) {
case 'true':
case true:
return true
case 'false':
case false:
return false
}
}

export function maybeBooleanishToBoolean(value?: Booleanish) {
return value ? booleanishToBoolean(value) : undefined
}