-
Notifications
You must be signed in to change notification settings - Fork 616
avoid creating a div on every render in portal #4037
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
Merged
Merged
Changes from all commits
Commits
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
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,5 @@ | ||
--- | ||
'@primer/react': patch | ||
--- | ||
|
||
Portal avoids useless createElement |
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 |
---|---|---|
|
@@ -65,14 +65,18 @@ export const Portal: React.FC<React.PropsWithChildren<PortalProps>> = ({ | |
onMount, | ||
containerName: _containerName, | ||
}) => { | ||
const hostElement = document.createElement('div') | ||
const elementRef = React.useRef<HTMLDivElement | null>(null) | ||
if (!elementRef.current) { | ||
const div = document.createElement('div') | ||
// Portaled content should get their own stacking context so they don't interfere | ||
// with each other in unexpected ways. One should never find themselves tempted | ||
// to change the zIndex to a value other than "1". | ||
div.style.position = 'relative' | ||
div.style.zIndex = '1' | ||
elementRef.current = div | ||
} | ||
|
||
// Portaled content should get their own stacking context so they don't interfere | ||
// with each other in unexpected ways. One should never find themselves tempted | ||
// to change the zIndex to a value other than "1". | ||
hostElement.style.position = 'relative' | ||
hostElement.style.zIndex = '1' | ||
const elementRef = React.useRef(hostElement) | ||
const element = elementRef.current | ||
|
||
useLayoutEffect(() => { | ||
let containerName = _containerName | ||
|
@@ -87,15 +91,14 @@ export const Portal: React.FC<React.PropsWithChildren<PortalProps>> = ({ | |
`Portal container '${_containerName}' is not yet registered. Container must be registered with registerPortal before use.`, | ||
) | ||
} | ||
const element = elementRef.current | ||
parentElement.appendChild(element) | ||
onMount?.() | ||
|
||
return () => { | ||
parentElement.removeChild(element) | ||
} | ||
// eslint-disable-next-line react-hooks/exhaustive-deps | ||
}, [elementRef]) | ||
}, [element]) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. element is stable, so this is the same. I kind of wonder if the lack of exhaustive deps here indicates other issues, but ignoring that for now since this pr is keeping identical behavior characteristics, with just a bit less waste |
||
|
||
return createPortal(children, elementRef.current) | ||
return createPortal(children, element) | ||
} |
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.
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.
since we only used the ref, which is created on the first render, we can just create it on the first render.
this is still not SSR safe, however, and we should probably change this to account for that, but at least we're not wasting memory for no reason?