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

BlockSettingsDropdown: No need to cast 'clientIds' to an array #59940

Merged
merged 2 commits into from
Mar 18, 2024
Merged

BlockSettingsDropdown: No need to cast 'clientIds' to an array #59940

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a94af6f
BlockSettingsDropdown: No need to cast 'clientIds' to an array
Mamaduka Mar 18, 2024
a8f058d
Fix clientId logic for 'onInsertBefore' and 'onInsertAfter' actions
Mamaduka Mar 18, 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
10 changes: 2 additions & 8 deletions packages/block-editor/src/components/block-actions/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,16 +98,10 @@ export default function BlockActions( {
return removeBlocks( clientIds, updateSelection );
},
onInsertBefore() {
const clientId = Array.isArray( clientIds )
? clientIds[ 0 ]
: clientId;
insertBeforeBlock( clientId );
Comment on lines -101 to -104
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I believe we missed a typo while refactoring in #43846. The previous logic would result in the following error if clientIds wasn't array: Uncaught ReferenceError: clientId is not defined.

cc @tyxla

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great catch, thanks I confirm this had to be clientIds in the first place!

insertBeforeBlock( clientIds[ 0 ] );
},
onInsertAfter() {
const clientId = Array.isArray( clientIds )
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Confirming that the rest of the code already expects arrays and doesn't do additional checks. Good find!

? clientIds[ clientIds.length - 1 ]
: clientId;
insertAfterBlock( clientId );
insertAfterBlock( clientIds[ clientIds.length - 1 ] );
},
onMoveTo() {
setNavigationMode( true );
Expand Down
9 changes: 3 additions & 6 deletions packages/block-editor/src/components/block-settings-menu/block-settings-dropdown.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,18 +46,15 @@ function CopyMenuItem( { clientIds, onCopy, label } ) {
export function BlockSettingsDropdown( {
block,
clientIds,
__experimentalSelectBlock,
children,
__experimentalSelectBlock,
__unstableDisplayLocation,
...props
} ) {
// Get the client id of the current block for this menu, if one is set.
const currentClientId = block?.clientId;
const blockClientIds = Array.isArray( clientIds )
? clientIds
: [ clientIds ];
const count = blockClientIds.length;
const firstBlockClientId = blockClientIds[ 0 ];
const count = clientIds.length;
const firstBlockClientId = clientIds[ 0 ];
const {
firstParentClientId,
onlyBlock,
Expand Down
Loading