Skip to content

Fix: back arrow for drawer navigation when browser is resized #7801

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
thienlnam merged 9 commits into from
Mar 7, 2022
Merged

Fix: back arrow for drawer navigation when browser is resized #7801

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
87a1a2c
Fix: back arrow in resize
parasharrajat Feb 17, 2022
4f16fd0
clean up the BaseDrawerNavigator Component
parasharrajat Feb 17, 2022
b912a63
Fix: drawer opening when browser is resized
parasharrajat Feb 28, 2022
67f4806
refactor
parasharrajat Feb 28, 2022
29f0434
Correct history before opening the drawer
parasharrajat Mar 3, 2022
f6df183
Revert changes to BaseDrawerNavigator
parasharrajat Mar 3, 2022
5963933
Correct drawer closing logic
parasharrajat Mar 3, 2022
5ec7493
Remove hacks and use direct navigation action
parasharrajat Mar 3, 2022
cc38098
Cleanup Code
parasharrajat Mar 3, 2022
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
16 changes: 11 additions & 5 deletions src/libs/Navigation/CustomActions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,11 +100,17 @@ function pushDrawerRoute(route) {
const screenRoute = {type: 'route', name: newScreenName};
const history = _.map(state.history ? [...state.history] : [screenRoute], () => screenRoute);

// Force drawer to close and show
history.push({
type: 'drawer',
status: 'closed',
});
// Force drawer to close
// https://github.com/react-navigation/react-navigation/blob/94ab791cae5061455f036cd3f6bc7fa63167e7c7/packages/routers/src/DrawerRouter.tsx#L142
const hasDrawerhistory = _.find(state.history || [], h => h.type === 'drawer');
if (!hasDrawerhistory || currentState.type !== 'drawer') {
history.push({
type: 'drawer',

// If current state is not from drawer navigator then always use closed status to close the drawer
status: currentState.type !== 'drawer' || currentState.default === 'open' ? 'closed' : 'open',
});
}

return CommonActions.reset({
...state,
Expand Down