@ditojs/admin 2.11.0 → 2.11.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ditojs/admin",
-  "version": "2.11.0",
+  "version": "2.11.1",
   "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,8 +33,8 @@
     "not ie_mob > 0"
   ],
   "dependencies": {
-    "@ditojs/ui": "^2.11.0",
-    "@ditojs/utils": "^2.11.0",
+    "@ditojs/ui": "^2.11.1",
+    "@ditojs/utils": "^2.11.1",
     "@kyvg/vue3-notification": "^2.9.1",
     "@lk77/vue3-color": "^3.0.6",
     "@tiptap/core": "^2.0.4",
@@ -60,7 +60,7 @@
     "@tiptap/vue-3": "^2.0.4",
     "@vueuse/integrations": "^10.2.1",
     "codeflask": "^1.4.1",
-    "filesize": "^10.0.7",
+    "filesize": "^10.0.8",
     "filesize-parser": "^1.5.0",
     "focus-trap": "^7.5.2",
     "nanoid": "^4.0.2",
@@ -83,7 +83,7 @@
     "vite": "^4.4.7"
   },
   "types": "types",
-  "gitHead": "1589dbd472f04ec8a540e8b39bd7de8e2907872a",
+  "gitHead": "fb1e7ce180f5c9ce8e058a7ef22465e0428cd758",
   "scripts": {
     "build": "vite build",
     "watch": "yarn build --mode 'development' --watch",

package/src/DitoAdmin.js

@@ -251,7 +251,8 @@ async function request(api, {
   params = null,
   query = params || null,
   headers = null,
-  data = null
+  data = null,
+  signal = null
 }) {
   if (params) {
     deprecate(
@@ -271,7 +272,8 @@ async function request(api, {
     credentials:
       isApiUrl && api.cors?.credentials
         ? 'include'
-        : 'same-origin'
+        : 'same-origin',
+    signal
   })
 
   if (response.headers.get('Content-Type')?.includes('application/json')) {

package/src/components/DitoPane.vue

@@ -240,6 +240,8 @@ export default DitoComponent.component('DitoPane', {
   $self: &;
   $root-padding: $content-padding - $form-spacing-half;
 
+  --pane-padding: 0px;
+
   display: flex;
   position: relative;
   flex-flow: row wrap;
@@ -247,6 +249,7 @@ export default DitoComponent.component('DitoPane', {
   align-content: flex-start;
   // Remove the padding added by `.dito-container` inside `.dito-pane`:
   margin: -$form-spacing-half;
+  padding: var(--pane-padding);
   // Use `flex: 0%` for all `.dito-pane` except `.dito-pane__main`,
   // so that the `.dito-buttons-main` can be moved all the way to the bottom.
   flex: 0%;
@@ -260,10 +263,10 @@ export default DitoComponent.component('DitoPane', {
     margin: 0;
     // Move the negative margin used to remove the padding added by
     // `.dito-container` inside `.dito-pane` to the padding:
-    padding: $root-padding;
+    --pane-padding: #{$root-padding};
 
     &#{$self}--single {
-      padding: $content-padding;
+      --pane-padding: #{$content-padding};
     }
 
     &:has(> .dito-container--label-vertical:first-of-type) {
@@ -293,11 +296,11 @@ export default DitoComponent.component('DitoPane', {
   }
 
   &--padding-inlined {
-    padding: 0;
+    --pane-padding: 0px;
   }
 
   &--padding-nested {
-    padding: $form-spacing;
+    --pane-padding: #{$form-spacing};
 
     &:has(> .dito-container--label-vertical:first-of-type) {
       // Reduce top spacing when the first row has labels.

package/src/components/DitoRoot.vue

@@ -502,7 +502,9 @@ function addRoutes(router, routes) {
 .dito-drag-leave-active {
   $duration: 0.15s;
 
-  transition: opacity $duration, backdrop-filter $duration;
+  transition:
+    opacity $duration,
+    backdrop-filter $duration;
 
   ~ * .dito-drop-target {
     transition: filter $duration;

package/src/mixins/DitoMixin.js

@@ -321,14 +321,28 @@ export default {
       return url ? this.api.getApiUrl({ url, query: resource.query }) : null
     },
 
-    async sendRequest({ method, url, resource, query, data, internal }) {
+    async sendRequest({
+      method,
+      url,
+      resource,
+      query,
+      data,
+      signal,
+      internal
+    }) {
       url ||= this.getResourceUrl(resource)
       method ||= resource?.method
       const checkUser = !internal && this.api.isApiUrl(url)
       if (checkUser) {
         await this.rootComponent.ensureUser()
       }
-      const response = await this.api.request({ method, url, data, query })
+      const response = await this.api.request({
+        method,
+        url,
+        query,
+        data,
+        signal
+      })
       // Detect change of the own user, and fetch it again if it was changed.
       if (
         checkUser &&

package/src/mixins/ResourceMixin.js

@@ -20,7 +20,8 @@ export default {
 
   data() {
     return {
-      loadedData: null
+      loadedData: null,
+      abortController: null
     }
   },
 
@@ -239,8 +240,12 @@ export default {
         updateRoot: true, // Display spinner in header when loading in resources
         updateView: this.isInView // Notify view of loading for view components
       }
+      this.abortController?.abort()
+      const controller = new AbortController()
+      this.abortController = controller
+      const { signal } = controller
+      const request = { method, resource, query, data, signal }
       this.setLoading(true, loadingOptions)
-      const request = { method, resource, data, query }
       try {
         const response = await this.sendRequest(request)
         // Pass both request and response to the callback, so they can be
@@ -258,7 +263,10 @@ export default {
           this.notify({ type: 'error', title, text })
         }
       }
-      this.setLoading(false, loadingOptions)
+      if (this.abortController === controller) {
+        this.abortController = null
+        this.setLoading(false, loadingOptions)
+      }
     },
 
     getPayloadData(button, method) {

package/src/styles/_button.scss

@@ -142,11 +142,15 @@
     position: sticky;
     bottom: 0;
     z-index: $z-index-main-buttons;
-    margin-bottom: -$content-padding;
+    background: $content-color-background;
     margin-top: 2 * $content-padding;
+    margin-bottom: calc(-1 * var(--pane-padding, 0px));
     box-shadow: 0 (-$content-padding) $content-padding (-$content-padding)
       $color-shadow;
-    background: $content-color-background;
+
+    &:empty {
+      display: none;
+    }
   }
 
   &.dito-buttons-round,