Remove the deprecation and force the prop name change

WordPress · Mar 22, 2021 · f2fdc47 · f2fdc47
1 parent 9aba7a2
commit f2fdc47
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 32 deletions.
diff --git a/packages/block-editor/src/components/block-navigation/tree.js b/packages/block-editor/src/components/block-navigation/tree.js
@@ -3,7 +3,6 @@
  */
 
 import { __experimentalTreeGrid as TreeGrid } from '@wordpress/components';
-import deprecated from '@wordpress/deprecated';
 import { useMemo, useRef } from '@wordpress/element';
 import { __ } from '@wordpress/i18n';
 /**
@@ -21,14 +20,10 @@ import useBlockNavigationDropZone from './use-block-navigation-drop-zone';
  * @param {Object}  props                                          Components props.
  * @param {boolean} props.__experimentalFeatures                   Flag to enable experimental features.
  * @param {boolean} props.__experimentalPersistentListViewFeatures Flag to enable features for the Persistent List View experiment.
- * @param {string}  props.selectedBlockClientId                    Deprecated. See props.selectedBlockClientIds.
- * @param {Array}   props.selectedBlockClientIds                   List of selected block client IDs.
  */
 export default function BlockNavigationTree( {
 	__experimentalFeatures,
 	__experimentalPersistentListViewFeatures,
-	selectedBlockClientId,
-	selectedBlockClientIds,
 	...props
 } ) {
 	const treeGridRef = useRef();
@@ -51,34 +46,14 @@ export default function BlockNavigationTree( {
 		]
 	);
 
-	// Deprecate selectedBlockClientId
-	if ( selectedBlockClientId ) {
-		deprecated(
-			'selectedBlockClientId (singular) prop of the BlockNavigationTree component',
-			{
-				alternative:
-					'selectedBlockClientIds (renamed to plural) of the BlockNavigationTree component',
-				hint: 'The renamed prop is an array',
-			}
-		);
-	}
-	// Convert selectedBlockClientId to selectedBlockClientIds for backward compatibility.
-	const updatedProps = {
-		...props,
-		selectedBlockClientIds:
-			selectedBlockClientId && ! selectedBlockClientIds
-				? [ selectedBlockClientId ]
-				: selectedBlockClientIds,
-	};
-
 	return (
 		<TreeGrid
 			className="block-editor-block-navigation-tree"
 			aria-label={ __( 'Block navigation structure' ) }
 			ref={ treeGridRef }
 		>
 			<BlockNavigationContext.Provider value={ contextValue }>
-				<BlockNavigationBranch { ...updatedProps } />
+				<BlockNavigationBranch { ...props } />
 			</BlockNavigationContext.Provider>
 		</TreeGrid>
 	);

diff --git a/packages/block-editor/src/components/block-navigation/utils.js b/packages/block-editor/src/components/block-navigation/utils.js
@@ -21,12 +21,12 @@ export const getBlockPositionDescription = ( position, siblingCount, level ) =>
  * Returns true if the client ID occurs within the block selection or multi-selection,
  * or false otherwise.
  *
- * @param {string}          clientId              Block client ID.
- * @param {string|string[]} selectedBlockClientId Selected block client ID, or an array of multi-selected blocks client IDs.
+ * @param {string}          clientId               Block client ID.
+ * @param {string|string[]} selectedBlockClientIds Selected block client ID, or an array of multi-selected blocks client IDs.
  *
  * @return {boolean} Whether the block is in multi-selection set.
  */
-export const isClientIdSelected = ( clientId, selectedBlockClientId ) =>
-	isArray( selectedBlockClientId ) && selectedBlockClientId.length
-		? selectedBlockClientId.indexOf( clientId ) !== -1
-		: selectedBlockClientId === clientId;
+export const isClientIdSelected = ( clientId, selectedBlockClientIds ) =>
+	isArray( selectedBlockClientIds ) && selectedBlockClientIds.length
+		? selectedBlockClientIds.indexOf( clientId ) !== -1
+		: selectedBlockClientIds === clientId;