@ditojs/admin 2.60.0 → 2.62.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ditojs/admin",
-  "version": "2.60.0",
+  "version": "2.62.0",
   "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",
@@ -43,55 +43,55 @@
   ],
   "dependencies": {
     "@ditojs/tiptap-footnotes": "^3.0.0",
-    "@ditojs/ui": "^2.60.0",
-    "@ditojs/utils": "^2.60.0",
-    "@kyvg/vue3-notification": "^3.4.1",
+    "@ditojs/ui": "^2.62.0",
+    "@ditojs/utils": "^2.62.0",
+    "@kyvg/vue3-notification": "^3.4.2",
     "@lk77/vue3-color": "^3.0.6",
-    "@tiptap/core": "^3.4.1",
-    "@tiptap/extension-blockquote": "^3.4.1",
-    "@tiptap/extension-bold": "^3.4.1",
-    "@tiptap/extension-bullet-list": "^3.4.1",
-    "@tiptap/extension-code": "^3.4.1",
-    "@tiptap/extension-code-block": "^3.4.1",
-    "@tiptap/extension-document": "^3.4.1",
-    "@tiptap/extension-hard-break": "^3.4.1",
-    "@tiptap/extension-heading": "^3.4.1",
-    "@tiptap/extension-history": "^3.4.1",
-    "@tiptap/extension-horizontal-rule": "^3.4.1",
-    "@tiptap/extension-italic": "^3.4.1",
-    "@tiptap/extension-link": "^3.4.1",
-    "@tiptap/extension-list": "^3.4.1",
-    "@tiptap/extension-list-item": "^3.4.1",
-    "@tiptap/extension-ordered-list": "^3.4.1",
-    "@tiptap/extension-paragraph": "^3.4.1",
-    "@tiptap/extension-strike": "^3.4.1",
-    "@tiptap/extension-subscript": "^3.4.1",
-    "@tiptap/extension-superscript": "^3.4.1",
-    "@tiptap/extension-text": "^3.4.1",
-    "@tiptap/extension-text-style": "^3.4.1",
-    "@tiptap/extension-underline": "^3.4.1",
-    "@tiptap/extensions": "^3.4.1",
-    "@tiptap/pm": "^3.4.1",
-    "@tiptap/vue-3": "^3.4.1",
-    "@vueuse/integrations": "^13.9.0",
+    "@tiptap/core": "^3.10.3",
+    "@tiptap/extension-blockquote": "^3.10.3",
+    "@tiptap/extension-bold": "^3.10.3",
+    "@tiptap/extension-bullet-list": "^3.10.3",
+    "@tiptap/extension-code": "^3.10.3",
+    "@tiptap/extension-code-block": "^3.10.3",
+    "@tiptap/extension-document": "^3.10.3",
+    "@tiptap/extension-hard-break": "^3.10.3",
+    "@tiptap/extension-heading": "^3.10.3",
+    "@tiptap/extension-history": "^3.10.3",
+    "@tiptap/extension-horizontal-rule": "^3.10.3",
+    "@tiptap/extension-italic": "^3.10.3",
+    "@tiptap/extension-link": "^3.10.3",
+    "@tiptap/extension-list": "^3.10.3",
+    "@tiptap/extension-list-item": "^3.10.3",
+    "@tiptap/extension-ordered-list": "^3.10.3",
+    "@tiptap/extension-paragraph": "^3.10.3",
+    "@tiptap/extension-strike": "^3.10.3",
+    "@tiptap/extension-subscript": "^3.10.3",
+    "@tiptap/extension-superscript": "^3.10.3",
+    "@tiptap/extension-text": "^3.10.3",
+    "@tiptap/extension-text-style": "^3.10.3",
+    "@tiptap/extension-underline": "^3.10.3",
+    "@tiptap/extensions": "^3.10.3",
+    "@tiptap/pm": "^3.10.3",
+    "@tiptap/vue-3": "^3.10.3",
+    "@vueuse/integrations": "^14.0.0",
     "codeflask": "^1.4.1",
-    "filesize": "^11.0.2",
+    "filesize": "^11.0.13",
     "filesize-parser": "^1.5.1",
-    "focus-trap": "^7.6.5",
-    "nanoid": "^5.1.5",
+    "focus-trap": "^7.6.6",
+    "nanoid": "^5.1.6",
     "sortablejs": "^1.15.6",
     "tinycolor2": "^1.6.0",
     "tippy.js": "^6.3.7",
-    "type-fest": "^4.41.0",
-    "vue": "^3.5.21",
-    "vue-multiselect": "^3.3.1",
-    "vue-router": "^4.5.1",
+    "type-fest": "^5.2.0",
+    "vue": "^3.5.24",
+    "vue-multiselect": "^3.4.0",
+    "vue-router": "^4.6.3",
     "vue-upload-component": "^3.1.17"
   },
   "devDependencies": {
-    "@ditojs/build": "^2.60.0",
-    "typescript": "^5.9.2",
-    "vite": "^7.1.5"
+    "@ditojs/build": "^2.62.0",
+    "typescript": "^5.9.3",
+    "vite": "^7.2.2"
   },
-  "gitHead": "c7231f64d4106e875c1a3a86e8adbfed2305ca54"
+  "gitHead": "4b9d07116e6ecbcd3b1103fb075c936fc5aa7f90"
 }

package/src/components/DitoDraggable.vue

