Skip to content

[CP Staging] Revert "Adjust adaptStateIfNecessary to push a split navigator without a sidebar screen" #57320

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mountiny merged 1 commit into from
Feb 24, 2025
Merged

[CP Staging] Revert "Adjust adaptStateIfNecessary to push a split navigator without a sidebar screen" #57320

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 3 additions & 6 deletions src/libs/Navigation/AppNavigator/createSplitNavigator/SplitRouter.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ function getRoutePolicyID(route: NavigationPartialRoute): string | undefined {

function adaptStateIfNecessary({state, options: {sidebarScreen, defaultCentralScreen, parentRoute}}: AdaptStateIfNecessaryArgs) {
const isNarrowLayout = getIsNarrowLayout();
const rootState = navigationRef.getRootState();

const lastRoute = state.routes.at(-1) as NavigationPartialRoute;
const routePolicyID = getRoutePolicyID(lastRoute);
Expand All @@ -38,14 +37,10 @@ function adaptStateIfNecessary({state, options: {sidebarScreen, defaultCentralSc
}
}

// When initializing the app on a small screen with the center screen as the initial screen, the sidebar must also be split to allow users to swipe back.
const isInitialRoute = !rootState || rootState.routes.length === 1;
const shouldSplitHaveSidebar = isInitialRoute || !isNarrowLayout;

// If the screen is wide, there should be at least two screens inside:
// - sidebarScreen to cover left pane.
// - defaultCentralScreen to cover central pane.
if (!isAtLeastOneInState(state, sidebarScreen) && shouldSplitHaveSidebar) {
if (!isAtLeastOneInState(state, sidebarScreen)) {
const paramsFromRoute = getParamsFromRoute(sidebarScreen);
const copiedParams = pick(lastRoute?.params, paramsFromRoute);

Expand All @@ -70,6 +65,8 @@ function adaptStateIfNecessary({state, options: {sidebarScreen, defaultCentralSc
// - defaultCentralScreen to cover central pane.
if (!isNarrowLayout) {
if (state.routes.length === 1 && state.routes[0].name === sidebarScreen) {
const rootState = navigationRef.getRootState();

const previousSameNavigator = rootState?.routes.filter((route) => route.name === parentRoute.name).at(-2);

// If we have optimization for not rendering all split navigators, then last selected option may not be in the state. In this case state has to be read from the preserved state.
Expand Down
Loading