Poc/split navs #101
Draft
Poc/split navs #101
+2,965
−2,624
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
…adjust getAdaptedState
…k button on member list
…m a link and going back
…pted-state-fixes Poc/split navs adapted state fixes
Poc/freeze perf
WojtekBoman
reviewed
Nov 13, 2024
| @@ -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.
Remember to remove unused pages/navigators before merging
| import type ChildrenProps from '@src/types/utils/ChildrenProps'; | ||
|
|
||
| function ActiveWorkspaceContextProvider({children}: ChildrenProps) { | ||
| const [activeWorkspaceID, setActiveWorkspaceID] = useState<string | undefined>(undefined); | ||
|
|
||
| const lastPolicyRoute = useNavigationState((state) => |
There was a problem hiding this comment.
Maybe add a comment explaining why we only check NAVIGATORS.REPORTS_SPLIT_NAVIGATOR and SCREENS.SEARCH.CENTRAL_PANE
There was a problem hiding this comment.
Or maybe we should use isFullScreenName?
There was a problem hiding this comment.
We can, but not all full screens store the policy ID, so it may be a bit confusing, but it will also work
| <View style={styles.rootNavigatorContainerStyles(shouldUseNarrowLayout)}> | ||
| <RootStack.Navigator | ||
| screenOptions={screenOptions.centralPaneNavigator} | ||
| isSmallScreenWidth={isSmallScreenWidth} | ||
| > | ||
| {/* This have to be the first navigator in auth screens. */} |
There was a problem hiding this comment.
Suggested change
| {/* This have to be the first navigator in auth screens. */} | |
| {/* This has to be the first navigator in auth screens. */} |
| return; | ||
| } | ||
|
|
||
| if (queryFromRouteParam) { |
There was a problem hiding this comment.
Check whether this if statement can be written in a more readable way
| @@ -264,6 +244,26 @@ function AuthScreens({session, lastOpenedPublicRoomID, initialLastUpdateIDApplie | |||
| isInitialRender.current = false; | |||
| } | |||
|
|
|||
| // Animation is disabled when navigating to the sidebar screen | |||
| const getSplitNavigatorOptions = (route: RouteProp<AuthScreensParamList>) => { | |||
There was a problem hiding this comment.
Maybe pass the screen as a parameter instead of the route
| @@ -89,7 +89,8 @@ function WorkspaceInviteMessagePage({policy, route, currentUserPersonalDetails}: | |||
| if (isEmptyObject(policy)) { | |||
| return; | |||
| } | |||
| Navigation.goBack(ROUTES.WORKSPACE_INVITE.getRoute(route.params.policyID), true); | |||
| // @TODO: Check if this method works the same as on the main branch | |||
| @@ -45,7 +45,9 @@ function WorkspaceJoinUserPage({route, policy}: WorkspaceJoinUserPageProps) { | |||
| } | |||
| if (!isEmptyObject(policy) && !policy?.isJoinRequestPending && !PolicyUtils.isPendingDeletePolicy(policy)) { | |||
| Navigation.isNavigationReady().then(() => { | |||
| Navigation.goBack(undefined, false, true); | |||
| // @TODO: Check if this method works the same as on the main branch | |||
| return screen; | ||
| } | ||
|
|
||
| // @TODO: Fix types here |
|
|
||
| // @TODO: Make sure that everything works fine without compareAndAdaptState function. Probably with getMatchingFullScreenRoute. |
…screen-blurred Adjust getIsScreenBlurred to native platforms
…ge-url-fix Make ReportsSplitNavigator public
…avigation.navigate
Poc/split cleanup
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