@afeefa/vue-app 0.0.161 → 0.0.163

package/.afeefa/package/release/version.txt

@@ -1 +1 @@
-0.0.161
+0.0.163

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@afeefa/vue-app",
-  "version": "0.0.161",
+  "version": "0.0.163",
   "description": "",
   "author": "Afeefa Kollektiv <kollektiv@afeefa.de>",
   "license": "MIT",

package/src/components/AModal.vue

@@ -136,6 +136,12 @@ export default class ADialog extends Mixins(UsesPositionServiceMixin, ComponentW
     }
 
     this.$emit('update:show', this.modal)
+
+    if (!this.modal) {
+      setTimeout(() => { // allow client to conditionally remove <edit-modal> using v-if not before inner dialog has been removed from dom
+        this.$emit('destroyed')
+      }, 100)
+    }
   }
 
   setPosition () {

package/src/components/form/EditForm.vue

@@ -60,7 +60,7 @@ export default class EditForm extends Vue {
     if (this.createModelToEdit) {
       this.modelToEdit = this.createModelToEdit(this.model)
     } else if (this.model) {
-      this.modelToEdit = this.model.cloneForEdit()
+      this.modelToEdit = this.model.clone()
     }
     this.lastJson = this.json
 

package/src/components/form/EditModal.vue

@@ -3,6 +3,7 @@
     :beforeClose="beforeClose"
     :show.sync="show_"
     v-bind="$attrs"
+    @destroyed="$emit('destroyed')"
   >
     <template #activator>
       <slot name="activator" />

package/src-admin/components/FlyingContextContainer.vue

@@ -34,6 +34,7 @@ export default class FlyingContextContainer extends Vue {
   visible = false
   oldOverflowY = null
   isClosing = false
+  lastScrollbarWidth = 0
 
   mounted () {
     const mutationWatcher = new MutationObserver(this.domChanged)
@@ -63,9 +64,8 @@ export default class FlyingContextContainer extends Vue {
   sizeChanged () {
     if (this.visible && !this.isClosing) { // do not set size if it is already closing
       this.$nextTick(() => {
-        const scrollbarWidth = this.getScrollbarWidth()
         const el = document.documentElement
-        const newSize = el.offsetWidth - this.$el.offsetWidth + scrollbarWidth
+        const newSize = el.offsetWidth - this.$el.offsetWidth + this.lastScrollbarWidth
         this.$el.style.left = newSize + 'px'
       })
     }
@@ -80,13 +80,13 @@ export default class FlyingContextContainer extends Vue {
     if (this.visible) {
       const style = getComputedStyle(el)
       this.oldOverflowY = style.overflowY
-      const scrollbarWidth = this.getScrollbarWidth()
+      this.lastScrollbarWidth = this.getScrollbarWidth()
       setTimeout(() => {
         el.style.overflowY = 'hidden'
-        el.style.marginRight = scrollbarWidth + 'px'
+        el.style.marginRight = this.lastScrollbarWidth + 'px'
       }, 100)
 
-      this.$el.style.left = (el.offsetWidth - this.$el.offsetWidth + scrollbarWidth) + 'px'
+      this.$el.style.left = (el.offsetWidth - this.$el.offsetWidth + this.lastScrollbarWidth) + 'px'
     } else {
       el.style.overflowY = this.oldOverflowY
       el.style.marginRight = 0