@ditojs/admin 2.0.2 → 2.0.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ditojs/admin",
-  "version": "2.0.2",
+  "version": "2.0.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",
@@ -33,38 +33,39 @@
     "not ie_mob > 0"
   ],
   "dependencies": {
-    "@ditojs/ui": "^2.0.1",
+    "@ditojs/ui": "^2.0.4",
     "@ditojs/utils": "^2.0.1",
     "@kyvg/vue3-notification": "^2.9.0",
     "@lk77/vue3-color": "^3.0.6",
-    "@tiptap/core": "^2.0.1",
-    "@tiptap/extension-blockquote": "^2.0.1",
-    "@tiptap/extension-bold": "^2.0.1",
-    "@tiptap/extension-bullet-list": "^2.0.1",
-    "@tiptap/extension-code": "^2.0.1",
-    "@tiptap/extension-code-block": "^2.0.1",
-    "@tiptap/extension-document": "^2.0.1",
-    "@tiptap/extension-hard-break": "^2.0.1",
-    "@tiptap/extension-heading": "^2.0.1",
-    "@tiptap/extension-history": "^2.0.1",
-    "@tiptap/extension-horizontal-rule": "^2.0.1",
-    "@tiptap/extension-italic": "^2.0.1",
-    "@tiptap/extension-link": "^2.0.1",
-    "@tiptap/extension-list-item": "^2.0.1",
-    "@tiptap/extension-ordered-list": "^2.0.1",
-    "@tiptap/extension-paragraph": "^2.0.1",
-    "@tiptap/extension-strike": "^2.0.1",
-    "@tiptap/extension-text": "^2.0.1",
-    "@tiptap/extension-underline": "^2.0.1",
-    "@tiptap/pm": "^2.0.1",
-    "@tiptap/vue-3": "^2.0.1",
+    "@tiptap/core": "^2.0.2",
+    "@tiptap/extension-blockquote": "^2.0.2",
+    "@tiptap/extension-bold": "^2.0.2",
+    "@tiptap/extension-bullet-list": "^2.0.2",
+    "@tiptap/extension-code": "^2.0.2",
+    "@tiptap/extension-code-block": "^2.0.2",
+    "@tiptap/extension-document": "^2.0.2",
+    "@tiptap/extension-hard-break": "^2.0.2",
+    "@tiptap/extension-heading": "^2.0.2",
+    "@tiptap/extension-history": "^2.0.2",
+    "@tiptap/extension-horizontal-rule": "^2.0.2",
+    "@tiptap/extension-italic": "^2.0.2",
+    "@tiptap/extension-link": "^2.0.2",
+    "@tiptap/extension-list-item": "^2.0.2",
+    "@tiptap/extension-ordered-list": "^2.0.2",
+    "@tiptap/extension-paragraph": "^2.0.2",
+    "@tiptap/extension-strike": "^2.0.2",
+    "@tiptap/extension-text": "^2.0.2",
+    "@tiptap/extension-underline": "^2.0.2",
+    "@tiptap/pm": "^2.0.2",
+    "@tiptap/vue-3": "^2.0.2",
+    "@vueuse/integrations": "^10.0.0-beta.2",
     "codeflask": "^1.4.1",
     "filesize": "^10.0.7",
     "filesize-parser": "^1.5.0",
     "nanoid": "^4.0.2",
+    "sortablejs": "^1.15.0",
     "tinycolor2": "^1.6.0",
     "vue": "^3.2.47",
-    "vue-draggable-plus": "^0.1.1",
     "vue-multiselect": "^3.0.0-beta.1",
     "vue-router": "^4.1.6",
     "vue-upload-component": "^3.1.8"
@@ -80,7 +81,7 @@
     "vite": "^4.2.1"
   },
   "types": "types",
