Skip to content
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

Jump to bottom

Fix unnecessary top-level context changes #1924

Merged
merged 2 commits into from
Feb 1, 2022
Merged

Fix unnecessary top-level context changes #1924

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d8dc2f7
Fix unnecessary top-level context changes
gaearon Feb 1, 2022
d31b665
Update packages/react/lib/index.js
wooorm Feb 1, 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
19 changes: 11 additions & 8 deletions packages/react/lib/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,15 +65,18 @@ export function withMDXComponents(Component) {
*/
export function useMDXComponents(components) {
const contextComponents = React.useContext(MDXContext)

// Custom merge via a function prop
if (typeof components === 'function') {
return components(contextComponents)
}

return {...contextComponents, ...components}
// Memoize to avoid unnecessary top-level context changes
return React.useMemo(() => {
// Custom merge via a function prop
if (typeof components === 'function') {
return components(contextComponents)
}
return {...contextComponents, ...components}
}, [contextComponents, components])
}

const emptyObject = {}
wooorm marked this conversation as resolved.
Show resolved Hide resolved

/**
* Provider for MDX context
*
Expand All @@ -84,7 +87,7 @@ export function MDXProvider({components, children, disableParentContext}) {
let allComponents = useMDXComponents(components)

if (disableParentContext) {
allComponents = components || {}
allComponents = components || emptyObject
}

return React.createElement(
Expand Down