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

Block editor: selectors: avoid has() or double get() on Maps #58372

Merged
merged 3 commits into from
Jan 29, 2024
Merged

Block editor: selectors: avoid has() or double get() on Maps #58372

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
37af468
Block editor: selectors: avoid has() or double get() on Maps
ellatrix Jan 29, 2024
fc87b2c
Fix typo
ellatrix Jan 29, 2024
45aeb7a
Revert getBlock
ellatrix Jan 29, 2024
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: 11 additions & 15 deletions packages/block-editor/src/store/selectors.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,12 +157,13 @@ export function getBlock( state, clientId ) {

export const __unstableGetBlockWithoutInnerBlocks = createSelector(
( state, clientId ) => {
if ( ! state.blocks.byClientId.has( clientId ) ) {
const block = state.blocks.byClientId.get( clientId );
if ( ! block ) {
return null;
}

return {
...state.blocks.byClientId.get( clientId ),
...block,
attributes: getBlockAttributes( state, clientId ),
};
},
Expand Down Expand Up @@ -540,9 +541,7 @@ export function getSelectedBlock( state ) {
* @return {?string} Root client ID, if exists
*/
export function getBlockRootClientId( state, clientId ) {
return state.blocks.parents.has( clientId )
? state.blocks.parents.get( clientId )
: null;
return state.blocks.parents.get( clientId ) ?? null;
}

/**
Expand All @@ -558,8 +557,7 @@ export const getBlockParents = createSelector(
( state, clientId, ascending = false ) => {
const parents = [];
let current = clientId;
while ( !! state.blocks.parents.get( current ) ) {
current = state.blocks.parents.get( current );
while ( ( current = state.blocks.parents.get( current ) ) ) {
parents.push( current );
}

Expand Down Expand Up @@ -2737,13 +2735,10 @@ export const __unstableGetContentLockingParent = createSelector(
( state, clientId ) => {
let current = clientId;
let result;
while ( state.blocks.parents.has( current ) ) {
current = state.blocks.parents.get( current );
while ( ( current = state.blocks.parents.get( current ) ) ) {
if (
( current &&
getBlockName( state, current ) === 'core/block' ) ||
( current &&
getTemplateLock( state, current ) === 'contentOnly' )
getBlockName( state, current ) === 'core/block' ||
getTemplateLock( state, current ) === 'contentOnly'
) {
result = current;
}
Expand Down Expand Up @@ -2869,8 +2864,9 @@ export function __unstableIsWithinBlockOverlay( state, clientId ) {
export const getBlockEditingMode = createRegistrySelector(
( select ) =>
( state, clientId = '' ) => {
if ( state.blockEditingModes.has( clientId ) ) {
return state.blockEditingModes.get( clientId );
const blockEditingMode = state.blockEditingModes.get( clientId );
if ( blockEditingMode ) {
return blockEditingMode;
}
if ( ! clientId ) {
return 'default';
Expand Down
Loading