From ddf912804fc4cb26d388283eacca63a0aeddf779 Mon Sep 17 00:00:00 2001
From: Shin'ya Ueoka <ueokande@i-beam.org>
Date: Sun, 29 Nov 2020 16:02:57 +0900
Subject: Make background operations as a operator

---
 .../operators/impls/SelectTabPrevOperator.ts       | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 src/background/operators/impls/SelectTabPrevOperator.ts

(limited to 'src/background/operators/impls/SelectTabPrevOperator.ts')

diff --git a/src/background/operators/impls/SelectTabPrevOperator.ts b/src/background/operators/impls/SelectTabPrevOperator.ts
new file mode 100644
index 0000000..93a0d6d
--- /dev/null
+++ b/src/background/operators/impls/SelectTabPrevOperator.ts
@@ -0,0 +1,22 @@
+import Operator from "../Operator";
+import TabPresenter from "../../presenters/TabPresenter";
+
+export default class SelectTabPrevOperator implements Operator {
+  constructor(
+    private readonly tabPresenter: TabPresenter,
+    private readonly count: number
+  ) {}
+
+  async run(): Promise<void> {
+    const tabs = await this.tabPresenter.getAll();
+    if (tabs.length < 2) {
+      return;
+    }
+    const tab = tabs.find((t) => t.active);
+    if (!tab) {
+      return;
+    }
+    const select = (tab.index - this.count + tabs.length) % tabs.length;
+    return this.tabPresenter.select(tabs[select].id as number);
+  }
+}
-- 
cgit v1.2.3


From 781b26a961603141af9365bb85d582569331d52f Mon Sep 17 00:00:00 2001
From: Shin'ya Ueoka <ueokande@i-beam.org>
Date: Thu, 3 Dec 2020 22:42:33 +0900
Subject: Fix select next/prev

---
 src/background/operators/impls/SelectTabNextOperator.ts   | 7 ++-----
 src/background/operators/impls/SelectTabPrevOperator.ts   | 7 ++-----
 src/background/operators/impls/TabOperatorFactoryChain.ts | 6 +++---
 3 files changed, 7 insertions(+), 13 deletions(-)

(limited to 'src/background/operators/impls/SelectTabPrevOperator.ts')

diff --git a/src/background/operators/impls/SelectTabNextOperator.ts b/src/background/operators/impls/SelectTabNextOperator.ts
index 37482fe..34d37ff 100644
--- a/src/background/operators/impls/SelectTabNextOperator.ts
+++ b/src/background/operators/impls/SelectTabNextOperator.ts
@@ -2,10 +2,7 @@ import Operator from "../Operator";
 import TabPresenter from "../../presenters/TabPresenter";
 
 export default class SelectTabNextOperator implements Operator {
-  constructor(
-    private readonly tabPresenter: TabPresenter,
-    private readonly count: number
-  ) {}
+  constructor(private readonly tabPresenter: TabPresenter) {}
 
   async run(): Promise<void> {
     const tabs = await this.tabPresenter.getAll();
@@ -16,7 +13,7 @@ export default class SelectTabNextOperator implements Operator {
     if (!tab) {
       return;
     }
-    const select = (tab.index + this.count) % tabs.length;
+    const select = (tab.index + 1) % tabs.length;
     return this.tabPresenter.select(tabs[select].id as number);
   }
 }
diff --git a/src/background/operators/impls/SelectTabPrevOperator.ts b/src/background/operators/impls/SelectTabPrevOperator.ts
index 93a0d6d..3776c1a 100644
--- a/src/background/operators/impls/SelectTabPrevOperator.ts
+++ b/src/background/operators/impls/SelectTabPrevOperator.ts
@@ -2,10 +2,7 @@ import Operator from "../Operator";
 import TabPresenter from "../../presenters/TabPresenter";
 
 export default class SelectTabPrevOperator implements Operator {
-  constructor(
-    private readonly tabPresenter: TabPresenter,
-    private readonly count: number
-  ) {}
+  constructor(private readonly tabPresenter: TabPresenter) {}
 
   async run(): Promise<void> {
     const tabs = await this.tabPresenter.getAll();
@@ -16,7 +13,7 @@ export default class SelectTabPrevOperator implements Operator {
     if (!tab) {
       return;
     }
-    const select = (tab.index - this.count + tabs.length) % tabs.length;
+    const select = (tab.index - 1 + tabs.length) % tabs.length;
     return this.tabPresenter.select(tabs[select].id as number);
   }
 }
diff --git a/src/background/operators/impls/TabOperatorFactoryChain.ts b/src/background/operators/impls/TabOperatorFactoryChain.ts
index b4cb401..edd3eaf 100644
--- a/src/background/operators/impls/TabOperatorFactoryChain.ts
+++ b/src/background/operators/impls/TabOperatorFactoryChain.ts
@@ -7,7 +7,7 @@ import CloseTabOperator from "./CloseTabOperator";
 import CloseTabRightOperator from "./CloseTabRightOperator";
 import ReopenTabOperator from "./ReopenTabOperator";
 import SelectTabPrevOperator from "./SelectTabPrevOperator";
-import SelectTabNextOperator from "./SelectTabPrevOperator";
+import SelectTabNextOperator from "./SelectTabNextOperator";
 import SelectFirstTabOperator from "./SelectFirstTabOperator";
 import SelectLastTabOperator from "./SelectLastTabOperator";
 import SelectPreviousSelectedTabOperator from "./SelectPreviousSelectedTabOperator";
@@ -39,9 +39,9 @@ export default class TabOperatorFactoryChain implements OperatorFactoryChain {
       case operations.TAB_REOPEN:
         return new ReopenTabOperator(this.tabPresenter);
       case operations.TAB_PREV:
-        return new SelectTabPrevOperator(this.tabPresenter, 1);
+        return new SelectTabPrevOperator(this.tabPresenter);
       case operations.TAB_NEXT:
-        return new SelectTabNextOperator(this.tabPresenter, 1);
+        return new SelectTabNextOperator(this.tabPresenter);
       case operations.TAB_FIRST:
         return new SelectFirstTabOperator(this.tabPresenter);
       case operations.TAB_LAST:
-- 
cgit v1.2.3