@ionic/react 8.8.1-dev.11773676615.1d6c4cf7 → 8.8.1-dev.11773873479.192398dc

package/dist/index.js

@@ -1591,7 +1591,9 @@ const matchesTab = (pathname, href) => {
     if (href === undefined) {
         return false;
     }
-    const normalizedHref = href.endsWith('/') && href !== '/' ? href.slice(0, -1) : href;
+    // Strip query string before comparing — href may contain search params (e.g., "/tabs/home?foo=bar")
+    const hrefPathname = href.split('?')[0];
+    const normalizedHref = hrefPathname.endsWith('/') && hrefPathname !== '/' ? hrefPathname.slice(0, -1) : hrefPathname;
     return pathname === normalizedHref || pathname.startsWith(normalizedHref + '/');
 };
 class IonTabBarUnwrapped extends React.PureComponent {
@@ -1683,7 +1685,7 @@ class IonTabBarUnwrapped extends React.PureComponent {
             const prevHref = state.tabs[prevActiveTab].currentHref;
             const prevRouteOptions = state.tabs[prevActiveTab].currentRouteOptions;
             if (activeTab !== prevActiveTab ||
-                prevHref !== props.routeInfo?.pathname ||
+                prevHref !== (props.routeInfo?.pathname || '') + (props.routeInfo?.search || '') ||
                 prevRouteOptions !== props.routeInfo?.routeOptions) {
                 tabs[activeTab] = {
                     originalHref: tabs[activeTab].originalHref,
@@ -1750,7 +1752,7 @@ class IonTabBarUnwrapped extends React.PureComponent {
         return (child) => {
             if (child != null && child.props && (child.type === IonTabButton || child.type.isTabButton)) {
                 const href = child.props.tab === activeTab
-                    ? this.props.routeInfo?.pathname
+                    ? (this.props.routeInfo?.pathname || '') + (this.props.routeInfo?.search || '')
                     : this.state.tabs[child.props.tab].currentHref;
                 const routeOptions = child.props.tab === activeTab
                     ? this.props.routeInfo?.routeOptions
@@ -2429,6 +2431,20 @@ class LocationHistory {
         }
         return undefined;
     }
+    /**
+     * Returns the most recent RouteInfo in global history (excluding the current
+     * entry) whose pathname matches the given value. Unlike findLastLocation,
+     * this search is tab-agnostic. Used by the multi-step back detection.
+     */
+    findLastLocationByPathname(pathname) {
+        for (let i = this.locationHistory.length - 2; i >= 0; i--) {
+            const ri = this.locationHistory[i];
+            if (ri && ri.pathname === pathname) {
+                return ri;
+            }
+        }
+        return undefined;
+    }
     findLastLocation(routeInfo) {
         const routeInfos = this._getRouteInfosByKey(routeInfo.tab);
         if (routeInfos) {