Skip to content

Fix: use active variation as the parent block if available #44609

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

Merged
merged 1 commit into from
Oct 7, 2022
Merged

Fix: use active variation as the parent block if available #44609

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
fix: use active variation as the parent block if available
  • Loading branch information
@dinhtungdu
dinhtungdu committed Sep 30, 2022
commit 4da8655fac31f36a42f976926701d8712a075c56
15 changes: 13 additions & 2 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 @@ -6,7 +6,11 @@ import { castArray } from 'lodash';
/**
* WordPress dependencies
*/
import { getBlockType, serialize } from '@wordpress/blocks';
import {
getBlockType,
serialize,
store as blocksStore,
} from '@wordpress/blocks';
import { DropdownMenu, MenuGroup, MenuItem } from '@wordpress/components';
import { useDispatch, useSelect } from '@wordpress/data';
import { moreVertical } from '@wordpress/icons';
Expand Down Expand Up @@ -75,8 +79,11 @@ export function BlockSettingsDropdown( {
getNextBlockClientId,
getSelectedBlockClientIds,
getSettings,
getBlockAttributes,
} = select( blockEditorStore );

const { getActiveBlockVariation } = select( blocksStore );

const parents = getBlockParents( firstBlockClientId );
const _firstParentClientId = parents[ parents.length - 1 ];
const parentBlockName = getBlockName( _firstParentClientId );
Expand All @@ -85,7 +92,11 @@ export function BlockSettingsDropdown( {
firstParentClientId: _firstParentClientId,
hasReducedUI: getSettings().hasReducedUI,
onlyBlock: 1 === getBlockCount(),
parentBlockType: getBlockType( parentBlockName ),
parentBlockType:
getActiveBlockVariation(
parentBlockName,
getBlockAttributes( _firstParentClientId )
) || getBlockType( parentBlockName ),
previousBlockClientId:
getPreviousBlockClientId( firstBlockClientId ),
nextBlockClientId: getNextBlockClientId( firstBlockClientId ),
Expand Down