@ditojs/admin 2.34.2 → 2.34.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ditojs/admin",
-  "version": "2.34.2",
+  "version": "2.34.3",
   "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",
@@ -91,5 +91,5 @@
     "vite": "^5.4.8"
   },
   "types": "types",
-  "gitHead": "305801f364bf3d0b663eb0aa4bcd5ef31d88beac"
+  "gitHead": "5a5381114ae8012a9111015e2279fbc9e322c73a"
 }

package/src/components/DitoTreeItem.vue

@@ -6,6 +6,7 @@
     'dito-active': active
   }`
   :style="level > 0 && { '--level': level }"
+  :data-path="path"
 )
   .dito-tree-header(
     v-if="label"
@@ -271,22 +272,38 @@ export default DitoComponent.component('DitoTreeItem', {
       return appendDataPath(this.dataPath, property.name)
     },
 
-    onEdit() {
+    editPath(path) {
       // All we got to do is push the right edit path to the router, the rest
       // is handled by our routes, allowing reloads as well.
       this.$router.push({
-        path: `${this.container.path}${this.path}`,
+        path: `${this.container.path}${path}`,
         // Preserve current query
         query: this.$route.query
       })
     },
 
+    onEdit() {
+      this.editPath(this.path)
+    },
+
     onDelete() {
       // TODO: Implement!
     },
 
     onChange() {
       this.container.onChange()
+    },
+
+    // @override
+    onEndDrag(event) {
+      SortableMixin.methods.onEndDrag.call(this, event)
+      const { item } = event
+      // Preserve active state of edited sub-items, by editing their new path.
+      if (item.classList.contains('dito-active')) {
+        this.$nextTick(() => {
+          this.editPath(event.item.dataset.path)
+        })
+      }
     }
   }
 })

package/src/mixins/DitoMixin.js

@@ -234,9 +234,9 @@ export default {
       }
       if (!store) {
         store = this.setStore(key, reactive({}))
-        if (index != null) {
-          this.setStoreKeyByIndex(index, key)
-        }
+      }
+      if (index != null) {
+        this.setStoreKeyByIndex(index, key)
       }
       return store
     },

package/src/types/DitoTypeMarkup.vue

@@ -373,11 +373,11 @@ export default DitoTypeComponent.register('markup', {
 
         HardBreak.extend({
           addKeyboardShortcuts: () => {
-            const callback = () => this.editor.commands.setHardBreak()
+            const setHardBreak = () => this.editor.commands.setHardBreak()
             return {
-              'Mod-Enter': callback,
-              'Shift-Enter': callback,
-              ...(this.hardBreak ? { Enter: callback } : null)
+              'Mod-Enter': setHardBreak,
+              'Shift-Enter': setHardBreak,
+              ...(this.hardBreak ? { Enter: setHardBreak } : null)
             }
           }
         })