-
Notifications
You must be signed in to change notification settings - Fork 3.2k
fix: abracadabra page #48899
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
Closed
Closed
fix: abracadabra page #48899
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
fadfc2c
fix: synchronous navigator mount
kirillzyusko 9bc4bc1
fix: patch react-navigation to perform async cleanup as prior to Stri…
kirillzyusko fa3c56a
refactor: simplify StrictMode wrapper
kirillzyusko 1f2db18
fix: resolve own todos, code cleanup
kirillzyusko File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
52 changes: 52 additions & 0 deletions
52
patches/@react-navigation+core+6.4.11+002+proper-navigator-unmount-in-strict-mode.patch
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,52 @@ | ||
diff --git a/node_modules/@react-navigation/core/lib/module/useNavigationBuilder.js b/node_modules/@react-navigation/core/lib/module/useNavigationBuilder.js | ||
index 6fb49e0..1f7c859 100644 | ||
--- a/node_modules/@react-navigation/core/lib/module/useNavigationBuilder.js | ||
+++ b/node_modules/@react-navigation/core/lib/module/useNavigationBuilder.js | ||
@@ -114,6 +114,16 @@ const getRouteConfigsFromChildren = (children, groupKey, groupOptions) => { | ||
return configs; | ||
}; | ||
|
||
+const useFullyMountedRef = () => { | ||
+ const isFullyMountedRef = React.useRef(false); | ||
+ | ||
+ React.useEffect(() => { | ||
+ isFullyMountedRef.current = true; | ||
+ }, []); | ||
+ | ||
+ return isFullyMountedRef; | ||
+}; | ||
+ | ||
/** | ||
* Hook for building navigators. | ||
* | ||
@@ -122,6 +132,7 @@ const getRouteConfigsFromChildren = (children, groupKey, groupOptions) => { | ||
* @returns An object containing `state`, `navigation`, `descriptors` objects. | ||
*/ | ||
export default function useNavigationBuilder(createRouter, options) { | ||
+ const isFullyMountedRef = useFullyMountedRef(); | ||
const navigatorKey = useRegisterNavigator(); | ||
const route = React.useContext(NavigationRouteContext); | ||
const { | ||
@@ -298,10 +309,18 @@ export default function useNavigationBuilder(createRouter, options) { | ||
setState(nextState); | ||
} | ||
return () => { | ||
- // We need to clean up state for this navigator on unmount | ||
- if (getCurrentState() !== undefined && getKey() === navigatorKey) { | ||
- setCurrentState(undefined); | ||
- stateCleanedUp.current = true; | ||
+ const cleanup = () => { | ||
+ // We need to clean up state for this navigator on unmount | ||
+ if (getCurrentState() !== undefined && getKey() === navigatorKey) { | ||
+ setCurrentState(undefined); | ||
+ stateCleanedUp.current = true; | ||
+ } | ||
+ } | ||
+ | ||
+ if (!isFullyMountedRef.current) { | ||
+ cleanup(); | ||
+ } else { | ||
+ setTimeout(cleanup, 0); | ||
} | ||
}; | ||
// eslint-disable-next-line react-hooks/exhaustive-deps |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.
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.
I think this should follow the New Library Process
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.
Submitted an issue here: #49519