@wordpress/block-editor 9.5.0 → 9.7.1-next.d6164808d3.0

package/src/components/spacing-sizes-control/style.scss

@@ -0,0 +1,122 @@
+.tools-panel-item-spacing {
+	display: grid;
+	grid-template-columns: auto 1fr auto;
+	grid-row-gap: $grid-unit-05;
+}
+
+.component-spacing-sizes-control {
+	box-sizing: border-box;
+	padding-bottom: 12px;
+	width: 100%;
+	display: contents;
+
+	legend {
+		padding: 0;
+		grid-column: 1 / 1;
+		grid-row: 1 / 1;
+		align-self: center;
+	}
+
+	.components-spacing-sizes-control__side-labels {
+		grid-column: 1 / 1;
+		min-height: 30px;
+		justify-content: left;
+	}
+
+	.components-spacing-sizes-control__hint-single {
+		margin-top: 0;
+		margin-left: 0;
+	}
+
+	.components-spacing-sizes-control__hint-single,
+	.components-spacing-sizes-control__hint-all {
+		color: $gray-700;
+		font-size: 12px;
+	}
+
+	.components-spacing-sizes-control__hint-all {
+		grid-column: 2 / 2;
+		justify-self: left;
+		grid-row: 1 / 1;
+		align-self: center;
+		margin-left: $grid-unit-05;
+	}
+
+	.components-spacing-sizes-control__custom-toggle-all {
+		grid-column: 2 / 2;
+		grid-row: 1 / 1;
+		justify-self: end;
+		margin-right: $grid-unit-05;
+		padding: 0;
+	}
+
+	.components-spacing-sizes-control__custom-toggle-single {
+		grid-column: 3 / 3;
+		justify-self: end;
+	}
+
+	.components-spacing-sizes-control__custom-toggle-all,
+	.components-spacing-sizes-control__custom-toggle-single {
+		&.is-small.has-icon {
+			padding: 0;
+			min-width: $icon-size;
+		}
+	}
+
+	.component-spacing-sizes-control__linked-button {
+		grid-column: 3 / 3;
+		grid-row: 1 / 1;
+		justify-self: end;
+	}
+
+	.components-spacing-sizes-control__custom-value-range {
+		grid-column: span 2;
+		margin-left: $grid-unit-10;
+		padding-right: $grid-unit-10;
+		height: 30px;
+	}
+
+	.components-spacing-sizes-control__custom-value-input {
+		width: 124px;
+	}
+
+	.components-spacing-sizes-control__range-control {
+		grid-column: span 3;
+		padding-right: $grid-unit-10;
+		height: 30px;
+	}
+
+	.components-range-control__wrapper {
+		margin-bottom: 0;
+	}
+
+	.components-range-control__mark {
+		height: $grid-unit-05;
+		width: 3px;
+		background-color: #fff;
+		z-index: 1;
+	}
+
+	.components-range-control__marks {
+		margin-top: 17px;
+
+		:first-child {
+			display: none;
+		}
+	}
+
+	[class*="ThumbWrapper-thumbColor"] {
+		z-index: 3;
+	}
+
+	.components-spacing-sizes-control__side-label {
+		margin-right: $grid-unit-05;
+		grid-column: 1 / 1;
+		justify-self: left;
+		font-size: 12px;
+	}
+
+	.components-spacing-sizes-control__custom-select-control {
+		grid-column: span 3;
+	}
+}

package/src/components/spacing-sizes-control/test/utils.js

