@koumoul/vjsf 3.0.0-beta.4 → 3.0.0-beta.41

package/src/components/nodes/list.vue

@@ -1,10 +1,23 @@
 <script setup>
 import { watch, computed, ref } from 'vue'
-import { VList, VListItem, VListItemAction, VBtn, VMenu, VIcon, VSheet, VSpacer, VDivider, VRow, VListSubheader } from 'vuetify/components'
-import { isSection, clone } from '@json-layout/core'
+import { useDefaults, useTheme } from 'vuetify'
+import { VList, VListItem, VListItemAction, VListItemTitle, VListSubheader } from 'vuetify/components/VList'
+import { VRow } from 'vuetify/components/VGrid'
+import { VTextField } from 'vuetify/components/VTextField'
+import { VSheet } from 'vuetify/components/VSheet'
+import { VDivider } from 'vuetify/components/VDivider'
+import { VIcon } from 'vuetify/components/VIcon'
+import { VBtn } from 'vuetify/components/VBtn'
+import { VMenu } from 'vuetify/components/VMenu'
+import { VForm } from 'vuetify/components/VForm'
+import { isSection, clone, getRegexp } from '@json-layout/core'
 import Node from '../node.vue'
-import { moveArrayItem } from '../../utils/index.js'
+import { moveDataItem } from '../../utils/index.js'
 import useDnd from '../../composables/use-dnd.js'
