@ditojs/admin 2.36.0 → 2.36.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ditojs/admin",
-  "version": "2.36.0",
+  "version": "2.36.2",
   "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",
@@ -39,34 +39,34 @@
     "not ie_mob > 0"
   ],
   "dependencies": {
-    "@ditojs/ui": "^2.36.0",
+    "@ditojs/ui": "^2.36.2",
     "@ditojs/utils": "^2.36.0",
     "@kyvg/vue3-notification": "^3.4.0",
     "@lk77/vue3-color": "^3.0.6",
-    "@tiptap/core": "^2.8.0",
-    "@tiptap/extension-blockquote": "^2.8.0",
-    "@tiptap/extension-bold": "^2.8.0",
-    "@tiptap/extension-bullet-list": "^2.8.0",
-    "@tiptap/extension-code": "^2.8.0",
-    "@tiptap/extension-code-block": "^2.8.0",
-    "@tiptap/extension-document": "^2.8.0",
-    "@tiptap/extension-hard-break": "^2.8.0",
-    "@tiptap/extension-heading": "^2.8.0",
-    "@tiptap/extension-history": "^2.8.0",
-    "@tiptap/extension-horizontal-rule": "^2.8.0",
-    "@tiptap/extension-italic": "^2.8.0",
-    "@tiptap/extension-link": "^2.8.0",
-    "@tiptap/extension-list-item": "^2.8.0",
-    "@tiptap/extension-ordered-list": "^2.8.0",
-    "@tiptap/extension-paragraph": "^2.8.0",
-    "@tiptap/extension-strike": "^2.8.0",
-    "@tiptap/extension-subscript": "^2.8.0",
-    "@tiptap/extension-superscript": "^2.8.0",
-    "@tiptap/extension-text": "^2.8.0",
-    "@tiptap/extension-text-style": "^2.8.0",
-    "@tiptap/extension-underline": "^2.8.0",
-    "@tiptap/pm": "^2.8.0",
-    "@tiptap/vue-3": "^2.8.0",
+    "@tiptap/core": "^2.9.1",
+    "@tiptap/extension-blockquote": "^2.9.1",
+    "@tiptap/extension-bold": "^2.9.1",
+    "@tiptap/extension-bullet-list": "^2.9.1",
+    "@tiptap/extension-code": "^2.9.1",
+    "@tiptap/extension-code-block": "^2.9.1",
+    "@tiptap/extension-document": "^2.9.1",
+    "@tiptap/extension-hard-break": "^2.9.1",
+    "@tiptap/extension-heading": "^2.9.1",
+    "@tiptap/extension-history": "^2.9.1",
+    "@tiptap/extension-horizontal-rule": "^2.9.1",
+    "@tiptap/extension-italic": "^2.9.1",
+    "@tiptap/extension-link": "^2.9.1",
+    "@tiptap/extension-list-item": "^2.9.1",
+    "@tiptap/extension-ordered-list": "^2.9.1",
+    "@tiptap/extension-paragraph": "^2.9.1",
+    "@tiptap/extension-strike": "^2.9.1",
+    "@tiptap/extension-subscript": "^2.9.1",
+    "@tiptap/extension-superscript": "^2.9.1",
+    "@tiptap/extension-text": "^2.9.1",
+    "@tiptap/extension-text-style": "^2.9.1",
+    "@tiptap/extension-underline": "^2.9.1",
+    "@tiptap/pm": "^2.9.1",
+    "@tiptap/vue-3": "^2.9.1",
     "@vueuse/integrations": "^11.1.0",
     "codeflask": "^1.4.1",
     "filesize": "^10.1.6",
@@ -77,16 +77,16 @@
     "tinycolor2": "^1.6.0",
     "tippy.js": "^6.3.7",
     "type-fest": "^4.26.1",
-    "vue": "^3.5.11",
+    "vue": "^3.5.12",
     "vue-multiselect": "^3.1.0",
     "vue-router": "^4.4.5",
     "vue-upload-component": "^3.1.17"
   },
   "devDependencies": {
-    "@ditojs/build": "^2.36.0",
+    "@ditojs/build": "^2.36.2",
     "typescript": "^5.6.3",
-    "vite": "^5.4.8"
+    "vite": "^5.4.10"
   },
   "types": "types",
