@koumoul/vjsf 3.13.0 → 3.13.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@koumoul/vjsf",
-  "version": "3.13.0",
+  "version": "3.13.2",
   "description": "Generate forms for the vuetify UI library (vuejs) based on annotated JSON schemas.",
   "scripts": {
     "test": "vitest run",

package/src/compat/v2.js

@@ -19,7 +19,7 @@ const expressionKeyMappings = {
  */
 const fixSimpleExpression = (expression) => {
   // looks like a simple expression is missing the data. prefix
-  if (expression.match(/^[a-z.]*$/i) && !['data', 'context', 'rootData', 'parent'].some(key => expression.startsWith(key + '.'))) {
+  if (expression.match(/^[a-z.0-9]*$/i) && !['data', 'context', 'rootData', 'parent'].some(key => expression.startsWith(key + '.'))) {
     expression = 'rootData.' + expression
   }
   // replace a array item referenced with dot notation to bracket notation

package/src/components/nodes/date-time-picker.vue

@@ -10,8 +10,10 @@ import { useDate, useDefaults } from 'vuetify'
 import { computed, ref, watch, toRef } from 'vue'
 import { getDateTimeParts, getDateTimeWithOffset, getShortTime } from '../../utils/dates.js'
 import useNode from '../../composables/use-node.js'
+import useCompDefaults from '../../composables/use-comp-defaults.js'
 
 useDefaults({}, 'VjsfDatePicker')
+const timePickerDefaults = useCompDefaults('VTimePicker')
 
 const props = defineProps({
   modelValue: {
@@ -54,8 +56,8 @@ const datePickerProps = computed(() => {
 })
 
 const timePickerProps = computed(() => {
-  const timePickerProps = { ...compProps.value }
-  timePickerProps['ampm-in-title'] = true
+  const timePickerProps = { ...timePickerDefaults.value, ...compProps.value }
+  if (timePickerProps.format !== '24hr') timePickerProps['ampm-in-title'] = true
   if (localData.value) timePickerProps.modelValue = getShortTime(localData.value.slice(11))
   timePickerProps['onUpdate:modelValue'] = (/** @type {string} */value) => {
     if (!localData.value) return

package/src/components/nodes/list.vue

@@ -111,7 +111,7 @@ const pushEmptyIndexedItem = () => {
   if (!newKey.value) return
   if (!newKeyForm.value) return
   if (!newKeyForm.value.isValid) return
-  const newData = { ...(props.modelValue.data ?? {}), [newKey.value]: null }
+  const newData = { ...(props.modelValue.data ?? {}), [newKey.value]: undefined }
   props.statefulLayout.input(props.modelValue, newData)
   if (layout.value.listEditMode === 'inline-single') {
     props.statefulLayout.activateItem(props.modelValue, Object.keys(newData).length - 1)

package/src/components/nodes/time-picker.vue

@@ -7,8 +7,10 @@ import { useDate, useDefaults } from 'vuetify'
 import { computed, toRef } from 'vue'
 import { getShortTime, getLongTime } from '../../utils/dates.js'
 import useNode from '../../composables/use-node.js'
+import useCompDefaults from '../../composables/use-comp-defaults.js'
 
-useDefaults({}, 'VjsfDatePicker')
+useDefaults({}, 'VjsfTimePicker')
+const timePickerDefaults = useCompDefaults('VTimePicker')
 
 const props = defineProps({
   modelValue: {
@@ -28,8 +30,8 @@ const vDate = useDate()
 const { compProps, localData } = useNode(toRef(props, 'modelValue'), props.statefulLayout)
 
 const timePickerProps = computed(() => {
-  const timePickerProps = { ...compProps.value }
-  timePickerProps['ampm-in-title'] = true
+  const timePickerProps = { ...timePickerDefaults.value, ...compProps.value }
+  if (timePickerProps.format !== '24hr') timePickerProps['ampm-in-title'] = true
   if (localData.value) timePickerProps.modelValue = getShortTime(localData.value)
   return timePickerProps
 })