@afeefa/vue-app 0.0.322 → 0.0.324

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

@@ -1 +1 @@
-0.0.322
+0.0.324

package/package.json

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

package/src/components/AContextMenu.vue

@@ -31,11 +31,12 @@ import { Component, Mixins, Watch } from '@a-vue'
 import { UsesPositionServiceMixin } from '../services/position/UsesPositionServiceMixin'
 import { Positions, PositionConfig } from '../services/PositionService'
 import { randomCssClass } from '../utils/random'
+import { CancelOnEscMixin } from '@a-vue/services/escape/CancelOnEscMixin'
 
 @Component({
   props: ['contentHeight', 'repositionWatchKey', 'triggerIcon', 'customAnchor']
 })
-export default class AContextMenu extends Mixins(UsesPositionServiceMixin) {
+export default class AContextMenu extends Mixins(UsesPositionServiceMixin, CancelOnEscMixin) {
   CONTEXT_MENU = true
   menuId = randomCssClass(10)
   nosePosition = 'left'
@@ -91,7 +92,7 @@ export default class AContextMenu extends Mixins(UsesPositionServiceMixin) {
     window.addEventListener('mousedown', this.onClickOutside)
     window.addEventListener('wheel', this.close)
     window.addEventListener('touchmove', this.close)
-    window.addEventListener('keydown', this.close)
+    window.addEventListener('keydown', this.onKeyDown)
 
     const container = this.getContainer()
     container.appendChild(this.popUp)
@@ -100,6 +101,8 @@ export default class AContextMenu extends Mixins(UsesPositionServiceMixin) {
 
     this.isOpen = true
 
+    this.coe_watchCancel()
+
     this.$emit('open')
   }
 
@@ -109,12 +112,14 @@ export default class AContextMenu extends Mixins(UsesPositionServiceMixin) {
     window.removeEventListener('mousedown', this.onClickOutside)
     window.removeEventListener('wheel', this.close)
     window.removeEventListener('touchmove', this.close)
-    window.removeEventListener('keydown', this.close)
+    window.removeEventListener('keydown', this.onKeyDown)
 
     this.$el.appendChild(this.popUp)
 
     this.isOpen = false
 
+    this.coe_unwatchCancel()
+
     this.$emit('close')
   }
 
@@ -139,6 +144,17 @@ export default class AContextMenu extends Mixins(UsesPositionServiceMixin) {
     return container.querySelector('.' + this.popUpCssClass)
   }
 
+  coe_cancelOnEsc () {
+    this.close()
+    return false // stop esc propagation
+  }
+
+  onKeyDown (e) {
+    if (e.key !== 'Escape') {
+      this.close()
+    }
+  }
+
   onClickOutside (e) {
     const popUp = this.popUp
 

package/src-admin/components/list/ListColumnSelector.vue

@@ -92,9 +92,12 @@ export default class ListColumnSelector extends Vue {
   }
 
   resetColumnOrder () {
-    this.columns_ = JSON.parse(JSON.stringify(this.defaultColumns))
-    this.selectedColumns = Object.keys(this.columns_)
-      .filter(k => this.columns_[k].visible)
+    const defaultKeys = Object.keys(this.defaultColumns)
+    const columns = {}
+    for (const key of defaultKeys) {
+      columns[key] = this.columns_[key]
+    }
+    this.columns_ = columns
     this.$emit('update:columns', this.columns_)
     this.saveColumnConfiguration()
   }