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

[Block Settings]: Show move to on nested blocks when only one root block #44827

Merged
merged 2 commits into from
Oct 10, 2022
Merged

[Block Settings]: Show move to on nested blocks when only one root block #44827

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f429892
[Block Settings]: Show `move to` on nested blocks when only one root …
ntsekouras Oct 10, 2022
e1a5c30
use `getBlockRootClientId`
ntsekouras Oct 10, 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
19 changes: 11 additions & 8 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 @@ -74,7 +74,7 @@ export function BlockSettingsDropdown( {
const {
getBlockCount,
getBlockName,
getBlockParents,
getBlockRootClientId,
getPreviousBlockClientId,
getNextBlockClientId,
getSelectedBlockClientIds,
Expand All @@ -84,19 +84,22 @@ export function BlockSettingsDropdown( {

const { getActiveBlockVariation } = select( blocksStore );

const parents = getBlockParents( firstBlockClientId );
const _firstParentClientId = parents[ parents.length - 1 ];
const parentBlockName = getBlockName( _firstParentClientId );
const _firstParentClientId =
getBlockRootClientId( firstBlockClientId );
const parentBlockName =
_firstParentClientId && getBlockName( _firstParentClientId );

return {
firstParentClientId: _firstParentClientId,
isDistractionFree: getSettings().isDistractionFree,
onlyBlock: 1 === getBlockCount(),
onlyBlock: 1 === getBlockCount( _firstParentClientId ),
ntsekouras marked this conversation as resolved.
Show resolved Hide resolved
parentBlockType:
getActiveBlockVariation(
_firstParentClientId &&
( getActiveBlockVariation(
parentBlockName,
getBlockAttributes( _firstParentClientId )
) || getBlockType( parentBlockName ),
) ||
getBlockType( parentBlockName ) ),
previousBlockClientId:
getPreviousBlockClientId( firstBlockClientId ),
nextBlockClientId: getNextBlockClientId( firstBlockClientId ),
Expand Down Expand Up @@ -221,7 +224,7 @@ export function BlockSettingsDropdown( {
<__unstableBlockSettingsMenuFirstItem.Slot
fillProps={ { onClose } }
/>
{ firstParentClientId !== undefined && (
{ !! firstParentClientId && (
<MenuItem
{ ...showParentOutlineGestures }
ref={ selectParentButtonRef }
Expand Down