@ditojs/admin 2.1.3 → 2.2.1

package/src/types/DitoTypeButton.vue

@@ -4,7 +4,7 @@ button.dito-button(
   ref="element"
   :type="type"
   :title="text"
-  :class="`dito-button-${verb}`"
+  :class="buttonClass"
   v-bind="attributes"
 ) {{ text }}
 </template>
@@ -21,13 +21,16 @@ export default DitoTypeComponent.register(
   {
     defaultValue: () => undefined, // Callback to override `defaultValue: null`
     excludeValue: true,
+    generateLabel: false,
     defaultWidth: 'auto',
-    // TODO: Consider making this work nicely:
-    // omitFlexGrow: true,
 
     computed: {
       verb() {
-        return this.verbs[this.name] || this.name
+        return this.verbs[this.name]
+      },
+
+      buttonClass() {
+        return this.verb ? `dito-button-${this.verb}` : null
       },
 
       text: getSchemaAccessor('text', {
@@ -40,16 +43,16 @@ export default DitoTypeComponent.register(
       closeForm: getSchemaAccessor('closeForm', {
         type: Boolean,
         default: false
-      }),
+      })
+    },
 
+    methods: {
       // @override
-      events() {
+      getEvents() {
         const { onFocus, onBlur, onClick } = this
         return { onFocus, onBlur, onClick }
-      }
-    },
+      },
 
-    methods: {
       async submit(options) {
         return this.resourceComponent?.submit(this, options)
       },

package/src/types/DitoTypeCode.vue

@@ -14,6 +14,7 @@ import CodeFlask from 'codeflask'
 // @vue/component
 export default DitoTypeComponent.register('code', {
   mixins: [DomMixin],
+  alignBottom: false,
 
   computed: {
     lines() {

package/src/types/DitoTypeComponent.vue

@@ -22,6 +22,7 @@ export default DitoTypeComponent.register('component', {
   // Override the standard `defaultValue: null` to not set any data for custom
   // components, unless they provide a default value.
   defaultValue: () => undefined, // Callback to override `defaultValue: null`
+  alignBottom: false,
   ignoreMissingValue: schema => !('default' in schema),
 
   async processSchema(api, schema) {

package/src/types/DitoTypeLabel.vue

@@ -11,7 +11,8 @@ import DitoTypeComponent from '../DitoTypeComponent.js'
 // @vue/component
 export default DitoTypeComponent.register('label', {
   excludeValue: true,
-  generateLabel: false
+  generateLabel: false,
+  alignBottom: false
 })
 </script>
 

package/src/types/DitoTypeList.vue

@@ -38,10 +38,11 @@
       :columns="columns"
       :hasEditButtons="hasEditButtons"
     )
-    UseSortable(
+    DitoDraggable(
       tag="tbody"
       :modelValue="updateOrder(sourceSchema, listData, paginationRange)"
-      :options="getSortableOptions(draggable)"
+      :options="getSortableOptions(false)"
+      :draggable="draggable"
       @update:modelValue="value => (listData = value)"
     )
       tr(
@@ -167,6 +168,7 @@ import { pickBy, equals, hyphenate } from '@ditojs/utils'
 // @vue/component
 export default DitoTypeComponent.register('list', {
   mixins: [SourceMixin, SortableMixin],
+  alignBottom: false,
 
   getSourceType(type) {
     // No need for transformation here. See TypeTreeList for details.

package/src/types/DitoTypeMarkup.vue

@@ -83,6 +83,8 @@ export default DitoTypeComponent.register('markup', {
     Icon
   },
 
+  alignBottom: false,
+
   data() {
     return {
       editor: null,

package/src/types/DitoTypeObject.vue

@@ -63,6 +63,8 @@ import { resolveSchemaComponent } from '../utils/schema.js'
 export default DitoTypeComponent.register('object', {
   mixins: [SourceMixin],
 
+  alignBottom: false,
+
   getSourceType(type) {
     // No need for transformation here. See TypeTreeList for details.
     return type

package/src/types/DitoTypePanel.vue

@@ -6,6 +6,7 @@ export default DitoTypeComponent.register('panel', {
   defaultValue: () => undefined, // Callback to override `defaultValue: null`
   excludeValue: true,
   generateLabel: false,
+  alignBottom: false,
   omitPadding: true,
 
   getPanelSchema(schema) {

package/src/types/DitoTypeSection.vue

@@ -20,7 +20,7 @@ export default DitoTypeComponent.register('section', {
   ignoreMissingValue: schema => !schema.nested && !('default' in schema),
   defaultNested: false,
   generateLabel: false,
-  omitFlexGrow: true,
+  alignBottom: false,
 
   computed: {
     item() {

package/src/types/DitoTypeTextarea.vue

@@ -17,6 +17,7 @@ import { getSchemaAccessor } from '../utils/accessor.js'
 export default DitoTypeComponent.register('textarea', {
   nativeField: true,
   textField: true,
+  alignBottom: false,
 
   computed: {
     lines() {

package/src/types/DitoTypeTreeList.vue

@@ -35,6 +35,8 @@ export default DitoTypeComponent.register(
   {
     mixins: [SourceMixin],
 
+    alignBottom: false,
+
     provide() {
       return { container: this }
     },

package/src/types/DitoTypeUpload.vue

@@ -12,10 +12,11 @@
           span Status
         th
           span
-    UseSortable(
+    DitoDraggable(
       v-model="files"
       tag="tbody"
-      :options="getSortableOptions(draggable)"
+      :options="getSortableOptions(false)"
+      :draggable="draggable"
     )
       tr(
         v-for="(file, index) in files"
@@ -111,6 +112,8 @@ export default DitoTypeComponent.register('upload', {
   mixins: [SortableMixin],
   components: { VueUpload },
 
+  alignBottom: false,
+
   data() {
     return {
       uploads: []

package/src/utils/accessor.js

@@ -53,7 +53,7 @@ export function getStoreAccessor(name, { default: def, get, set } = {}) {
       let value = this.getStore(name)
       if (value === undefined && def !== undefined) {
         // Support `default()` functions:
-        value = isFunction(def) ? def.call(this, this.context) : def
+        value = isFunction(def) ? def.call(this) : def
         // Trigger setter by setting value and accessor to default:
         this[name] = value
         // Now access store again, for reactivity tracking

package/src/utils/options.js

@@ -36,6 +36,7 @@ const ditoOptionKeys = [
   'generateLabel',
   'excludeValue',
   'ignoreMissingValue',
+  'alignBottom',
   'omitPadding',
   'processValue',
   'processSchema',

package/src/utils/schema.js

@@ -432,10 +432,6 @@ export function getItemFormSchema(schema, item, context) {
   return getItemFormSchemaFromForms(getFormSchemas(schema, context), item)
 }
 
-export function hasLabel(schema) {
-  return schema.label !== false
-}
-
 export function isCompact(schema) {
   return !!schema.compact
 }
@@ -448,10 +444,14 @@ export function isNested(schema) {
   return !!(schema.nested || getTypeOptions(schema)?.defaultNested === true)
 }
 
-export function shouldOmitPadding(schema) {
+export function omitPadding(schema) {
   return !!getTypeOptions(schema)?.omitPadding
 }
 
+export function alignBottom(schema) {
+  return !!getTypeOptions(schema)?.alignBottom
+}
+
 export function getDefaultValue(schema) {
   // Support default values both on schema and on component level.
   // NOTE: At the time of creation, components may not be instantiated, (e.g. if
@@ -475,16 +475,6 @@ export function ignoreMissingValue(schema) {
   )
 }
 
-export function hasLabels(schema) {
-  const checkComponents = components =>
-    Object.values(components || {}).some(hasLabel)
-
-  return (
-    checkComponents(schema.components) ||
-    Object.values(schema.tabs || {}).some(checkComponents)
-  )
-}
-
 export function setDefaultValues(schema, data = {}, component) {
   const options = { component, rootData: data }
 

package/types/index.d.ts

@@ -319,40 +319,19 @@ export interface SchemaSourceMixin<$Item> {
    *
    * @defaultValue `false`
    */
-  creatable?: OrItemAccessor<
-    $Item,
-    {},
-    | boolean
-    | {
-        label: string
-      }
-  >
+  creatable?: OrItemAccessor<$Item, {}, boolean | { label: string }>
   /**
    * Whether to add edit buttons next to the list items.
    *
    * @defaultValue `false`
    */
-  editable?: OrItemAccessor<
-    $Item,
-    {},
-    | boolean
-    | {
-        label: string
-      }
-  >
+  editable?: OrItemAccessor<$Item, {}, boolean | { label: string }>
   /**
    * Whether to add delete buttons next to the list items.
    *
    * @defaultValue `false`
    */
-  deletable?: OrItemAccessor<
-    $Item,
-    {},
-    | boolean
-    | {
-        label: string
-      }
-  >
+  deletable?: OrItemAccessor<$Item, {}, boolean | { label: string }>
   /**
    * The column used for the order resulting from dragging around list entries
    * when the `draggable` property of the list schema is set to `true`.