Refactor selectors newly introduced in WordPress 6.1 from public expe…

…rimental into private experimental
WordPress · Sep 28, 2022 · 27fbb8f · 27fbb8f
1 parent 995154f
commit 27fbb8f
Show file tree

Hide file tree

Showing 23 changed files with 246 additions and 79 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/block-editor/package.json b/packages/block-editor/package.json
@@ -44,6 +44,7 @@
 		"@wordpress/deprecated": "file:../deprecated",
 		"@wordpress/dom": "file:../dom",
 		"@wordpress/element": "file:../element",
+		"@wordpress/experiments": "file:../experiments",
 		"@wordpress/hooks": "file:../hooks",
 		"@wordpress/html-entities": "file:../html-entities",
 		"@wordpress/i18n": "file:../i18n",

diff --git a/packages/block-editor/src/components/block-inspector/index.js b/packages/block-editor/src/components/block-inspector/index.js
@@ -35,6 +35,12 @@ import BlockVariationTransforms from '../block-variation-transforms';
 import useBlockDisplayInformation from '../use-block-display-information';
 import { store as blockEditorStore } from '../../store';
 import BlockIcon from '../block-icon';
+import {
+	unlock,
+	__experimentalAccessKey as blockEditorExperiments,
+} from '../../experiments';
+
+const { __unstableGetContentLockingParent } = unlock( blockEditorExperiments );
 
 function useContentBlocks( blockTypes, block ) {
 	const contenBlocksObjectAux = useMemo( () => {
@@ -142,7 +148,6 @@ const BlockInspector = ( { showNoBlockSelectedMessage = true } ) => {
 			getSelectedBlockClientId,
 			getSelectedBlockCount,
 			getBlockName,
-			__unstableGetContentLockingParent,
 			getTemplateLock,
 		} = select( blockEditorStore );
 

diff --git a/packages/block-editor/src/components/block-list/block.js b/packages/block-editor/src/components/block-list/block.js
@@ -18,7 +18,6 @@ import {
 	isUnmodifiedDefaultBlock,
 	serializeRawBlock,
 	switchToBlockType,
-	store as blocksStore,
 } from '@wordpress/blocks';
 import { withFilters } from '@wordpress/components';
 import {
@@ -40,6 +39,16 @@ import BlockCrashBoundary from './block-crash-boundary';
 import BlockHtml from './block-html';
 import { useBlockProps } from './use-block-props';
 import { store as blockEditorStore } from '../../store';
+import {
+	unlock,
+	__experimentalAccessKey as blockEditorExperiments,
+} from '../../experiments';
+
+const {
+	__experimentalHasContentRoleAttribute,
+	__unstableGetContentLockingParent,
+	__unstableGetTemporarilyEditingAsBlocks,
+} = unlock( blockEditorExperiments );
 
 export const BlockListBlockContext = createContext();
 
@@ -102,20 +111,12 @@ function BlockListBlock( {
 		isTemporarilyEditingAsBlocks,
 	} = useSelect(
 		( select ) => {
-			const {
-				getSettings,
-				__unstableGetContentLockingParent,
-				getTemplateLock,
-				__unstableGetTemporarilyEditingAsBlocks,
-			} = select( blockEditorStore );
+			const { getSettings, getTemplateLock } = select( blockEditorStore );
 			const _hasContentLockedParent =
 				!! __unstableGetContentLockingParent( clientId );
 			return {
 				themeSupportsLayout: getSettings().supportsLayout,
-				isContentBlock:
-					select( blocksStore ).__experimentalHasContentRoleAttribute(
-						name
-					),
+				isContentBlock: __experimentalHasContentRoleAttribute( name ),
 				hasContentLockedParent: _hasContentLockedParent,
 				isContentLocking:
 					getTemplateLock( clientId ) === 'contentOnly' &&

diff --git a/packages/block-editor/src/components/block-list/use-block-props/use-block-class-names.js b/packages/block-editor/src/components/block-list/use-block-props/use-block-class-names.js
@@ -6,13 +6,19 @@ import classnames from 'classnames';
 /**
  * WordPress dependencies
  */
-import { useSelect } from '@wordpress/data';
+import {
+	useSelect,
+	__experimentalAccessKey as dataExperiments,
+} from '@wordpress/data';
 import { isReusableBlock, getBlockType } from '@wordpress/blocks';
 
 /**
  * Internal dependencies
  */
 import { store as blockEditorStore } from '../../../store';
+import { unlock } from '../../../experiments';
+
+const { __unstableSelectionHasUnmergeableBlock } = unlock( dataExperiments );
 
 /**
  * Returns the class names used for the different states of the block.
@@ -34,7 +40,6 @@ export function useBlockClassNames( clientId ) {
 				hasSelectedInnerBlock,
 				isTyping,
 				__unstableIsFullySelected,
-				__unstableSelectionHasUnmergeableBlock,
 			} = select( blockEditorStore );
 			const { outlineMode } = getSettings();
 			const isDragging = isBlockBeingDragged( clientId );

diff --git a/packages/block-editor/src/components/block-toolbar/index.js b/packages/block-editor/src/components/block-toolbar/index.js
@@ -27,6 +27,12 @@ import BlockEditVisuallyButton from '../block-edit-visually-button';
 import { useShowMoversGestures } from './utils';
 import { store as blockEditorStore } from '../../store';
 import __unstableBlockNameContext from './block-name-context';
+import {
+	unlock,
+	__experimentalAccessKey as blockEditorExperiments,
+} from '../../experiments';
+
+const { __unstableGetContentLockingParent } = unlock( blockEditorExperiments );
 
 const BlockToolbar = ( { hideDragHandle } ) => {
 	const {
@@ -46,7 +52,6 @@ const BlockToolbar = ( { hideDragHandle } ) => {
 			isBlockValid,
 			getBlockRootClientId,
 			getSettings,
-			__unstableGetContentLockingParent,
 		} = select( blockEditorStore );
 		const selectedBlockClientIds = getSelectedBlockClientIds();
 		const selectedBlockClientId = selectedBlockClientIds[ 0 ];

diff --git a/packages/block-editor/src/components/block-tools/block-contextual-toolbar.js b/packages/block-editor/src/components/block-tools/block-contextual-toolbar.js
@@ -16,16 +16,18 @@ import { useSelect } from '@wordpress/data';
 import NavigableToolbar from '../navigable-toolbar';
 import BlockToolbar from '../block-toolbar';
 import { store as blockEditorStore } from '../../store';
+import {
+	unlock,
+	__experimentalAccessKey as blockEditorExperiments,
+} from '../../experiments';
+
+const { __unstableGetContentLockingParent } = unlock( blockEditorExperiments );
 
 function BlockContextualToolbar( { focusOnMount, isFixed, ...props } ) {
 	const { blockType, hasParents, showParentSelector } = useSelect(
 		( select ) => {
-			const {
-				getBlockName,
-				getBlockParents,
-				getSelectedBlockClientIds,
-				__unstableGetContentLockingParent,
-			} = select( blockEditorStore );
+			const { getBlockName, getBlockParents, getSelectedBlockClientIds } =
+				select( blockEditorStore );
 			const { getBlockType } = select( blocksStore );
 			const selectedBlockClientIds = getSelectedBlockClientIds();
 			const selectedBlockClientId = selectedBlockClientIds[ 0 ];

diff --git a/packages/block-editor/src/experiments.js b/packages/block-editor/src/experiments.js
@@ -0,0 +1,42 @@
+/**
+ * WordPress dependencies
+ */
+import { __dangerousOptInToUnstableAPIsOnlyForCoreModules } from '@wordpress/experiments';
+import { __experimentalAccessKey as dataExperiments } from '@wordpress/data';
+
+/**
+ * Internal dependencies
+ */
+import { store } from './store';
+import {
+	__unstableSelectionHasUnmergeableBlock,
+	__unstableGetContentLockingParent,
+	__unstableGetTemporarilyEditingAsBlocks,
+} from './store/selectors';
+
+export const { register, unlock } =
+	__dangerousOptInToUnstableAPIsOnlyForCoreModules(
+		'I know using unstable features means my plugin or theme will inevitably break on the next WordPress release.',
+		'@wordpress/block-editor'
+	);
+
+const { __experimentalPrivateSelector } = unlock( dataExperiments );
+
+export const __experimentalAccessKey = register( {
+	// Follow-up on https://github.com/WordPress/gutenberg/pull/42934
+	__unstableSelectionHasUnmergeableBlock: () =>
+		__experimentalPrivateSelector(
+			store,
+			__unstableSelectionHasUnmergeableBlock
+		),
+
+	// Follow-up on https://github.com/WordPress/gutenberg/pull/43037
+	__unstableGetContentLockingParent: ( ...args ) =>
+		__experimentalPrivateSelector( store, () =>
+			__unstableGetContentLockingParent( ...args )
+		),
+	__unstableGetTemporarilyEditingAsBlocks: ( ...args ) =>
+		__experimentalPrivateSelector( store, () =>
+			__unstableGetTemporarilyEditingAsBlocks( ...args )
+		),
+} );
diff --git a/packages/block-editor/src/hooks/align.js b/packages/block-editor/src/hooks/align.js
@@ -21,7 +21,12 @@ import { useSelect } from '@wordpress/data';
  */
 import { BlockControls, BlockAlignmentControl } from '../components';
 import useAvailableAlignments from '../components/block-alignment-control/use-available-alignments';
-import { store as blockEditorStore } from '../store';
+import {
+	unlock,
+	__experimentalAccessKey as blockEditorExperiments,
+} from '../experiments';
+
+const { __unstableGetContentLockingParent } = unlock( blockEditorExperiments );
 
 /**
  * An array which includes all possible valid alignments,
@@ -132,14 +137,9 @@ export const withToolbarControls = createHigherOrderComponent(
 		const validAlignments = useAvailableAlignments(
 			blockAllowedAlignments
 		).map( ( { name } ) => name );
-		const isContentLocked = useSelect(
-			( select ) => {
-				return select(
-					blockEditorStore
-				).__unstableGetContentLockingParent( props.clientId );
-			},
-			[ props.clientId ]
-		);
+		const isContentLocked = useSelect( () => {
+			return __unstableGetContentLockingParent( props.clientId );
+		}, [ props.clientId ] );
 		if ( ! validAlignments.length || isContentLocked ) {
 			return blockEdit;
 		}

diff --git a/packages/block-editor/src/hooks/content-lock-ui.js b/packages/block-editor/src/hooks/content-lock-ui.js
@@ -13,6 +13,16 @@ import { useEffect, useRef, useCallback } from '@wordpress/element';
  */
 import { store as blockEditorStore } from '../store';
 import { BlockControls } from '../components';
+import {
+	unlock,
+	__experimentalAccessKey as blockEditorExperiments,
+} from '../experiments';
+
+const {
+	__unstableGetContentLockingParent,
+	__unstableGetTemporarilyEditingAsBlocks,
+} = unlock( blockEditorExperiments );
+
 /**
  * External dependencies
  */
@@ -48,11 +58,7 @@ export const withBlockControls = createHigherOrderComponent(
 		const focusModeToRevert = useRef();
 		const { templateLock, isLockedByParent, isEditingAsBlocks } = useSelect(
 			( select ) => {
-				const {
-					__unstableGetContentLockingParent,
-					getTemplateLock,
-					__unstableGetTemporarilyEditingAsBlocks,
-				} = select( blockEditorStore );
+				const { getTemplateLock } = select( blockEditorStore );
 				return {
 					templateLock: getTemplateLock( props.clientId ),
 					isLockedByParent: !! __unstableGetContentLockingParent(