@afeefa/vue-app 0.0.151 → 0.0.153

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

@@ -1 +1 @@
-0.0.151
+0.0.153

package/package.json

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

package/src/components/form/EditForm.vue

@@ -67,6 +67,10 @@ export default class EditForm extends Vue {
     this.$emit('update:modelToEdit', this.modelToEdit)
   }
 
+  resetChanged () {
+    this.lastJson = this.json
+  }
+
   /**
    * This will be triggered after the this.model has been set
    * but before sub components may have changed model values

package/src/components/form/EditModal.vue

@@ -137,5 +137,9 @@ export default class EditModal extends Vue {
   ignoreChangesOnClose () {
     this.$refs.form.forceUnchanged()
   }
+
+  resetChanged () {
+    this.$refs.form.resetChanged()
+  }
 }
 </script>

package/src-admin/components/FlyingContextContainer.vue

@@ -32,6 +32,7 @@ import { getZIndex } from 'vuetify/lib/util/helpers'
 })
 export default class FlyingContextContainer extends Vue {
   visible = false
+  oldOverflowY = null
 
   mounted () {
     this.mutationWatcher = new MutationObserver(this.domChanged)
@@ -40,14 +41,39 @@ export default class FlyingContextContainer extends Vue {
     window.addEventListener('mousedown', this.onClickOutside)
   }
 
+  getScrollbarWidth () {
+    const el = document.documentElement
+    const overflowY = getComputedStyle(el)['overflow-y']
+    if (overflowY === 'scroll' || (overflowY === 'auto' && el.scrollHeight > el.clientHeight)) {
+      // measure scrollbar width https://stackoverflow.com/a/55278118
+      const scrollbox = document.createElement('div')
+      scrollbox.style.overflow = 'scroll'
+      document.body.appendChild(scrollbox)
+      const scrollBarWidth = scrollbox.offsetWidth - scrollbox.clientWidth
+      document.body.removeChild(scrollbox)
+      return scrollBarWidth
+    }
+    return 0
+  }
+
+
   domChanged () {
     const container = this.getChildrenContainer()
     this.visible = !!container.children.length
 
+    const el = document.documentElement
+
     if (this.visible) {
-      document.documentElement.style.overflow = 'hidden'
+      const style = getComputedStyle(el)
+      this.oldOverflowY = style.overflowY
+      const scrollbarWidth = this.getScrollbarWidth()
+      setTimeout(() => {
+        el.style.overflowY = 'hidden'
+        el.style.marginRight = scrollbarWidth + 'px'
+      }, 100)
     } else {
-      document.documentElement.style.overflow = 'auto'
+      el.style.overflowY = this.oldOverflowY
+      el.style.marginRight = 0
     }
   }
 

package/src-admin/styles.scss

@@ -1,3 +1,7 @@
+html {
+  overflow-y: auto; // ress.css • v2.0.4 sets overflow-y: scroll
+}
+
 .container {
   padding: 0;
 }