@eturnity/eturnity_reusable_components 7.6.1-qa-16-02-15.1 → 7.8.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eturnity/eturnity_reusable_components",
-  "version": "7.6.1-qa-16-02-15.1",
+  "version": "7.8.0",
   "private": false,
   "scripts": {
     "dev": "vue-cli-service serve",

package/src/components/modals/modal/index.vue

@@ -3,6 +3,7 @@
     :position="position"
     :isOpen="isOpen"
     :class="{ visible: isOpen, hidden: !isOpen }"
+    @click.native="onOutsideClose()"
     :backdrop="backdrop"
   >
     <modal-container @click.stop>
@@ -26,7 +27,7 @@
 // import Modal from "@eturnity/eturnity_reusable_components/src/components/modals/modal"
 // This is a more flexible modal box, where the parent can decide how the body of the modal looks
 // To use:
-// <modal :isOpen="isOpen" @on-close="$emit('on-close-summary')" :isLoading="true" :hideClose="true">
+// <modal :isOpen="isOpen" @on-close="$emit('on-close-summary')" :preventOutsideClose="true" :isLoading="true" :hideClose="true">
 //   <div>Data....</div>
 // </modal>
 
@@ -136,6 +137,10 @@ export default {
       required: true,
       default: false
     },
+    preventOutsideClose: {
+      required: false,
+      default: false
+    },
     isLoading: {
       required: false,
       default: false
@@ -153,30 +158,20 @@ export default {
       default: 'fixed'
     }
   },
-  beforeDestroy() {
-    window.removeEventListener('keydown', this.handleKeyDown)
-  },
   methods: {
     onCloseModal() {
       this.$emit('on-close')
     },
-    handleKeyDown({ key }) {
-      if (key === 'Escape') {
-        this.onCloseModal()
+    onOutsideClose() {
+      // If true, then only allow closing to come from clicking the X or wherever the onCloseModal is called
+      if (!this.preventOutsideClose) {
+        this.$emit('on-close')
       }
     }
   },
   watch: {
-    isOpen: {
-      immediate: true,
-      handler(isOpen) {
-        document.body.style.overflow = isOpen ? 'hidden' : ''
-        if (isOpen) {
-          window.addEventListener('keydown', this.handleKeyDown)
-        } else {
-          window.removeEventListener('keydown', this.handleKeyDown)
-        }
-      }
+    isOpen: function (newVal) {
+      document.body.style.overflow = newVal ? 'hidden' : ''
     }
   }
 }