@ionic/react 8.8.1-dev.11772745200.1f0e21b1 → 8.8.1-dev.11773168858.1f9c0eb8

package/dist/index.js

@@ -380,9 +380,7 @@ const useIonViewDidLeave = (callback, deps = []) => {
 };
 
 const NavContext = /*@__PURE__*/ React.createContext({
-    getIonRedirect: () => undefined,
     getIonRoute: () => undefined,
-    getPageManager: () => undefined,
     getStackManager: () => undefined,
     goBack: (route) => {
         if (typeof window !== 'undefined') {
@@ -1137,7 +1135,18 @@ class PageManager extends React.PureComponent {
         super(props);
         this.ionPageElementRef = React.createRef();
         // React refs must be stable (not created inline).
-        this.stableMergedRefs = mergeRefs(this.ionPageElementRef, this.props.forwardedRef);
+        // Wrap merged refs to add ion-page-invisible synchronously when element is created
+        const baseMergedRefs = mergeRefs(this.ionPageElementRef, this.props.forwardedRef);
+        this.stableMergedRefs = (node) => {
+            if (node && !node.classList.contains('ion-page-invisible') && !node.classList.contains('ion-page-hidden')) {
+                // Add ion-page-invisible synchronously before first paint (if in an outlet)
+                // This prevents the flash that occurs when componentDidMount runs after paint
+                if (this.context?.isInOutlet?.()) {
+                    node.classList.add('ion-page-invisible');
+                }
+            }
+            baseMergedRefs(node);
+        };
         /**
          * This binds the scope of the following methods to the class scope.
          * The `.bind` method returns a new function, so we need to assign it
@@ -1149,11 +1158,38 @@ class PageManager extends React.PureComponent {
         this.ionViewWillLeaveHandler = this.ionViewWillLeaveHandler.bind(this);
         this.ionViewDidLeaveHandler = this.ionViewDidLeaveHandler.bind(this);
     }
+    parseClasses(className) {
+        if (!className)
+            return new Set();
+        return new Set(className.split(/\s+/).filter(Boolean));
+    }
+    /**
+     * Updates classList by diffing old/new className props.
+     * Preserves framework-added classes (can-go-back, ion-page-invisible, etc.).
+     */
+    updateUserClasses(oldClassName, newClassName) {
+        if (!this.ionPageElementRef.current)
+            return;
+        const oldClasses = this.parseClasses(oldClassName);
+        const newClasses = this.parseClasses(newClassName);
+        oldClasses.forEach((cls) => {
+            if (!newClasses.has(cls)) {
+                this.ionPageElementRef.current.classList.remove(cls);
+            }
+        });
+        newClasses.forEach((cls) => {
+            if (!oldClasses.has(cls)) {
+                this.ionPageElementRef.current.classList.add(cls);
+            }
+        });
+    }
     componentDidMount() {
         if (this.ionPageElementRef.current) {
-            if (this.context.isInOutlet()) {
-                this.ionPageElementRef.current.classList.add('ion-page-invisible');
-            }
+            // Add user classes via DOM manipulation to preserve framework-added classes.
+            // We only set "ion-page" in JSX; user classes are added here.
+            // Note: ion-page-invisible is added in the ref callback (stableMergedRefs) to prevent flash.
+            // The ref callback runs synchronously when the element is created, before the browser paints.
+            this.updateUserClasses(undefined, this.props.className);
             this.context.registerIonPage(this.ionPageElementRef.current, this.props.routeInfo);
             this.ionPageElementRef.current.addEventListener('ionViewWillEnter', this.ionViewWillEnterHandler);
             this.ionPageElementRef.current.addEventListener('ionViewDidEnter', this.ionViewDidEnterHandler);
@@ -1161,6 +1197,11 @@ class PageManager extends React.PureComponent {
             this.ionPageElementRef.current.addEventListener('ionViewDidLeave', this.ionViewDidLeaveHandler);
         }
     }
+    componentDidUpdate(prevProps) {
+        if (prevProps.className !== this.props.className) {
+            this.updateUserClasses(prevProps.className, this.props.className);
+        }
+    }
     componentWillUnmount() {
         if (this.ionPageElementRef.current) {
             this.ionPageElementRef.current.removeEventListener('ionViewWillEnter', this.ionViewWillEnterHandler);
@@ -1190,9 +1231,11 @@ class PageManager extends React.PureComponent {
     render() {
         // eslint-disable-next-line @typescript-eslint/no-unused-vars
         const { className, children, routeInfo, forwardedRef, ...props } = this.props;
+        // Only set "ion-page" in JSX. User classes are managed via DOM in componentDidMount/componentDidUpdate
+        // to preserve framework-added classes (can-go-back, ion-page-invisible, etc.) when className prop changes.
         return (jsx(IonLifeCycleContext.Consumer, { children: (context) => {
                 this.ionLifeCycleContext = context;
-                return (jsx("div", { className: className ? `${className} ion-page` : `ion-page`, ref: this.stableMergedRefs, ...props, children: children }));
+                return (jsx("div", { className: "ion-page", ref: this.stableMergedRefs, ...props, children: children }));
             } }));
     }
     static get contextType() {
@@ -1331,10 +1374,10 @@ class OutletPageManager extends React.Component {
         this.ionLifeCycleContext.ionViewDidLeave();
     }
     render() {
-        const { StackManager, children, routeInfo, ...props } = this.props;
+        const { StackManager, children, routeInfo, id, ...props } = this.props;
         return (jsx(IonLifeCycleContext.Consumer, { children: (context) => {
                 this.ionLifeCycleContext = context;
-                return (jsx(StackManager, { routeInfo: routeInfo, children: jsx(IonRouterOutletInner, { setRef: (val) => (this.ionRouterOutlet = val), ...props, children: children }) }));
+                return (jsx(StackManager, { id: id, routeInfo: routeInfo, children: jsx(IonRouterOutletInner, { id: id, setRef: (val) => (this.ionRouterOutlet = val), ...props, children: children }) }));
             } }));
     }
     static get contextType() {
@@ -1345,11 +1388,13 @@ class OutletPageManager extends React.Component {
 class IonRouterOutletContainer extends React.Component {
     constructor(props) {
         super(props);
+        this.outletId = props.id ?? `routerOutlet-${generateId('routerOutlet')}`;
     }
     render() {
         const StackManager = this.context.getStackManager();
         const { children, forwardedRef, ...props } = this.props;
-        return this.context.hasIonicRouter() ? (props.ionPage ? (jsx(OutletPageManager, { StackManager: StackManager, routeInfo: this.context.routeInfo, ...props, children: children })) : (jsx(StackManager, { routeInfo: this.context.routeInfo, children: jsx(IonRouterOutletInner, { ...props, forwardedRef: forwardedRef, children: children }) }))) : (jsx(IonRouterOutletInner, { ref: forwardedRef, ...this.props, children: this.props.children }));
+        const outletId = props.id ?? this.outletId;
+        return this.context.hasIonicRouter() ? (props.ionPage ? (jsx(OutletPageManager, { StackManager: StackManager, routeInfo: this.context.routeInfo, ...props, children: children })) : (jsx(StackManager, { routeInfo: this.context.routeInfo, id: outletId, children: jsx(IonRouterOutletInner, { ...props, id: outletId, forwardedRef: forwardedRef, children: children }) }))) : (jsx(IonRouterOutletInner, { ref: forwardedRef, ...this.props, children: this.props.children }));
     }
     static get contextType() {
         return NavContext;
@@ -1830,20 +1875,6 @@ class IonRoute extends React.PureComponent {
     }
 }
 
-class IonRedirect extends React.PureComponent {
-    render() {
-        const IonRedirectInner = this.context.getIonRedirect();
-        if (!this.context.hasIonicRouter() || !IonRedirect) {
-            console.error('You either do not have an Ionic Router package, or your router does not support using <IonRedirect>');
-            return null;
-        }
-        return jsx(IonRedirectInner, { ...this.props });
-    }
-    static get contextType() {
-        return NavContext;
-    }
-}
-
 const IonRouterContext = React.createContext({
     routeInfo: undefined, // TODO(FW-2959): type
     push: () => {
@@ -2240,6 +2271,7 @@ const RouteManagerContext = /*@__PURE__*/ React.createContext({
     findLeavingViewItemByRouteInfo: () => undefined,
     findViewItemByRouteInfo: () => undefined,
     getChildrenToRender: () => undefined,
+    getViewItemsForOutlet: () => [],
     goBack: () => undefined,
     unMountViewItem: () => undefined,
 });
@@ -2358,7 +2390,14 @@ class LocationHistory {
     _replace(routeInfo) {
         const routeInfos = this._getRouteInfosByKey(routeInfo.tab);
         routeInfos && routeInfos.pop();
-        this.locationHistory.pop();
+        // Get the current route that's being replaced
+        const currentRoute = this.locationHistory[this.locationHistory.length - 1];
+        // Only pop from global history if we're replacing in the same outlet context.
+        // Don't pop if we're entering a nested outlet (current route has no tab, new route has a tab)
+        const isEnteringNestedOutlet = currentRoute && !currentRoute.tab && !!routeInfo.tab;
+        if (!isEnteringNestedOutlet) {
+            this.locationHistory.pop();
+        }
         this._add(routeInfo);
     }
     _clear() {
@@ -2441,10 +2480,8 @@ class NavManager extends React.PureComponent {
             goBack: this.goBack.bind(this),
             hasIonicRouter: () => true,
             navigate: this.navigate.bind(this),
-            getIonRedirect: this.getIonRedirect.bind(this),
             getIonRoute: this.getIonRoute.bind(this),
             getStackManager: this.getStackManager.bind(this),
-            getPageManager: this.getPageManager.bind(this),
             routeInfo: this.props.routeInfo,
             setCurrentTab: this.props.onSetCurrentTab,
             changeTab: this.props.onChangeTab,
@@ -2477,12 +2514,6 @@ class NavManager extends React.PureComponent {
     navigate(path, direction = 'forward', action = 'push', animationBuilder, options, tab) {
         this.props.onNavigate(path, action, direction, animationBuilder, options, tab);
     }
-    getPageManager() {
-        return PageManager;
-    }
-    getIonRedirect() {
-        return this.props.ionRedirect;
-    }
     getIonRoute() {
         return this.props.ionRoute;
     }
@@ -2544,5 +2575,5 @@ class ViewStacks {
     }
 }
 
-export { CreateAnimation, DefaultIonLifeCycleContext, IonAccordion, IonAccordionGroup, IonActionSheet, IonAlert, IonApp, IonAvatar, IonBackButton, IonBackdrop, IonBadge, IonBreadcrumb, IonBreadcrumbs, IonButton, IonButtons, IonCard, IonCardContent, IonCardHeader, IonCardSubtitle, IonCardTitle, IonCheckbox, IonChip, IonCol, IonContent, IonDatetime, IonDatetimeButton, IonFab, IonFabButton, IonFabList, IonFooter, IonGrid, IonHeader, IonIcon, IonImg, IonInfiniteScroll, IonInfiniteScrollContent, IonInput, IonInputOtp, IonInputPasswordToggle, IonItem, IonItemDivider, IonItemGroup, IonItemOption, IonItemOptions, IonItemSliding, IonLabel, IonLifeCycleContext, IonList, IonListHeader, IonLoading, IonMenu, IonMenuButton, IonMenuToggle, IonModal, IonNav, IonNavLink, IonNote, IonPage, IonPicker, IonPickerColumn, IonPickerColumnOption, IonPickerLegacy, IonPopover, IonProgressBar, IonRadio, IonRadioGroup, IonRange, IonRedirect, IonRefresher, IonRefresherContent, IonReorder, IonReorderGroup, IonRippleEffect, IonRoute, IonRouterContext, IonRouterLink, IonRouterOutlet, IonRow, IonSearchbar, IonSegment, IonSegmentButton, IonSegmentContent, IonSegmentView, IonSelect, IonSelectModal, IonSelectOption, IonSkeletonText, IonSpinner, IonSplitPane, IonTab, IonTabBar, IonTabButton, IonTabs, IonTabsContext, IonText, IonTextarea, IonThumbnail, IonTitle, IonToast, IonToggle, IonToolbar, LocationHistory, NavContext, NavManager, RouteManagerContext, StackContext, ViewLifeCycleManager, ViewStacks, generateId, getConfig, getPlatforms, isPlatform, setupIonicReact, useIonActionSheet, useIonAlert, useIonLoading, useIonModal, useIonPicker, useIonPopover, useIonRouter, useIonToast, useIonViewDidEnter, useIonViewDidLeave, useIonViewWillEnter, useIonViewWillLeave, withIonLifeCycle };
+export { CreateAnimation, DefaultIonLifeCycleContext, IonAccordion, IonAccordionGroup, IonActionSheet, IonAlert, IonApp, IonAvatar, IonBackButton, IonBackdrop, IonBadge, IonBreadcrumb, IonBreadcrumbs, IonButton, IonButtons, IonCard, IonCardContent, IonCardHeader, IonCardSubtitle, IonCardTitle, IonCheckbox, IonChip, IonCol, IonContent, IonDatetime, IonDatetimeButton, IonFab, IonFabButton, IonFabList, IonFooter, IonGrid, IonHeader, IonIcon, IonImg, IonInfiniteScroll, IonInfiniteScrollContent, IonInput, IonInputOtp, IonInputPasswordToggle, IonItem, IonItemDivider, IonItemGroup, IonItemOption, IonItemOptions, IonItemSliding, IonLabel, IonLifeCycleContext, IonList, IonListHeader, IonLoading, IonMenu, IonMenuButton, IonMenuToggle, IonModal, IonNav, IonNavLink, IonNote, IonPage, IonPicker, IonPickerColumn, IonPickerColumnOption, IonPickerLegacy, IonPopover, IonProgressBar, IonRadio, IonRadioGroup, IonRange, IonRefresher, IonRefresherContent, IonReorder, IonReorderGroup, IonRippleEffect, IonRoute, IonRouterContext, IonRouterLink, IonRouterOutlet, IonRow, IonSearchbar, IonSegment, IonSegmentButton, IonSegmentContent, IonSegmentView, IonSelect, IonSelectModal, IonSelectOption, IonSkeletonText, IonSpinner, IonSplitPane, IonTab, IonTabBar, IonTabButton, IonTabs, IonTabsContext, IonText, IonTextarea, IonThumbnail, IonTitle, IonToast, IonToggle, IonToolbar, LocationHistory, NavContext, NavManager, RouteManagerContext, StackContext, ViewLifeCycleManager, ViewStacks, generateId, getConfig, getPlatforms, isPlatform, setupIonicReact, useIonActionSheet, useIonAlert, useIonLoading, useIonModal, useIonPicker, useIonPopover, useIonRouter, useIonToast, useIonViewDidEnter, useIonViewDidLeave, useIonViewWillEnter, useIonViewWillLeave, withIonLifeCycle };
 //# sourceMappingURL=index.js.map