Merge pull request #86 from studiopress/remove/editor-dependency

Prevent PHP notice on Widgets page

Author: kienstra

js/src/block-editor/controls/test/file.js

@@ -16,6 +16,10 @@ jest.mock( '@wordpress/api-fetch', () => {
 	} );
 } );
 
+jest.mock( '@wordpress/data/build/components/use-select', () =>
+	jest.fn( () => false )
+);
+
 // @todo: remove this when the console warning no longer appears.
 // Expected mock function not to be called but it was called with:
 // ["wp.components.DropZoneProvider is deprecated. Note: wp.component.DropZone no longer needs a provider. wp.components.DropZoneProvider is safe to remove from your code."]

js/src/block-editor/controls/test/image.js

@@ -16,6 +16,10 @@ jest.mock( '@wordpress/api-fetch', () => {
 	} );
 } );
 
+jest.mock( '@wordpress/data/build/components/use-select', () =>
+	jest.fn( () => false )
+);
+
 // @todo: remove this when the console warning no longer appears.
 // Expected mock function not to be called but it was called with:
 // ["wp.components.DropZoneProvider is deprecated. Note: wp.component.DropZone no longer needs a provider. wp.components.DropZoneProvider is safe to remove from your code."]

js/src/block-editor/hooks/useMedia.js

@@ -1,8 +1,9 @@
 /**
  * WordPress dependencies
  */
+import { store as blockEditorStore } from '@wordpress/block-editor';
 import { useSelect } from '@wordpress/data';
-import { mediaUpload } from '@wordpress/editor';
+import { mediaUpload as legacyMediaUpload } from '@wordpress/editor';
 import { useEffect, useState } from '@wordpress/element';
 import { __, sprintf } from '@wordpress/i18n';
 
@@ -58,6 +59,13 @@ const useMedia = ( fieldValue, onChange, allowedTypes ) => {
 		return select( 'core' ).getMedia( fieldValue );
 	} );
 
+	/* @type {function|undefined} */
+	const mediaUpload = useSelect( ( select ) => {
+		// @ts-ignore The function isn't in the declaration file.
+		const { getSettings } = select( blockEditorStore );
+		return getSettings()?.mediaUpload || legacyMediaUpload;
+	} );
+
 	useEffect( () => {
 		if ( media?.source_url ) {
 			setMediaSrc( media.source_url );

php/Blocks/Loader.php

@@ -126,7 +126,7 @@ public function editor_assets() {
 		wp_enqueue_script(
 			$js_handle,
 			$this->assets['url']['entry'],
-			$js_config['dependencies'],
+			[],
 			$js_config['version'],
 			true
 		);