From 1c93b75e397961e374620eb43bee3d6bb4389836 Mon Sep 17 00:00:00 2001
From: Liam DeBeasi <liamdebeasi@users.noreply.github.com>
Date: Mon, 22 Mar 2021 16:11:45 -0400
Subject: [PATCH] fix(react): correctly show ion-back-button when going back
 (#23069)

resolves #22692
---
 .../src/ReactRouter/StackManager.tsx          |  2 +-
 .../cypress/integration/routing.spec.js       | 21 +++++++++++++++++++
 .../test-app/src/pages/routing/Details.tsx    |  2 +-
 3 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/packages/react-router/src/ReactRouter/StackManager.tsx b/packages/react-router/src/ReactRouter/StackManager.tsx
index 7e0e4dcb70..13b77ef1a4 100644
--- a/packages/react-router/src/ReactRouter/StackManager.tsx
+++ b/packages/react-router/src/ReactRouter/StackManager.tsx
@@ -194,7 +194,7 @@ export class StackManager extends React.PureComponent<StackManagerProps, StackMa
         deepWait: true,
         duration: direction === undefined ? 0 : undefined,
         direction: direction as any,
-        showGoBack: direction === 'forward',
+        showGoBack: !!routeInfo.pushedByRoute,
         progressAnimation: false,
         animationBuilder: routeInfo.routeAnimation,
       });
diff --git a/packages/react-router/test-app/cypress/integration/routing.spec.js b/packages/react-router/test-app/cypress/integration/routing.spec.js
index 98f3b2090b..36d31be4d3 100644
--- a/packages/react-router/test-app/cypress/integration/routing.spec.js
+++ b/packages/react-router/test-app/cypress/integration/routing.spec.js
@@ -289,6 +289,27 @@ describe('Routing Tests', () => {
     cy.ionPageVisible('home-page');
     cy.ionPageHidden('favorites-page');
   });
+
+  it('should show back button when going back to a pushed page', () => {
+    cy.visit(`http://localhost:${port}/routing/tabs/home`);
+
+    cy.ionNav('ion-item', 'Details 1');
+    cy.ionPageHidden('home-page');
+    cy.ionPageVisible('home-details-page-1');
+
+    cy.get('ion-tab-button#tab-button-settings').click();
+    cy.ionPageHidden('home-details-page-1');
+    cy.ionPageVisible('settings-page');
+
+    cy.get('ion-tab-button#tab-button-home').click();
+    cy.ionPageHidden('settings-page');
+    cy.ionPageVisible('home-details-page-1');
+
+    cy.ionBackClick('home-details-page-1');
+
+    cy.ionPageDoesNotExist('home-details-page-1');
+    cy.ionPageVisible('home-page');
+  });
   /*
     Tests to add:
     Test that lifecycle events fire
diff --git a/packages/react-router/test-app/src/pages/routing/Details.tsx b/packages/react-router/test-app/src/pages/routing/Details.tsx
index 3815d431e5..0e2c5e92b3 100644
--- a/packages/react-router/test-app/src/pages/routing/Details.tsx
+++ b/packages/react-router/test-app/src/pages/routing/Details.tsx
@@ -37,7 +37,7 @@ const Details: React.FC<DetailsProps> = () => {
       <IonHeader>
         <IonToolbar>
           <IonButtons>
-            <IonBackButton defaultHref="/routing/tabs/home"></IonBackButton>
+            <IonBackButton></IonBackButton>
           </IonButtons>
           <IonTitle>Details</IonTitle>
         </IonToolbar>