From e18a98d8bb8a955d0bbce829129661abdc66605a Mon Sep 17 00:00:00 2001
From: dgyimesi <dgyimesi@gmail.com>
Date: Sun, 20 Jan 2019 22:55:06 +0100
Subject: [PATCH] fix: Don't change the tab immediately when closing the key
 action popover (#895)

---
 .../uhk-web/src/app/components/popover/popover.component.ts | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/uhk-web/src/app/components/popover/popover.component.ts b/packages/uhk-web/src/app/components/popover/popover.component.ts
index a2087d0b..10a2d525 100644
--- a/packages/uhk-web/src/app/components/popover/popover.component.ts
+++ b/packages/uhk-web/src/app/components/popover/popover.component.ts
@@ -163,12 +163,13 @@ export class PopoverComponent implements OnChanges {
     }
 
     ngOnChanges(change: SimpleChanges) {
+        let tab: TabHeader;
+
         if (this.keyPosition && this.wrapPosition && (change['keyPosition'] || change['wrapPosition'])) {
             this.calculatePosition();
         }
 
         if (change['defaultKeyAction']) {
-            let tab: TabHeader;
             this.disableRemapOnAllLayer = false;
 
             if (this.defaultKeyAction instanceof KeystrokeAction) {
@@ -192,12 +193,13 @@ export class PopoverComponent implements OnChanges {
                 tabHeader.disabled = allowOnlyLayerTab && tabHeader.tabName !== TabName.Layer;
                 console.log(tabHeader);
             }
-            this.selectTab(tab);
         }
 
         if (change['visible']) {
             if (change['visible'].currentValue) {
                 this.animationState = 'opened';
+
+                this.selectTab(tab);
             } else {
                 this.animationState = 'closed';
             }