-
Notifications
You must be signed in to change notification settings - Fork 0
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.
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
Poc/split navs #101
base: main
Are you sure you want to change the base?
Poc/split navs #101
Changes from 250 commits
8b44987
741c10d
a6c28f8
47c8e0b
4b1cedd
8b7e4a0
222e8ad
b83d53d
a214ae0
d7bd472
00001dd
93eb244
7b36a3b
59df51e
65c5468
9e34f96
63fed48
413e777
d2e2119
3d9199c
1e1e06b
cd5cf44
45dd97a
74f8e18
564fe9e
9aed8a0
a8b8d0d
dc6dfc2
ee31d12
b6b4ad8
3dfd640
356519c
481f591
cbae813
0cdad81
2f137ca
e6a4c54
b9fff42
2391422
c7f7040
e07125b
0612b54
dcdf021
9efb031
4881e68
31069c1
75c4b80
e69c349
d6f3322
03bd743
90b5e67
5f09a69
e56bdaa
a0b5c50
e8b58f8
b16a7ca
9132ffd
0fc9470
b23a3f1
a95797c
052d352
6701e9f
a3063c8
d0a1b69
0ab9076
f4dd1bf
927c68b
8cd6ade
37b5cc0
072ea6a
2d30771
eb35ca7
34b56d9
fac8f6f
eb8c882
79a508f
ec4a01e
287d7ed
e8cc9c3
be7fe0d
868b305
fb326c3
b9a1119
0f46afb
c1d813f
223e383
30c9748
8fcd73c
84f1543
21e1863
86fb765
92e47ac
8ddbd8e
f4d7f2e
4c7c320
6dde5fd
dfdd15d
27a356d
e528b6a
8fa61a2
9fd294b
75c3f18
0ad8a87
8e44d87
ed0ebca
4c2c180
65b6c89
6f65c7c
b213f93
33d6012
0c90d16
44bde76
6fc9f27
c52cbaa
dab0ad4
4dbdd23
a455bac
f6084ec
122fc6a
43f48d3
b5eb92b
4cb080c
34d6403
0cd11da
5d978e3
99166de
061f2ca
3659ad0
62b1cda
20efb77
2df2704
4849fb7
0de350b
e211447
a846373
954a411
c7c315e
785259f
9765499
37203aa
741ce5f
899084b
861f87a
2e212a7
93fa76d
4ace213
fd99fa8
d54df17
9280e9e
9fbccec
be9cb55
e8749f4
3ed172e
dd7a57c
2afede2
3afe817
324b598
f44db08
216c812
f46818a
7cf08be
21f7bf6
b11cba2
b15bcca
e69b8f0
2896031
686dde6
d7d0ff3
097d3c5
0ae4aac
7345d80
ade9a19
27c6f92
96289b1
18ad376
14068c4
0a11e29
5117a9f
08f5c9d
579608e
79202d1
9f5bccb
faeaf9a
e7a5150
49c49f9
4620ac7
f405f7e
2e08e1e
3e7f16c
c611aa2
7438d33
88b9998
28ed8b9
99fc247
17759f4
1480723
af2058d
98247e3
e5fa16b
4b2949d
0a07ab6
94f9dfb
1b32364
2d6951a
84a15f5
c81e83d
9fbe3d3
e22f82a
e575d1b
f4ef875
3bc1739
03e6a6d
c4fa287
4a6766e
3acba0a
5232577
0b6c39f
a22cf59
3a9fd70
c404c02
3960579
8bc926d
9c9d28c
b21cb6a
6589e68
f05d53c
8648ce7
3af5702
e07c4f5
d514067
5f90743
0812be8
c1d8459
c11217d
f1bc522
52ce458
667a052
21be090
114b059
36c1238
6d1010f
2b5299a
50f36ea
ac8a578
072f0d9
8292c1e
133e7d2
a7207b8
12cf649
0da271f
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Remember to remove unused pages/navigators before merging There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Maybe we should change variable name or find some more generic way to handle it? |
||
+ | ||
const { | ||
headerShown = true, | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -4649,13 +4649,15 @@ const CONST = { | |
SF_COORDINATES: [-122.4194, 37.7749], | ||
|
||
NAVIGATION: { | ||
TYPE: { | ||
UP: 'UP', | ||
}, | ||
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. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Are those actions described somewhere? |
||
DISMISS_MODAL: 'DISMISS_MODAL', | ||
OPEN_WORKSPACE_SPLIT: 'OPEN_WORKSPACE_SPLIT', | ||
}, | ||
}, | ||
TIME_PERIOD: { | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -4,7 +4,6 @@ | |
* */ | ||
export default { | ||
CENTRAL_PANE_NAVIGATOR: 'CentralPaneNavigator', | ||
BOTTOM_TAB_NAVIGATOR: 'BottomTabNavigator', | ||
LEFT_MODAL_NAVIGATOR: 'LeftModalNavigator', | ||
RIGHT_MODAL_NAVIGATOR: 'RightModalNavigator', | ||
ONBOARDING_MODAL_NAVIGATOR: 'OnboardingModalNavigator', | ||
|
@@ -13,4 +12,7 @@ export default { | |
EXPLANATION_MODAL_NAVIGATOR: 'ExplanationModalNavigator', | ||
MIGRATED_USER_MODAL_NAVIGATOR: 'MigratedUserModalNavigator', | ||
FULL_SCREEN_NAVIGATOR: 'FullScreenNavigator', | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This one is ready to be removed |
||
REPORTS_SPLIT_NAVIGATOR: 'ReportsSplitNavigator', | ||
SETTINGS_SPLIT_NAVIGATOR: 'SettingsSplitNavigator', | ||
WORKSPACE_SPLIT_NAVIGATOR: 'WorkspaceSplitNavigator', | ||
} as const; |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,11 +1,8 @@ | ||
import {createContext} from 'react'; | ||
|
||
type ActiveWorkspaceContextType = { | ||
activeWorkspaceID?: string; | ||
setActiveWorkspaceID: (activeWorkspaceID?: string) => void; | ||
}; | ||
|
||
const ActiveWorkspaceContext = createContext<ActiveWorkspaceContextType>({activeWorkspaceID: undefined, setActiveWorkspaceID: () => undefined}); | ||
const ActiveWorkspaceContext = createContext<{activeWorkspaceID: string | undefined; setActiveWorkspaceID: (workspaceID: string | undefined) => void}>({ | ||
activeWorkspaceID: undefined, | ||
setActiveWorkspaceID: () => {}, | ||
}); | ||
|
||
export default ActiveWorkspaceContext; | ||
export {type ActiveWorkspaceContextType}; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why are the tests put here?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We'll move it to the separate package