@koumoul/vjsf 3.0.1 → 3.1.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@koumoul/vjsf",
-  "version": "3.0.1",
+  "version": "3.1.1",
   "description": "Generate forms for the vuetify UI library (vuejs) based on annotated JSON schemas.",
   "scripts": {
     "test": "vitest",
@@ -70,7 +70,7 @@
     "vuetify": "^3.6.13"
   },
   "dependencies": {
-    "@json-layout/core": "0.33.4",
+    "@json-layout/core": "0.34.1",
     "@vueuse/core": "^10.5.0",
     "debug": "^4.3.4"
   },

package/src/components/nodes/number-field.vue

@@ -27,7 +27,7 @@ export default defineComponent({
     const fullProps = computed(() => {
       const fullProps = { ...inputProps.value }
       fullProps.type = 'number'
-      fullProps['onUpdate:modelValue'] = (/** @type string */value) => props.statefulLayout.input(props.modelValue, value && Number(value))
+      fullProps['onUpdate:modelValue'] = (/** @type string */value) => props.statefulLayout.input(props.modelValue, value ? Number(value) : undefined)
       fullProps.modelValue = localData.value
       return fullProps
     })

package/src/components/nodes/one-of-select.vue

@@ -64,7 +64,10 @@ const fieldProps = computed(() => {
 
 <template>
   <v-row>
-    <v-col v-if="modelValue.skeleton.childrenTrees">
+    <v-col
+      v-if="modelValue.skeleton.childrenTrees"
+      cols="12"
+    >
       <v-select
         v-bind="fieldProps"
         :model-value="activeChildTree"

package/src/composables/use-comp-defaults.js

@@ -14,6 +14,6 @@ export default function useCompDefaultProps (name, localDefaults = null) {
   return computed(() => {
     const componentDefaults = defaults.value?.[name] ?? {}
     if (!localDefaults) return componentDefaults
-    return { ...componentDefaults, ...localDefaults }
+    return { ...localDefaults, ...componentDefaults }
   })
 }

package/src/composables/use-vjsf.js

@@ -50,9 +50,10 @@ export const useVjsf = (schema, modelValue, options, nodeComponents, emit, compi
   // cf https://github.com/vuetifyjs/vuetify/blob/master/packages/vuetify/src/composables/form.ts
   /** @type {any | null} */
   const form = inject(Symbol.for('vuetify:form'), null)
+  const formMemberId = `vjsf-${Math.random().toString(36).substring(2, 9)}`
   if (form) {
     form.register({
-      id: `vjsf-${Math.random().toString(36).substring(2, 9)}`,
+      id: formMemberId,
       validate: () => {
         statefulLayout.value?.validate()
         return statefulLayout.value?.errors || []
@@ -61,6 +62,8 @@ export const useVjsf = (schema, modelValue, options, nodeComponents, emit, compi
       resetValidation: () => statefulLayout.value?.resetValidation(),
       vm: getCurrentInstance()
     })
+  } else {
+    console.warn('Vjsf should be wrapped in VForm')
   }
 
   const slots = useSlots()
@@ -77,9 +80,9 @@ export const useVjsf = (schema, modelValue, options, nodeComponents, emit, compi
     emit('update:state', statefulLayout)
     if (form) {
       // cf https://vuetifyjs.com/en/components/forms/#validation-state
-      if (statefulLayout.valid) form.update('vjsf', true, [])
-      else if (statefulLayout.hasHiddenError) form.update('vjsf', null, [])
-      else form.update('vjsf', false, [])
+      if (statefulLayout.valid) form.update(formMemberId, true, [])
+      else if (statefulLayout.hasHiddenError) form.update(formMemberId, null, [])
+      else form.update(formMemberId, false, [])
     }
   }
   /**

package/types/composables/use-vjsf.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"use-vjsf.d.ts","sourceRoot":"","sources":["../../src/composables/use-vjsf.js"],"names":[],"mappings":"AAaA;IACE;;MAEE;gCADO,GAAG;IAGZ;;MAEE;4BADO,OAAO,aAAa,EAAE,kBAAkB;EAGlD;AAWM,gCARI,OAAO,KAAK,EAAE,GAAG,CAAC,MAAM,CAAC,cACzB,OAAO,KAAK,EAAE,GAAG,CAAC,GAAG,CAAC,WACtB,OAAO,KAAK,EAAE,GAAG,CAAC,OAAO,aAAa,EAAE,kBAAkB,GAAG,IAAI,CAAC,kBAClE,OAAO,MAAM,EAAE,OAAO,KAAK,EAAE,SAAS,CAAC,QACvC,GAAG;;;;EAwIb"}
+{"version":3,"file":"use-vjsf.d.ts","sourceRoot":"","sources":["../../src/composables/use-vjsf.js"],"names":[],"mappings":"AAaA;IACE;;MAEE;gCADO,GAAG;IAGZ;;MAEE;4BADO,OAAO,aAAa,EAAE,kBAAkB;EAGlD;AAWM,gCARI,OAAO,KAAK,EAAE,GAAG,CAAC,MAAM,CAAC,cACzB,OAAO,KAAK,EAAE,GAAG,CAAC,GAAG,CAAC,WACtB,OAAO,KAAK,EAAE,GAAG,CAAC,OAAO,aAAa,EAAE,kBAAkB,GAAG,IAAI,CAAC,kBAClE,OAAO,MAAM,EAAE,OAAO,KAAK,EAAE,SAAS,CAAC,QACvC,GAAG;;;;EA2Ib"}