useMatchMedia: cache queries #61000
Merged
useMatchMedia: cache queries #61000
Conversation
This file contains 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
|
The following accounts have interacted with this PR and/or linked issues. I will continue to update these lists as activity occurs. You can also manually ask me to refresh this list by adding the If you're merging code through a pull request on GitHub, copy and paste the following into the bottom of the merge commit message. To understand the WordPress project's expectations around crediting contributors, please review the Contributor Attribution page in the Core Handbook. |
|
Size Change: +78 B (0%) Total Size: 1.74 MB
ℹ️ View Unchanged
|
jsnajdr
reviewed
Apr 23, 2024
tyxla
reviewed
Apr 23, 2024
There was a problem hiding this comment.
Perhaps we could clean the cache before every test?
diff --git a/packages/compose/src/hooks/use-media-query/index.js b/packages/compose/src/hooks/use-media-query/index.js
index 598ab006ecb..a9f759a58de 100644
--- a/packages/compose/src/hooks/use-media-query/index.js
+++ b/packages/compose/src/hooks/use-media-query/index.js
@@ -3,7 +3,7 @@
*/
import { useMemo, useSyncExternalStore } from '@wordpress/element';
-const matchMediaCache = new Map();
+export const matchMediaCache = new Map();
/**
* A new MediaQueryList object for the media query
diff --git a/packages/compose/src/hooks/use-media-query/test/index.js b/packages/compose/src/hooks/use-media-query/test/index.js
index 88b2c1b0a3b..ffe7a897688 100644
--- a/packages/compose/src/hooks/use-media-query/test/index.js
+++ b/packages/compose/src/hooks/use-media-query/test/index.js
@@ -7,7 +7,7 @@ import { matchMedia, setMedia, cleanup } from 'mock-match-media';
/**
* Internal dependencies
*/
-import useMediaQuery from '../';
+import useMediaQuery, { matchMediaCache } from '../';
const TestComponent = ( { query } ) => {
const queryResult = useMediaQuery( query );
@@ -23,6 +23,7 @@ describe( 'useMediaQuery', () => {
setMedia( {
width: '960px',
} );
+ matchMediaCache.clear();
} );
afterEach( () => {
|
@tyxla That might work as well, but I opted for not clearing all the mocked media queries state instead, so we don't need to clear the cache and it will test it at the same time. |
Even better. Thanks! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
What?
As seen in #60546 (among others, such as #57133),
matchMediais the most expensive part of these media queries. Let's cache it. Usually the number of different media queries is very small, so I wouldn't worry about the cache getting out of hand.Why?
How?
Testing Instructions
Testing Instructions for Keyboard
Screenshots or screencast