+import useCompDefaults from '../../composables/use-comp-defaults.js'
+
+useDefaults({}, 'VjsfList')
+const vSheetProps = useCompDefaults('VjsfList-VSheet', { border: true })
 
 const props = defineProps({
   modelValue: {
@@ -19,15 +32,21 @@ const props = defineProps({
   }
 })
 
+const theme = useTheme()
+
 /* use composable for drag and drop */
 const { activeDnd, sortableArray, draggable, hovered, dragging, itemBind, handleBind } = useDnd(props.modelValue.children, () => {
-  props.statefulLayout.input(props.modelValue, sortableArray.value.map((child) => child.data))
+  const newData = props.modelValue.layout.indexed
+    ? sortableArray.value.reduce((a, child) => { a[child.key] = child.data; return a }, /** @type {Record<string, any>} */({}))
+    : sortableArray.value.map((child) => child.data)
+  console.log(newData)
+  props.statefulLayout.input(props.modelValue, newData)
 })
 watch(() => props.modelValue.children, (array) => { sortableArray.value = array })
 
 /* manage hovered and edited items */
 const editedItem = computed(() => {
-  return props.statefulLayout.activeItems[props.modelValue.fullKey]
+  return props.statefulLayout.activatedItems[props.modelValue.fullKey]
 })
 const menuOpened = ref(-1)
 const activeItem = computed(() => {
@@ -48,11 +67,77 @@ const buttonDensity = computed(() => {
   return props.modelValue.options.density
 })
 
+const pushEmptyItem = () => {
+  const newData = (props.modelValue.data ?? []).concat([undefined])
+  props.statefulLayout.input(props.modelValue, newData)
+  if (props.modelValue.layout.listEditMode === 'inline-single') {
+    props.statefulLayout.activateItem(props.modelValue, newData.length - 1)
+  }
+}
+
+const newKey = ref('')
+/** @type {import('vue').Ref<InstanceType<typeof import('vuetify/components/VForm').VForm> | null>} */
+const newKeyForm = ref(null)
+const pushEmptyIndexedItem = () => {
+  if (!newKey.value) return
+  if (!newKeyForm.value) return
+  if (!newKeyForm.value.isValid) return
+  const newData = { ...(props.modelValue.data ?? {}), [newKey.value]: null }
+  props.statefulLayout.input(props.modelValue, newData)
+  if (props.modelValue.layout.listEditMode === 'inline-single') {
+    props.statefulLayout.activateItem(props.modelValue, Object.keys(newData).length - 1)
+  }
+  newKey.value = ''
+  newKeyForm.value?.reset()
+}
+
+/**
+ * @param {number} childIndex
+ */
+const deleteItem = (childIndex) => {
+  if (props.modelValue.layout.indexed) {
+    const oldData = /** @type {Record<string, any>} */(props.modelValue.data)
+    const keys = Object.keys(props.modelValue.data)
+    /** @type {Record<string, any>} */
+    const newData = {}
+    for (let i = 0; i < keys.length; i++) {
+      if (i !== childIndex) newData[keys[i]] = oldData[keys[i]]
+    }
+    props.statefulLayout.input(props.modelValue, newData)
+  } else {
+    const newData = [...props.modelValue.data.slice(0, childIndex), ...props.modelValue.data.slice(childIndex + 1)]
+    props.statefulLayout.input(props.modelValue, newData)
+  }
+
+  menuOpened.value = -1
+}
+
+/**
+ * @param {import('@json-layout/core').StateNode} child
+ * @param {number} childIndex
+ */
+const duplicateItem = (child, childIndex) => {
+  const newData = [...props.modelValue.data.slice(0, childIndex), clone(child.data), ...props.modelValue.data.slice(childIndex)]
+  props.statefulLayout.input(props.modelValue, newData)
+  if (props.modelValue.layout.listEditMode === 'inline-single') {
+    props.statefulLayout.activateItem(props.modelValue, childIndex + 1)
+  }
+  menuOpened.value = -1
+}
+
+const itemBorderColor = computed(() => (/** @type {import('@json-layout/core').StateNode} */child, /** @type {number} */childIndex) => {
+  if (editedItem.value === childIndex) return theme.current.value.colors.primary
+  if (child.validated && (child.error || child.childError)) return theme.current.value.colors.error
+  if (props.modelValue.options.readOnly) return 'transparent'
+  if (activeItem.value === childIndex) return theme.current.value.colors.primary
+  return 'transparent'
+})
+
 </script>
 
 <template>
-  <v-sheet :elevation="1">
-    <v-list :density="modelValue.options.density">
+  <v-sheet v-bind="vSheetProps">
+    <v-list class="py-0">
       <v-list-subheader v-if="modelValue.layout.title">
         {{ modelValue.layout.title }}
       </v-list-subheader>
@@ -62,11 +147,17 @@ const buttonDensity = computed(() => {
       >
         <v-list-item
           v-bind="itemBind(childIndex)"
-          :density="modelValue.options.density"
           :draggable="draggable === childIndex"
-          :variant="editedItem === childIndex ? 'outlined' : 'flat'"
+          variant="flat"
+          :style="`border: 1px solid ${itemBorderColor(child, childIndex)}`"
           class="pa-1 vjsf-list-item"
         >
+          <v-list-item-title
+            v-if="modelValue.layout.indexed"
+            class="pl-4 pt-2"
+          >
+            {{ child.key }}
+          </v-list-item-title>
           <v-row class="ma-0">
             <node
               v-for="grandChild of isSection(child) ? child.children : [child]"
@@ -76,115 +167,153 @@ const buttonDensity = computed(() => {
             />
           </v-row>
           <template
-            v-if="activeItem === childIndex"
+            v-if="!modelValue.options.readOnly && modelValue.layout.listActions.length"
             #append
           >
-            <div>
-              <v-list-item-action
-                v-if="modelValue.layout.listActions.includes('edit') && modelValue.layout.listEditMode === 'inline-single'"
-              >
+            <div class="vjsf-list-item-actions-wrapper">
+              <v-list-item-action v-if="activeItem !== childIndex">
                 <v-btn
-                  v-if="editedItem !== childIndex"
-                  :title="modelValue.messages.edit"
-                  icon="mdi-pencil"
+                  style="visibility:hidden"
                   variant="text"
-                  color="primary"
                   :density="buttonDensity"
-                  @click="statefulLayout.activateItem(modelValue, childIndex)"
-                />
-                <v-btn
-                  v-else
-                  :title="modelValue.messages.edit"
                   icon="mdi-pencil"
-                  variant="flat"
-                  color="primary"
-                  :density="buttonDensity"
-                  @click="statefulLayout.deactivateItem(modelValue)"
-                />
-              </v-list-item-action>
-              <v-list-item-action
-                v-if="editedItem === undefined && modelValue.layout.listActions.includes('sort') && activeDnd"
-              >
-                <v-btn
-                  :title="modelValue.messages.sort"
-                  icon="mdi-arrow-up-down"
-                  variant="plain"
-                  :density="buttonDensity"
-                  v-bind="handleBind(childIndex)"
                 />
               </v-list-item-action>
-              <v-list-item-action
-                v-if="editedItem === undefined && (modelValue.layout.listActions.includes('delete') || modelValue.layout.listActions.includes('duplicate') || modelValue.layout.listActions.includes('sort'))"
-              >
-                <v-menu
-                  location="bottom end"
-                  @update:model-value="value => {menuOpened = value ? childIndex : -1}"
+              <template v-else>
+                <v-list-item-action
+                  v-if="modelValue.layout.listActions.includes('edit') && modelValue.layout.listEditMode === 'inline-single'"
                 >
-                  <template #activator="{props: activatorProps}">
-                    <v-btn
-                      v-bind="activatorProps"
-                      icon="mdi-dots-vertical"
-                      variant="plain"
-                      slim
-                      :density="buttonDensity"
-                    />
-                  </template>
-                  <v-list :density="modelValue.options.density">
-                    <v-list-item
-                      v-if="modelValue.layout.listActions.includes('delete')"
-                      base-color="warning"
-                      @click="statefulLayout.input(modelValue, [...modelValue.data.slice(0, childIndex), ...modelValue.data.slice(childIndex + 1)])"
-                    >
-                      <template #prepend>
-                        <v-icon icon="mdi-delete" />
-                      </template>
-                      {{ modelValue.messages.delete }}
-                    </v-list-item>
-                    <v-list-item
-                      v-if="modelValue.layout.listActions.includes('duplicate')"
-                      @click="statefulLayout.input(modelValue, [...modelValue.data.slice(0, childIndex), clone(child.data), ...modelValue.data.slice(childIndex)])"
-                    >
-                      <template #prepend>
-                        <v-icon icon="mdi-content-duplicate" />
-                      </template>
-                      {{ modelValue.messages.duplicate }}
-                    </v-list-item>
-                    <v-list-item
-                      v-if="modelValue.layout.listActions.includes('sort')"
-                      @click="statefulLayout.input(modelValue, moveArrayItem(modelValue.data, childIndex, childIndex - 1))"
-                    >
-                      <template #prepend>
-                        <v-icon icon="mdi-arrow-up" />
-                      </template>
-                      {{ modelValue.messages.up }}
-                    </v-list-item>
-                    <v-list-item
-                      v-if="modelValue.layout.listActions.includes('sort')"
-                      @click="statefulLayout.input(modelValue, moveArrayItem(modelValue.data, childIndex, childIndex + 1))"
-                    >
-                      <template #prepend>
-                        <v-icon icon="mdi-arrow-down" />
-                      </template>
-                      {{ modelValue.messages.down }}
-                    </v-list-item>
-                  </v-list>
-                </v-menu>
-              </v-list-item-action>
+                  <v-btn
+                    v-if="editedItem !== childIndex"
+                    :title="modelValue.messages.edit"
+                    icon="mdi-pencil"
+                    variant="text"
+                    color="primary"
+                    :density="buttonDensity"
+                    @click="statefulLayout.activateItem(modelValue, childIndex)"
+                  />
+                  <v-btn
+                    v-else
+                    :title="modelValue.messages.close"
+                    icon="mdi-close"
+                    variant="flat"
+                    color="primary"
+                    :density="buttonDensity"
+                    @click="statefulLayout.deactivateItem(modelValue)"
+                  />
+                </v-list-item-action>
+                <v-list-item-action
+                  v-if="editedItem === undefined && modelValue.layout.listActions.includes('sort') && activeDnd"
+                >
+                  <v-btn
+                    :title="modelValue.messages.sort"
+                    icon="mdi-arrow-up-down"
+                    variant="plain"
+                    :density="buttonDensity"
+                    v-bind="handleBind(childIndex)"
+                  />
+                </v-list-item-action>
+                <v-list-item-action
+                  v-if="editedItem === undefined && (modelValue.layout.listActions.includes('delete') || modelValue.layout.listActions.includes('duplicate') || modelValue.layout.listActions.includes('sort'))"
+                >
+                  <v-menu
+                    location="bottom end"
+                    @update:model-value="value => {menuOpened = value ? childIndex : -1}"
+                  >
+                    <template #activator="{props: activatorProps}">
+                      <v-btn
+                        v-bind="activatorProps"
+                        icon="mdi-dots-vertical"
+                        variant="plain"
+                        slim
+                        :density="buttonDensity"
+                      />
+                    </template>
+                    <v-list>
+                      <v-list-item
+                        v-if="modelValue.layout.listActions.includes('delete')"
+                        base-color="warning"
+                        @click="deleteItem(childIndex)"
+                      >
+                        <template #prepend>
+                          <v-icon icon="mdi-delete" />
+                        </template>
+                        {{ modelValue.messages.delete }}
+                      </v-list-item>
+                      <v-list-item
+                        v-if="modelValue.layout.listActions.includes('duplicate')"
+                        @click="duplicateItem(child, childIndex)"
+                      >
+                        <template #prepend>
+                          <v-icon icon="mdi-content-duplicate" />
+                        </template>
+                        {{ modelValue.messages.duplicate }}
+                      </v-list-item>
+                      <v-list-item
+                        v-if="modelValue.layout.listActions.includes('sort')"
+                        @click="statefulLayout.input(modelValue, moveDataItem(modelValue.data, childIndex, childIndex - 1))"
+                      >
+                        <template #prepend>
+                          <v-icon icon="mdi-arrow-up" />
+                        </template>
+                        {{ modelValue.messages.up }}
+                      </v-list-item>
+                      <v-list-item
+                        v-if="modelValue.layout.listActions.includes('sort')"
+                        @click="statefulLayout.input(modelValue, moveDataItem(modelValue.data, childIndex, childIndex + 1))"
+                      >
+                        <template #prepend>
+                          <v-icon icon="mdi-arrow-down" />
+                        </template>
+                        {{ modelValue.messages.down }}
+                      </v-list-item>
+                    </v-list>
+                  </v-menu>
+                </v-list-item-action>
+              </template>
             </div>
           </template>
         </v-list-item>
         <v-divider v-if="childIndex < modelValue.children.length - 1" />
       </template>
-      <v-list-item v-if="!modelValue.options.readOnly && modelValue.layout.listActions.includes('add')">
-        <v-spacer />
-        <v-btn
-          color="primary"
-          :density="modelValue.options.density"
-          @click="statefulLayout.input(modelValue, (modelValue.data ?? []).concat([undefined]))"
-        >
-          {{ modelValue.messages.addItem }}
-        </v-btn>
-        <v-spacer />
+      <v-list-item
+        v-if="!modelValue.options.readOnly && modelValue.layout.listActions.includes('add')"
+        class="py-2"
+      >
+        <template v-if="modelValue.layout.indexed">
+          <v-form
+            ref="newKeyForm"
+            style="max-width: 250px;"
+            @submit.prevent
+          >
+            <v-text-field
+              v-model="newKey"
+              variant="outlined"
+              :placeholder="modelValue.messages.addItem"
+              hide-details
+              :rules="[v => !modelValue.children.some(c => c.key === v), v => !v || modelValue.layout.indexed?.some(pattern => v.match(getRegexp(pattern)))]"
+              @keypress.enter="pushEmptyIndexedItem"
+            >
+              <template #append>
+                <v-icon
+                  color="primary"
+                  size="large"
+                  @click="pushEmptyIndexedItem"
+                >
+                  mdi-plus
+                </v-icon>
+              </template>
+            </v-text-field>
+          </v-form>
+        </template>
+        <template v-else>
+          <v-btn
+            color="primary"
+            @click="pushEmptyItem"
+          >
+            {{ modelValue.messages.addItem }}
+          </v-btn>
+        </template>
       </v-list-item>
     </v-list>
   </v-sheet>
@@ -195,4 +324,10 @@ const buttonDensity = computed(() => {
   height: 100%;
   align-items: start;
 }
+.vjsf-list-item .v-list-item__content {
+  padding-right: 4px;
+}
+.vjsf-list-item-actions-wrapper {
+  /*margin: -4px;*/
+}
 </style>

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

@@ -1,7 +1,8 @@
 <script>
 import { defineComponent, h, computed, shallowRef, ref } from 'vue'
-import { VCombobox } from 'vuetify/components'
+import { VCombobox } from 'vuetify/components/VCombobox'
 import { getInputProps, getCompSlots } from '../../utils/index.js'
+import { useDefaults } from 'vuetify'
 
 export default defineComponent({
   props: {
@@ -17,6 +18,8 @@ export default defineComponent({
     }
   },
   setup (props) {
+    useDefaults({}, 'VjsfNumberCombobox')
+
     /** @type import('vue').Ref<import('@json-layout/vocabulary').SelectItems> */
     const items = shallowRef(props.modelValue.layout.items ?? [])
     /** @type import('vue').Ref<boolean> */

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

@@ -1,7 +1,8 @@
 <script>
 import { defineComponent, h, computed } from 'vue'
-import { VTextField } from 'vuetify/components'
+import { VTextField } from 'vuetify/components/VTextField'
 import { getInputProps, getCompSlots } from '../../utils/index.js'
+import { useDefaults } from 'vuetify'
 
 export default defineComponent({
   props: {
@@ -17,6 +18,8 @@ export default defineComponent({
     }
   },
   setup (props) {
+    useDefaults({}, 'VjsfNumberField')
+
     const fieldProps = computed(() => {
       const fieldProps = getInputProps(props.modelValue, props.statefulLayout, ['step', 'min', 'max', 'placeholder'])
       fieldProps.type = 'number'

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

@@ -1,8 +1,14 @@
 <script setup>
-import { VSelect, VRow } from 'vuetify/components'
-import { shallowRef, watch } from 'vue'
+import { VRow, VCol } from 'vuetify/components/VGrid'
+import { VSelect } from 'vuetify/components/VSelect'
+import { ref, watch, computed, h } from 'vue'
 import { isSection } from '@json-layout/core'
+import { isCompObject } from '@json-layout/vocabulary'
+import { getInputProps } from '../../utils/index.js'
 import Node from '../node.vue'
+import { useDefaults } from 'vuetify'
+
+useDefaults({}, 'VjsfOneOfSelect')
 
 const props = defineProps({
   modelValue: {
@@ -17,40 +23,56 @@ const props = defineProps({
   }
 })
 
-/** @type import('vue').ShallowRef<import('@json-layout/core').SkeletonTree | undefined> */
-const activeChildTree = shallowRef(undefined)
+/** @type import('vue').Ref<string | undefined> */
+const activeChildTree = ref(undefined)
 watch(() => props.modelValue, () => {
-  // we set the active oneOf child as the one whose schema validates on the current data
-  if (props.modelValue.fullKey in props.statefulLayout.activeItems) {
-    activeChildTree.value = props.modelValue.skeleton.childrenTrees?.[props.statefulLayout.activeItems[props.modelValue.fullKey]]
+  if (props.modelValue.children?.length === 1) {
+    if (typeof props.modelValue.children[0].key === 'number') {
+      activeChildTree.value = props.modelValue.skeleton.childrenTrees?.[props.modelValue.children[0].key]
+    }
   } else {
     activeChildTree.value = undefined
   }
 }, { immediate: true })
 
-const onChange = (/** @type import('@json-layout/core').SkeletonTree */childTree) => {
+const onChange = (/** @type {string} */childTree) => {
   if (!props.modelValue.skeleton.childrenTrees) return
   props.statefulLayout.activateItem(props.modelValue, props.modelValue.skeleton.childrenTrees.indexOf(childTree))
 }
 
+const fieldProps = computed(() => {
+  const fieldProps = getInputProps(props.modelValue, props.statefulLayout)
+  fieldProps.modelValue = activeChildTree.value
+  fieldProps['onUpdate:modelValue'] = onChange
+  const items = []
+  for (const childTreePointer of props.modelValue.skeleton.childrenTrees || []) {
+    const childTree = props.statefulLayout.compiledLayout.skeletonTrees[childTreePointer]
+    const childLayout = props.statefulLayout.compiledLayout.normalizedLayouts[childTree.root]
+    if (!isCompObject(childLayout) || !childLayout.if || !!props.statefulLayout.evalNodeExpression(props.modelValue, childLayout.if, props.modelValue.data)) {
+      items.push(childTree)
+    }
+  }
+  fieldProps.items = items
+  fieldProps.itemTitle = 'title'
+  fieldProps.itemValue = (/** @type {import('@json-layout/core').SkeletonTree} */childTree) => childTree.root
+  return fieldProps
+})
 </script>
 
 <template>
-  <v-select
-    v-if="modelValue.skeleton.childrenTrees"
-    v-model="activeChildTree"
-    :items="modelValue.skeleton.childrenTrees"
-    item-title="title"
-    return-object
-    :error-messages="modelValue.validated ? modelValue.error : null"
-    @update:model-value="onChange"
-  />
-  <v-row v-if="modelValue.children?.[0]">
-    <node
-      v-for="grandChild of isSection(modelValue.children?.[0]) ? modelValue.children?.[0].children : modelValue.children"
-      :key="grandChild.fullKey"
-      :model-value="/** @type import('../../types.js').VjsfNode */(grandChild)"
-      :stateful-layout="statefulLayout"
-    />
+  <v-row>
+    <v-col v-if="modelValue.skeleton.childrenTrees">
+      <v-select
+        v-bind="fieldProps"
+      />
+    </v-col>
+    <template v-if="modelValue.children?.[0]">
+      <node
+        v-for="grandChild of isSection(modelValue.children?.[0]) ? modelValue.children?.[0].children : modelValue.children"
+        :key="grandChild.fullKey"
+        :model-value="/** @type import('../../types.js').VjsfNode */(grandChild)"
+        :stateful-layout="statefulLayout"
+      />
+    </template>
   </v-row>
 </template>

package/src/components/nodes/radio-group.vue

@@ -0,0 +1,55 @@
+<script>
+import { VRadio } from 'vuetify/components/VRadio'
+import { VRadioGroup } from 'vuetify/components/VRadioGroup'
+import { VSkeletonLoader } from 'vuetify/components/VSkeletonLoader'
+import { defineComponent, h, computed } from 'vue'
+import { getInputProps, getCompSlots } from '../../utils/index.js'
+import useGetItems from '../../composables/use-get-items.js'
+import { useDefaults } from 'vuetify'
+
+export default defineComponent({
+  props: {
+    modelValue: {
+      /** @type import('vue').PropType<import('../../types.js').VjsfRadioGroupNode> */
+      type: Object,
+      required: true
+    },
+    statefulLayout: {
+      /** @type import('vue').PropType<import('../../types.js').VjsfStatefulLayout> */
+      type: Object,
+      required: true
+    }
+  },
+  setup (props) {
+    useDefaults({}, 'VjsfRadioGroup')
+
+    const getItems = useGetItems(props)
+
+    const fieldProps = computed(() => {
+      const fieldProps = getInputProps(props.modelValue, props.statefulLayout)
+      return fieldProps
+    })
+
+    const fieldSlots = computed(() => {
+      const slots = getCompSlots(props.modelValue, props.statefulLayout)
+      /** @type {import('vue').VNode[]} */
+      const children = []
+      if (getItems.loading.value) {
+        children.push(h(VSkeletonLoader, { type: 'chip' }))
+      } else {
+        for (const item of getItems.items.value) {
+          children.push(h(VRadio, { label: item.title, value: item.value }))
+        }
+      }
+      slots.default = () => children
+      return slots
+    })
+
+    // @ts-ignore
+    return () => {
+      return h(VRadioGroup, fieldProps.value, fieldSlots.value)
+    }
+  }
+})
+
+</script>

package/src/components/nodes/section.vue

@@ -1,7 +1,10 @@
 <script setup>
-import { VRow } from 'vuetify/components'
+import { VRow } from 'vuetify/components/VGrid'
 import Node from '../node.vue'
 import SectionHeader from '../fragments/section-header.vue'
+import { useDefaults } from 'vuetify'
+
+useDefaults({}, 'VjsfSection')
 
 defineProps({
   modelValue: {