@ditojs/admin 2.73.2 → 2.73.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ditojs/admin",
-  "version": "2.73.2",
+  "version": "2.73.4",
   "type": "module",
   "description": "Dito.js Admin is a schema based admin interface for Dito.js Server, featuring auto-generated views and forms and built with Vue.js",
   "repository": "https://github.com/ditojs/dito/tree/master/packages/admin",
@@ -93,5 +93,5 @@
     "typescript": "^5.9.3",
     "vite": "^7.3.1"
   },
-  "gitHead": "82e7dfcbddabbb559f9c4b04596aafb37c5b5e74"
+  "gitHead": "bbb41fce56cdd91db7a090a2237bd130a699159a"
 }

package/src/components/DitoContainer.vue

@@ -36,9 +36,9 @@
     :label="label"
     :single="single"
     :nested="nested"
-    :disabled="componentDisabled"
     :accumulatedBasis="combinedBasis"
     @errors="onErrors"
+    @update:component="value => (component = value)"
   )
   DitoErrors(:errors="errors")
 </template>
@@ -48,6 +48,7 @@ import { isString, isNumber } from '@ditojs/utils'
 import DitoComponent from '../DitoComponent.js'
 import ValueMixin from '../mixins/ValueMixin.js'
 import ContextMixin from '../mixins/ContextMixin.js'
+import DitoContext from '../DitoContext.js'
 import { getSchemaAccessor } from '../utils/accessor.js'
 import {
   getAllPanelEntries,
@@ -77,11 +78,29 @@ export default DitoComponent.component('DitoContainer', {
 
   data() {
     return {
-      errors: null
+      errors: null,
+      // The nested type component instance, for context-based schema accessor
+      // evaluation.
+      component: null
     }
   },
 
   computed: {
+    context() {
+      return new DitoContext(
+        // When available, use the type component for context-based schema
+        // accessors, but fall back to container.
+        // TODO: Consider architectural inversion to eliminate timing issues:
+        // - Type components render DitoContainer at their root
+        // - Pass type component content through container's default slot
+        // - DitoPane/DitoButtons render type components directly
+        // - Eliminates need for component instance synchronization
+        // - Provides true synchronous access to component context
+        this.component ?? this,
+        { nested: this.nested }
+      )
+    },
+
     name() {
       return this.schema.name
     },

package/src/components/DitoLabel.vue

@@ -1,7 +1,8 @@
 <template lang="pug">
 component.dito-label(
   v-if="text || collapsible"
-  :is="as"
+  :is="collapsible ? 'button' : 'div'"
+  :type="collapsible ? 'button' : null"
   v-bind="attributes"
   :class="{ 'dito-label--active': isActive }"
 )
@@ -51,10 +52,6 @@ export default DitoComponent.component('DitoLabel', {
   },
 
   computed: {
-    as() {
-      return this.collapsible ? 'button' : 'div'
-    },
-
     text() {
       const { label } = this
       return isObject(label) ? label?.text : label

package/src/mixins/TypeMixin.js

@@ -7,6 +7,7 @@ import { asArray, camelize } from '@ditojs/utils'
 // @vue/component
 export default {
   mixins: [ValueMixin, ContextMixin, ValidationMixin],
+  emits: ['update:component'],
 
   props: {
     schema: { type: Object, required: true },
@@ -20,7 +21,6 @@ export default {
     label: { type: String, default: null },
     single: { type: Boolean, default: false },
     nested: { type: Boolean, default: true },
-    disabled: { type: Boolean, default: false },
     accumulatedBasis: { type: Number, default: null }
   },
 
@@ -84,6 +84,11 @@ export default {
       }
     }),
 
+    disabled: getSchemaAccessor('disabled', {
+      type: Boolean,
+      default: false
+    }),
+
     maxLength: getSchemaAccessor('maxLength', {
       type: Number
     }),
@@ -167,6 +172,8 @@ export default {
 
   methods: {
     _register(add) {
+      // Provide component to container for schema accessor evaluation.
+      this.$emit('update:component', add ? this : null)
       // Prevent unnested type components from overriding parent data paths
       if (this.nested) {
         this.schemaComponent._registerComponent(this, add)