@trudb/tru-common-lib 0.0.891 → 0.0.892

package/fesm2022/trudb-tru-common-lib.mjs

@@ -4949,6 +4949,35 @@ class TruDesktopWindow {
      *
      */
     onKeydown = (event) => {
+        if (!this.window.active)
+            return;
+        if (event.altKey)
+            event.preventDefault();
+        var keySequence = this.desktopCtrl.getKeySequence(event);
+        if (keySequence === 'ctrl+shift+s' || keySequence === 'meta+shift+s') { //Restore
+            this.save();
+            event.preventDefault();
+        }
+        if (keySequence === 'ctrl+shift+r' || keySequence === 'meta+shift+r') { //Save
+            this.revert();
+            event.preventDefault();
+        }
+        if (keySequence === 'alt+left') { //Previous View
+            this.previousView();
+            event.preventDefault();
+        }
+        if (keySequence === 'alt+right') { //Next View
+            this.nextView();
+            event.preventDefault();
+        }
+        if (keySequence === 'alt+up') { //First View
+            this.firstView();
+            event.preventDefault();
+        }
+        if (keySequence === 'alt+down') { //Last View
+            this.lastView();
+            event.preventDefault();
+        }
     };
     /**
      * @tru.doc watch
@@ -5046,6 +5075,7 @@ class TruDesktopWindow {
         this.subs.push(this.truWindowEventHandler.onSetWindowTitle().subscribe((windowTitle) => {
             this.setWindowTitle(windowTitle);
         }));
+        window.addEventListener('keydown', this.onKeydown);
     }
     ngAfterViewInit() {
         this.cd.detectChanges();
@@ -5053,6 +5083,7 @@ class TruDesktopWindow {
     ngOnDestroy() {
         document.removeEventListener('mousemove', this.mouseMove);
         document.removeEventListener('mouseup', this.mouseUp);
+        window.removeEventListener('keydown', this.onKeydown);
         window.removeEventListener('resize', this.resizeEventHandler);
         this.subs.forEach(s => s.unsubscribe());
     }
@@ -5893,34 +5924,6 @@ class TruDesktop {
             this.closeWindow(activeWindow);
             event.preventDefault();
         }
-        if (keySequence === 'alt+left') { //Previous View
-            var activeWindow = this.getActiveWindow();
-            if (!activeWindow)
-                return;
-            activeWindow.previousView();
-            event.preventDefault();
-        }
-        if (keySequence === 'alt+right') { //Next View
-            var activeWindow = this.getActiveWindow();
-            if (!activeWindow)
-                return;
-            activeWindow.nextView();
-            event.preventDefault();
-        }
-        if (keySequence === 'alt+up') { //First View
-            var activeWindow = this.getActiveWindow();
-            if (!activeWindow)
-                return;
-            activeWindow.firstView();
-            event.preventDefault();
-        }
-        if (keySequence === 'alt+down') { //Last View
-            var activeWindow = this.getActiveWindow();
-            if (!activeWindow)
-                return;
-            activeWindow.lastView();
-            event.preventDefault();
-        }
         if (keySequence === 'alt+l') { //Maximize left
             var activeWindow = this.getActiveWindow();
             if (!activeWindow.maximized) {
@@ -5945,16 +5948,6 @@ class TruDesktop {
                 this.restoreSavedPosition(activeWindow);
             event.preventDefault();
         }
-        if (keySequence === 'ctrl+shift+s' || keySequence === 'meta+shift+s') { //Restore
-            var activeWindow = this.getActiveWindow();
-            activeWindow.save();
-            event.preventDefault();
-        }
-        if (keySequence === 'ctrl+shift+r' || keySequence === 'meta+shift+r') { //Save
-            var activeWindow = this.getActiveWindow();
-            activeWindow.revert();
-            event.preventDefault();
-        }
         if (keySequence === 'alt+d') { //Toggle Desktop
             //this.desktopShown = this.hideShowAll();
             event.preventDefault();