Merge pull request #1001 from mkenne11/circular_next_prev_pane

Allow wrap around when advancing next & previous pane
railsware · Mar 25, 2017 · 7b66ee5 · 7b66ee5
2 parents 70e8b42 + c2782bb
commit 7b66ee5
Showing 1 changed file with 22 additions and 2 deletions.
diff --git a/src/utils/PaneTree.ts b/src/utils/PaneTree.ts
@@ -77,7 +77,14 @@ export abstract class PaneList {
         }
     }
 
+    /**
+     * Returns the pane previous to the 'pane' argument provided.
+     * @param {Pane} pane The reference pane.
+     * @returns {Pane}
+     */
     previous(pane: Pane): Pane {
+        const firstPaneIndex = 0;
+        const lastPaneIndex = this.size - 1;
         let paneIndex = 0;
 
         this.forEach((current, index) => {
@@ -89,15 +96,25 @@ export abstract class PaneList {
         let previous = pane;
 
         this.forEach((current, index) => {
-            if (index === paneIndex - 1) {
+            if (paneIndex === firstPaneIndex) {
+                if (index === lastPaneIndex)
+                    previous = current;
+            } else if (index === paneIndex - 1) {
                 previous = current;
             }
         });
 
         return previous;
     }
 
+    /**
+     * Returns the pane next after the 'pane' argument provided.
+     * @param {Pane} pane The reference pane.
+     * @returns {Pane}
+     */
     next(pane: Pane): Pane {
+        const firstPaneIndex = 0;
+        const lastPaneIndex = this.size - 1;
         let paneIndex = 0;
 
         this.forEach((current, index) => {
@@ -109,7 +126,10 @@ export abstract class PaneList {
         let next = pane;
 
         this.forEach((current, index) => {
-            if (index === paneIndex + 1) {
+            if (paneIndex === lastPaneIndex) {
+                if (index === firstPaneIndex)
+                    next = current;
+            } else if (index === paneIndex + 1) {
                 next = current;
             }
         });