diff --git a/packages/block-library/src/navigation/edit/index.jsx b/packages/block-library/src/navigation/edit/index.jsx index 7165e7f2558a34..ee82dba914712e 100644 --- a/packages/block-library/src/navigation/edit/index.jsx +++ b/packages/block-library/src/navigation/edit/index.jsx @@ -357,12 +357,8 @@ function Navigation( { await createNavigationMenu( '' ); }; - const { - hasUncontrolledInnerBlocks, - uncontrolledInnerBlocks, - isInnerBlockSelected, - innerBlocks, - } = useInnerBlocks( clientId ); + const { hasUncontrolledInnerBlocks, isInnerBlockSelected, innerBlocks } = + useInnerBlocks( clientId ); const { replaceInnerBlocks, @@ -997,7 +993,7 @@ function Navigation( { > diff --git a/packages/block-library/src/navigation/edit/use-inner-blocks.js b/packages/block-library/src/navigation/edit/use-inner-blocks.js deleted file mode 100644 index c86bd348c467de..00000000000000 --- a/packages/block-library/src/navigation/edit/use-inner-blocks.js +++ /dev/null @@ -1,36 +0,0 @@ -import { useSelect } from '@wordpress/data'; -import { store as blockEditorStore } from '@wordpress/block-editor'; - -const EMPTY_ARRAY = []; - -export function useInnerBlocks( clientId ) { - return useSelect( - ( select ) => { - const { getBlock, getBlocks, hasSelectedInnerBlock } = - select( blockEditorStore ); - - // This relies on the fact that `getBlock` won't return controlled - // inner blocks, while `getBlocks` does. It might be more stable to - // introduce a selector like `getUncontrolledInnerBlocks`, just in - // case `getBlock` is fixed. - const _uncontrolledInnerBlocks = getBlock( clientId ).innerBlocks; - - const _hasUncontrolledInnerBlocks = - !! _uncontrolledInnerBlocks?.length; - const _controlledInnerBlocks = _hasUncontrolledInnerBlocks - ? EMPTY_ARRAY - : getBlocks( clientId ); - - return { - innerBlocks: _hasUncontrolledInnerBlocks - ? _uncontrolledInnerBlocks - : _controlledInnerBlocks, - hasUncontrolledInnerBlocks: _hasUncontrolledInnerBlocks, - uncontrolledInnerBlocks: _uncontrolledInnerBlocks, - controlledInnerBlocks: _controlledInnerBlocks, - isInnerBlockSelected: hasSelectedInnerBlock( clientId, true ), - }; - }, - [ clientId ] - ); -} diff --git a/packages/block-library/src/navigation/edit/use-inner-blocks.ts b/packages/block-library/src/navigation/edit/use-inner-blocks.ts new file mode 100644 index 00000000000000..c775e432ef95fb --- /dev/null +++ b/packages/block-library/src/navigation/edit/use-inner-blocks.ts @@ -0,0 +1,35 @@ +import { useSelect } from '@wordpress/data'; +import { store as blockEditorStore } from '@wordpress/block-editor'; +import type { Block } from '@wordpress/blocks'; + +interface InnerBlocks { + innerBlocks: Block[]; + hasUncontrolledInnerBlocks: boolean; + isInnerBlockSelected: boolean; +} + +export function useInnerBlocks( clientId: string ): InnerBlocks { + return useSelect( + ( select ) => { + const { + areInnerBlocksControlled, + getBlocks, + hasSelectedInnerBlock, + } = select( blockEditorStore ); + + // Inner blocks become controlled once they are synced with a + // `wp_navigation` entity. Until then, any inner blocks belong to + // the Navigation block itself. + const innerBlocks = getBlocks( clientId ); + + return { + innerBlocks, + hasUncontrolledInnerBlocks: + ! areInnerBlocksControlled( clientId ) && + !! innerBlocks.length, + isInnerBlockSelected: hasSelectedInnerBlock( clientId, true ), + }; + }, + [ clientId ] + ); +} diff --git a/tools/eslint/suppressions.json b/tools/eslint/suppressions.json index 78ff71fabb911b..24d20a65374acd 100644 --- a/tools/eslint/suppressions.json +++ b/tools/eslint/suppressions.json @@ -3372,11 +3372,6 @@ "count": 1 } }, - "packages/block-library/src/navigation/edit/use-inner-blocks.js": { - "gutenberg/use-typescript": { - "count": 1 - } - }, "packages/block-library/src/navigation/edit/use-layout-custom-properties.js": { "gutenberg/use-typescript": { "count": 1