Skip to content

ToC: Fix list block check #41351

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
ZebulanStanphill merged 1 commit into from
May 25, 2022
Merged

ToC: Fix list block check #41351

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
17 changes: 12 additions & 5 deletions packages/block-library/src/table-of-contents/edit.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import {
store as blockEditorStore,
useBlockProps,
} from '@wordpress/block-editor';
import { createBlock, store as blocksStore } from '@wordpress/blocks';
import { createBlock } from '@wordpress/blocks';
import {
PanelBody,
Placeholder,
Expand Down Expand Up @@ -57,9 +57,16 @@ export default function TableOfContentsEdit( {
const blockProps = useBlockProps();
const disabledRef = useDisabled();

const listBlockExists = useSelect(
( select ) => !! select( blocksStore ).getBlockType( 'core/list' ),
[]
const canInsertList = useSelect(
( select ) => {
const { getBlockRootClientId, canInsertBlockType } = select(
blockEditorStore
);
const rootClientId = getBlockRootClientId( clientId );

return canInsertBlockType( 'core/list', rootClientId );
},
[ clientId ]
);

const {
Expand Down Expand Up @@ -222,7 +229,7 @@ export default function TableOfContentsEdit( {

const headingTree = linearToNestedHeadingList( headings );

const toolbarControls = listBlockExists && (
const toolbarControls = canInsertList && (
<BlockControls>
<ToolbarGroup>
<ToolbarButton
Expand Down