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

Blocks: Disable Grouping when block removal is locked #39541

Merged
merged 2 commits into from
Mar 17, 2022
Merged

Blocks: Disable Grouping when block removal is locked #39541

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
159958c
Blocks: Disable Grouping when block removal is locked
Mamaduka Mar 17, 2022
c4ab4a2
Use selector in slot
Mamaduka Mar 17, 2022
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
9 changes: 7 additions & 2 deletions packages/block-editor/src/components/block-settings-menu-controls/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,11 @@ import { store as blockEditorStore } from '../../store';

const { Fill, Slot } = createSlotFill( 'BlockSettingsMenuControls' );

const BlockSettingsMenuControlsSlot = ( { fillProps, clientIds = null } ) => {
const BlockSettingsMenuControlsSlot = ( {
fillProps,
clientIds = null,
canRemove,
} ) => {
const { selectedBlocks, selectedClientIds } = useSelect(
( select ) => {
const { getBlocksByClientId, getSelectedBlockClientIds } = select(
Expand All @@ -50,7 +54,8 @@ const BlockSettingsMenuControlsSlot = ( { fillProps, clientIds = null } ) => {
// and pass this props down to ConvertToGroupButton.
const convertToGroupButtonProps = useConvertToGroupButtonProps();
const { isGroupable, isUngroupable } = convertToGroupButtonProps;
const showConvertToGroupButton = isGroupable || isUngroupable;
const showConvertToGroupButton =
( isGroupable || isUngroupable ) && canRemove;

return (
<Slot fillProps={ { ...fillProps, selectedBlocks, selectedClientIds } }>
Expand Down
1 change: 1 addition & 0 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 @@ -227,6 +227,7 @@ export function BlockSettingsDropdown( {
<BlockSettingsMenuControls.Slot
fillProps={ { onClose } }
clientIds={ clientIds }
canRemove={ canRemove }
Mamaduka marked this conversation as resolved.
Show resolved Hide resolved
/>
{ typeof children === 'function'
? children( { onClose } )
Expand Down