-  "gitHead": "3e7213fbe25c5697f4f11dada830037934e396c8",
+  "gitHead": "e2236a6758c7716a20f8e9fc7c7787521782d6d4",
   "scripts": {
     "build": "vite build",
     "watch": "yarn build --mode 'development' --watch",

package/src/components/DitoLabel.vue

@@ -52,7 +52,7 @@ component.dito-label(
         // so that buttons always appear right-aligned:
         flex: 1 1 auto
       &::after
-        content: '\a0' // &nbps;
+        content: '\a0' //  
 
     .dito-label-prefix,
     .dito-label-suffix
@@ -94,8 +94,9 @@ component.dito-label(
     > .dito-schema-content
       > .dito-pane
         > .dito-container
-          > .dito-label:not(.dito-label-component)
-            display: inline-block
+          display: flex
+          flex-flow: row wrap
+          align-items: baseline
 </style>
 
 <script>
@@ -130,11 +131,7 @@ export default DitoComponent.component('dito-label', {
     },
 
     attributes() {
-      return {
-        ...(this.collapsible && {
-          onClick: this.onClick
-        })
-      }
+      return this.collapsible ? { onClick: this.onClick } : {}
     },
 
     isActive() {

package/src/components/DitoTreeItem.vue

@@ -60,14 +60,12 @@
         :store="store"
         :disabled="disabled"
       )
-  vue-draggable(
+  use-sortable(
     v-if="childrenSchema"
     v-show="opened"
     :modelValue="updateOrder(childrenSchema, childrenList)"
     @update:modelValue="value => childrenList = value"
-    @start="onStartDrag"
-    @end="onEndDrag($event, childrenSchema)"
-    v-bind="getDragOptions(childrenDraggable, true)"
+    :options="getSortableOptions(childrenDraggable, true)"
   )
     dito-tree-item(
       v-for="(item, index) in childrenItems"
@@ -152,17 +150,15 @@
 </style>
 
 <script>
-import { VueDraggable } from 'vue-draggable-plus'
 import DitoComponent from '../DitoComponent.js'
-import OrderedMixin from '../mixins/OrderedMixin.js'
+import SortableMixin from '../mixins/SortableMixin.js'
 import { appendDataPath } from '../utils/data.js'
 import { getSchemaAccessor } from '../utils/accessor.js'
 import { getNamedSchemas, hasFormSchema } from '../utils/schema.js'
 
 // @vue/component
 export default DitoComponent.component('dito-tree-item', {
-  components: { VueDraggable },
-  mixins: [OrderedMixin],
+  mixins: [SortableMixin],
   inject: ['container'],
 
   props: {

package/src/mixins/DitoMixin.js

@@ -245,19 +245,6 @@ export default {
       }
     },
 
-    getDragOptions(draggable, fallback = false) {
-      return {
-        animation: 150,
-        disabled: !draggable,
-        handle: '.dito-button-drag',
-        dragClass: 'dito-drag-active',
-        chosenClass: 'dito-drag-chosen',
-        ghostClass: 'dito-drag-ghost',
-        fallbackClass: 'dito-drag-fallback',
-        forceFallback: fallback
-      }
-    },
-
     // TODO: Rename *Link() to *Route().
     getQueryLink(query) {
       return {

package/src/mixins/{OrderedMixin.js → SortableMixin.js}

@@ -1,7 +1,9 @@
-import ItemMixin from '../mixins/ItemMixin.js'
+import ItemMixin from './ItemMixin.js'
+import { UseSortable } from '@vueuse/integrations/useSortable/component'
 
 // @vue/component
 export default {
+  components: { UseSortable },
   mixins: [ItemMixin],
 
   data() {
@@ -11,6 +13,21 @@ export default {
   },
 
   methods: {
+    getSortableOptions(draggable, fallback = false) {
+      return {
+        animation: 150,
+        disabled: !draggable,
+        handle: '.dito-button-drag',
+        dragClass: 'dito-sortable-active',
+        chosenClass: 'dito-sortable-chosen',
+        ghostClass: 'dito-sortable-ghost',
+        fallbackClass: 'dito-sortable-fallback',
+        forceFallback: fallback,
+        onStart: this.onStartDrag,
+        onEnd: this.onEndDrag
+      }
+    },
+
     onStartDrag() {
       this.dragging = true
     },

package/src/mixins/TypeMixin.js

@@ -3,7 +3,7 @@ import ValidationMixin from './ValidationMixin.js'
 import { getSchemaAccessor } from '../utils/accessor.js'
 import { computeValue } from '../utils/schema.js'
 import { getItem, getParentItem } from '../utils/data.js'
-import { isString, asArray, camelize } from '@ditojs/utils'
+import { isString, asArray } from '@ditojs/utils'
 
 // @vue/component
 export default {
@@ -156,10 +156,17 @@ export default {
       type: String
     }),
 
+    // @overridable
+    events() {
+      const { onFocus, onBlur, onInput, onChange } = this
+      return { onFocus, onBlur, onInput, onChange }
+    },
+
     attributes() {
       const { nativeField, textField } = this.$options
 
       const attributes = {
+        ...this.events,
         disabled: this.disabled
       }
 
@@ -176,25 +183,7 @@ export default {
         }
       }
 
-      return {
-        ...Object.fromEntries(
-          Object.entries(this.$attrs).filter(([key]) => key.startsWith('on'))
-        ),
-        ...this.events,
-        ...attributes
-      }
-    },
-
-    events() {
-      const events = this.getEvents()
-      // Register callbacks for all provides non-recognized events,
-      // assuming they are native events.
-      // TODO: Move to vue3-style `on[A-Z]` event handlers naming that aren't
-      // namespaced in `schema.events` once the transition is complete.
-      for (const event of Object.keys(this.schema.events || {})) {
-        events[`on${camelize(event, true)}`] ||= () => this.emitEvent(event)
-      }
-      return events
+      return attributes
     },
 
     validations() {
@@ -235,12 +224,6 @@ export default {
       }
     },
 
-    // @overridable
-    getEvents() {
-      const { onFocus, onBlur, onInput, onChange } = this
-      return { onFocus, onBlur, onInput, onChange }
-    },
-
     // @overridable
     getValidations() {
       return null

package/src/styles/{_drag.sass → _sortable.sass}

@@ -1,4 +1,4 @@
-.dito-drag-fallback
+.dito-sortable-fallback
   filter: drop-shadow(0 2px 4px $color-shadow)
 
   // Nested <td> need to also switch to `display: block` style during dragging

package/src/styles/style.sass

@@ -5,6 +5,6 @@
 @import '_pulldown'
 @import '_layout'
 @import '_scroll'
-@import '_drag'
+@import '_sortable'
 @import '_table'
 @import '_notifications'

package/src/types/TypeButton.vue

@@ -41,16 +41,17 @@ export default TypeComponent.register([
     closeForm: getSchemaAccessor('closeForm', {
       type: Boolean,
       default: false
-    })
-  },
+    }),
 
-  methods: {
     // @override
-    getEvents() {
+    events() {
       const { onFocus, onBlur, onClick } = this
       return { onFocus, onBlur, onClick }
-    },
+    }
+
+  },
 
+  methods: {
     async submit(options) {
       return this.resourceComponent?.submit(this, options)
     },

package/src/types/TypeList.vue

@@ -38,13 +38,11 @@
       :columns="columns"
       :hasEditButtons="hasEditButtons"
     )
-    vue-draggable(
+    use-sortable(
       tag="tbody"
       :modelValue="updateOrder(sourceSchema, listData, paginationRange)"
       @update:modelValue="value => listData = value"
-      @start="onStartDrag"
-      @end="onEndDrag"
-      :v-bind="getDragOptions(draggable)"
+      :options="getSortableOptions(draggable)"
     )
       tr(
         v-for="item, index in listData"
@@ -176,11 +174,10 @@
 </style>
 
 <script>
-import { VueDraggable } from 'vue-draggable-plus'
 import TypeComponent from '../TypeComponent.js'
 import DitoContext from '../DitoContext.js'
 import SourceMixin from '../mixins/SourceMixin.js'
-import OrderedMixin from '../mixins/OrderedMixin.js'
+import SortableMixin from '../mixins/SortableMixin.js'
 import {
   getNamedSchemas, getViewEditPath,
   resolveSchemaComponent, resolveSchemaComponents
@@ -191,8 +188,7 @@ import { pickBy, equals, hyphenate } from '@ditojs/utils'
 
 // @vue/component
 export default TypeComponent.register('list', {
-  components: { VueDraggable },
-  mixins: [SourceMixin, OrderedMixin],
+  mixins: [SourceMixin, SortableMixin],
 
   getSourceType(type) {
     // No need for transformation here. See TypeTreeList for details.

package/src/types/TypeMultiselect.vue

@@ -7,8 +7,6 @@
 )
   vue-multiselect(
     ref="element"
-    v-model="selectedOptions"
-    v-bind="attributes"
     :show-labels="false"
     :placeholder="placeholder"
     tag-placeholder="Press enter to add new tag",
@@ -25,9 +23,12 @@
     :clear-on-select="!searchFilter"
     :close-on-select="!stayOpen"
     :loading="isLoading"
-    @open="populate = true"
+    @open="onOpen"
+    @close="onClose"
     @tag="onAddTag"
     @search-change="onSearchChange"
+    v-model="selectedOptions"
+    v-bind="attributes"
   )
   button.dito-button-clear.dito-button-overlay(
     type="button"
@@ -224,6 +225,7 @@
 <script>
 import TypeComponent from '../TypeComponent.js'
 import DitoContext from '../DitoContext.js'
+import TypeMixin from '../mixins/TypeMixin.js'
 import OptionsMixin from '../mixins/OptionsMixin.js'
 import VueMultiselect from 'vue-multiselect'
 import { getSchemaAccessor } from '../utils/accessor.js'
@@ -329,6 +331,24 @@ export default TypeComponent.register('multiselect', {
       this.$refs.element.activate()
     },
 
+    onOpen() {
+      this.populate = true
+    },
+
+    onClose() {
+      // Since we don't fire blur events while the multiselect is open (see
+      // below), we need to do it here, when it's actually closed.
+      if (this.focused) {
+        this.onBlur()
+      }
+    },
+
+    onBlur() {
+      if (!this.$refs.element.isOpen) {
+        TypeMixin.methods.onBlur.call(this)
+      }
+    },
+
     onAddTag(tag) {
       const option = this.addTagOption(tag)
       if (option) {

package/src/types/TypeSwitch.vue

@@ -2,7 +2,6 @@
 switch-button.dito-switch(
   ref="element"
   :id="dataPath"
-  :sync="true"
   :labels="labels"
   v-model="value"
   v-bind="attributes"

package/src/types/TypeUpload.vue

@@ -12,12 +12,10 @@
           span Status
         th
           span
-    vue-draggable(
+    use-sortable(
       tag="tbody"
-      @start="onStartDrag"
-      @end="onEndDrag"
       v-model="files"
-      v-bind="getDragOptions(draggable)"
+      :options="getSortableOptions(draggable)"
     )
       tr(
         v-for="(file, index) in files"
@@ -107,21 +105,20 @@
 </style>
 
 <script>
-import VueUpload from 'vue-upload-component'
-import { VueDraggable } from 'vue-draggable-plus'
 import TypeComponent from '../TypeComponent.js'
 import DitoContext from '../DitoContext.js'
-import OrderedMixin from '../mixins/OrderedMixin.js'
+import SortableMixin from '../mixins/SortableMixin.js'
 import parseFileSize from 'filesize-parser'
 import { getSchemaAccessor } from '../utils/accessor.js'
 import { formatFileSize } from '../utils/units.js'
 import { appendDataPath } from '../utils/data.js'
 import { isArray, asArray, escapeHtml } from '@ditojs/utils'
+import VueUpload from 'vue-upload-component'
 
 // @vue/component
 export default TypeComponent.register('upload', {
-  components: { VueUpload, VueDraggable },
-  mixins: [OrderedMixin],
+  components: { VueUpload },
+  mixins: [SortableMixin],
 
   data() {
     return {