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

useSelect: two code improvements #39975

Merged
merged 1 commit into from
Apr 1, 2022
Merged

useSelect: two code improvements #39975

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
26 changes: 9 additions & 17 deletions packages/data/src/components/use-select/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,10 +127,10 @@ export default function useSelect( mapSelect, deps ) {
// Keep track of the stores being selected in the _mapSelect function,
// and only subscribe to those stores later.
const listeningStores = useRef( [] );
const trapSelect = useCallback(
const wrapSelect = useCallback(
( callback ) =>
registry.__experimentalMarkListeningStores(
callback,
() => callback( registry.select, registry ),
listeningStores
),
[ registry ]
Expand All @@ -150,9 +150,7 @@ export default function useSelect( mapSelect, deps ) {

if ( hasReplacedMapSelect || lastMapSelectFailed ) {
try {
mapOutput = trapSelect( () =>
_mapSelect( registry.select, registry )
);
mapOutput = wrapSelect( _mapSelect );
} catch ( error ) {
let errorMessage = `An error occurred while running 'mapSelect': ${ error.message }`;

Expand Down Expand Up @@ -196,9 +194,7 @@ export default function useSelect( mapSelect, deps ) {
const onStoreChange = () => {
if ( isMountedAndNotUnsubscribing.current ) {
try {
const newMapOutput = trapSelect( () =>
latestMapSelect.current( registry.select, registry )
);
const newMapOutput = wrapSelect( latestMapSelect.current );

if (
isShallowEqual( latestMapOutput.current, newMapOutput )
Expand All @@ -213,14 +209,6 @@ export default function useSelect( mapSelect, deps ) {
}
};

// Catch any possible state changes during mount before the subscription
// could be set.
if ( latestIsAsync.current ) {
renderQueue.add( queueContext, onStoreChange );
} else {
onStoreChange();
}

const onChange = () => {
if ( latestIsAsync.current ) {
renderQueue.add( queueContext, onStoreChange );
Expand All @@ -229,6 +217,10 @@ export default function useSelect( mapSelect, deps ) {
}
};

// Catch any possible state changes during mount before the subscription
// could be set.
onChange();

const unsubscribers = listeningStores.current.map( ( storeName ) =>
registry.__experimentalSubscribeStore( storeName, onChange )
);
Expand All @@ -242,7 +234,7 @@ export default function useSelect( mapSelect, deps ) {
// If you're tempted to eliminate the spread dependencies below don't do it!
// We're passing these in from the calling function and want to make sure we're
// examining every individual value inside the `deps` array.
}, [ registry, trapSelect, hasMappingFunction, depsChangedFlag ] );
}, [ registry, wrapSelect, hasMappingFunction, depsChangedFlag ] );

return hasMappingFunction ? mapOutput : registry.select( mapSelect );
}