chore(tabstore): getters for tabstore vars

SputNikPlop · Jan 31, 2024 · 9008750 · 9008750
1 parent 45cf037
commit 9008750
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/lib/stores/shared/tabs.dart b/lib/stores/shared/tabs.dart
@@ -23,6 +23,12 @@ abstract class _TabsStore with Store {
   @observable
   bool performTabClickAction = false;
 
+  GlobalKey<NavigatorState> keyForCurrentTab() =>
+      this.navigatorKeys[this.activeTab]!;
+
+  String activeRouteForCurrentTab() =>
+      this.activeRoutePerNavigator[this.activeTab]!;
+
   @action
   void setActiveTab(Tabs activeTab) => this.activeTab = activeTab;
 

diff --git a/lib/tab_base.dart b/lib/tab_base.dart
@@ -103,9 +103,8 @@ class _TabBaseState extends State<TabBase> {
         return PopScope(
           canPop: false,
           onPopInvoked: (didPop) {
-            if (tabsStore.navigatorKeys[tabsStore.activeTab]!.currentState!
-                .canPop()) {
-              tabsStore.navigatorKeys[tabsStore.activeTab]!.currentState!.pop();
+            if (tabsStore.keyForCurrentTab().currentState!.canPop()) {
+              tabsStore.keyForCurrentTab().currentState!.pop();
             } else if (tabsStore.activeTab != Tabs.Home) {
               tabsStore.setActiveTab(Tabs.Home);
             }