From 28d21ae55f0404d9da3fa1d2f1aaf82759e124de Mon Sep 17 00:00:00 2001
From: Ely Lucas <ely@meta-tek.net>
Date: Mon, 14 Oct 2019 08:43:39 -0600
Subject: [PATCH] chore(react): fixing test and another method to tab nav

---
 packages/react-router/src/ReactRouter/NavManager.tsx     | 7 ++++++-
 packages/react/src/components/__tests__/IonTabs.spec.tsx | 4 ++--
 packages/react/src/components/navigation/IonTabBar.tsx   | 2 +-
 packages/react/src/contexts/NavContext.ts                | 2 ++
 4 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/packages/react-router/src/ReactRouter/NavManager.tsx b/packages/react-router/src/ReactRouter/NavManager.tsx
index f4cd33f6b8..2e3183c2a0 100644
--- a/packages/react-router/src/ReactRouter/NavManager.tsx
+++ b/packages/react-router/src/ReactRouter/NavManager.tsx
@@ -33,7 +33,8 @@ export class NavManager extends React.Component<NavManagerProps, NavContextState
       getStackManager: this.getStackManager.bind(this),
       getPageManager: this.getPageManager.bind(this),
       currentPath: this.props.location.pathname,
-      registerIonPage: () => { return; } // overridden in View for each IonPage
+      registerIonPage: () => { return; }, // overridden in View for each IonPage
+      tabNavigate: this.tabNavigate.bind(this)
     };
 
     this.listenUnregisterCallback = this.props.history.listen((location: HistoryLocation) => {
@@ -93,6 +94,10 @@ export class NavManager extends React.Component<NavManagerProps, NavContextState
     this.props.history.push(path, { direction });
   }
 
+  tabNavigate(url: string) {
+    this.props.history.replace(url, { direction: 'back' });
+  }
+
   getPageManager() {
     return (children: any) => children;
   }
diff --git a/packages/react/src/components/__tests__/IonTabs.spec.tsx b/packages/react/src/components/__tests__/IonTabs.spec.tsx
index 9e98c9e9c1..15392f5eb5 100644
--- a/packages/react/src/components/__tests__/IonTabs.spec.tsx
+++ b/packages/react/src/components/__tests__/IonTabs.spec.tsx
@@ -10,7 +10,7 @@ describe('IonTabs', () => {
     const { container } = render(
       <IonTabs>
         <IonRouterOutlet></IonRouterOutlet>
-        <IonTabBar slot="bottom" currentPath={'/'} navigate={() => {}}>
+        <IonTabBar slot="bottom" currentPath={'/'}>
           <IonTabButton tab="schedule">
             <IonLabel>Schedule</IonLabel>
             <IonIcon name="schedule"></IonIcon>
@@ -44,7 +44,7 @@ describe('IonTabs', () => {
     const { container } = render(
       <IonTabs>
         <IonRouterOutlet></IonRouterOutlet>
-        <IonTabBar slot="bottom" currentPath={'/'} navigate={() => {}}>
+        <IonTabBar slot="bottom" currentPath={'/'}>
           {false &&
           <IonTabButton tab="schedule">
             <IonLabel>Schedule</IonLabel>
diff --git a/packages/react/src/components/navigation/IonTabBar.tsx b/packages/react/src/components/navigation/IonTabBar.tsx
index 79e8fbf178..9b97707746 100644
--- a/packages/react/src/components/navigation/IonTabBar.tsx
+++ b/packages/react/src/components/navigation/IonTabBar.tsx
@@ -70,7 +70,7 @@ const IonTabBarUnwrapped = /*@__PURE__*/(() => class extends React.Component<Pro
     if (this.state.activeTab === e.detail.tab) {
       const originalHref = this.state.tabs[e.detail.tab].originalHref;
       if (this.context.hasIonicRouter()) {
-        this.context.goBack(originalHref);
+        this.context.tabNavigate(originalHref);
       } else {
         this.context.navigate(originalHref, 'back');
       }
diff --git a/packages/react/src/contexts/NavContext.ts b/packages/react/src/contexts/NavContext.ts
index 865d16a331..8bc1873187 100644
--- a/packages/react/src/contexts/NavContext.ts
+++ b/packages/react/src/contexts/NavContext.ts
@@ -10,6 +10,7 @@ export interface NavContextState {
   navigate: (path: string, direction?: RouterDirection | 'none') => void;
   hasIonicRouter: () => boolean;
   registerIonPage: (page: HTMLElement) => void;
+  tabNavigate: (url: string) => void;
   currentPath: string | undefined;
 }
 
@@ -26,6 +27,7 @@ export const NavContext = /*@__PURE__*/React.createContext<NavContextState>({
     }
   },
   navigate: (path: string) => { window.location.pathname = path; },
+  tabNavigate: () => undefined,
   hasIonicRouter: () => false,
   registerIonPage: () => undefined,
   currentPath: undefined