@@ -0,0 +1,156 @@
+/**
+ * Internal dependencies
+ */
+import {
+	isValueSpacingPreset,
+	getCustomValueFromPreset,
+	getSpacingPresetCssVar,
+	getSpacingPresetSlug,
+	getSliderValueFromPreset,
+	getAllRawValue,
+	isValuesMixed,
+	isValuesDefined,
+} from '../utils';
+
+describe( 'isValueSpacingPreset', () => {
+	it( 'should return true if value is string in spacing presets var format', () => {
+		expect( isValueSpacingPreset( 'var:preset|spacing|20' ) ).toBe( true );
+	} );
+	it( 'should return false if value is not a string in spacing presets var format', () => {
+		expect( isValueSpacingPreset( '30px' ) ).toBe( false );
+	} );
+} );
+
+describe( 'getCustomValueFromPreset', () => {
+	const spacingSizes = [ { name: 'Small', slug: 20, size: '8px' } ];
+	it( 'should return original value if not a string in spacing presets var format', () => {
+		expect( getCustomValueFromPreset( '20px', spacingSizes ) ).toBe(
+			'20px'
+		);
+	} );
+	it( 'should return value from matching spacingSizes array entry if string in spacing presets var format', () => {
+		expect(
+			getCustomValueFromPreset( 'var:preset|spacing|20', spacingSizes )
+		).toBe( '8px' );
+	} );
+	it( 'should return undefined if no matching preset in spacingSizes array', () => {
+		expect(
+			getCustomValueFromPreset( 'var:preset|spacing|30', spacingSizes )
+		).toBe( undefined );
+	} );
+} );
+
+describe( 'getSpacingPresetCssVar', () => {
+	it( 'should return original value if not a string in spacing presets var format', () => {
+		expect( getSpacingPresetCssVar( '20px' ) ).toBe( '20px' );
+	} );
+	it( 'should return a string in spacing presets css var format with slug from provided value', () => {
+		expect( getSpacingPresetCssVar( 'var:preset|spacing|20' ) ).toBe(
+			'var(--wp--preset--spacing--20)'
+		);
+	} );
+} );
+
+describe( 'getSpacingPresetSlug', () => {
+	it( 'should return original value if 0 or default', () => {
+		expect( getSpacingPresetSlug( '0' ) ).toBe( '0' );
+		expect( getSpacingPresetSlug( 'default' ) ).toBe( 'default' );
+	} );
+	it( 'should return the int value of the slug portion of a valid preset var', () => {
+		expect( getSpacingPresetSlug( 'var:preset|spacing|20' ) ).toBe( '20' );
+	} );
+} );
+
+describe( 'getSliderValueFromPreset', () => {
+	const spacingSizes = [
+		{ name: 'Small', slug: 20, size: '8px' },
+		{ name: 'Large', slug: 30, size: '24px' },
+	];
+	it( 'should return NaN if no matching preset found - NaN makes range control go to start', () => {
+		expect( getSliderValueFromPreset( '10px', spacingSizes ) ).toBe( NaN );
+	} );
+	it( 'should return the int value of the slug portion of a valid preset var', () => {
+		expect(
+			getSliderValueFromPreset( 'var:preset|spacing|30', spacingSizes )
+		).toBe( 1 );
+	} );
+} );
+
+describe( 'getAllRawValue', () => {
+	const customValues = {
+		top: '5px',
+		bottom: '5px',
+		left: '6px',
+		right: '2px',
+	};
+	it( 'should return the most common custom value from the values object', () => {
+		expect( getAllRawValue( customValues ) ).toBe( '5px' );
+	} );
+	const presetValues = {
+		top: 'var:preset|spacing|30',
+		bottom: 'var:preset|spacing|20',
+		left: 'var:preset|spacing|10',
+		right: 'var:preset|spacing|30',
+	};
+	it( 'should return the most common preset value from the values object', () => {
+		expect( getAllRawValue( presetValues ) ).toBe(
+			'var:preset|spacing|30'
+		);
+	} );
+} );
+
+describe( 'isValuesMixed', () => {
+	const unmixedValues = {
+		top: '5px',
+		bottom: '5px',
+		left: '5px',
+		right: '5px',
+	};
+	it( 'should return false if all values are the same', () => {
+		expect( isValuesMixed( unmixedValues ) ).toBe( false );
+	} );
+	const mixedValues = {
+		top: 'var:preset|spacing|30',
+		bottom: 'var:preset|spacing|20',
+		left: 'var:preset|spacing|10',
+		right: 'var:preset|spacing|30',
+	};
+	it( 'should return true if all the values are not the same', () => {
+		expect( isValuesMixed( mixedValues ) ).toBe( true );
+	} );
+	const singleValue = {
+		top: 'var:preset|spacing|30',
+	};
+	it( 'should return true if only one side set', () => {
+		expect( isValuesMixed( singleValue ) ).toBe( true );
+	} );
+	const incompleteValues = {
+		top: 'var:preset|spacing|30',
+		bottom: 'var:preset|spacing|30',
+		left: 'var:preset|spacing|30',
+	};
+	it( 'should return true if all sides not set', () => {
+		expect( isValuesMixed( incompleteValues ) ).toBe( true );
+	} );
+} );
+
+describe( 'isValuesDefined', () => {
+	const undefinedValues = {
+		top: undefined,
+		bottom: undefined,
+		left: undefined,
+		right: undefined,
+	};
+	it( 'should return false if values are not defined', () => {
+		expect( isValuesDefined( undefinedValues ) ).toBe( false );
+	} );
+	const definedValues = {
+		top: 'var:preset|spacing|30',
+		bottom: 'var:preset|spacing|20',
+		left: 'var:preset|spacing|10',
+		right: 'var:preset|spacing|30',
+	};
+	it( 'should return true if all the values are not the same', () => {
+		expect( isValuesDefined( definedValues ) ).toBe( true );
+	} );
+} );

