Skip to content
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

@swm/navigation refactor #19263

Merged
merged 189 commits into from
Jun 6, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
189 commits
Select commit Hold shift + click to select a range
ebba3fc
bump react-navigation/native and react-navigation/stack version
adamgrzybowski Mar 13, 2023
671ea06
Merge pull request #15928 from adamgrzybowski/bump-react-navigation-v…
mountiny Mar 15, 2023
9a390e9
Merge branch 'main' into navigation-refactor
mountiny Mar 15, 2023
2c273d3
Merge main into navigation-refactor
mountiny Mar 30, 2023
22ba888
remove web specific getNavigationModalCardStyles
adamgrzybowski Mar 20, 2023
6e1691b
extract modal screens to the RightModalStack
adamgrzybowski Mar 21, 2023
f7a1ed1
create responsive stack navigator
adamgrzybowski Mar 23, 2023
17b47f8
remove drawer
adamgrzybowski Mar 22, 2023
543cb76
replace BaseDrawerNavigator with ReportScreen
adamgrzybowski Mar 23, 2023
e87f205
add handling initial state on resize
adamgrzybowski Mar 23, 2023
53cd8e1
fullScreenModalStack
adamgrzybowski Mar 23, 2023
674883e
add border color for sidebar
adamgrzybowski Mar 24, 2023
f432729
rename WideView to ThreePaneView
adamgrzybowski Mar 24, 2023
74798c0
Remove withDrawerState and isDrawerOpen (#3)
staszekscp Mar 27, 2023
b3d01d4
add new Navigators and adjust linking config
adamgrzybowski Mar 24, 2023
8ec253d
modify Navigation.js
adamgrzybowski Mar 24, 2023
e26af41
use ReportScreenWrapper to set initial params and add ensureCentralPa…
adamgrzybowski Mar 27, 2023
b22258c
fix not working FAB on ThreePaneView
staszekscp Mar 28, 2023
08c2ccc
modyfi linkTo to push instead of navigate in specified conditions
adamgrzybowski Mar 28, 2023
b7d2535
Revert "add getTopmostReportId"
adamgrzybowski Mar 28, 2023
8d2d330
remove isModal option from the RightModalStackScreen and rename navig…
adamgrzybowski Mar 29, 2023
6e46cb0
move ensuring report screen on the stack to the custom router
adamgrzybowski Mar 29, 2023
3dbabdc
fix ReportSccreenWrapper reportID loading when opening directly after…
adamgrzybowski Mar 29, 2023
58fbc77
add getTopmostReportId
staszekscp Mar 28, 2023
298328b
improve readability
staszekscp Mar 28, 2023
ac7043c
fix
staszekscp Mar 30, 2023
e0fc4ca
fix the not found page
adamgrzybowski Mar 30, 2023
8d070fb
remove isDrawerReady from pages and actions
adamgrzybowski Mar 30, 2023
95dd4ee
fix rebase problems
adamgrzybowski Mar 31, 2023
c0e4814
wrap navigation on concierge page with useFocusEffect
adamgrzybowski Mar 31, 2023
b1a80a0
add firstRenderRef to the ReportScreen
adamgrzybowski Apr 3, 2023
e808e81
uncomment section for getting state in the linkTo
adamgrzybowski Apr 3, 2023
c58f0d3
fix going back sidebar behavior
staszekscp Apr 4, 2023
7872b50
cleanup
staszekscp Apr 4, 2023
1a71cc4
fix comment
staszekscp Apr 4, 2023
d98111a
Merge pull request #8 from adamgrzybowski/fix-going-back
adamgrzybowski Apr 4, 2023
387820a
add optional chaining for type safety
staszekscp Apr 5, 2023
3913906
add accidentally removed Select_Year in linking config
adamgrzybowski Apr 5, 2023
701cd01
add proper animation for opening report screen on the android
adamgrzybowski Apr 5, 2023
b0f6c88
fix crashing safari
staszekscp Apr 5, 2023
5bc5338
Merge branch 'main' into navigation-refactor
mountiny Apr 5, 2023
eaf8b97
Merge branch 'navigation-refactor' into remove-drawer
adamgrzybowski Apr 5, 2023
803711c
apply code suggestions
adamgrzybowski Apr 5, 2023
c354a4c
add animation for closing report screen
adamgrzybowski Apr 5, 2023
ba4ab72
remove getReportIDFromRoute helper function from /AppNavigator
adamgrzybowski Apr 5, 2023
b919e64
fix eslint errors in ThreePaneView and StyleUtils
adamgrzybowski Apr 5, 2023
85665d1
fix fab on android
staszekscp Apr 6, 2023
71b7c61
remove unused onLayout prop
staszekscp Apr 6, 2023
aea4187
remove unused onLayout prop
staszekscp Apr 6, 2023
9c626fa
create CustomFlatList that remembers the offset when frozen
adamgrzybowski Apr 6, 2023
9ce4817
fix navigating push to currently visible report screens
adamgrzybowski Apr 7, 2023
3dfae04
add dismiss modal to the concierge page
adamgrzybowski Apr 7, 2023
091232e
use goBack on the BlockinView and ReportScreen
adamgrzybowski Apr 7, 2023
7d53900
add prop types for the ResponsiveStackNavigator
adamgrzybowski Apr 7, 2023
6e501c8
add JSDocs for getTopmostReportId and CustomRouter
adamgrzybowski Apr 7, 2023
fbbb0d6
remove renderRightPanel function from the THreePaneView
adamgrzybowski Apr 7, 2023
62b5df8
remove drawer related functions from the Navigation.js
adamgrzybowski Apr 7, 2023
907ecb9
fix linting errors
adamgrzybowski Apr 7, 2023
4997eaa
Merge branch 'main' into navigation-refactor
mountiny Apr 11, 2023
12925ce
merge navigation-refactor into remove-drawer
adamgrzybowski Apr 11, 2023
fab09fb
fix styles
staszekscp Apr 12, 2023
90d5548
remove getNavigationModalCardStyles
staszekscp Apr 12, 2023
4ff3feb
openOnAdminRoom support
staszekscp Apr 12, 2023
f6aabf9
fix proptypes
staszekscp Apr 12, 2023
9912285
feat: testing
WoLewicki Apr 12, 2023
f075d79
fix: tests
WoLewicki Apr 13, 2023
a4100b4
fix linting errors
adamgrzybowski Apr 17, 2023
a84b889
add suggestes chagnes
adamgrzybowski Apr 17, 2023
21d26f6
Merge main
mountiny Apr 17, 2023
16f651a
Merge branch 'navigation-refactor' into remove-drawer
adamgrzybowski Apr 18, 2023
ef5f498
feat: another approach to heavy first render
WoLewicki Apr 20, 2023
1083956
add suggested chagnes
adamgrzybowski Apr 20, 2023
68e66c0
remove unnecessary isDrawerReady and isDrawerOpen
staszekscp Apr 21, 2023
d0fc931
apply suggested changes
staszekscp Apr 21, 2023
83749b4
chore: make tests pass for now
WoLewicki Apr 21, 2023
5bdfc35
rem
staszekscp Apr 21, 2023
2305c61
add
staszekscp Apr 21, 2023
04b5c75
add last line
staszekscp Apr 21, 2023
0dde99f
Update src/libs/Navigation/Navigation.js
adamgrzybowski Apr 21, 2023
66756e7
Update src/libs/Navigation/AppNavigator/Navigators/CentralPaneNavigat…
adamgrzybowski Apr 21, 2023
e54d869
add suggested chagnes
adamgrzybowski Apr 21, 2023
da3fb81
Merge pull request #16581 from adamgrzybowski/remove-drawer
mountiny Apr 22, 2023
efe7757
Merge main
mountiny Apr 22, 2023
dcd9711
Fix flatlist glitch for android (#9)
staszekscp Apr 24, 2023
2807556
fix: mock animation completion callback to trigger setState
WoLewicki Apr 25, 2023
3b5e279
remove close button
staszekscp Apr 25, 2023
f200f22
Merge branch 'navigation-refactor' into remove-close-button
staszekscp Apr 25, 2023
19a9513
fix linter
staszekscp Apr 26, 2023
a86fdc6
rename storybook file
staszekscp Apr 26, 2023
8be6a05
fix: move InteractionManager mock to dedicated file
WoLewicki Apr 26, 2023
bcbfccb
fix: restore old prop and add comment
WoLewicki Apr 26, 2023
f474545
Merge pull request #17956 from WoLewicki/@wolewicki/fix-navigation-tests
tgolen Apr 26, 2023
63f00c8
Merge main
mountiny Apr 26, 2023
9aaa242
Merge branch 'navigation-refactor' into remove-close-button
staszekscp Apr 27, 2023
0a5008e
simplify code
staszekscp Apr 27, 2023
ab605b0
fixes
staszekscp Apr 27, 2023
ad65cec
fixes and improvements
staszekscp Apr 27, 2023
9b82116
remove ModalHeader
staszekscp Apr 27, 2023
8ee7d09
feat: some work done
WoLewicki Apr 28, 2023
1e456f6
move to goback
staszekscp May 2, 2023
71d6fed
add workspaces
staszekscp May 2, 2023
00f1f82
fixes
staszekscp May 4, 2023
7e0365d
fixes for yearpicker
staszekscp May 4, 2023
9748448
fix animation
staszekscp May 4, 2023
619cce2
remove some code
staszekscp May 4, 2023
d6da21d
fixes
staszekscp May 4, 2023
25b3cb9
Merge main
mountiny May 4, 2023
281a25f
chore: merge current navigation-refactor
WoLewicki May 4, 2023
25b74e7
Resolve merge conflict
mountiny May 4, 2023
de67205
Resolve conflicts
mountiny May 4, 2023
a50078e
Remove openOnAdminRoom from AuthScreens
mountiny May 4, 2023
b143205
feat: some changes
WoLewicki May 4, 2023
588b401
Merge branch 'navigation-refactor' into implement-up-press
WoLewicki May 4, 2023
db4430d
fix: remove unused import
WoLewicki May 4, 2023
bafd3bb
add improvements from previous pr
staszekscp May 5, 2023
44f1f1b
fix: app not loading
WoLewicki May 5, 2023
e64177d
fix for narrow screens
staszekscp May 8, 2023
6236f7f
fix: freeze on swipe
WoLewicki May 8, 2023
dcf5f75
fix: lint
WoLewicki May 8, 2023
2395ac3
fix: add patch for web too
WoLewicki May 8, 2023
fb4968f
fix patch
staszekscp May 10, 2023
6d17cc8
Merge main, resolve merge conflicts and fix style
mountiny May 10, 2023
5175d8b
improvements
staszekscp May 15, 2023
99214de
add prettier for easier resolving conflicts
staszekscp May 15, 2023
67a3a2c
merge after prettier
staszekscp May 15, 2023
8374575
fixes
staszekscp May 15, 2023
043994f
fix remaining lint problems
staszekscp May 15, 2023
962fe54
Merge main and resolve merge conflicts
mountiny May 15, 2023
489e5a0
Merge branch 'navigation-refactor' into implement-up-press
staszekscp May 15, 2023
eee8f27
fix
staszekscp May 15, 2023
b2293a7
fix wrong focus
staszekscp May 15, 2023
01f20aa
lint
staszekscp May 15, 2023
cc216e9
address comment issues
staszekscp May 16, 2023
9487da2
Merge main
mountiny May 17, 2023
bd07f59
fix
staszekscp May 17, 2023
2162b81
Merge branch 'navigation-refactor' into implement-up-press
staszekscp May 17, 2023
b49cc6d
podfile.lock update
staszekscp May 17, 2023
a9585be
fix not working back button after resize
staszekscp May 18, 2023
8a8ebbf
performance test
staszekscp May 18, 2023
e96e7d6
fix test
staszekscp May 19, 2023
450136b
fix: test from main
WoLewicki May 19, 2023
e5d8bdc
add last line to package.json
staszekscp May 19, 2023
19a3b1a
Merge pull request #18402 from adamgrzybowski/implement-up-press
mountiny May 19, 2023
c1e1a20
chore: merge current main
WoLewicki May 19, 2023
a9efc41
chore: merge current main
WoLewicki May 19, 2023
e1eb3fb
fix LHN width
staszekscp May 22, 2023
8720c59
fix wrong redirection in iou flow
staszekscp May 23, 2023
a48efb0
test web perf
staszekscp May 23, 2023
8fc7aef
fix for notive
staszekscp May 23, 2023
8efdd3b
fix drag and drop
staszekscp May 23, 2023
83b2525
fix dropzone id
staszekscp May 23, 2023
d2b8e2d
feat: first look on RHP navigating
WoLewicki May 24, 2023
a314801
feat: update patch for stack to handle back button freeze
WoLewicki May 25, 2023
008ba0f
chore: merge current main
WoLewicki May 25, 2023
15850a0
fix: remove unused screen
WoLewicki May 25, 2023
5ee1b93
feat: change freeze placeholder to null
WoLewicki May 25, 2023
86b697f
fix: prettier
WoLewicki May 25, 2023
aede8a5
fix: dismiss modal on search clicked
WoLewicki May 25, 2023
3d1bde8
fix: lint
WoLewicki May 25, 2023
78200d1
chore: merge current main
WoLewicki May 25, 2023
215ada7
chore: remove @react-navigation/drawer mentions
WoLewicki May 26, 2023
a5876b2
feat: change replace animation to push for send/request etc flows
WoLewicki May 26, 2023
d1d1155
fix: add comment
WoLewicki May 26, 2023
aa55da2
fix: revert window reload
WoLewicki May 26, 2023
a7042d3
fix: resolve most of PR comments
WoLewicki May 26, 2023
e5c38f4
fix: remove drawerGoBack
WoLewicki May 26, 2023
cfb8a1f
chore: merge current main
WoLewicki May 26, 2023
75ae9e5
fix: restore order of screens and add back missing one
WoLewicki May 26, 2023
66e959a
fix: proper back button
WoLewicki May 26, 2023
fbd93ab
Update src/NAVIGATORS.js
WoLewicki May 29, 2023
113d2dc
Update src/libs/Navigation/AppNavigator/createResponsiveStackNavigato…
WoLewicki May 29, 2023
60d8293
fix: optimize freeze in CentralPaneNavigator and remove Freeze from R…
WoLewicki May 30, 2023
cd253fd
fix: remove headerSkeleton so back button is responsive
WoLewicki May 30, 2023
17989b0
chore: merge current main
WoLewicki May 30, 2023
3557c32
feat: another approach to heavy first render
WoLewicki May 30, 2023
97c44d7
feat: dismissModal for New Task flow
WoLewicki May 30, 2023
e6bcee5
feat: add freezeWrapper and move freezing of sidebarLinks higher
WoLewicki May 30, 2023
24d3f34
Merge branch 'main' into @swm/navigation-refactor
adamgrzybowski Jun 5, 2023
3e74799
fix: set default value of shouldShowBackButton to false in HeaderWith…
adamgrzybowski Jun 5, 2023
2188213
fix: check if the screenIndex is null
adamgrzybowski Jun 5, 2023
f3398df
fix: FreezeWrapper
adamgrzybowski Jun 6, 2023
757637e
fix: incorrectly resolved conflicts
adamgrzybowski Jun 6, 2023
1c1dad7
fix: remove optymalization from LHNOptionsList
adamgrzybowski Jun 6, 2023
e87890a
fix: tests failing due to performance optimalisation
adamgrzybowski Jun 6, 2023
77f6c25
Merge branch 'main' into @swm/navigation-refactor
adamgrzybowski Jun 6, 2023
2422219
fix: use more descriptive name
adamgrzybowski Jun 6, 2023
e773f15
fix: condition for openReportIfNecessary
adamgrzybowski Jun 6, 2023
123f889
fix: proper navigation inside task flows
WoLewicki Jun 6, 2023
f178c29
chore: merge current main
WoLewicki Jun 6, 2023
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
8 changes: 8 additions & 0 deletions __mocks__/react-native.js
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,14 @@ jest.doMock('react-native', () => {
dimensions = newDimensions;
},
},

// `runAfterInteractions` method would normally be triggered after the native animation is completed,
// we would have to mock waiting for the animation end and more state changes,
// so it seems easier to just run the callback immediately in tests.
InteractionManager: {
...ReactNative.InteractionManager,
runAfterInteractions: (callback) => callback(),
},
},
ReactNative,
);
Expand Down
9 changes: 1 addition & 8 deletions config/webpack/webpack.common.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ const includeModules = [
'react-native-gesture-handler',
'react-native-flipper',
'react-native-google-places-autocomplete',
'@react-navigation/drawer',
'react-native-qrcode-svg',
'react-native-view-shot',
].join('|');
Expand Down Expand Up @@ -59,13 +58,7 @@ const webpackConfig = ({envFile = '.env', platform = 'web'}) => ({
publicPath: '/',
},
stats: {
warningsFilter: [
// @react-navigation for web uses the legacy modules (related to react-native-reanimated)
// This results in 33 warnings with stack traces that appear during build and each time we make a change
// We can't do anything about the warnings, and they only get in the way, so we suppress them
'./node_modules/@react-navigation/drawer/lib/module/views/legacy/Drawer.js',
'./node_modules/@react-navigation/drawer/lib/module/views/legacy/Overlay.js',
],
warningsFilter: [],
},
plugins: [
new CleanWebpackPlugin(),
Expand Down
174 changes: 92 additions & 82 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 2 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -66,9 +66,8 @@
"@react-native-firebase/crashlytics": "^12.3.0",
"@react-native-firebase/perf": "^12.3.0",
"@react-native-picker/picker": "^2.4.3",
"@react-navigation/drawer": "github:Expensify/react-navigation#react-navigation-drawer-v6.5.0-alpha1-gitpkg",
"@react-navigation/native": "6.0.13",
"@react-navigation/stack": "6.3.1",
"@react-navigation/native": "6.1.6",
"@react-navigation/stack": "6.3.16",
"@react-ng/bounds-observer": "^0.2.1",
"@ua/react-native-airship": "^15.2.6",
"awesome-phonenumber": "^5.4.0",
Expand Down
Loading