@koumoul/vjsf 4.3.0 → 4.4.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@koumoul/vjsf",
-  "version": "4.3.0",
+  "version": "4.4.0",
   "description": "Generate forms for the vuetify UI library (vuejs) based on annotated JSON schemas.",
   "scripts": {
     "test-tz1": "TZ=Europe/Paris vitest run",
@@ -78,7 +78,7 @@
     "vuetify": "^4.0.0"
   },
   "dependencies": {
-    "@json-layout/core": "~2.7.0",
+    "@json-layout/core": "~2.8.0",
     "@json-layout/vocabulary": "~2.13.0",
     "@vueuse/core": "^12.5.0",
     "debug": "^4.3.4"

package/src/components/nodes/list.vue

@@ -106,6 +106,14 @@ const buttonDensity = computed(() => {
   return options.value.density
 })
 
+const menuActions = computed(() => {
+  return layout.value.listActions.filter(a => {
+    if (a === 'add' || a === 'paste') return false
+    if (a === 'edit' && layout.value.listEditMode === 'inline') return false
+    return true
+  })
+})
+
 const itemTitles = computed(() => {
   const expr = props.modelValue.layout.itemTitle
   if (!expr) return null
@@ -276,7 +284,7 @@ const toggleDialog = (/** @type {boolean} */value) => {
             />
           </v-row>
           <template
-            v-if="!modelValue.options.readOnly && modelValue.layout.listActions.length"
+            v-if="!modelValue.options.readOnly && menuActions.length"
             #append
           >
             <div class="vjsf-list-item-actions-wrapper">
@@ -316,7 +324,7 @@ const toggleDialog = (/** @type {boolean} */value) => {
                 />
               </v-list-item-action>
               <v-list-item-action
-                v-else-if="(editedItem === undefined || modelValue.layout.listEditMode === 'menu') && modelValue.layout.listActions.length"
+                v-else-if="(editedItem === undefined || modelValue.layout.listEditMode === 'menu') && menuActions.length"
               >
                 <v-menu
                   location="bottom end"

package/src/composables/use-dnd.js

@@ -34,15 +34,22 @@ export default function useDnd (array, callback) {
       hovered.value = -1
     },
 
-    // drag the item
-    onDragstart: () => {
+    // drag the item — only when the user activated drag through the handle (handleBind sets draggable)
+    onDragstart: (/** @type {DragEvent} */e) => {
+      if (draggable.value !== itemIndex) {
+        // a child element (text, link, image, etc.) started a native drag; cancel it
+        e.preventDefault()
+        return
+      }
       dragging.value = itemIndex
     },
     onDragover: () => {
+      if (dragging.value === -1) return
       sortableArray.value = moveArrayItem(sortableArray.value, dragging.value, itemIndex)
       dragging.value = itemIndex
     },
     onDragend: () => {
+      if (dragging.value === -1) return
       hovered.value = itemIndex
       dragging.value = -1
       callback()

package/src/composables/use-vjsf.js

@@ -115,6 +115,7 @@ export const useVjsf = (schema, modelValue, options, nodeComponents, emit, compi
   }
 
   let lastDataUpdate
+  let lastEmittedData = toRaw(modelValue.value)
   /**
    * @param {any} data
    */
@@ -126,6 +127,7 @@ export const useVjsf = (schema, modelValue, options, nodeComponents, emit, compi
       debug('onDataUpdate data changed while waiting for nextTick, do not emit')
     } else {
       debug('  -> emit update:modelValue', data)
+      lastEmittedData = data
       emit('update:modelValue', data)
     }
   }
@@ -190,6 +192,10 @@ export const useVjsf = (schema, modelValue, options, nodeComponents, emit, compi
   // case where data is updated from outside
   watch(modelValue, (newData) => {
     const rawData = toRaw(newData)
+    // ignore round-trips of values we just emitted: when async work (e.g. list getItems)
+    // mutates _data after an emit, the v-model echo of that emit can fire here later
+    // and would otherwise overwrite the newer internal state with stale data
+    if (rawData === lastEmittedData) return
     if (statefulLayout.value && statefulLayout.value.data !== rawData) {
       debug('modelValue changed from outside', rawData)
       debug('  -> update statefulLayout data')

package/types/components/nodes/list.vue.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"list.vue.d.ts","sourceRoot":"","sources":["../../../src/components/nodes/list.vue"],"names":[],"mappings":"wBAomEqB,OAAO,YAAY;;AAdxC;;QAGI,0EAA0E;cAAhE,OAAO,KAAK,EAAE,QAAQ,CAAC,OAAO,gBAAgB,EAAE,YAAY,CAAC;;;;QAKvE,gFAAgF;cAAtE,OAAO,KAAK,EAAE,QAAQ,CAAC,OAAO,gBAAgB,EAAE,kBAAkB,CAAC;;;;;QAL7E,0EAA0E;cAAhE,OAAO,KAAK,EAAE,QAAQ,CAAC,OAAO,gBAAgB,EAAE,YAAY,CAAC;;;;QAKvE,gFAAgF;cAAtE,OAAO,KAAK,EAAE,QAAQ,CAAC,OAAO,gBAAgB,EAAE,kBAAkB,CAAC;;;6IAK9E"}
+{"version":3,"file":"list.vue.d.ts","sourceRoot":"","sources":["../../../src/components/nodes/list.vue"],"names":[],"mappings":"wBAqnEqB,OAAO,YAAY;;AAdxC;;QAGI,0EAA0E;cAAhE,OAAO,KAAK,EAAE,QAAQ,CAAC,OAAO,gBAAgB,EAAE,YAAY,CAAC;;;;QAKvE,gFAAgF;cAAtE,OAAO,KAAK,EAAE,QAAQ,CAAC,OAAO,gBAAgB,EAAE,kBAAkB,CAAC;;;;;QAL7E,0EAA0E;cAAhE,OAAO,KAAK,EAAE,QAAQ,CAAC,OAAO,gBAAgB,EAAE,YAAY,CAAC;;;;QAKvE,gFAAgF;cAAtE,OAAO,KAAK,EAAE,QAAQ,CAAC,OAAO,gBAAgB,EAAE,kBAAkB,CAAC;;;6IAK9E"}

package/types/composables/use-dnd.d.ts

@@ -13,7 +13,7 @@ export default function useDnd<T>(array: T[], callback: () => void): {
     itemBind: (itemIndex: number, defaultItemProps: Record<string, any>) => {
         onMouseenter: () => void;
         onMouseleave: () => void;
-        onDragstart: () => void;
+        onDragstart: (e: DragEvent) => void;
         onDragover: () => void;
         onDragend: () => void;
     };

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

@@ -1 +1 @@
-{"version":3,"file":"use-dnd.d.ts","sourceRoot":"","sources":["../../src/composables/use-dnd.js"],"names":[],"mappings":"AAGA;;;;;GAKG;AACH,+BALa,CAAC,SACH,CAAC,EAAE,YACH,MAAM,IAAI;;;;;;0BAoBU,MAAM,oBAA0B,MAAM,SAAS,GAAG,CAAC;;;;;;;4BAyBjD,MAAM;;;;EAmBtC"}
+{"version":3,"file":"use-dnd.d.ts","sourceRoot":"","sources":["../../src/composables/use-dnd.js"],"names":[],"mappings":"AAGA;;;;;GAKG;AACH,+BALa,CAAC,SACH,CAAC,EAAE,YACH,MAAM,IAAI;;;;;;0BAoBU,MAAM,oBAA0B,MAAM,SAAS,GAAG,CAAC;;;yBAWrD,SAAS;;;;4BAqBL,MAAM;;;;EAmBtC"}

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":"AAcA;IACE;;MAEE;gCADO,GAAG;IAGZ;;MAEE;4BADO,OAAO,aAAa,EAAE,kBAAkB;EAGlD;AAiBM,gCAdI,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,MAAM,CAAC,MAAM,EAAE,OAAO,KAAK,EAAE,SAAS,CAAC,QACvC,GAAG,YACH,cAAc,2BAA2B,EAAE,OAAO,0BAClD,cAAc,2BAA2B,EAAE,qBAAqB,sBAChE,OAAO,KAAK,EAAE,GAAG,CAAC,OAAO,mBAAmB,EAAE,cAAc,CAAC,GAC3D;IACV,EAAE,EAAE,OAAO,KAAK,EAAE,GAAG,CAAC,IAAI,CAAC,CAAC;IAC5B,cAAc,EAAE,OAAO,KAAK,EAAE,UAAU,CAAC,OAAO,aAAa,EAAE,kBAAkB,GAAG,IAAI,CAAC,CAAC;IAC1F,SAAS,EAAE,OAAO,KAAK,EAAE,UAAU,CAAC,OAAO,mBAAmB,EAAE,SAAS,GAAG,IAAI,CAAC,CAAA;CAChF,CAyKH"}
+{"version":3,"file":"use-vjsf.d.ts","sourceRoot":"","sources":["../../src/composables/use-vjsf.js"],"names":[],"mappings":"AAcA;IACE;;MAEE;gCADO,GAAG;IAGZ;;MAEE;4BADO,OAAO,aAAa,EAAE,kBAAkB;EAGlD;AAiBM,gCAdI,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,MAAM,CAAC,MAAM,EAAE,OAAO,KAAK,EAAE,SAAS,CAAC,QACvC,GAAG,YACH,cAAc,2BAA2B,EAAE,OAAO,0BAClD,cAAc,2BAA2B,EAAE,qBAAqB,sBAChE,OAAO,KAAK,EAAE,GAAG,CAAC,OAAO,mBAAmB,EAAE,cAAc,CAAC,GAC3D;IACV,EAAE,EAAE,OAAO,KAAK,EAAE,GAAG,CAAC,IAAI,CAAC,CAAC;IAC5B,cAAc,EAAE,OAAO,KAAK,EAAE,UAAU,CAAC,OAAO,aAAa,EAAE,kBAAkB,GAAG,IAAI,CAAC,CAAC;IAC1F,SAAS,EAAE,OAAO,KAAK,EAAE,UAAU,CAAC,OAAO,mBAAmB,EAAE,SAAS,GAAG,IAAI,CAAC,CAAA;CAChF,CA+KH"}