Remove APIs deprecated on WordPress 5.4 (#38564)

WordPress · Feb 7, 2022 · 241e063 · 241e063
1 parent cf5dc72
commit 241e063
Show file tree

Hide file tree

Showing 17 changed files with 12 additions and 113 deletions.
diff --git a/docs/reference-guides/data/data-core-editor.md b/docs/reference-guides/data/data-core-editor.md
@@ -516,29 +516,6 @@ _Related_
 
 -   getPreviousBlockClientId in core/block-editor store.
 
-### getReferenceByDistinctEdits
-
-> **Deprecated** since Gutenberg 6.5.0.
-
-Returns a new reference when edited values have changed. This is useful in
-inferring where an edit has been made between states by comparison of the
-return values using strict equality.
-
-_Usage_
-
-    const hasEditOccurred = (
-       getReferenceByDistinctEdits( beforeState ) !==
-       getReferenceByDistinctEdits( afterState )
-    );
-
-_Parameters_
-
--   _state_ `Object`: Editor state.
-
-_Returns_
-
--   `*`: A value whose reference will change only when an edit occurs.
-
 ### getSelectedBlock
 
 _Related_

diff --git a/packages/block-editor/README.md b/packages/block-editor/README.md
@@ -524,10 +524,6 @@ _Related_
 
 -   <https://github.com/WordPress/gutenberg/blob/HEAD/packages/block-editor/src/components/plain-text/README.md>
 
-### PreserveScrollInReorder
-
-Undocumented declaration.
-
 ### RichText
 
 _Related_

diff --git a/packages/block-editor/src/components/index.js b/packages/block-editor/src/components/index.js
@@ -134,7 +134,6 @@ export {
 	useTypingObserver as __unstableUseTypingObserver,
 	useMouseMoveTypingReset as __unstableUseMouseMoveTypingReset,
 } from './observe-typing';
-export { default as PreserveScrollInReorder } from './preserve-scroll-in-reorder';
 export { default as SkipToSelectedBlock } from './skip-to-selected-block';
 export {
 	default as Typewriter,

diff --git a/packages/block-editor/src/components/media-placeholder/index.js b/packages/block-editor/src/components/media-placeholder/index.js
@@ -17,7 +17,6 @@ import {
 import { __ } from '@wordpress/i18n';
 import { useState, useEffect } from '@wordpress/element';
 import { useSelect } from '@wordpress/data';
-import deprecated from '@wordpress/deprecated';
 import { keyboardReturn } from '@wordpress/icons';
 
 /**
@@ -65,7 +64,6 @@ export function MediaPlaceholder( {
 	addToGallery,
 	multiple = false,
 	handleUpload = true,
-	dropZoneUIOnly,
 	disableDropZone,
 	disableMediaButtons,
 	onError,
@@ -400,14 +398,7 @@ export function MediaPlaceholder( {
 		return renderPlaceholder( uploadMediaLibraryButton );
 	};
 
-	if ( dropZoneUIOnly || disableMediaButtons ) {
-		if ( dropZoneUIOnly ) {
-			deprecated( 'wp.blockEditor.MediaPlaceholder dropZoneUIOnly prop', {
-				since: '5.4',
-				alternative: 'disableMediaButtons',
-			} );
-		}
-
+	if ( disableMediaButtons ) {
 		return <MediaUploadCheck>{ renderDropZone() }</MediaUploadCheck>;
 	}
 

diff --git a/packages/block-editor/src/components/preserve-scroll-in-reorder/index.js b/packages/block-editor/src/components/preserve-scroll-in-reorder/index.js
diff --git a/packages/block-editor/src/components/rich-text/index.js b/packages/block-editor/src/components/rich-text/index.js
@@ -400,6 +400,7 @@ function RichTextWrapper(
 	deprecated( 'wp.blockEditor.RichText wrapperClassName prop', {
 		since: '5.4',
 		alternative: 'className prop or create your own wrapper div',
+		version: '6.2',
 	} );
 
 	const className = classnames( 'block-editor-rich-text', wrapperClassName );

diff --git a/packages/block-editor/src/components/rich-text/index.native.js b/packages/block-editor/src/components/rich-text/index.native.js
@@ -696,6 +696,7 @@ function RichTextWrapper(
 	deprecated( 'wp.blockEditor.RichText wrapperClassName prop', {
 		since: '5.4',
 		alternative: 'className prop or create your own wrapper div',
+		version: '6.2',
 	} );
 
 	return (

diff --git a/packages/block-editor/src/components/rich-text/utils.js b/packages/block-editor/src/components/rich-text/utils.js
@@ -54,6 +54,7 @@ export function getAllowedFormats( {
 	deprecated( 'wp.blockEditor.RichText formattingControls prop', {
 		since: '5.4',
 		alternative: 'allowedFormats',
+		version: '6.2',
 	} );
 
 	return formattingControls.map( ( name ) => `core/${ name }` );

diff --git a/packages/components/src/button/deprecated.js b/packages/components/src/button/deprecated.js
@@ -14,6 +14,7 @@ function IconButton( { labelPosition, size, tooltip, label, ...props }, ref ) {
 	deprecated( 'wp.components.IconButton', {
 		since: '5.4',
 		alternative: 'wp.components.Button',
+		version: '6.2',
 	} );
 
 	return (

diff --git a/packages/components/src/button/index.js b/packages/components/src/button/index.js
@@ -48,6 +48,7 @@ function useDeprecatedProps( {
 		deprecated( 'Button isDefault prop', {
 			since: '5.4',
 			alternative: 'variant="secondary"',
+			version: '6.2',
 		} );
 
 		computedVariant ??= 'secondary';

diff --git a/packages/components/src/modal/index.js b/packages/components/src/modal/index.js
@@ -22,7 +22,6 @@ import {
 	useConstrainedTabbing,
 	useMergeRefs,
 } from '@wordpress/compose';
-import deprecated from '@wordpress/deprecated';
 import { ESCAPE } from '@wordpress/keycodes';
 import { __ } from '@wordpress/i18n';
 import { closeSmall } from '@wordpress/icons';
@@ -45,8 +44,7 @@ function Modal( props, forwardedRef ) {
 		focusOnMount = true,
 		shouldCloseOnEsc = true,
 		shouldCloseOnClickOutside = true,
-		isDismissable, // Deprecated
-		isDismissible = isDismissable || true,
+		isDismissible = true,
 		/* accessibility */
 		aria = {
 			labelledby: null,
@@ -93,13 +91,6 @@ function Modal( props, forwardedRef ) {
 		};
 	}, [] );
 
-	if ( isDismissable ) {
-		deprecated( 'isDismissable prop of the Modal component', {
-			since: '5.4',
-			alternative: 'isDismissible prop (renamed) of the Modal component',
-		} );
-	}
-
 	function handleEscapeKeyDown( event ) {
 		if (
 			shouldCloseOnEsc &&

diff --git a/packages/data/src/plugins/controls/index.js b/packages/data/src/plugins/controls/index.js
diff --git a/packages/data/src/plugins/index.js b/packages/data/src/plugins/index.js
@@ -1,2 +1 @@
-export { default as controls } from './controls';
 export { default as persistence } from './persistence';
diff --git a/packages/data/src/registry.js b/packages/data/src/registry.js
@@ -291,6 +291,10 @@ export function createRegistry( storeConfigs = {}, parent = null ) {
 	// This function will be deprecated as soon as it is no longer internally referenced.
 	//
 	function use( plugin, options ) {
+		if ( ! plugin ) {
+			return;
+		}
+
 		registry = {
 			...registry,
 			...plugin( registry, options ),

diff --git a/packages/editor/src/components/deprecated.js b/packages/editor/src/components/deprecated.js
@@ -48,7 +48,6 @@ import {
 	MultiSelectScrollIntoView as RootMultiSelectScrollIntoView,
 	NavigableToolbar as RootNavigableToolbar,
 	ObserveTyping as RootObserveTyping,
-	PreserveScrollInReorder as RootPreserveScrollInReorder,
 	SkipToSelectedBlock as RootSkipToSelectedBlock,
 	URLInput as RootURLInput,
 	URLInputButton as RootURLInputButton,
@@ -224,10 +223,6 @@ export const ObserveTyping = deprecateComponent(
 	'ObserveTyping',
 	RootObserveTyping
 );
-export const PreserveScrollInReorder = deprecateComponent(
-	'PreserveScrollInReorder',
-	RootPreserveScrollInReorder
-);
 export const SkipToSelectedBlock = deprecateComponent(
 	'SkipToSelectedBlock',
 	RootSkipToSelectedBlock

diff --git a/packages/editor/src/store/selectors.js b/packages/editor/src/store/selectors.js
@@ -277,41 +277,6 @@ export const getPostEdits = createRegistrySelector( ( select ) => ( state ) => {
 	);
 } );
 
-/**
- * Returns a new reference when edited values have changed. This is useful in
- * inferring where an edit has been made between states by comparison of the
- * return values using strict equality.
- *
- * @deprecated since Gutenberg 6.5.0.
- *
- * @example
- *
- * ```
- * const hasEditOccurred = (
- *    getReferenceByDistinctEdits( beforeState ) !==
- *    getReferenceByDistinctEdits( afterState )
- * );
- * ```
- *
- * @param {Object} state Editor state.
- *
- * @return {*} A value whose reference will change only when an edit occurs.
- */
-export const getReferenceByDistinctEdits = createRegistrySelector(
-	( select ) => (/* state */) => {
-		deprecated(
-			"`wp.data.select( 'core/editor' ).getReferenceByDistinctEdits`",
-			{
-				since: '5.4',
-				alternative:
-					"`wp.data.select( 'core' ).getReferenceByDistinctEdits`",
-			}
-		);
-
-		return select( coreStore ).getReferenceByDistinctEdits();
-	}
-);
-
 /**
  * Returns an attribute value of the saved post.
  *

diff --git a/packages/nux/src/index.js b/packages/nux/src/index.js
@@ -9,4 +9,5 @@ export { default as DotTip } from './components/dot-tip';
 deprecated( 'wp.nux', {
 	since: '5.4',
 	hint: 'wp.components.Guide can be used to show a user guide.',
+	version: '6.2',
 } );