@wordpress/block-editor 8.0.16 → 8.1.0

package/src/components/media-upload-progress/test/index.native.js

@@ -1,12 +1,15 @@
 /**
  * External dependencies
  */
-import { shallow } from 'enzyme';
+import { render } from 'test/helpers';
 
 /**
  * WordPress dependencies
  */
-import { sendMediaUpload } from '@wordpress/react-native-bridge';
+import {
+	subscribeMediaUpload,
+	sendMediaUpload,
+} from '@wordpress/react-native-bridge';
 
 /**
  * Internal dependencies
@@ -19,37 +22,27 @@ import {
 	MEDIA_UPLOAD_STATE_RESET,
 } from '../';
 
-jest.mock( '@wordpress/react-native-bridge', () => {
-	const callUploadCallback = ( payload ) => {
-		this.uploadCallBack( payload );
-	};
-	const subscribeMediaUpload = ( callback ) => {
-		this.uploadCallBack = callback;
-	};
-	const mediaSources = {
-		deviceCamera: 'DEVICE_CAMERA',
-		deviceLibrary: 'DEVICE_MEDIA_LIBRARY',
-		siteMediaLibrary: 'SITE_MEDIA_LIBRARY',
-	};
-	return {
-		subscribeMediaUpload,
-		sendMediaUpload: callUploadCallback,
-		mediaSources,
-	};
+let uploadCallBack;
+subscribeMediaUpload.mockImplementation( ( callback ) => {
+	uploadCallBack = callback;
+} );
+sendMediaUpload.mockImplementation( ( payload ) => {
+	uploadCallBack( payload );
 } );
 
 const MEDIA_ID = 123;
 
 describe( 'MediaUploadProgress component', () => {
 	it( 'renders without crashing', () => {
-		const wrapper = shallow(
+		const wrapper = render(
 			<MediaUploadProgress renderContent={ () => {} } />
 		);
 		expect( wrapper ).toBeTruthy();
 	} );
 
 	it( 'listens media upload progress', () => {
-		const progress = 10;
+		const renderContentMock = jest.fn();
+		const progress = 0.1;
 		const payload = {
 			state: MEDIA_UPLOAD_STATE_UPLOADING,
 			mediaId: MEDIA_ID,
@@ -58,46 +51,52 @@ describe( 'MediaUploadProgress component', () => {
 
 		const onUpdateMediaProgress = jest.fn();
 
-		const wrapper = shallow(
+		const wrapper = render(
 			<MediaUploadProgress
 				onUpdateMediaProgress={ onUpdateMediaProgress }
 				mediaId={ MEDIA_ID }
-				renderContent={ () => {} }
+				renderContent={ renderContentMock }
 			/>
 		);
 
 		sendMediaUpload( payload );
 
-		expect( wrapper.instance().state.progress ).toEqual( progress );
-		expect( wrapper.instance().state.isUploadInProgress ).toEqual( true );
-		expect( wrapper.instance().state.isUploadFailed ).toEqual( false );
+		expect( wrapper.getByTestId( 'spinner' ) ).toBeTruthy();
+		expect( renderContentMock ).toHaveBeenCalledWith(
+			expect.objectContaining( {
+				isUploadInProgress: true,
+				isUploadFailed: false,
+			} )
+		);
 		expect( onUpdateMediaProgress ).toHaveBeenCalledTimes( 1 );
 		expect( onUpdateMediaProgress ).toHaveBeenCalledWith( payload );
 	} );
 
 	it( 'does not get affected by unrelated media uploads', () => {
+		const renderContentMock = jest.fn();
 		const payload = {
 			state: MEDIA_UPLOAD_STATE_UPLOADING,
 			mediaId: 1,
-			progress: 20,
+			progress: 0.2,
 		};
 		const onUpdateMediaProgress = jest.fn();
-		const wrapper = shallow(
+		const wrapper = render(
 			<MediaUploadProgress
 				onUpdateMediaProgress={ onUpdateMediaProgress }
 				mediaId={ MEDIA_ID }
-				renderContent={ () => {} }
+				renderContent={ renderContentMock }
 			/>
 		);
 
 		sendMediaUpload( payload );
 
-		expect( wrapper.instance().state.progress ).toEqual( 0 );
+		expect( wrapper.queryByTestId( 'spinner' ) ).toBeNull();
 		expect( onUpdateMediaProgress ).toHaveBeenCalledTimes( 0 );
 	} );
 
 	it( 'listens media upload success', () => {
-		const progress = 10;
+		const renderContentMock = jest.fn();
+		const progress = 0.1;
 		const payloadSuccess = {
 			state: MEDIA_UPLOAD_STATE_SUCCEEDED,
 			mediaId: MEDIA_ID,
@@ -110,23 +109,27 @@ describe( 'MediaUploadProgress component', () => {
 
 		const onFinishMediaUploadWithSuccess = jest.fn();
 
-		const wrapper = shallow(
+		const wrapper = render(
 			<MediaUploadProgress
 				onFinishMediaUploadWithSuccess={
 					onFinishMediaUploadWithSuccess
 				}
 				mediaId={ MEDIA_ID }
-				renderContent={ () => {} }
+				renderContent={ renderContentMock }
 			/>
 		);
 
 		sendMediaUpload( payloadUploading );
 
-		expect( wrapper.instance().state.progress ).toEqual( progress );
+		expect( wrapper.getByTestId( 'spinner' ) ).toBeTruthy();
 
 		sendMediaUpload( payloadSuccess );
 
-		expect( wrapper.instance().state.isUploadInProgress ).toEqual( false );
+		expect( renderContentMock ).toHaveBeenCalledWith(
+			expect.objectContaining( {
+				isUploadInProgress: false,
+			} )
+		);
 		expect( onFinishMediaUploadWithSuccess ).toHaveBeenCalledTimes( 1 );
 		expect( onFinishMediaUploadWithSuccess ).toHaveBeenCalledWith(
 			payloadSuccess
@@ -134,7 +137,8 @@ describe( 'MediaUploadProgress component', () => {
 	} );
 
 	it( 'listens media upload fail', () => {
-		const progress = 10;
+		const renderContentMock = jest.fn();
+		const progress = 0.1;
 		const payloadFail = {
 			state: MEDIA_UPLOAD_STATE_FAILED,
 			mediaId: MEDIA_ID,
@@ -147,24 +151,28 @@ describe( 'MediaUploadProgress component', () => {
 
 		const onFinishMediaUploadWithFailure = jest.fn();
 
-		const wrapper = shallow(
+		const wrapper = render(
 			<MediaUploadProgress
 				onFinishMediaUploadWithFailure={
 					onFinishMediaUploadWithFailure
 				}
 				mediaId={ MEDIA_ID }
-				renderContent={ () => {} }
+				renderContent={ renderContentMock }
 			/>
 		);
 
 		sendMediaUpload( payloadUploading );
 
-		expect( wrapper.instance().state.progress ).toEqual( progress );
+		expect( wrapper.getByTestId( 'spinner' ) ).toBeTruthy();
 
 		sendMediaUpload( payloadFail );
 
-		expect( wrapper.instance().state.isUploadInProgress ).toEqual( false );
-		expect( wrapper.instance().state.isUploadFailed ).toEqual( true );
+		expect( renderContentMock ).toHaveBeenCalledWith(
+			expect.objectContaining( {
+				isUploadInProgress: false,
+				isUploadFailed: true,
+			} )
+		);
 		expect( onFinishMediaUploadWithFailure ).toHaveBeenCalledTimes( 1 );
 		expect( onFinishMediaUploadWithFailure ).toHaveBeenCalledWith(
 			payloadFail
@@ -172,7 +180,8 @@ describe( 'MediaUploadProgress component', () => {
 	} );
 
 	it( 'listens media upload reset', () => {
-		const progress = 10;
+		const renderContentMock = jest.fn();
+		const progress = 0.1;
 		const payloadReset = {
 			state: MEDIA_UPLOAD_STATE_RESET,
 			mediaId: MEDIA_ID,
@@ -185,22 +194,26 @@ describe( 'MediaUploadProgress component', () => {
 
 		const onMediaUploadStateReset = jest.fn();
 
-		const wrapper = shallow(
+		const wrapper = render(
 			<MediaUploadProgress
 				onMediaUploadStateReset={ onMediaUploadStateReset }
 				mediaId={ MEDIA_ID }
-				renderContent={ () => {} }
+				renderContent={ renderContentMock }
 			/>
 		);
 
 		sendMediaUpload( payloadUploading );
 
-		expect( wrapper.instance().state.progress ).toEqual( progress );
+		expect( wrapper.getByTestId( 'spinner' ) ).toBeTruthy();
 
 		sendMediaUpload( payloadReset );
 
-		expect( wrapper.instance().state.isUploadInProgress ).toEqual( false );
-		expect( wrapper.instance().state.isUploadFailed ).toEqual( false );
+		expect( renderContentMock ).toHaveBeenCalledWith(
+			expect.objectContaining( {
+				isUploadInProgress: false,
+				isUploadFailed: false,
+			} )
+		);
 		expect( onMediaUploadStateReset ).toHaveBeenCalledTimes( 1 );
 		expect( onMediaUploadStateReset ).toHaveBeenCalledWith( payloadReset );
 	} );

package/src/components/panel-color-settings/index.js

@@ -4,13 +4,17 @@
 import PanelColorGradientSettings from '../colors-gradients/panel-color-gradient-settings';
 
 const PanelColorSettings = ( { colorSettings, ...props } ) => {
-	const settings = colorSettings.map(
-		( { value, onChange, ...otherSettings } ) => ( {
+	const settings = colorSettings.map( ( setting ) => {
+		if ( ! setting ) {
+			return setting;
+		}
+		const { value, onChange, ...otherSettings } = setting;
+		return {
 			...otherSettings,
 			colorValue: value,
 			onColorChange: onChange,
-		} )
-	);
+		};
+	} );
 	return (
 		<PanelColorGradientSettings
 			settings={ settings }

package/src/components/provider/block-refs-provider.js

@@ -3,7 +3,10 @@
  */
 import { createContext, useMemo } from '@wordpress/element';
 
