@koumoul/vjsf 3.5.0 → 3.6.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@koumoul/vjsf",
-  "version": "3.5.0",
+  "version": "3.6.0",
   "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": "~1.2.1",
+    "@json-layout/core": "~1.3.0",
     "@vueuse/core": "^10.5.0",
     "debug": "^4.3.4"
   },

package/src/components/node.vue

@@ -50,7 +50,7 @@ const nodeClasses = computed(() => {
   return classes
 })
 
-if (props.modelValue.layout.comp !== 'none' && !props.statefulLayout.options.nodeComponents[props.modelValue.layout.comp]) {
+if (props.modelValue.layout.comp !== 'none' && !props.modelValue.slots?.component && !props.statefulLayout.options.nodeComponents[props.modelValue.layout.comp]) {
   console.error(`vjsf: missing component to render vjsf node "${props.modelValue.layout.comp}", maybe you forgot to register a component from a plugin ?`)
 }
 
@@ -64,9 +64,9 @@ if (props.modelValue.layout.comp !== 'none' && !props.statefulLayout.options.nod
       :class="nodeClasses"
     >
       <node-slot
-        v-if="modelValue.layout.slots?.before"
+        v-if="modelValue.slots?.before"
         key="before"
-        :layout-slot="modelValue.layout.slots?.before"
+        :layout-slot="modelValue.slots?.before"
         :node="modelValue"
         :stateful-layout="statefulLayout"
         :class="beforeAfterClasses[modelValue.options.density]"
@@ -77,9 +77,9 @@ if (props.modelValue.layout.comp !== 'none' && !props.statefulLayout.options.nod
         :node="modelValue"
       />
       <node-slot
-        v-if="modelValue.layout.slots?.component"
+        v-if="modelValue.slots?.component"
         key="component"
-        :layout-slot="modelValue.layout.slots?.component"
+        :layout-slot="modelValue.slots?.component"
         :node="modelValue"
         :stateful-layout="statefulLayout"
       />
@@ -91,9 +91,9 @@ if (props.modelValue.layout.comp !== 'none' && !props.statefulLayout.options.nod
       />
 
       <node-slot
-        v-if="modelValue.layout.slots?.after"
+        v-if="modelValue.slots?.after"
         key="after"
-        :layout-slot="modelValue.layout.slots?.after"
+        :layout-slot="modelValue.slots?.after"
         :node="modelValue"
         :stateful-layout="statefulLayout"
         :class="beforeAfterClasses[modelValue.options.density]"

package/src/composables/use-vjsf.js

@@ -1,6 +1,6 @@
 import { useDefaults, useLocale } from 'vuetify'
 import { StatefulLayout, produceCompileOptions } from '@json-layout/core'
-import { inject, toRaw, shallowRef, computed, ref, watch, useSlots, getCurrentInstance } from 'vue'
+import { inject, toRaw, shallowRef, computed, ref, watch, useSlots, getCurrentInstance, nextTick } from 'vue'
 import { useElementSize } from '@vueuse/core'
 import { getFullOptions } from '../options.js'
 import { setAutoFreeze } from 'immer'
@@ -88,9 +88,10 @@ export const useVjsf = (schema, modelValue, options, nodeComponents, emit, compi
   /**
    * @param {any} data
    */
-  const onDataUpdate = (data) => {
+  const onDataUpdate = async (data) => {
     debug('onDataUpdate', data)
     debug('  -> emit update:modelValue')
+    await nextTick() // necessary for form validation to be applied before emitting new data
     emit('update:modelValue', data)
   }
   const onAutofocus = () => {

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;;;;EA6Ib"}
+{"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;;;;EA8Ib"}