@ditojs/admin 2.4.2 → 2.4.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ditojs/admin",
-  "version": "2.4.2",
+  "version": "2.4.3",
   "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",
@@ -83,7 +83,7 @@
     "vite": "^4.3.1"
   },
   "types": "types",
-  "gitHead": "3041bd1b47272ac99276fbeca8152cbfb1d75b77",
+  "gitHead": "fa8525e80d6cce3844fb8c62d665c60761a564b1",
   "scripts": {
     "build": "vite build",
     "watch": "yarn build --mode 'development' --watch",

package/src/components/DitoUploadFile.vue

@@ -189,6 +189,9 @@ const TYPES = {
 
   img {
     display: block;
+    // SVG images need 100% settings to scale into the container.
+    width: 100%;
+    height: 100%;
     min-width: var(--min-size);
     min-height: var(--min-size);
     max-width: var(--max-size);

package/src/mixins/DitoMixin.js

@@ -192,17 +192,37 @@ export default {
       return value
     },
 
+    removeStore(key) {
+      delete this.store[key]
+    },
+
+    getStoreKeyByIndex(index) {
+      return this.store.$keysByIndex?.[index]
+    },
+
+    setStoreKeyByIndex(index, key) {
+      this.store.$keysByIndex ??= {}
+      this.store.$keysByIndex[index] = key
+    },
+
     getChildStore(key, index) {
-      // When storing, temporary ids change to permanent ones and thus the key
-      // can change, so we need to store the index as well, to be able to find
-      // the store again after the item was saved.
-      const store = (
-        this.getStore(key) ||
-        index != null && this.getStore(index) ||
-        this.setStore(key, reactive({}))
-      )
-      if (index != null) {
-        this.setStore(index, store)
+      let store = this.getStore(key)
+      if (!store && index != null) {
+        // When storing, temporary ids change to permanent ones and thus the key
+        // can change. To still find the store, we reference by index as well,
+        // to be able to find the store again after the item was saved.
+        const oldKey = this.getStoreKeyByIndex(index)
+        store = this.getStore(oldKey)
+        if (store) {
+          this.setStore(key, store)
+          this.removeStore(oldKey)
+        }
+      }
+      if (!store) {
+        store = this.setStore(key, reactive({}))
+        if (index != null) {
+          this.setStoreKeyByIndex(index, key)
+        }
       }
       return store
     },