Add useSelectors hook for getting a store's selectors

packages/block-editor/src/components/block-actions/index.js

@@ -6,7 +6,7 @@ import { castArray, first, last, every } from 'lodash';
 /**
  * WordPress dependencies
  */
-import { useDispatch, useSelect } from '@wordpress/data';
+import { useDispatch, useSelectors } from '@wordpress/data';
 import {
 	hasBlockSupport,
 	switchToBlockType,
@@ -30,8 +30,8 @@ export default function BlockActions( {
 		getBlocksByClientId,
 		canMoveBlocks,
 		canRemoveBlocks,
-	} = useSelect( blockEditorStore );
-	const { getDefaultBlockName, getGroupingBlockName } = useSelect(
+	} = useSelectors( blockEditorStore );
+	const { getDefaultBlockName, getGroupingBlockName } = useSelectors(
 		blocksStore
 	);
 

packages/block-editor/src/components/block-list/use-block-props/use-focus-handler.js

@@ -1,7 +1,7 @@
 /**
  * WordPress dependencies
  */
-import { useSelect, useDispatch } from '@wordpress/data';
+import { useDispatch, useSelectors } from '@wordpress/data';
 import { useRefEffect } from '@wordpress/compose';
 
 /**
@@ -16,7 +16,7 @@ import { store as blockEditorStore } from '../../../store';
  * @param {string} clientId Block client ID.
  */
 export function useFocusHandler( clientId ) {
-	const { isBlockSelected } = useSelect( blockEditorStore );
+	const { isBlockSelected } = useSelectors( blockEditorStore );
 	const { selectBlock, selectionChange } = useDispatch( blockEditorStore );
 
 	return useRefEffect(

packages/block-editor/src/components/block-list/use-block-props/use-nav-mode-exit.js

@@ -1,7 +1,7 @@
 /**
  * WordPress dependencies
  */
-import { useSelect, useDispatch } from '@wordpress/data';
+import { useDispatch, useSelectors } from '@wordpress/data';
 import { useRefEffect } from '@wordpress/compose';
 
 /**
@@ -15,7 +15,9 @@ import { store as blockEditorStore } from '../../../store';
  * @param {string} clientId Block client ID.
  */
 export function useNavModeExit( clientId ) {
-	const { isNavigationMode, isBlockSelected } = useSelect( blockEditorStore );
+	const { isNavigationMode, isBlockSelected } = useSelectors(
+		blockEditorStore
+	);
 	const { setNavigationMode, selectBlock } = useDispatch( blockEditorStore );
 	return useRefEffect(
 		( node ) => {

packages/block-editor/src/components/block-list/use-block-props/use-selected-block-event-handlers.js

@@ -3,7 +3,7 @@
  */
 import { isTextField } from '@wordpress/dom';
 import { ENTER, BACKSPACE, DELETE } from '@wordpress/keycodes';
-import { useSelect, useDispatch } from '@wordpress/data';
+import { useSelect, useDispatch, useSelectors } from '@wordpress/data';
 import { useRefEffect } from '@wordpress/compose';
 
 /**
@@ -24,7 +24,7 @@ export function useEventHandlers( clientId ) {
 		( select ) => select( blockEditorStore ).isBlockSelected( clientId ),
 		[ clientId ]
 	);
-	const { getBlockRootClientId, getBlockIndex } = useSelect(
+	const { getBlockRootClientId, getBlockIndex } = useSelectors(
 		blockEditorStore
 	);
 	const { insertDefaultBlock, removeBlock } = useDispatch( blockEditorStore );

packages/block-editor/src/components/block-list/use-in-between-inserter.js

@@ -3,7 +3,7 @@
  */
 import { useRefEffect } from '@wordpress/compose';
 
-import { useSelect, useDispatch } from '@wordpress/data';
+import { useSelect, useDispatch, useSelectors } from '@wordpress/data';
 import { useContext } from '@wordpress/element';
 
 /**
@@ -26,7 +26,7 @@ export function useInBetweenInserter() {
 		isMultiSelecting,
 		getSelectedBlockClientIds,
 		getTemplateLock,
-	} = useSelect( blockEditorStore );
+	} = useSelectors( blockEditorStore );
 	const { showInsertionPoint, hideInsertionPoint } = useDispatch(
 		blockEditorStore
 	);

packages/block-editor/src/components/block-selection-clearer/index.js

@@ -1,7 +1,7 @@
 /**
  * WordPress dependencies
  */
-import { useSelect, useDispatch } from '@wordpress/data';
+import { useDispatch, useSelectors } from '@wordpress/data';
 import { useRefEffect } from '@wordpress/compose';
 
 /**
@@ -17,7 +17,7 @@ import { store as blockEditorStore } from '../../store';
  * @return {import('react').RefCallback} Ref callback.
  */
 export function useBlockSelectionClearer() {
-	const { hasSelectedBlock, hasMultiSelection } = useSelect(
+	const { hasSelectedBlock, hasMultiSelection } = useSelectors(
 		blockEditorStore
 	);
 	const { clearSelectedBlock } = useDispatch( blockEditorStore );

packages/block-editor/src/components/block-tools/block-selection-button.js

@@ -8,7 +8,7 @@ import classnames from 'classnames';
  */
 import { dragHandle } from '@wordpress/icons';
 import { Button, Flex, FlexItem } from '@wordpress/components';
-import { useSelect, useDispatch } from '@wordpress/data';
+import { useSelect, useDispatch, useSelectors } from '@wordpress/data';
 import { useEffect, useRef } from '@wordpress/element';
 import {
 	BACKSPACE,
@@ -101,7 +101,7 @@ function BlockSelectionButton( { clientId, rootClientId, blockElement } ) {
 		getPreviousBlockClientId,
 		getNextBlockClientId,
 		isNavigationMode,
-	} = useSelect( blockEditorStore );
+	} = useSelectors( blockEditorStore );
 	const {
 		selectBlock,
 		clearSelectedBlock,

packages/block-editor/src/components/block-tools/index.js

@@ -6,7 +6,7 @@ import { first, last } from 'lodash';
 /**
  * WordPress dependencies
  */
-import { useSelect, useDispatch } from '@wordpress/data';
+import { useSelect, useDispatch, useSelectors } from '@wordpress/data';
 import { useViewportMatch } from '@wordpress/compose';
 import { Popover } from '@wordpress/components';
 import { __unstableUseShortcutEventMatch as useShortcutEventMatch } from '@wordpress/keyboard-shortcuts';
@@ -40,7 +40,7 @@ export default function BlockTools( {
 		[]
 	);
 	const isMatch = useShortcutEventMatch();
-	const { getSelectedBlockClientIds, getBlockRootClientId } = useSelect(
+	const { getSelectedBlockClientIds, getBlockRootClientId } = useSelectors(
 		blockEditorStore
 	);
 	const {

packages/block-editor/src/components/copy-handler/index.js

@@ -11,7 +11,7 @@ import {
 	documentHasSelection,
 	documentHasUncollapsedSelection,
 } from '@wordpress/dom';
-import { useDispatch, useSelect } from '@wordpress/data';
+import { useDispatch, useSelectors } from '@wordpress/data';
 import { __, _n, sprintf } from '@wordpress/i18n';
 import { store as noticesStore } from '@wordpress/notices';
 import { useRefEffect } from '@wordpress/compose';
@@ -23,8 +23,8 @@ import { getPasteEventData } from '../../utils/pasting';
 import { store as blockEditorStore } from '../../store';
 
 export function useNotifyCopy() {
-	const { getBlockName } = useSelect( blockEditorStore );
-	const { getBlockType } = useSelect( blocksStore );
+	const { getBlockName } = useSelectors( blockEditorStore );
+	const { getBlockType } = useSelectors( blocksStore );
 	const { createSuccessNotice } = useDispatch( noticesStore );
 
 	return useCallback( ( eventType, selectedBlockClientIds ) => {
@@ -78,7 +78,7 @@ export function useClipboardHandler() {
 		getSelectedBlockClientIds,
 		hasMultiSelection,
 		getSettings,
-	} = useSelect( blockEditorStore );
+	} = useSelectors( blockEditorStore );
 	const { flashBlock, removeBlocks, replaceBlocks } = useDispatch(
 		blockEditorStore
 	);

packages/block-editor/src/components/inner-blocks/use-inner-block-template-sync.js

@@ -7,7 +7,7 @@ import { isEqual } from 'lodash';
  * WordPress dependencies
  */
 import { useRef, useLayoutEffect } from '@wordpress/element';
-import { useSelect, useDispatch } from '@wordpress/data';
+import { useSelect, useDispatch, useSelectors } from '@wordpress/data';
 import { synchronizeBlocksWithTemplate } from '@wordpress/blocks';
 
 /**
@@ -40,7 +40,7 @@ export default function useInnerBlockTemplateSync(
 	templateLock,
 	templateInsertUpdatesSelection
 ) {
-	const { getSelectedBlocksInitialCaretPosition } = useSelect(
+	const { getSelectedBlocksInitialCaretPosition } = useSelectors(
 		blockEditorStore
 	);
 	const { replaceInnerBlocks } = useDispatch( blockEditorStore );

packages/block-editor/src/components/inserter/hooks/use-clipboard-block.native.js

@@ -1,7 +1,7 @@
 /**
  * WordPress dependencies
  */
-import { useSelect } from '@wordpress/data';
+import { useSelectors } from '@wordpress/data';
 import { rawHandler, store as blocksStore } from '@wordpress/blocks';
 import { getClipboard } from '@wordpress/components';
 
@@ -11,8 +11,8 @@ import { getClipboard } from '@wordpress/components';
 import { store as blockEditorStore } from '../../../store';
 
 export default function useClipboardBlock( destinationRootClientId ) {
-	const { canInsertBlockType } = useSelect( blockEditorStore );
-	const { getBlockType } = useSelect( blocksStore );
+	const { canInsertBlockType } = useSelectors( blockEditorStore );
+	const { getBlockType } = useSelectors( blocksStore );
 
 	const clipboard = getClipboard();
 	const clipboardBlock = rawHandler( { HTML: clipboard } )[ 0 ];

packages/block-editor/src/components/inserter/hooks/use-insertion-point.js

@@ -6,7 +6,7 @@ import { castArray } from 'lodash';
 /**
  * WordPress dependencies
  */
-import { useDispatch, useSelect } from '@wordpress/data';
+import { useDispatch, useSelect, useSelectors } from '@wordpress/data';
 import { isUnmodifiedDefaultBlock } from '@wordpress/blocks';
 import { _n, sprintf } from '@wordpress/i18n';
 import { speak } from '@wordpress/a11y';
@@ -45,7 +45,7 @@ function useInsertionPoint( {
 	onSelect,
 	shouldFocusBlock = true,
 } ) {
-	const { getSelectedBlock } = useSelect( blockEditorStore );
+	const { getSelectedBlock } = useSelectors( blockEditorStore );
 	const { destinationRootClientId, destinationIndex } = useSelect(
 		( select ) => {
 			const {

packages/block-editor/src/components/inserter/menu.native.js

@@ -7,7 +7,7 @@ import { AccessibilityInfo, TouchableHighlight, Platform } from 'react-native';
  * WordPress dependencies
  */
 import { useEffect, useState, useCallback } from '@wordpress/element';
-import { useSelect, useDispatch } from '@wordpress/data';
+import { useSelect, useDispatch, useSelectors } from '@wordpress/data';
 import { createBlock } from '@wordpress/blocks';
 import {
 	BottomSheet,
@@ -80,7 +80,7 @@ function InserterMenu( {
 		}
 	);
 
-	const { getBlockOrder, getBlockCount } = useSelect( blockEditorStore );
+	const { getBlockOrder, getBlockCount } = useSelectors( blockEditorStore );
 
 	useEffect( () => {
 		// Show/Hide insertion point on Mount/Dismount

packages/block-editor/src/components/inspector-controls/block-support-tools-panel.js

@@ -2,7 +2,7 @@
  * WordPress dependencies
  */
 import { __experimentalToolsPanel as ToolsPanel } from '@wordpress/components';
-import { useDispatch, useSelect } from '@wordpress/data';
+import { useDispatch, useSelectors } from '@wordpress/data';
 import { useCallback } from '@wordpress/element';
 
 /**
@@ -18,7 +18,7 @@ export default function BlockSupportToolsPanel( { children, group, label } ) {
 		getMultiSelectedBlockClientIds,
 		getSelectedBlockClientId,
 		hasMultiSelection,
-	} = useSelect( blockEditorStore );
+	} = useSelectors( blockEditorStore );
 
 	const panelId = getSelectedBlockClientId();
 	const resetAll = useCallback(

packages/block-editor/src/components/list-view/use-block-selection.js

@@ -8,7 +8,7 @@ import { difference } from 'lodash';
  */
 import { speak } from '@wordpress/a11y';
 import { __, sprintf } from '@wordpress/i18n';
-import { useDispatch, useSelect } from '@wordpress/data';
+import { useDispatch, useSelectors } from '@wordpress/data';
 import { useCallback } from '@wordpress/element';
 import { UP, DOWN, HOME, END } from '@wordpress/keycodes';
 import { store as blocksStore } from '@wordpress/blocks';
@@ -31,9 +31,9 @@ export default function useBlockSelection() {
 		getSelectedBlockClientIds,
 		hasMultiSelection,
 		hasSelectedBlock,
-	} = useSelect( blockEditorStore );
+	} = useSelectors( blockEditorStore );
 
-	const { getBlockType } = useSelect( blocksStore );
+	const { getBlockType } = useSelectors( blocksStore );
 
 	const updateBlockSelection = useCallback(
 		async ( event, clientId, destinationClientId ) => {

packages/block-editor/src/components/list-view/use-list-view-drop-zone.js

@@ -1,7 +1,7 @@
 /**
  * WordPress dependencies
  */
-import { useSelect } from '@wordpress/data';
+import { useSelectors } from '@wordpress/data';
 import { useState, useCallback } from '@wordpress/element';
 import {
 	useThrottle,
@@ -201,7 +201,7 @@ export default function useListViewDropZone() {
 		getBlockCount,
 		getDraggedBlockClientIds,
 		canInsertBlocks,
-	} = useSelect( blockEditorStore );
+	} = useSelectors( blockEditorStore );
 	const [ target, setTarget ] = useState();
 	const { rootClientId: targetRootClientId, blockIndex: targetBlockIndex } =
 		target || {};

packages/block-editor/src/components/rich-text/use-caret-in-format.js

@@ -2,7 +2,7 @@
  * WordPress dependencies
  */
 import { useEffect } from '@wordpress/element';
-import { useDispatch, useSelect } from '@wordpress/data';
+import { useDispatch, useSelectors } from '@wordpress/data';
 
 /**
  * Internal dependencies
@@ -12,7 +12,7 @@ import { store as blockEditorStore } from '../../store';
 export function useCaretInFormat( { value } ) {
 	const hasActiveFormats =
 		value.activeFormats && !! value.activeFormats.length;
-	const { isCaretWithinFormattedText } = useSelect( blockEditorStore );
+	const { isCaretWithinFormattedText } = useSelectors( blockEditorStore );
 	const { enterFormattedText, exitFormattedText } = useDispatch(
 		blockEditorStore
 	);

packages/block-editor/src/components/rich-text/use-undo-automatic-change.js

@@ -1,7 +1,7 @@
 /**
  * WordPress dependencies
  */
-import { useSelect } from '@wordpress/data';
+import { useSelectors } from '@wordpress/data';
 import { useRefEffect } from '@wordpress/compose';
 import { BACKSPACE, DELETE, ESCAPE } from '@wordpress/keycodes';
 
@@ -11,7 +11,9 @@ import { BACKSPACE, DELETE, ESCAPE } from '@wordpress/keycodes';
 import { store as blockEditorStore } from '../../store';
 
 export function useUndoAutomaticChange() {
-	const { didAutomaticChange, getSettings } = useSelect( blockEditorStore );
+	const { didAutomaticChange, getSettings } = useSelectors(
+		blockEditorStore
+	);
 	return useRefEffect( ( element ) => {
 		function onKeyDown( event ) {
 			const { keyCode } = event;

packages/block-editor/src/components/use-block-drop-zone/index.js

@@ -1,7 +1,7 @@
 /**
  * WordPress dependencies
  */
-import { useDispatch, useSelect } from '@wordpress/data';
+import { useDispatch, useSelect, useSelectors } from '@wordpress/data';
 import { useCallback, useState } from '@wordpress/element';
 import {
 	useThrottle,
@@ -100,7 +100,7 @@ export default function useBlockDropZone( {
 		[ targetRootClientId ]
 	);
 
-	const { getBlockListSettings } = useSelect( blockEditorStore );
+	const { getBlockListSettings } = useSelectors( blockEditorStore );
 	const { showInsertionPoint, hideInsertionPoint } = useDispatch(
 		blockEditorStore
 	);

packages/block-editor/src/components/use-on-block-drop/index.js

@@ -7,7 +7,7 @@ import {
 	getBlockTransforms,
 	pasteHandler,
 } from '@wordpress/blocks';
-import { useDispatch, useSelect } from '@wordpress/data';
+import { useDispatch, useSelect, useSelectors } from '@wordpress/data';
 import { getFilesFromDataTransfer } from '@wordpress/dom';
 
 /**
@@ -221,7 +221,7 @@ export default function useOnBlockDrop( targetRootClientId, targetBlockIndex ) {
 		canInsertBlockType,
 		getBlockIndex,
 		getClientIdsOfDescendants,
-	} = useSelect( blockEditorStore );
+	} = useSelectors( blockEditorStore );
 	const {
 		insertBlocks,
 		moveBlocksToPosition,

packages/block-editor/src/components/writing-flow/use-arrow-nav.js

@@ -16,7 +16,7 @@ import {
 	isRTL,
 } from '@wordpress/dom';
 import { UP, DOWN, LEFT, RIGHT } from '@wordpress/keycodes';
-import { useSelect } from '@wordpress/data';
+import { useSelectors } from '@wordpress/data';
 import { useRefEffect } from '@wordpress/compose';
 
 /**
@@ -125,7 +125,7 @@ export default function useArrowNav() {
 		getNextBlockClientId,
 		getSettings,
 		hasMultiSelection,
-	} = useSelect( blockEditorStore );
+	} = useSelectors( blockEditorStore );
 	return useRefEffect( ( node ) => {
 		// Here a DOMRect is stored while moving the caret vertically so
 		// vertical position of the start position can be restored. This is to