-  "gitHead": "ba2704e52f9f04ea2d28fb5a418c4e721784aa50"
+  "gitHead": "1fe383dfcdd9f856f324450d60c081be51071cf9"
 }

package/src/DitoContext.js

@@ -32,10 +32,10 @@ function toObject(context) {
     if (object) break
     raw = Object.getPrototypeOf(raw)
   } while (raw)
-  if (raw !== rawStart) {
+  if (object && raw !== rawStart) {
     // Assign the passed context with the original object as well, so we don't
     // have to search for it again:
-    contexts.set(rawStart, object)
+    contexts.set(raw, object)
   }
   return object
 }

package/src/components/DitoRoot.vue

@@ -119,14 +119,12 @@ export default DitoComponent.component('DitoRoot', {
     tippyDelegate(this.$el, {
       target: '.dito-info',
       theme: 'info',
-      appendTo: node => node.closest('.dito-pane'),
       animation: 'shift-away-subtle',
       interactive: true,
       delay: 250,
       zIndex: 1,
-      onCreate(instance) {
-        instance.setContent(instance.reference.dataset.info)
-      }
+      appendTo: node => node.closest('.dito-pane'),
+      onShow: instance => instance.setContent(instance.reference.dataset.info)
     })
 
     // Clear the label marked as active on all mouse and keyboard events, except

package/src/components/DitoSchema.vue

@@ -598,26 +598,32 @@ export default DitoComponent.component('DitoSchema', {
           while (dataPathParts.length > 0) {
             const components = this.getComponentsByDataPath(dataPathParts)
             for (const component of components) {
-              if (
-                await component.navigateToComponent?.(
-                  fullDataPath,
-                  subComponents => {
-                    let found = false
-                    for (const component of subComponents) {
-                      const errs = errors[component.dataPath]
-                      if (
-                        errs &&
-                        component.showValidationErrors(errs, first && focus)
-                      ) {
-                        found = true
-                        first = false
-                        break
-                      }
+              const navigated = await component.navigateToComponent?.(
+                fullDataPath,
+                subComponents => {
+                  let found = false
+                  for (const component of subComponents) {
+                    const matched = Object.fromEntries(
+                      Object.entries(errors).filter(
+                        ([dataPath]) =>
+                          normalizeDataPath(dataPath).startsWith(
+                            component.dataPath
+                          )
+                      )
+                    )
+                    if (
+                      Object.keys(matched).length > 0 &&
+                      component.showValidationErrors(matched, first && focus)
+                    ) {
+                      found = true
+                      first = false
+                      break
                     }
-                    return found
                   }
-                )
-              ) {
+                  return found
+                }
+              )
+              if (navigated) {
                 // Found a nested form to display at least parts fo the errors.
                 // We can't show all errors at once, so we're done. Don't call
                 // `notifyErrors()` yet, as we can only display it once

package/src/mixins/SourceMixin.js

@@ -587,6 +587,7 @@ export default {
                   this.$nextTick(callOnComplete)
                 })
             }
+            return
           }
           // Keep removing the last part until we find a match.
           dataPathParts.pop()

package/src/mixins/ValidationMixin.js

@@ -95,6 +95,9 @@ export default {
     showValidationErrors(errors, focus) {
       // Convert from AJV errors objects to an array of error messages
       this.errors = []
+      if (errors.length === 0) {
+        return false
+      }
       for (const { message } of errors) {
         this.addError(message, true)
       }

package/src/types/DitoTypeComputed.vue

@@ -31,7 +31,7 @@ export default DitoTypeComponent.register(
         get() {
           const { schema } = this
           if (schema.data || schema.dataPath) {
-            const value = this.handleDataSchema(schema, 'schema')
+            const value = this.handleDataSchema(schema, 'value')
             // TODO: Fix side-effects
             // eslint-disable-next-line max-len
             // eslint-disable-next-line vue/no-side-effects-in-computed-properties