Skip to content

Add type-safety checks in navigation functions #5478

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
roryabraham merged 1 commit into from
Sep 24, 2021
Merged

Add type-safety checks in navigation functions #5478

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
23 changes: 23 additions & 0 deletions src/libs/Navigation/Navigation.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,10 @@ function setDidTapNotification() {
* @private
*/
function openDrawer() {
if (!navigationRef.isReady()) {
console.debug('[Navigation] openDrawer failed because navigation ref was not yet ready');
return;
}
navigationRef.current.dispatch(DrawerActions.openDrawer());
}

Expand All @@ -46,6 +50,10 @@ function openDrawer() {
* @private
*/
function closeDrawer() {
if (!navigationRef.isReady()) {
console.debug('[Navigation] closeDrawer failed because navigation ref was not yet ready');
return;
}
navigationRef.current.dispatch(DrawerActions.closeDrawer());
}

Expand All @@ -65,6 +73,11 @@ function getDefaultDrawerState(isSmallScreenWidth) {
* @param {Boolean} shouldOpenDrawer
*/
function goBack(shouldOpenDrawer = true) {
if (!navigationRef.isReady()) {
console.debug('[Navigation] goBack failed because navigation ref was not yet ready');
return;
}

if (!navigationRef.current.canGoBack()) {
console.debug('Unable to go back');
if (shouldOpenDrawer) {
Expand All @@ -81,6 +94,11 @@ function goBack(shouldOpenDrawer = true) {
* @param {String} route
*/
function navigate(route = ROUTES.HOME) {
if (!navigationRef.isReady()) {
console.debug('[Navigation] navigate failed because navigation ref was not yet ready');
return;
}

if (route === ROUTES.HOME) {
if (isLoggedIn) {
openDrawer();
Expand Down Expand Up @@ -110,6 +128,11 @@ function navigate(route = ROUTES.HOME) {
* @param {Boolean} shouldOpenDrawer
*/
function dismissModal(shouldOpenDrawer = false) {
if (!navigationRef.isReady()) {
console.debug('[Navigation] dismissModal failed because navigation ref was not yet ready');
return;
}

const normalizedShouldOpenDrawer = _.isBoolean(shouldOpenDrawer)
? shouldOpenDrawer
: false;
Expand Down