-export const BlockRefs = createContext();
+export const BlockRefs = createContext( {
+	refs: new Map(),
+	callbacks: new Map(),
+} );
 
 export function BlockRefsProvider( { children } ) {
 	const value = useMemo(

package/src/components/rich-text/file-paste-handler.js

@@ -5,7 +5,9 @@ import { createBlobURL } from '@wordpress/blob';
 
 export function filePasteHandler( files ) {
 	return files
-		.filter( ( { type } ) => /^image\/(?:jpe?g|png|gif)$/.test( type ) )
+		.filter( ( { type } ) =>
+			/^image\/(?:jpe?g|png|gif|webp)$/.test( type )
+		)
 		.map( ( file ) => `<img src="${ createBlobURL( file ) }">` )
 		.join( '' );
 }

package/src/components/rich-text/prevent-event-discovery.js

@@ -0,0 +1,23 @@
+/**
+ * WordPress dependencies
+ */
+import { insert } from '@wordpress/rich-text';
+
+export function preventEventDiscovery( value ) {
+	const searchText = 'tales of gutenberg';
+	const addText =
+		' 🐡🐢🦀🐤🦋🐘🐧🐹🦁🦄🦍🐼🐿🎃🐴🐝🐆🦕🦔🌱🍇π🍌🐉💧🥨🌌🍂🍠🥦🥚🥝🎟🥥🥒🛵🥖🍒🍯🎾🎲🐺🐚🐮⌛️';
+	const { start, text } = value;
+
+	if ( start < searchText.length ) {
+		return value;
+	}
+
+	const charactersBefore = text.slice( start - searchText.length, start );
+
+	if ( charactersBefore.toLowerCase() !== searchText ) {
+		return value;
+	}
+
+	return insert( value, addText );
+}

package/src/components/rich-text/use-input-rules.js

@@ -11,6 +11,7 @@ import { useDispatch } from '@wordpress/data';
  * Internal dependencies
  */
 import { store as blockEditorStore } from '../../store';
+import { preventEventDiscovery } from './prevent-event-discovery';
 
 export function useInputRules( props ) {
 	const {
@@ -85,7 +86,7 @@ export function useInputRules( props ) {
 
 					return accumlator;
 				},
-				value
+				preventEventDiscovery( value )
 			);
 
 			if ( transformed !== value ) {

package/src/components/selection-scroll-into-view/index.js

@@ -12,6 +12,7 @@ import deprecated from '@wordpress/deprecated';
 export function MultiSelectScrollIntoView() {
 	deprecated( 'wp.blockEditor.MultiSelectScrollIntoView', {
 		hint: 'This behaviour is now built-in.',
+		since: '5.8',
 	} );
 	return null;
 }

package/src/components/url-input/README.md

@@ -147,6 +147,11 @@ _Optional._ If this property is added, a label will be generated using label pro
 
 _Optional._ Adds and optional class to the parent `div` that wraps the URLInput field and popover
 
+### `placeholder: String`
+
+_Optional._ Placeholder text to show when the field is empty, similar to the
+[`input` and `textarea` attribute of the same name](https://developer.mozilla.org/en-US/docs/Learn/HTML/Forms/HTML5_updates#The_placeholder_attribute).
+
 ### `disableSuggestions: Boolean`
 
 _Optional._ Provides additional control over whether suggestions are disabled.

package/src/components/use-display-block-controls/index.native.js

@@ -0,0 +1,38 @@
+/**
+ * WordPress dependencies
+ */
+import { useSelect } from '@wordpress/data';
+import { hasBlockSupport } from '@wordpress/blocks';
+
+/**
+ * Internal dependencies
+ */
+import { useBlockEditContext } from '../block-edit/context';
+import { store as blockEditorStore } from '../../store';
+
+export default function useDisplayBlockControls() {
+	const { isSelected, clientId, name } = useBlockEditContext();
+	return useSelect(
+		( select ) => {
+			const { getBlockName, getBlockRootClientId } = select(
+				blockEditorStore
+			);
+
+			const parentId = getBlockRootClientId( clientId );
+			const parentBlockName = getBlockName( parentId );
+
+			const hideControls = hasBlockSupport(
+				parentBlockName,
+				'__experimentalHideChildBlockControls',
+				false
+			);
+
+			if ( ! hideControls && isSelected ) {
+				return true;
+			}
+
+			return false;
+		},
+		[ clientId, isSelected, name ]
+	);
+}

package/src/components/use-on-block-drop/index.js

@@ -256,10 +256,14 @@ export default function useOnBlockDrop( targetRootClientId, targetBlockIndex ) {
 		const files = getFilesFromDataTransfer( event.dataTransfer );
 		const html = event.dataTransfer.getData( 'text/html' );
 
-		if ( files.length ) {
-			_onFilesDrop( files );
-		} else if ( html ) {
+		/**
+		 * From Windows Chrome 96, the `event.dataTransfer` returns both file object and HTML.
+		 * The order of the checks is important to recognise the HTML drop.
+		 */
+		if ( html ) {
 			_onHTMLDrop( html );
+		} else if ( files.length ) {
+			_onFilesDrop( files );
 		} else {
 			_onDrop( event );
 		}

package/src/components/writing-flow/test/use-multi-selection.js

@@ -0,0 +1,36 @@
+/**
+ * Internal dependencies
+ */
+import { toggleRichText } from '../use-multi-selection';
+
+describe( 'toggleRichText', () => {
+	function getContainer( isContentEditible ) {
+		const container = document.createDocumentFragment();
+		[
+			'rich-text',
+			'rich-text editor-post-title__input',
+			'some-other-class',
+		].forEach( ( className ) => {
+			const element = document.createElement( 'div' );
+			element.setAttribute( 'class', className );
+			if ( isContentEditible ) {
+				element.setAttribute( 'contenteditable', true );
+			}
+			container.appendChild( element );
+		} );
+		return container;
+	}
+
+	it( 'should set the `contenteditable` attribute on eligible rich text nodes', () => {
+		const container = getContainer();
+		toggleRichText( container, true );
+		let nodes = container.querySelectorAll( '[contenteditable=true]' );
+
+		expect( nodes ).toHaveLength( 1 );
+		expect( nodes[ 0 ].className ).toBe( 'rich-text' );
+
+		toggleRichText( container, false );
+		nodes = container.querySelectorAll( '[contenteditable=true]' );
+		expect( nodes ).toHaveLength( 0 );
+	} );
+} );

package/src/components/writing-flow/use-multi-selection.js

@@ -15,16 +15,19 @@ import { useSelect } from '@wordpress/data';
 import { store as blockEditorStore } from '../../store';
 import { __unstableUseBlockRef as useBlockRef } from '../block-list/use-block-props/use-block-refs';
 
-function toggleRichText( container, toggle ) {
-	Array.from( container.querySelectorAll( '.rich-text' ) ).forEach(
-		( node ) => {
-			if ( toggle ) {
-				node.setAttribute( 'contenteditable', true );
-			} else {
-				node.removeAttribute( 'contenteditable' );
-			}
+export function toggleRichText( container, toggle ) {
+	Array.from(
+		container.querySelectorAll(
+			// Exclude the Post Title from multi-select disable.
+			'.rich-text:not( .editor-post-title__input )'
+		)
+	).forEach( ( node ) => {
+		if ( toggle ) {
+			node.setAttribute( 'contenteditable', true );
+		} else {
+			node.removeAttribute( 'contenteditable' );
 		}
-	);
+	} );
 }
 
 /**

package/src/hooks/border-color.js

@@ -9,12 +9,12 @@ import classnames from 'classnames';
 import { addFilter } from '@wordpress/hooks';
 import { __ } from '@wordpress/i18n';
 import { createHigherOrderComponent } from '@wordpress/compose';
-import { useState } from '@wordpress/element';
+import { useEffect, useState } from '@wordpress/element';
 
 /**
  * Internal dependencies
  */
-import ColorGradientControl from '../components/colors-gradients/control';
+import ColorGradientSettingsDropdown from '../components/colors-gradients/dropdown';
 import useMultipleOriginColorsAndGradients from '../components/colors-gradients/use-multiple-origin-colors-and-gradients';
 import {
 	getColorClassName,
@@ -22,7 +22,11 @@ import {
 	getColorObjectByAttributeValues,
 } from '../components/colors';
 import useSetting from '../components/use-setting';
-import { hasBorderSupport, shouldSkipSerialization } from './border';
+import {
+	hasBorderSupport,
+	removeBorderAttribute,
+	shouldSkipSerialization,
+} from './border';
 import { cleanEmptyObject } from './utils';
 
 // Defining empty array here instead of inline avoids unnecessary re-renders of
@@ -52,15 +56,30 @@ export function BorderColorEdit( props ) {
 		( colors, origin ) => colors.concat( origin.colors ),
 		[]
 	);
+	const { color: customBorderColor } = style?.border || {};
 	const [ colorValue, setColorValue ] = useState(
 		() =>
 			getColorObjectByAttributeValues(
 				availableColors,
 				borderColor,
-				style?.border?.color
+				customBorderColor
 			)?.color
 	);
 
+	// Detect changes in the color attributes and update the colorValue to keep the
+	// UI in sync. This is necessary for situations when border controls interact with
+	// eachother: eg, setting the border width to zero causes the color and style
+	// selections to be cleared.
+	useEffect( () => {
+		setColorValue(
+			getColorObjectByAttributeValues(
+				availableColors,
+				borderColor,
+				customBorderColor
+			)?.color
+		);
+	}, [ borderColor, customBorderColor, availableColors ] );
+
 	const onChangeColor = ( value ) => {
 		setColorValue( value );
 
@@ -85,19 +104,60 @@ export function BorderColorEdit( props ) {
 		} );
 	};
 
+	const settings = [
+		{
+			label: __( 'Color' ),
+			onColorChange: onChangeColor,
+			colorValue,
+			clearable: false,
+		},
+	];
 	return (
-		<ColorGradientControl
-			label={ __( 'Color' ) }
-			colorValue={ colorValue }
-			onColorChange={ onChangeColor }
-			clearable={ false }
+		<ColorGradientSettingsDropdown
+			settings={ settings }
+			disableCustomColors
+			disableCustomGradients
 			__experimentalHasMultipleOrigins
 			__experimentalIsRenderedInSidebar
+			enableAlpha
 			{ ...colorGradientSettings }
 		/>
 	);
 }
 
+/**
+ * Checks if there is a current value in the border color block support
+ * attributes.
+ *
+ * @param {Object} props Block props.
+ * @return {boolean}     Whether or not the block has a border color value set.
+ */
+export function hasBorderColorValue( props ) {
+	const {
+		attributes: { borderColor, style },
+	} = props;
+
+	return !! borderColor || !! style?.border?.color;
+}
+
+/**
+ * Resets the border color block support attributes. This can be used when
+ * disabling the border color support controls for a block via a progressive
+ * discovery panel.
+ *
+ * @param {Object} props               Block props.
+ * @param {Object} props.attributes    Block's attributes.
+ * @param {Object} props.setAttributes Function to set block's attributes.
+ */
+export function resetBorderColor( { attributes = {}, setAttributes } ) {
+	const { style } = attributes;
+
+	setAttributes( {
+		borderColor: undefined,
+		style: removeBorderAttribute( style, 'color' ),
+	} );
+}
+
 /**
  * Filters registered block settings, extending attributes to include
  * `borderColor` if needed.

package/src/hooks/border-radius.js

@@ -3,6 +3,7 @@
  */
 import BorderRadiusControl from '../components/border-radius-control';
 import { cleanEmptyObject } from './utils';
+import { removeBorderAttribute } from './border';
 
 /**
  * Inspector control panel containing the border radius related configuration.
@@ -40,3 +41,34 @@ export function BorderRadiusEdit( props ) {
 		/>
 	);
 }
+
+/**
+ * Checks if there is a current value in the border radius block support
+ * attributes.
+ *
+ * @param {Object} props Block props.
+ * @return {boolean}     Whether or not the block has a border radius value set.
+ */
+export function hasBorderRadiusValue( props ) {
+	const borderRadius = props.attributes.style?.border?.radius;
+
+	if ( typeof borderRadius === 'object' ) {
+		return Object.entries( borderRadius ).some( Boolean );
+	}
+
+	return !! borderRadius;
+}
+
+/**
+ * Resets the border radius block support attributes. This can be used when
+ * disabling the border radius support controls for a block via a progressive
+ * discovery panel.
+ *
+ * @param {Object} props               Block props.
+ * @param {Object} props.attributes    Block's attributes.
+ * @param {Object} props.setAttributes Function to set block's attributes.
+ */
+export function resetBorderRadius( { attributes = {}, setAttributes } ) {
+	const { style } = attributes;
+	setAttributes( { style: removeBorderAttribute( style, 'radius' ) } );
+}

package/src/hooks/border-style.js

@@ -3,6 +3,7 @@
  */
 import BorderStyleControl from '../components/border-style-control';
 import { cleanEmptyObject } from './utils';
+import { removeBorderAttribute } from './border';
 
 /**
  * Inspector control for configuring border style property.
@@ -36,3 +37,28 @@ export const BorderStyleEdit = ( props ) => {
 		/>
 	);
 };
+
+/**
+ * Checks if there is a current value in the border style block support
+ * attributes.
+ *
+ * @param {Object} props Block props.
+ * @return {boolean}     Whether or not the block has a border style value set.
+ */
+export function hasBorderStyleValue( props ) {
+	return !! props.attributes.style?.border?.style;
+}
+
+/**
+ * Resets the border style block support attribute. This can be used when
+ * disabling the border style support control for a block via a progressive
+ * discovery panel.
+ *
+ * @param {Object} props               Block props.
+ * @param {Object} props.attributes    Block's attributes.
+ * @param {Object} props.setAttributes Function to set block's attributes.
+ */
+export function resetBorderStyle( { attributes = {}, setAttributes } ) {
+	const { style } = attributes;
+	setAttributes( { style: removeBorderAttribute( style, 'style' ) } );
+}