[internal] perf: sx #44254
+680
−413
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,12 @@ | ||
| import PropTypes from 'prop-types'; | ||
| import isObjectEmpty from '@mui/utils/isObjectEmpty'; | ||
| import fastDeepAssign from '@mui/utils/fastDeepAssign'; | ||
| import deepmerge from '@mui/utils/deepmerge'; | ||
| import merge from '../merge'; | ||
| import { isCqShorthand, getContainerQuery } from '../cssContainerQueries'; | ||
| import createBreakpoints from '../createBreakpoints/createBreakpoints'; | ||
|
|
||
| const EMPTY_THEME = {}; | ||
|
|
||
| // The breakpoint **start** at this value. | ||
| // For instance with the first breakpoint xs: [xs, sm[. | ||
|
|
@@ -13,12 +18,7 @@ export const values = { | |
| xl: 1536, // large screen | ||
| }; | ||
|
|
||
| export const DEFAULT_BREAKPOINTS = createBreakpoints({ values }); | ||
|
|
||
| const defaultContainerQueries = { | ||
| containerQueries: (containerName) => ({ | ||
|
|
@@ -35,52 +35,77 @@ const defaultContainerQueries = { | |
| }; | ||
|
|
||
| export function handleBreakpoints(props, propValue, styleFromPropValue) { | ||
| const result = {}; | ||
| return iterateBreakpoints(result, props.theme, propValue, (mediaKey, value, initialKey) => { | ||
| const finalValue = styleFromPropValue(value, initialKey); | ||
| if (mediaKey) { | ||
| result[mediaKey] = finalValue; | ||
| } else { | ||
| fastDeepAssign(result, finalValue); | ||
| } | ||
| }); | ||
| } | ||
|
|
||
| export function iterateBreakpoints(target, theme, propValue, callback) { | ||
| theme ??= EMPTY_THEME; | ||
|
|
||
| if (Array.isArray(propValue)) { | ||
| const breakpoints = theme.breakpoints ?? DEFAULT_BREAKPOINTS; | ||
| for (let i = 0; i < propValue.length; i += 1) { | ||
| buildBreakpoint( | ||
| target, | ||
| breakpoints.up(breakpoints.keys[i]), | ||
| propValue[i], | ||
| undefined, | ||
| callback, | ||
| ); | ||
| } | ||
| return target; | ||
| } | ||
|
|
||
| if (typeof propValue === 'object') { | ||
| const breakpoints = theme.breakpoints ?? DEFAULT_BREAKPOINTS; | ||
| const breakpointValues = breakpoints.values ?? values; | ||
|
|
||
| for (const key in propValue) { | ||
| if (isCqShorthand(breakpoints.keys, key)) { | ||
| const containerKey = getContainerQuery( | ||
| theme.containerQueries ? theme : defaultContainerQueries, | ||
| key, | ||
| ); | ||
| if (containerKey) { | ||
| buildBreakpoint(target, containerKey, propValue[key], key, callback); | ||
| } | ||
| } | ||
| // key is key | ||
| else if (key in breakpointValues) { | ||
| const mediaKey = breakpoints.up(key); | ||
| buildBreakpoint(target, mediaKey, propValue[key], key, callback); | ||
| } else { | ||
| const cssKey = key; | ||
| target[cssKey] = propValue[cssKey]; | ||
| } | ||
| } | ||
|
|
||
| return target; | ||
| } | ||
|
|
||
| callback(undefined, propValue); | ||
|
|
||
| return target; | ||
| } | ||
|
|
||
| function buildBreakpoint(target, mediaKey, value, initialKey, callback) { | ||
| target[mediaKey] ??= {}; | ||
| callback(mediaKey, value, initialKey); | ||
| } | ||
|
|
||
| function setupBreakpoints(styleFunction) { | ||
| // eslint-disable-next-line react/function-component-definition | ||
| const newStyleFunction = (props) => { | ||
| const theme = props.theme || {}; | ||
| const base = styleFunction(props); | ||
| const themeBreakpoints = theme.breakpoints || DEFAULT_BREAKPOINTS; | ||
|
|
||
| const extended = themeBreakpoints.keys.reduce((acc, key) => { | ||
| if (props[key]) { | ||
|
|
@@ -110,33 +135,36 @@ function breakpoints(styleFunction) { | |
| return newStyleFunction; | ||
| } | ||
|
|
||
| export function createEmptyBreakpointObject(breakpoints = DEFAULT_BREAKPOINTS) { | ||
| const { internal_mediaKeys: mediaKeys } = breakpoints; | ||
| const result = {}; | ||
| for (let i = 0; i < mediaKeys.length; i += 1) { | ||
| result[mediaKeys[i]] = {}; | ||
| } | ||
| return result; | ||
| } | ||
|
|
||
| export function removeUnusedBreakpoints(breakpoints, style) { | ||
| const breakpointKeys = breakpoints.internal_mediaKeys; | ||
|
|
||
| for (let i = 0; i < breakpointKeys.length; i += 1) { | ||
| const key = breakpointKeys[i]; | ||
|
|
||
| if (isObjectEmpty(style[key])) { | ||
mnajdova marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| delete style[key]; | ||
| } | ||
| } | ||
|
|
||
| return style; | ||
| } | ||
|
|
||
| export function mergeBreakpointsInOrder(breakpoints, ...styles) { | ||
| const emptyBreakpoints = createEmptyBreakpointObject(breakpoints); | ||
| const mergedOutput = [emptyBreakpoints, ...styles].reduce( | ||
| (prev, next) => deepmerge(prev, next), | ||
| {}, | ||
| ); | ||
| return removeUnusedBreakpoints(breakpoints, mergedOutput); | ||
| } | ||
|
|
||
| // compute base for responsive values; e.g., | ||
|
|
@@ -197,4 +225,24 @@ export function resolveBreakpointValues({ | |
| }, {}); | ||
| } | ||
|
|
||
| export function hasBreakpoint(breakpoints, value) { | ||
| if (Array.isArray(value)) { | ||
| return true; | ||
| } | ||
| if (typeof value === 'object' && value !== null) { | ||
| for (let i = 0; i < breakpoints.keys.length; i += 1) { | ||
| if (breakpoints.keys[i] in value) { | ||
| return true; | ||
| } | ||
| } | ||
| const valueKeys = Object.keys(value); | ||
| for (let i = 0; i < valueKeys.length; i += 1) { | ||
| if (isCqShorthand(breakpoints.keys, valueKeys[i])) { | ||
| return true; | ||
| } | ||
| } | ||
| } | ||
| return false; | ||
| } | ||
|
Comment on lines
+228
to
+246
Member
There was a problem hiding this comment. This is, more or less, Array.some export function hasBreakpoint(breakpoints, value) {
if (Array.isArray(value)) {
return true;
}
if (typeof value === 'object' && value !== null) {
return breakpoints.keys.some((key) => key in value);
}
return false;
}
Member
There was a problem hiding this comment. Considering this is a perf PR, I assume the changes are intentionally not using array methods, e.g. check https://romgrk.com/posts/optimizing-javascript/#3-avoid-arrayobject-methods. Same for the other comments below 👇
Contributor
Author
There was a problem hiding this comment. Indeed intentional. I avoid array methods on very low-level utils like these ones which are used basically everywhere. I only do micro-optizimations like this for very hot code, not so much for high-level components. |
||
|
|
||
| export default setupBreakpoints; | ||
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
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.
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.
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.
createEmptyBreakpointObjectnow requiresbreakpoints.internal_mediaKeysto exist. If a consumer provides a customtheme.breakpointsobject (or a test stub) without this internal field, this will throw. Consider falling back to computing media keys frombreakpoints.keys+breakpoints.upwheninternal_mediaKeysis missing, so this remains backward-compatible.