package/src/components/spacing-sizes-control/utils.js

@@ -0,0 +1,195 @@
+/**
+ * External dependencies
+ */
+import { isEmpty } from 'lodash';
+
+/**
+ * WordPress dependencies
+ */
+import { __ } from '@wordpress/i18n';
+
+/**
+ * Checks is given value is a spacing preset.
+ *
+ * @param {string} value Value to check
+ *
+ * @return {boolean} Return true if value is string in format var:preset|spacing|.
+ */
+export function isValueSpacingPreset( value ) {
+	if ( ! value?.includes ) {
+		return false;
+	}
+	return value === '0' || value.includes( 'var:preset|spacing|' );
+}
+
+/**
+ * Converts a spacing preset into a custom value.
+ *
+ * @param {string} value        Value to convert
+ * @param {Array}  spacingSizes Array of the current spacing preset objects
+ *
+ * @return {string} Mapping of the spacing preset to its equivalent custom value.
+ */
+export function getCustomValueFromPreset( value, spacingSizes ) {
+	if ( ! isValueSpacingPreset( value ) ) {
+		return value;
+	}
+
+	const slug = getSpacingPresetSlug( value );
+	const spacingSize = spacingSizes.find(
+		( size ) => String( size.slug ) === slug
+	);
+
+	return spacingSize?.size;
+}
+
+/**
+ * Converts a spacing preset into a custom value.
+ *
+ * @param {string} value Value to convert.
+ *
+ * @return {string} CSS var string for given spacing preset value.
+ */
+export function getSpacingPresetCssVar( value ) {
+	if ( ! value ) {
+		return;
+	}
+
+	const slug = value.match( /var:preset\|spacing\|(.+)/ );
+
+	if ( ! slug ) {
+		return value;
+	}
+
+	return `var(--wp--preset--spacing--${ slug[ 1 ] })`;
+}
+
+/**
+ * Returns the slug section of the given spacing preset string.
+ *
+ * @param {string} value Value to extract slug from.
+ *
+ * @return {number} The int value of the slug from given spacing preset.
+ */
+export function getSpacingPresetSlug( value ) {
+	if ( ! value ) {
+		return;
+	}
+
+	if ( value === '0' || value === 'default' ) {
+		return value;
+	}
+
+	const slug = value.match( /var:preset\|spacing\|(.+)/ );
+
+	return slug ? slug[ 1 ] : undefined;
+}
+
+/**
+ * Converts spacing preset value into a Range component value .
+ *
+ * @param {string} presetValue  Value to convert to Range value.
+ * @param {Array}  spacingSizes Array of current spacing preset value objects.
+ *
+ * @return {number} The int value for use in Range control.
+ */
+export function getSliderValueFromPreset( presetValue, spacingSizes ) {
+	if ( presetValue === undefined ) {
+		return 0;
+	}
+	const slug =
+		parseFloat( presetValue, 10 ) === 0
+			? '0'
+			: getSpacingPresetSlug( presetValue );
+	const sliderValue = spacingSizes.findIndex( ( spacingSize ) => {
+		return String( spacingSize.slug ) === slug;
+	} );
+
+	// Returning NaN rather than undefined as undefined makes range control thumb sit in center
+	return sliderValue !== -1 ? sliderValue : NaN;
+}
+
+export const LABELS = {
+	all: __( 'All sides' ),
+	top: __( 'Top' ),
+	bottom: __( 'Bottom' ),
+	left: __( 'Left' ),
+	right: __( 'Right' ),
+	mixed: __( 'Mixed' ),
+	vertical: __( 'Vertical' ),
+	horizontal: __( 'Horizontal' ),
+};
+
+export const DEFAULT_VALUES = {
+	top: undefined,
+	right: undefined,
+	bottom: undefined,
+	left: undefined,
+};
+
+export const ALL_SIDES = [ 'top', 'right', 'bottom', 'left' ];
+
+/**
+ * Gets an items with the most occurrence within an array
+ * https://stackoverflow.com/a/20762713
+ *
+ * @param {Array<any>} arr Array of items to check.
+ * @return {any} The item with the most occurrences.
+ */
+function mode( arr ) {
+	return arr
+		.sort(
+			( a, b ) =>
+				arr.filter( ( v ) => v === a ).length -
+				arr.filter( ( v ) => v === b ).length
+		)
+		.pop();
+}
+
+/**
+ * Gets the 'all' input value from values data.
+ *
+ * @param {Object} values Box spacing values
+ *
+ * @return {string} The most common value from all sides of box.
+ */
+export function getAllRawValue( values = {} ) {
+	return mode( Object.values( values ) );
+}
+
+/**
+ * Checks to determine if values are mixed.
+ *
+ * @param {Object} values Box values.
+ * @param {Array}  sides  Sides that values relate to.
+ *
+ * @return {boolean} Whether values are mixed.
+ */
+export function isValuesMixed( values = {}, sides = ALL_SIDES ) {
+	return (
+		( Object.values( values ).length >= 1 &&
+			Object.values( values ).length < sides.length ) ||
+		new Set( Object.values( values ) ).size > 1
+	);
+}
+
+/**
+ * Checks to determine if values are defined.
+ *
+ * @param {Object} values Box values.
+ *
+ * @return {boolean} Whether values are defined.
+ */
+export function isValuesDefined( values ) {
+	return (
+		values !== undefined &&
+		! isEmpty(
+			Object.values( values ).filter(
+				// Switching units when input is empty causes values only
+				// containing units. This gives false positive on mixed values
+				// unless filtered.
+				( value ) => !! value && /\d/.test( value )
+			)
+		)
+	);
+}