@@ -2,7 +2,7 @@
 UseSortable.dito-draggable(
   v-if="draggable"
   :class="{ 'dito-draggable--dragging': isDragging }"
-  :tag="tag"
+  :as="as"
   :modelValue="modelValue"
   :options="{ ...options, onStart, onEnd }"
   @update:modelValue="$emit('update:modelValue', $event)"
@@ -10,7 +10,7 @@ UseSortable.dito-draggable(
   slot
 component(
   v-else
-  :is="tag"
+  :is="as"
 )
   slot
 </template>
@@ -31,7 +31,7 @@ export default DitoComponent.component('DitoDraggable', {
       type: Array,
       required: true
     },
-    tag: {
+    as: {
       type: String,
       default: 'div'
     },

package/src/components/DitoElement.vue

@@ -21,7 +21,7 @@ import { isObject, isString, asArray } from '@ditojs/utils'
 // @vue/component
 export default DitoComponent.component('DitoElement', {
   props: {
-    tag: { type: String, default: 'span' },
+    as: { type: String, default: 'span' },
     content: { type: [String, Object], default: null }
   },
 
@@ -36,7 +36,7 @@ export default DitoComponent.component('DitoElement', {
     },
 
     tagName() {
-      return this.options.tag || this.tag
+      return this.options.as || this.as
     },
 
     classes() {

package/src/components/DitoLabel.vue

@@ -1,7 +1,7 @@
 <template lang="pug">
 component.dito-label(
   v-if="text || collapsible"
-  :is="tag"
+  :is="as"
   v-bind="attributes"
   :class="{ 'dito-active': isActive }"
 )
@@ -18,7 +18,7 @@ component.dito-label(
       DitoElement(
         v-for="(prefix, index) of prefixes"
         :key="`prefix-${index}`"
-        tag="span"
+        as="span"
         :content="prefix"
       )
     label(
@@ -32,7 +32,7 @@ component.dito-label(
       DitoElement(
         v-for="(suffix, index) of suffixes"
         :key="`suffix-${index}`"
-        tag="span"
+        as="span"
         :content="suffix"
       )
     .dito-info(
@@ -58,7 +58,7 @@ export default DitoComponent.component('DitoLabel', {
   },
 
   computed: {
-    tag() {
+    as() {
       return this.collapsible ? 'a' : 'div'
     },
 

package/src/components/DitoSchema.vue

@@ -662,6 +662,7 @@ export default DitoComponent.component('DitoSchema', {
       // We can't set `this.data = ...` because it's a property, but we can set
       // all known properties on it to the values returned by
       // `setDefaultValues()`, as they are all reactive already from the starts:
+      // eslint-disable-next-line vue/no-mutating-props
       Object.assign(this.data, setDefaultValues(this.dataSchema, {}, this))
       this.clearErrors()
     },

package/src/styles/_table.scss

@@ -132,12 +132,10 @@ table.dito-table {
         @include table-border;
       }
 
-      & {
-        @include table-border-top;
-        @include table-border-bottom;
-        @include table-border-left;
-        @include table-border-right;
-      }
+      @include table-border-top;
+      @include table-border-bottom;
+      @include table-border-left;
+      @include table-border-right;
     }
 
     &:first-child > * {

package/src/types/DitoTypeList.vue

@@ -37,7 +37,7 @@
       :hasEditButtons="hasEditButtons"
     )
     DitoDraggable(
-      tag="tbody"
+      as="tbody"
       :options="getDraggableOptions()"
       :draggable="draggable"
       :modelValue="updateOrder(sourceSchema, listData, paginationRange)"

package/src/types/DitoTypeUpload.vue

@@ -34,7 +34,7 @@
           span
     DitoDraggable(
       v-model="files"
-      tag="tbody"
+      as="tbody"
       :options="getDraggableOptions()"
       :draggable="draggable"
     )

package/src/utils/schema.js

@@ -3,7 +3,7 @@ import DitoMixin from '../mixins/DitoMixin.js'
 import TypeMixin from '../mixins/TypeMixin.js'
 import { getUid } from './uid.js'
 import { SchemaGraph } from './SchemaGraph.js'
-import { appendDataPath, isTemporaryId } from './data.js'
+import { appendDataPath } from './data.js'
 import { isMatchingType, convertType } from './type.js'
 import {
   isObject,
@@ -771,7 +771,7 @@ export function processData(schema, sourceSchema, data, dataPath, {
     // The schema expects the `wrapPrimitives` transformations to be present on
     // the data that it is applied on, so warp before and unwrap after.
     if (isArray(value)) {
-      const { wrapPrimitives, orderKey, idKey = 'id' } = schema
+      const { wrapPrimitives } = schema
       if (wrapPrimitives) {
         value = value.map(entry => ({
           [wrapPrimitives]: entry
@@ -780,20 +780,6 @@ export function processData(schema, sourceSchema, data, dataPath, {
         // Always shallow-clone array values:
         value = [...value]
       }
-      if (orderKey && target === 'clipboard') {
-        // Sort the data back into the natural sequence as defined by their ids,
-        // so copy-pasting between servers (e.g. nested font-cuts on Lineto)
-        // naturally gets mapped to the same entries in the graph.
-        value.sort((a, b) => {
-          const id1 = a?.[idKey]
-          const id2 = b?.[idKey]
-          return id1 == null || isTemporaryId(id1)
-            ? 1
-            : id2 == null || isTemporaryId(id2)
-              ? -1
-              : id1 - id2
-        })
-      }
     }
     processedData[name] = value
   }