Poc/split navs #101
Draft
Poc/split navs #101
+4,398
−3,660
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
WojtekBoman
force-pushed
the
poc/split-navs
branch
from
d5a8d96 to
0283fa5
Compare
WojtekBoman
force-pushed
the
poc/split-navs
branch
from
030b630 to
a1d9a3a
Compare
Poc/split go up
split navigators performance
Migrate FloatingActionButton to useOnyx and add small cleanups
…eze-sidebar Poc/split navs freeze sidebar
WoLewicki
reviewed
Jan 13, 2025
| @@ -208,3 +208,274 @@ The action for the first step created with `getMinimalAction` looks like this: | |||
|
|
|||
| ### Deeplinking | |||
| There is no minimal action for deeplinking directly to the `Profile` screen. But because the `Settings_root` is not on the stack, pressing UP will reset the params for navigators to the correct ones. | |||
|
|
|||
| ### Tests | |||
There was a problem hiding this comment.
We'll move it to the separate package
| @@ -43,7 +43,7 @@ index 7558eb3..b7bb75e 100644 | |||
| }) : STATE_TRANSITIONING_OR_BELOW_TOP; | |||
| } | |||
| + | |||
| + const isHomeScreenAndNotOnTop = (route.name === 'BottomTabNavigator' || route.name === 'Workspace_Initial') && isScreenActive !== STATE_ON_TOP; | |||
| + const isHomeScreenAndNotOnTop = (route.name === 'BottomTabNavigator' || route.name === 'Workspace_Initial' || route.name === 'Home' || route.name === 'Search_Bottom_Tab' || route.name === 'Settings_Root' || route.name === 'ReportsSplitNavigator' || route.name === 'Search_Central_Pane') && isScreenActive !== STATE_ON_TOP; | |||
There was a problem hiding this comment.
Maybe we should change variable name or find some more generic way to handle it?
| ACTION_TYPE: { | ||
| REPLACE: 'REPLACE', | ||
| PUSH: 'PUSH', | ||
| NAVIGATE: 'NAVIGATE', | ||
|
|
||
| /** These action types are custom for RootNavigator */ | ||
| SWITCH_POLICY_ID: 'SWITCH_POLICY_ID', |
There was a problem hiding this comment.
Are those actions described somewhere?
| const [isSidebarLoaded] = useOnyx(ONYXKEYS.IS_SIDEBAR_LOADED, {initialValue: false}); | ||
| const isActiveRouteHome = useIsCurrentRouteHome(); | ||
| const isActiveRouteHome = useNavigationState((state) => state?.routes.some((route) => route.name === SCREENS.HOME)); |
There was a problem hiding this comment.
Maybe this logic can be abstracted to some navigation utils file?
| const rootState = navigationRef.getRootState() as State<RootStackParamList>; | ||
| const lastSearchRoute = rootState.routes.filter((route) => route.name === SCREENS.SEARCH.CENTRAL_PANE).at(-1); | ||
| const rootState = navigationRef.getRootState() as State<RootNavigatorParamList>; | ||
| const lastSearchRoute = rootState.routes.filter((route) => route.name === SCREENS.SEARCH.ROOT).at(-1); |
| @@ -38,6 +38,7 @@ jest.mock('@react-navigation/native', () => { | |||
| const actualNav = jest.requireActual<typeof Navigation>('@react-navigation/native'); | |||
| return { | |||
| ...actualNav, | |||
| useNavigationState: () => true, | |||
|
|
||
| function switchPolicyAfterInteractions(newPolicyID: string | undefined) { | ||
| InteractionManager.runAfterInteractions(() => { | ||
| Navigation.navigateWithSwitchPolicyID({policyID: newPolicyID}); | ||
| navigationRef.dispatch({type: CONST.NAVIGATION.ACTION_TYPE.SWITCH_POLICY_ID, payload: {policyID: newPolicyID}}); |
There was a problem hiding this comment.
Isn't it too detailed to be called in non-navigation file?
| @@ -35,19 +43,37 @@ function BaseSidebarScreen() { | |||
| return; | |||
| } | |||
|
|
|||
| Navigation.navigateWithSwitchPolicyID({policyID: undefined}); | |||
| // Otherwise, if the workspace is already loaded, we don't need to do anything | |||
| const topmostReport = navigationRef.getRootState()?.routes.findLast((route) => route.name === NAVIGATORS.REPORTS_SPLIT_NAVIGATOR); | |||
| <BaseSidebarScreen /> | ||
| </FreezeWrapper> | ||
| ); | ||
| return <BaseSidebarScreen />; |
| } else { | ||
| // Otherwise, navigate to the specific route defined in "backTo" with a country parameter | ||
| Navigation.navigate(appendParam(backTo, 'country', option.value)); | ||
| // Set compareParams to false because we want to goUp to this particular screen and update params (country). |
Add LinkToOptions
Fix tooltips for bottom tab bar and sidebar list
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Details
Fixed Issues
$
PROPOSAL:
Tests
Offline tests
QA Steps
PR Author Checklist
### Fixed Issuessection aboveTestssectionOffline stepssectionQA stepssectiontoggleReportand notonIconClick)myBool && <MyComponent />.src/languages/*files and using the translation methodSTYLE.md) were followedAvatar, I verified the components usingAvatarare working as expected)StyleUtils.getBackgroundAndBorderStyle(theme.componentBG))Avataris modified, I verified thatAvataris working as expected in all cases)Designlabel and/or tagged@Expensify/designso the design team can review the changes.ScrollViewcomponent to make it scrollable when more elements are added to the page.mainbranch was merged into this PR after a review, I tested again and verified the outcome was still expected according to theTeststeps.Screenshots/Videos
Android: Native
Android: mWeb Chrome
iOS: Native
iOS: mWeb Safari
MacOS: Chrome / Safari
MacOS: Desktop