package/src/components/text-decoration-control/index.js

@@ -1,7 +1,7 @@
 /**
  * WordPress dependencies
  */
-import { Button } from '@wordpress/components';
+import { BaseControl, Button } from '@wordpress/components';
 import { formatStrikethrough, formatUnderline } from '@wordpress/icons';
 import { __ } from '@wordpress/i18n';
 
@@ -30,7 +30,9 @@ const TEXT_DECORATIONS = [
 export default function TextDecorationControl( { value, onChange } ) {
 	return (
 		<fieldset className="block-editor-text-decoration-control">
-			<legend>{ __( 'Decoration' ) }</legend>
+			<BaseControl.VisualLabel as="legend">
+				{ __( 'Decoration' ) }
+			</BaseControl.VisualLabel>
 			<div className="block-editor-text-decoration-control__buttons">
 				{ TEXT_DECORATIONS.map( ( textDecoration ) => {
 					return (

package/src/components/text-transform-control/index.js

@@ -1,7 +1,7 @@
 /**
  * WordPress dependencies
  */
-import { Button } from '@wordpress/components';
+import { BaseControl, Button } from '@wordpress/components';
 import { __ } from '@wordpress/i18n';
 import {
 	formatCapitalize,
@@ -39,7 +39,9 @@ const TEXT_TRANSFORMS = [
 export default function TextTransformControl( { value, onChange } ) {
 	return (
 		<fieldset className="block-editor-text-transform-control">
-			<legend>{ __( 'Letter case' ) }</legend>
+			<BaseControl.VisualLabel as="legend">
+				{ __( 'Letter case' ) }
+			</BaseControl.VisualLabel>
 			<div className="block-editor-text-transform-control__buttons">
 				{ TEXT_TRANSFORMS.map( ( textTransform ) => {
 					return (

package/src/components/url-input/index.js

@@ -462,7 +462,7 @@ class URLInput extends Component {
 			'aria-label': label ? undefined : __( 'URL' ), // Ensure input always has an accessible label
 			'aria-expanded': showSuggestions,
 			'aria-autocomplete': 'list',
-			'aria-owns': suggestionsListboxId,
+			'aria-controls': suggestionsListboxId,
 			'aria-activedescendant':
 				selectedSuggestion !== null
 					? `${ suggestionOptionIdPrefix }-${ selectedSuggestion }`

package/src/components/url-input/style.scss

@@ -45,9 +45,9 @@ $input-size: 300px;
 
 	.components-spinner {
 		position: absolute;
-		right: $input-padding;
-		bottom: $input-padding + $grid-unit-10 + 1;
 		margin: 0;
+		top: calc(50% - #{$spinner-size} / 2);
+		right: $grid-unit;
 	}
 }
 

package/src/components/url-popover/image-url-input-ui.js

@@ -51,6 +51,7 @@ const ImageURLInputUI = ( {
 	rel,
 } ) => {
 	const [ isOpen, setIsOpen ] = useState( false );
+	const buttonRef = useRef( null );
 	const openLinkUI = useCallback( () => {
 		setIsOpen( true );
 	} );
@@ -245,9 +246,11 @@ const ImageURLInputUI = ( {
 				label={ url ? __( 'Edit link' ) : __( 'Insert link' ) }
 				aria-expanded={ isOpen }
 				onClick={ openLinkUI }
+				ref={ buttonRef }
 			/>
 			{ isOpen && (
 				<URLPopover
+					anchorRef={ buttonRef }
 					onFocusOutside={ onFocusOutside() }
 					onClose={ closeLinkUI }
 					renderSettings={ () => advancedOptions }

package/src/components/url-popover/style.scss

@@ -72,9 +72,6 @@
 	.block-editor-url-input .components-base-control__field {
 		margin-bottom: 0;
 	}
-	.block-editor-url-input .components-spinner {
-		bottom: $input-padding + 1;
-	}
 }
 
 .block-editor-url-popover__link-viewer-url {

package/src/components/writing-flow/use-arrow-nav.js

@@ -17,7 +17,7 @@ import { useRefEffect } from '@wordpress/compose';
 /**
  * Internal dependencies
  */
-import { isInSameBlock } from '../../utils/dom';
+import { getBlockClientId } from '../../utils/dom';
 import { store as blockEditorStore } from '../../store';
 
 /**
@@ -130,11 +130,8 @@ export function getClosestTabbable(
 
 export default function useArrowNav() {
 	const {
-		getSelectedBlockClientId,
 		getMultiSelectedBlocksStartClientId,
 		getMultiSelectedBlocksEndClientId,
-		getPreviousBlockClientId,
-		getNextBlockClientId,
 		getSettings,
 		hasMultiSelection,
 		__unstableIsFullySelected,
@@ -150,26 +147,13 @@ export default function useArrowNav() {
 			verticalRect = null;
 		}
 
-		/**
-		 * Returns true if the given target field is the last in its block which
-		 * can be considered for tab transition. For example, in a block with
-		 * two text fields, this would return true when reversing from the first
-		 * of the two fields, but false when reversing from the second.
-		 *
-		 * @param {Element} target    Currently focused text field.
-		 * @param {boolean} isReverse True if considering as the first field.
-		 *
-		 * @return {boolean} Whether field is at edge for tab transition.
-		 */
-		function isTabbableEdge( target, isReverse ) {
+		function isClosestTabbableABlock( target, isReverse ) {
 			const closestTabbable = getClosestTabbable(
 				target,
 				isReverse,
 				node
 			);
-			return (
-				! closestTabbable || ! isInSameBlock( target, closestTabbable )
-			);
+			return closestTabbable && getBlockClientId( closestTabbable );
 		}
 
 		function onKeyDown( event ) {
@@ -254,23 +238,10 @@ export default function useArrowNav() {
 			// next, which is the exact reverse of LTR.
 			const isReverseDir = isRTL( target ) ? ! isReverse : isReverse;
 			const { keepCaretInsideBlock } = getSettings();
-			const selectedBlockClientId = getSelectedBlockClientId();
 
 			if ( isShift ) {
-				const selectionEndClientId =
-					getMultiSelectedBlocksEndClientId();
-				const selectionBeforeEndClientId = getPreviousBlockClientId(
-					selectionEndClientId || selectedBlockClientId
-				);
-				const selectionAfterEndClientId = getNextBlockClientId(
-					selectionEndClientId || selectedBlockClientId
-				);
-
 				if (
-					// Ensure that there is a target block.
-					( ( isReverse && selectionBeforeEndClientId ) ||
-						( ! isReverse && selectionAfterEndClientId ) ) &&
-					isTabbableEdge( target, isReverse ) &&
+					isClosestTabbableABlock( target, isReverse ) &&
 					isNavEdge( target, isReverse )
 				) {
 					node.contentEditable = true;

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

@@ -27,7 +27,7 @@ function setContentEditableWrapper( node, value ) {
 export default function useDragSelection() {
 	const { startMultiSelect, stopMultiSelect } =
 		useDispatch( blockEditorStore );
-	const { isSelectionEnabled, hasMultiSelection } =
+	const { isSelectionEnabled, hasMultiSelection, isDraggingBlocks } =
 		useSelect( blockEditorStore );
 	return useRefEffect(
 		( node ) => {
@@ -72,6 +72,12 @@ export default function useDragSelection() {
 			}
 
 			function onMouseLeave( { buttons, target } ) {
+				// Avoid triggering a multi-selection if the user is already
+				// dragging blocks.
+				if ( isDraggingBlocks() ) {
+					return;
+				}
+
 				// The primary button must be pressed to initiate selection.
 				// See https://developer.mozilla.org/en-US/docs/Web/API/MouseEvent/buttons
 				if ( buttons !== 1 ) {

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

@@ -75,8 +75,11 @@ export default function useMultiSelection() {
 			// able to select across instances immediately.
 			node.contentEditable = true;
 
-			defaultView.getSelection().removeAllRanges();
+			// For some browsers, like Safari, it is important that focus
+			// happens BEFORE selection removal.
 			node.focus();
+
+			defaultView.getSelection().removeAllRanges();
 		},
 		[
 			hasMultiSelection,

package/src/components/writing-flow/use-select-all.js

@@ -19,7 +19,7 @@ import { store as blockEditorStore } from '../../store';
 export default function useSelectAll() {
 	const { getBlockOrder, getSelectedBlockClientIds, getBlockRootClientId } =
 		useSelect( blockEditorStore );
-	const { multiSelect } = useDispatch( blockEditorStore );
+	const { multiSelect, selectBlock } = useDispatch( blockEditorStore );
 	const isMatch = useShortcutEventMatch();
 
 	return useRefEffect( ( node ) => {
@@ -53,6 +53,7 @@ export default function useSelectAll() {
 			const lastClientId = last( blockClientIds );
 
 			if ( firstClientId === lastClientId ) {
+				selectBlock( firstClientId );
 				return;
 			}