FIXED: do not change active view in singleView mode

CLEANED-UP: winState.getActiveView(bool) -> winState.getActiveView/getInactiveView

Author: warpdesign

e2e/cypress/integration/keyboard.hotkeys.spec.ts

@@ -17,6 +17,10 @@ describe("keyboard hotkeys", () => {
                     stubs.navHistory.push(cy.spy(cache, "navHistory"));
                 }
             }
+
+            // activate splitView mode
+            const winState = win.appState.winStates[0];
+            winState.splitView = true;
         });
     }
 
@@ -73,6 +77,18 @@ describe("keyboard hotkeys", () => {
         });
     });
 
+    it("should not change view in single view mode", () => {
+        cy.get("#view_0").should("have.class", "active");
+        cy.get("#view_1").should("not.have.class", "active");
+
+        cy.get('.data-cy-toggle-splitview')
+        .click();
+
+        cy.triggerHotkey(`{ctrl}{shift}{rightarrow}`).then(() => {
+            cy.get("#view_1").should("not.have.class", "active");
+            cy.get("#view_0").should("have.class", "active");
+        });
+    });
     // it("should open devtools", () => {
     //     cy.triggerHotkey(`{alt}${MOD_KEY}i`).then(() => {
     //         expect(ipcRenderer.send).to.be.calledOnce;

src/components/shortcuts/KeyboardHotkeys.tsx

@@ -83,9 +83,13 @@ class KeyboardHotkeysClass extends React.Component<WithNamespaces> {
 
     onNextView = () => {
         const winState = this.appState.winStates[0];
-        const nextView = winState.getActiveView(false);        
+        // do nothing if single view
+        if (winState.splitView) {
+            // get the view that's not active
+            const nextView = winState.getInactiveView();
 
-        winState.setActiveView(nextView.viewId);
+            winState.setActiveView(nextView.viewId);
+        }
     };
 
     onBackwardHistory = () => {

src/components/shortcuts/MenuAccelerators.tsx

@@ -131,20 +131,20 @@ class MenuAcceleratorsClass extends React.Component<IProps> {
         }
     };
 
-    onNextTab = () => {
+    cycleTab = (direction: 1|-1) => {
         if (this.appState.isExplorer) {
             const winState = this.appState.winStates[0];
             const viewState = winState.getActiveView();
-            viewState.cycleTab(1);
+            viewState.cycleTab(direction);
         }
+    }
+
+    onNextTab = () => {
+        this.cycleTab(1);
     };
 
     onPreviousTab = () => {
-        if (this.appState.isExplorer) {
-            const winState = this.appState.winStates[0];
-            const viewState = winState.getActiveView();
-            viewState.cycleTab(-1);
-        }
+        this.cycleTab(-1);
     };
 
     onNewTab = () => {

src/state/appState.ts

@@ -250,7 +250,7 @@ export class AppState {
     }
 
     getViewFromCache(cache: FileState) {
-        const winState = this.winStates[0];        
+        const winState = this.winStates[0];
         const viewId = cache.viewId;
         return winState.getView(viewId);
     }
@@ -262,18 +262,18 @@ export class AppState {
      */
     getInactiveViewVisibleCache(): FileState {
         const winState = this.winStates[0];
-        const view = winState.getActiveView(false);
+        const view = winState.getInactiveView();
         return view.caches.find(cache => cache.isVisible === true);
     }
 
     getViewVisibleCache(viewId: number): FileState {
-        const winState = this.winStates[0];        
+        const winState = this.winStates[0];
         const view = winState.getView(viewId);
         return view.caches.find(cache => cache.isVisible === true);
     }
 
     getCachesForView(viewId: number) {
-        const winState = this.winStates[0];        
+        const winState = this.winStates[0];
         const view = winState.getView(viewId);
         return view.caches;
     }
@@ -378,7 +378,7 @@ export class AppState {
 
     getActiveCache(): FileState {
         const winState = this.winStates[0];        
-        const view = winState.getActiveView(true);
+        const view = winState.getActiveView();
         return this.isExplorer
             ? view.caches.find(cache => cache.isVisible === true)
             : null;

src/state/winState.ts

@@ -80,13 +80,25 @@ export class WinState {
     @action
     setActiveView(viewId: number) {
         console.log("setting active view", viewId);
-        const previous = this.getActiveView(true);
+        const previous = this.getActiveView();
         const next = this.getView(viewId);
         previous.isActive = false;
         next.isActive = true;
     }
 
-    getActiveView(isActive = true): ViewState {
+    getActiveView():ViewState {
+        return this.getViewByActive(true);
+    }
+
+    getInactiveView():ViewState {
+        return this.getViewByActive(false);
+    }
+
+    /**
+     * returns active or invactive view
+     * @param isActive if set to true returns the active view, otherwise inactive one
+     */
+    getViewByActive(isActive = true): ViewState {
         return this.views.find(view => view.isActive === isActive);
     }