From d4fe6409285f92a285b23aa961caf7432882ffc7 Mon Sep 17 00:00:00 2001
From: Liam DeBeasi <liamdebeasi@icloud.com>
Date: Mon, 28 Jun 2021 15:25:48 +0000
Subject: [PATCH 1/2] params now match to new views, updated tests

---
 packages/vue-router/src/viewStacks.ts         | 40 ++++++----------
 .../test-app/src/views/RoutingParameter.vue   |  2 +-
 .../vue/test-app/tests/e2e/specs/routing.js   | 46 +++++++++++++------
 .../test-app/tests/e2e/support/commands.js    |  1 -
 .../vue/test-app/tests/unit/routing.spec.ts   |  4 +-
 5 files changed, 51 insertions(+), 42 deletions(-)

diff --git a/packages/vue-router/src/viewStacks.ts b/packages/vue-router/src/viewStacks.ts
index 3b891137259..15a48857049 100644
--- a/packages/vue-router/src/viewStacks.ts
+++ b/packages/vue-router/src/viewStacks.ts
@@ -23,31 +23,7 @@ export const createViewStacks = (router: Router) => {
   }
 
   const findViewItemByRouteInfo = (routeInfo: RouteInfo, outletId?: number) => {
-    let viewItem = findViewItemByPath(routeInfo.pathname, outletId, false);
-
-    /**
-     * Given a route such as /path/:id,
-     * going from /page/1 to /home
-     * to /page/2 will cause the same
-     * view item from /page/1 to match
-     * for /page/2 so we need to make
-     * sure any params get updated.
-     * Not normally an issue for accessing
-     * the params via useRouter from vue-router,
-     * but when passing params as props not doing
-     * this would cause the old props to show up.
-     */
-    if (viewItem && viewItem.params !== routeInfo.params) {
-      /**
-       * Clear the props function result
-       * as the value may have changed due
-       * to different props.
-       */
-      delete viewItem.vueComponentData.propsFunctionResult;
-      viewItem.params = routeInfo.params;
-    }
-
-    return viewItem;
+    return findViewItemByPath(routeInfo.pathname, outletId, false);
   }
 
   const findLeavingViewItemByRouteInfo = (routeInfo: RouteInfo, outletId?: number, mustBeIonRoute: boolean = true) => {
@@ -81,6 +57,20 @@ export const createViewStacks = (router: Router) => {
       const findMatchedRoute = resolvedPath.matched.find((matchedRoute: RouteLocationMatched) => matchedRoute === viewItem.matchedRoute);
 
       if (findMatchedRoute) {
+
+        /**
+         * /page/1 and /page/2 should not match
+         * to the same view item otherwise there will
+         * be not page transition and we will need to
+         * explicitly clear out parameters from page 1
+         * so the page 2 params are properly passed
+         * to the developer's app.
+         */
+        const hasParameter = findMatchedRoute.path.includes(':');
+        if (hasParameter && path !== viewItem.pathname) {
+          return false;
+        }
+
         return viewItem;
       }
 
diff --git a/packages/vue/test-app/src/views/RoutingParameter.vue b/packages/vue/test-app/src/views/RoutingParameter.vue
index ffeac7f0f08..36c74e2fcc9 100644
--- a/packages/vue/test-app/src/views/RoutingParameter.vue
+++ b/packages/vue/test-app/src/views/RoutingParameter.vue
@@ -1,5 +1,5 @@
 <template>
-  <ion-page data-pageid="routingparameter">
+  <ion-page :data-pageid="'routingparameter-' + $props.id">
     <ion-header :translucent="true">
       <ion-toolbar>
         <ion-buttons>
diff --git a/packages/vue/test-app/tests/e2e/specs/routing.js b/packages/vue/test-app/tests/e2e/specs/routing.js
index 662f1fca02c..9a06d9d1319 100644
--- a/packages/vue/test-app/tests/e2e/specs/routing.js
+++ b/packages/vue/test-app/tests/e2e/specs/routing.js
@@ -53,15 +53,15 @@ describe('Routing', () => {
     cy.visit('http://localhost:8080/routing');
 
     cy.get('#parameter-abc').click();
-    cy.ionPageVisible('routingparameter');
-    cy.get('[data-pageid=routingparameter] #parameter-value').should('have.text', 'abc');
-    cy.ionBackClick('routingparameter');
+    cy.ionPageVisible('routingparameter-abc');
+    cy.get('[data-pageid=routingparameter-abc] #parameter-value').should('have.text', 'abc');
+    cy.ionBackClick('routingparameter-abc');
 
-    cy.ionPageDoesNotExist('routingparameter');
+    cy.ionPageDoesNotExist('routingparameter-abc');
 
     cy.get('#parameter-xyz').click();
-    cy.ionPageVisible('routingparameter');
-    cy.get('[data-pageid=routingparameter] #parameter-value').should('have.text', 'xyz');
+    cy.ionPageVisible('routingparameter-xyz');
+    cy.get('[data-pageid=routingparameter-xyz] #parameter-value').should('have.text', 'xyz');
   });
 
   // Verifies fix for https://github.com/ionic-team/ionic-framework/issues/22359
@@ -69,7 +69,7 @@ describe('Routing', () => {
     cy.visit('http://localhost:8080/routing');
 
     cy.get('#parameter-abc').click();
-    cy.ionPageVisible('routingparameter');
+    cy.ionPageVisible('routingparameter-abc');
 
     cy.get('#parameter-view').click();
 
@@ -149,32 +149,32 @@ describe('Routing', () => {
   });
 
   // Verifies fix for https://github.com/ionic-team/ionic-framework/issues/22658
-  it('should select correct leaving view when navigating between paramter urls', () => {
+  it('should select correct leaving view when navigating between parameter urls', () => {
     cy.visit('http://localhost:8080');
 
     cy.routerPush('/routing/123');
-    cy.ionPageVisible('routingparameter');
+    cy.ionPageVisible('routingparameter-123');
     cy.ionPageHidden('home');
 
     cy.routerPush('/routing/456');
-    cy.ionPageVisible('routingparameter');
+    cy.ionPageVisible('routingparameter-456');
     cy.ionPageHidden('home');
 
     cy.routerPush('/navigation');
     cy.ionPageVisible('navigation');
-    cy.ionPageHidden('routingparameter');
+    cy.ionPageHidden('routingparameter-456');
 
     cy.routerPush('/routing/789');
-    cy.ionPageVisible('routingparameter');
+    cy.ionPageVisible('routingparameter-789');
     cy.ionPageHidden('home');
 
     cy.routerPush('/routing/000');
-    cy.ionPageVisible('routingparameter');
+    cy.ionPageVisible('routingparameter-000');
     cy.ionPageHidden('home');
 
     cy.routerPush('/navigation');
     cy.ionPageVisible('navigation');
-    cy.ionPageHidden('routingparameter');
+    cy.ionPageHidden('routingparameter-000');
   });
 
   // Verifies fix for https://github.com/ionic-team/ionic-framework/issues/22528
@@ -191,6 +191,24 @@ describe('Routing', () => {
 
     cy.ionBackButtonHidden('home');
   });
+
+  // Verifies fix for https://github.com/ionic-team/ionic-framework/issues/22662
+  it('should push a new instance of a parameterized page so there is a transition', () => {
+    cy.visit('http://localhost:8080');
+
+    cy.routerPush('/routing/123');
+    cy.ionPageVisible('routingparameter-123');
+    cy.ionPageHidden('home');
+
+    cy.routerPush('/routing/456');
+    cy.ionPageVisible('routingparameter-456');
+    cy.ionPageHidden('routingparameter-123');
+
+    cy.ionBackClick('routingparameter-456');
+
+    cy.ionPageVisible('routingparameter-123')
+    cy.ionPageDoesNotExist('routingparameter-456');
+  })
 });
 
 describe('Routing - Swipe to Go Back', () => {
diff --git a/packages/vue/test-app/tests/e2e/support/commands.js b/packages/vue/test-app/tests/e2e/support/commands.js
index f25d0d1eae9..1aafb03ef47 100644
--- a/packages/vue/test-app/tests/e2e/support/commands.js
+++ b/packages/vue/test-app/tests/e2e/support/commands.js
@@ -50,7 +50,6 @@ Cypress.Commands.add('ionPageVisible', (pageId) => {
 Cypress.Commands.add('ionPageHidden', (pageId) => {
   cy.get(`div.ion-page[data-pageid=${pageId}]`)
     .should('have.class', 'ion-page-hidden')
-    .should('have.length', 1)
 })
 
 Cypress.Commands.add('ionBackClick', (pageId) => {
diff --git a/packages/vue/test-app/tests/unit/routing.spec.ts b/packages/vue/test-app/tests/unit/routing.spec.ts
index 68357db9a86..cd2845979ff 100644
--- a/packages/vue/test-app/tests/unit/routing.spec.ts
+++ b/packages/vue/test-app/tests/unit/routing.spec.ts
@@ -392,6 +392,8 @@ describe('Routing', () => {
     router.push('/page/2');
     await waitForRouter();
 
-    expect(page.props()).toEqual({ id: '2' });
+    const pageAgain = wrapper.findAllComponents(Page);
+    expect(pageAgain[0].props()).toEqual({ id: '1' });
+    expect(pageAgain[1].props()).toEqual({ id: '2' });
   });
 });

From 379decab2088627ad98b96ea79af68f5efd5275a Mon Sep 17 00:00:00 2001
From: Liam DeBeasi <liamdebeasi@icloud.com>
Date: Mon, 28 Jun 2021 15:33:16 +0000
Subject: [PATCH 2/2] improve tests

---
 packages/vue/test-app/src/router/index.ts     |  9 ++--
 packages/vue/test-app/src/views/Tab1.vue      |  2 +-
 .../vue/test-app/src/views/Tab1ChildTwo.vue   | 44 -------------------
 .../{Tab1ChildOne.vue => Tab1Parameter.vue}   | 13 ++++--
 4 files changed, 13 insertions(+), 55 deletions(-)
 delete mode 100644 packages/vue/test-app/src/views/Tab1ChildTwo.vue
 rename packages/vue/test-app/src/views/{Tab1ChildOne.vue => Tab1Parameter.vue} (67%)

diff --git a/packages/vue/test-app/src/router/index.ts b/packages/vue/test-app/src/router/index.ts
index f3701f21791..ae08e71890e 100644
--- a/packages/vue/test-app/src/router/index.ts
+++ b/packages/vue/test-app/src/router/index.ts
@@ -90,12 +90,9 @@ const routes: Array<RouteRecordRaw> = [
         component: () => import('@/views/Tab1.vue'),
       },
       {
-        path: 'tab1/child-one',
-        component: () => import('@/views/Tab1ChildOne.vue')
-      },
-      {
-        path: 'tab1/child-two',
-        component: () => import('@/views/Tab1ChildTwo.vue')
+        path: 'tab1/:id',
+        component: () => import('@/views/Tab1Parameter.vue'),
+        props: true
       },
       {
         path: 'tab2',
diff --git a/packages/vue/test-app/src/views/Tab1.vue b/packages/vue/test-app/src/views/Tab1.vue
index 6ae2efaebdf..a63a50b76b5 100644
--- a/packages/vue/test-app/src/views/Tab1.vue
+++ b/packages/vue/test-app/src/views/Tab1.vue
@@ -17,7 +17,7 @@
 
       <ExploreContainer name="Tab 1 page" />
 
-      <ion-item button router-link="/tabs/tab1/child-one" id="child-one">
+      <ion-item button router-link="/tabs/tab1/childone" id="child-one">
         <ion-label>Go to Tab 1 Child 1</ion-label>
       </ion-item>
       <ion-item button router-link="/nested" id="nested">
diff --git a/packages/vue/test-app/src/views/Tab1ChildTwo.vue b/packages/vue/test-app/src/views/Tab1ChildTwo.vue
deleted file mode 100644
index 5606b7c82eb..00000000000
--- a/packages/vue/test-app/src/views/Tab1ChildTwo.vue
+++ /dev/null
@@ -1,44 +0,0 @@
-<template>
-  <ion-page data-pageid="tab1childtwo">
-    <ion-header>
-      <ion-toolbar>
-        <ion-buttons>
-          <ion-back-button></ion-back-button>
-        </ion-buttons>
-        <ion-title>Tab 1 Child 2</ion-title>
-      </ion-toolbar>
-    </ion-header>
-    <ion-content :fullscreen="true">
-      <ion-header collapse="condense">
-        <ion-toolbar>
-          <ion-title size="large">Tab 1 Child 2</ion-title>
-        </ion-toolbar>
-      </ion-header>
-
-    </ion-content>
-  </ion-page>
-</template>
-
-<script>
-import {
-  IonButtons,
-  IonBackButton,
-  IonPage,
-  IonHeader,
-  IonToolbar,
-  IonTitle,
-  IonContent
-} from '@ionic/vue';
-
-export default  {
-  components: {
-    IonButtons,
-    IonBackButton,
-    IonPage,
-    IonHeader,
-    IonToolbar,
-    IonTitle,
-    IonContent
-  }
-}
-</script>
diff --git a/packages/vue/test-app/src/views/Tab1ChildOne.vue b/packages/vue/test-app/src/views/Tab1Parameter.vue
similarity index 67%
rename from packages/vue/test-app/src/views/Tab1ChildOne.vue
rename to packages/vue/test-app/src/views/Tab1Parameter.vue
index 02964876777..701f73b512c 100644
--- a/packages/vue/test-app/src/views/Tab1ChildOne.vue
+++ b/packages/vue/test-app/src/views/Tab1Parameter.vue
@@ -1,21 +1,25 @@
 <template>
-  <ion-page data-pageid="tab1childone">
+  <ion-page :data-pageid="'tab1' + $props.id">
     <ion-header>
       <ion-toolbar>
         <ion-buttons>
           <ion-back-button></ion-back-button>
         </ion-buttons>
-        <ion-title>Tab 1 Child 1</ion-title>
+        <ion-title>Tab 1 Child {{ $props.id }}</ion-title>
       </ion-toolbar>
     </ion-header>
     <ion-content :fullscreen="true">
       <ion-header collapse="condense">
         <ion-toolbar>
-          <ion-title size="large">Tab 1 Child 1</ion-title>
+          <ion-title size="large">Tab 1 Child {{ $props.id }}</ion-title>
         </ion-toolbar>
       </ion-header>
 
-      <ion-item router-link="child-two" id="child-two">
+      <ion-item router-link="childone" id="child-one">
+        <ion-label>Tab 1 Child 1</ion-label>
+      </ion-item>
+
+      <ion-item router-link="childtwo" id="child-two">
         <ion-label>Tab 1 Child 2</ion-label>
       </ion-item>
 
@@ -37,6 +41,7 @@ import {
 } from '@ionic/vue';
 
 export default  {
+  props: { id: String },
   components: {
     IonButtons,
     IonBackButton,