@ditojs/admin 2.2.7-debug.5 → 2.2.8

package/src/styles/_button.scss

@@ -130,7 +130,7 @@
     }
   }
 
-  &.dito-buttons-main {
+  &.dito-buttons-main:not(:empty) {
     position: sticky;
     bottom: 0;
     width: 100%;

package/src/types/DitoTypeCode.vue

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

package/src/types/DitoTypeComponent.vue

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

package/src/types/DitoTypeList.vue

@@ -167,7 +167,6 @@ 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.
@@ -195,17 +194,10 @@ export default DitoTypeComponent.register('list', {
         },
         set query(query) {
           const component = getListComponent()
-          console.log('set query', !!component)
           if (component) {
             // Filter out undefined values for comparing with equals()
             const filter = obj => pickBy(obj, value => value !== undefined)
-            console.log(
-              'set query',
-              JSON.stringify(filter(query)),
-              JSON.stringify(filter(component.query))
-            )
             if (!equals(filter(query), filter(component.query))) {
-              console.log('load data')
               component.query = query
               component.loadData(false)
             }
@@ -345,6 +337,26 @@ export default DitoTypeComponent.register('list', {
     display: grid;
     grid-template-rows: min-content;
     height: 100%;
+
+    // Make single list header, navigation and buttons sticky to the top and
+    // bottom:
+    .dito-navigation {
+      position: sticky;
+      top: 0;
+      margin-top: -$content-padding;
+      padding-top: $content-padding;
+      background: $content-color-background;
+      z-index: 1;
+
+      + .dito-table {
+        .dito-table-head {
+          position: sticky;
+          top: calc($input-height + $content-padding + $content-padding-half);
+          background: $content-color-background;
+          z-index: 1;
+        }
+      }
+    }
   }
 }
 </style>

package/src/types/DitoTypeMarkup.vue

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

package/src/types/DitoTypeObject.vue

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

package/src/types/DitoTypeSection.vue

@@ -1,6 +1,6 @@
 <template lang="pug">
 .dito-section(:class="{ 'dito-section-labelled': !!schema.label }")
-  DitoPane.dito-section-pane(
+  DitoPane.dito-section__pane(
     :schema="getItemFormSchema(schema, item, context)"
     :dataPath="dataPath"
     :data="item"
@@ -20,7 +20,6 @@ export default DitoTypeComponent.register('section', {
   ignoreMissingValue: schema => !schema.nested && !('default' in schema),
   defaultNested: false,
   generateLabel: false,
-  alignBottom: false,
 
   computed: {
     item() {
@@ -49,5 +48,9 @@ export default DitoTypeComponent.register('section', {
     padding: $form-spacing;
     box-sizing: border-box;
   }
+
+  .dito-section__pane {
+    padding: 0;
+  }
 }
 </style>

package/src/types/DitoTypeTextarea.vue

@@ -17,7 +17,6 @@ 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,8 +35,6 @@ export default DitoTypeComponent.register(
   {
     mixins: [SourceMixin],
 
-    alignBottom: false,
-
     provide() {
       return { container: this }
     },

package/src/types/DitoTypeUpload.vue

@@ -112,8 +112,6 @@ export default DitoTypeComponent.register('upload', {
   mixins: [SortableMixin],
   components: { VueUpload },
 
-  alignBottom: false,
-
   data() {
     return {
       uploads: []

package/src/utils/filter.js

@@ -67,7 +67,6 @@ export const filterComponents = {
 }
 
 export function createFiltersPanel(api, filters, dataPath, proxy) {
-  console.log('createFiltersPanel()', dataPath)
   const { sticky, ...filterSchemas } = filters
   const panel = {
     type: 'panel',
@@ -110,13 +109,6 @@ export function createFiltersPanel(api, filters, dataPath, proxy) {
 
     methods: {
       applyFilters() {
-        console.log(
-          'applyFilters()',
-          JSON.stringify({
-            filters: this.filters,
-            data: this.data
-          })
-        )
         proxy.query = {
           ...proxy.query,
           filter: this.filters,
@@ -126,7 +118,6 @@ export function createFiltersPanel(api, filters, dataPath, proxy) {
       },
 
       clearFilters() {
-        console.log('clearFilters()')
         this.resetData()
         this.applyFilters()
       }
@@ -212,13 +203,6 @@ function getComponentsForFilter(schema, name) {
 }
 
 function formatFiltersData(schema, data) {
-  console.log(
-    'formatFiltersData()',
-    JSON.stringify({
-      data: data ?? null,
-      schema: schema ? Object.keys(schema.components) : null
-    })
-  )
   const filters = []
   for (const name in data) {
     const entry = data[name]
@@ -233,7 +217,6 @@ function formatFiltersData(schema, data) {
       }
     }
   }
-  console.log('formatFiltersData() =>', filters)
   return filters
 }
 

package/src/utils/options.js

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

package/src/utils/schema.js

@@ -474,10 +474,6 @@ 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