Page Menu
Home
Phabricator
Search
Configure Global Search
Log In
Files
F2984032
D13520.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Size
1 KB
Referenced Files
None
Subscribers
None
D13520.diff
View Options
diff --git a/native/navigation/navigation-utils.js b/native/navigation/navigation-utils.js
--- a/native/navigation/navigation-utils.js
+++ b/native/navigation/navigation-utils.js
@@ -9,6 +9,7 @@
import invariant from 'invariant';
import {
+ NUXTipOverlayBackdropRouteName,
ComposeSubchannelRouteName,
AppRouteName,
threadRoutes,
@@ -167,6 +168,22 @@
return childRoute;
}
+// isShowingNUXTips assumes nav state is valid
+function isShowingNUXTips(state: PossiblyStaleNavigationState): boolean {
+ const [appRoute] = state.routes;
+ const appSubroutes = appRoute?.state?.routes;
+ if (!appSubroutes) {
+ return false;
+ }
+ for (const route of appSubroutes) {
+ if (route.name === NUXTipOverlayBackdropRouteName) {
+ return true;
+ }
+ }
+
+ return false;
+}
+
export {
getStateFromNavigatorRoute,
getThreadIDFromParams,
@@ -176,4 +193,5 @@
removeScreensFromStack,
validNavState,
getChildRouteFromNavigatorRoute,
+ isShowingNUXTips,
};
diff --git a/native/root.react.js b/native/root.react.js
--- a/native/root.react.js
+++ b/native/root.react.js
@@ -78,7 +78,10 @@
type NavContextType,
} from './navigation/navigation-context.js';
import NavigationHandler from './navigation/navigation-handler.react.js';
-import { validNavState } from './navigation/navigation-utils.js';
+import {
+ validNavState,
+ isShowingNUXTips,
+} from './navigation/navigation-utils.js';
import OrientationHandler from './navigation/orientation-handler.react.js';
import { navStateAsyncStorageKey } from './navigation/persistance.js';
import RootNavigator from './navigation/root-navigator.react.js';
@@ -158,7 +161,7 @@
);
if (navStateString) {
const savedState = JSON.parse(navStateString);
- if (validNavState(savedState)) {
+ if (validNavState(savedState) && !isShowingNUXTips(savedState)) {
loadedState = savedState;
}
}
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Thu, Oct 17, 11:53 AM (21 h, 25 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2307471
Default Alt Text
D13520.diff (1 KB)
Attached To
Mode
D13520: [native] Fix crash in NUX
Attached
Detach File
Event Timeline
Log In to Comment