@wordpress/block-editor 12.18.1 → 12.19.0

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

@@ -4,6 +4,7 @@
 import {
 	BaseControl,
 	__experimentalHStack as HStack,
+	__experimentalVStack as VStack,
 } from '@wordpress/components';
 import { useState } from '@wordpress/element';
 import { __, _x, sprintf } from '@wordpress/i18n';
@@ -114,7 +115,7 @@ export default function SpacingSizesControl( {
 					/>
 				) }
 			</HStack>
-			{ renderControls() }
+			<VStack spacing={ 0.5 }>{ renderControls() }</VStack>
 		</fieldset>
 	);
 }

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

@@ -15,11 +15,13 @@ $input-size: 300px;
 			width: $input-size;
 		}
 		padding: $input-padding;
-		border: none;
-		border-radius: 0;
 		margin-left: 0;
 		margin-right: 0;
 
+		&:not(:focus) {
+			border-color: transparent;
+		}
+
 		/* Fonts smaller than 16px causes mobile safari to zoom. */
 		font-size: $mobile-text-min-font-size;
 		@include break-small {

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

@@ -2,19 +2,25 @@
  * WordPress dependencies
  */
 import { __ } from '@wordpress/i18n';
-import { useRef, useState } from '@wordpress/element';
+import { useRef, useEffect, useState } from '@wordpress/element';
+import { focus } from '@wordpress/dom';
 import {
 	ToolbarButton,
-	Button,
 	NavigableMenu,
+	Button,
 	MenuItem,
 	ToggleControl,
 	TextControl,
-	SVG,
-	Path,
 	__experimentalVStack as VStack,
 } from '@wordpress/components';
-import { link as linkIcon, close } from '@wordpress/icons';
+import {
+	Icon,
+	link as linkIcon,
+	image,
+	page,
+	fullscreen,
+	linkOff,
+} from '@wordpress/icons';
 
 /**
  * Internal dependencies
@@ -27,14 +33,6 @@ const LINK_DESTINATION_MEDIA = 'media';
 const LINK_DESTINATION_ATTACHMENT = 'attachment';
 const NEW_TAB_REL = [ 'noreferrer', 'noopener' ];
 
-const icon = (
-	<SVG viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
-		<Path d="M0,0h24v24H0V0z" fill="none" />
-		<Path d="m19 5v14h-14v-14h14m0-2h-14c-1.1 0-2 0.9-2 2v14c0 1.1 0.9 2 2 2h14c1.1 0 2-0.9 2-2v-14c0-1.1-0.9-2-2-2z" />
-		<Path d="m14.14 11.86l-3 3.87-2.14-2.59-3 3.86h12l-3.86-5.14z" />
-	</SVG>
-);
-
 const ImageURLInputUI = ( {
 	linkDestination,
 	onChangeUrl,
@@ -45,6 +43,9 @@ const ImageURLInputUI = ( {
 	linkTarget,
 	linkClass,
 	rel,
+	showLightboxSetting,
+	lightboxEnabled,
+	onSetLightbox,
 } ) => {
 	const [ isOpen, setIsOpen ] = useState( false );
 	// Use internal state instead of a ref to make sure that the component
@@ -58,6 +59,17 @@ const ImageURLInputUI = ( {
 	const [ urlInput, setUrlInput ] = useState( null );
 
 	const autocompleteRef = useRef( null );
+	const wrapperRef = useRef();
+
+	useEffect( () => {
+		if ( ! wrapperRef.current ) {
+			return;
+		}
+		const nextFocusTarget =
+			focus.focusable.find( wrapperRef.current )[ 0 ] ||
+			wrapperRef.current;
+		nextFocusTarget.focus();
+	}, [ isEditingLink, url, lightboxEnabled ] );
 
 	const startEditLink = () => {
 		if (
@@ -138,6 +150,7 @@ const ImageURLInputUI = ( {
 				onChangeUrl( {
 					href: urlInput,
 					linkDestination: selectedDestination,
+					lightbox: { enabled: false },
 				} );
 			}
 			stopEditLink();
@@ -157,22 +170,17 @@ const ImageURLInputUI = ( {
 		const linkDestinations = [
 			{
 				linkDestination: LINK_DESTINATION_MEDIA,
-				title: __( 'Media File' ),
+				title: __( 'Link to image file' ),
 				url: mediaType === 'image' ? mediaUrl : undefined,
-				icon,
+				icon: image,
 			},
 		];
 		if ( mediaType === 'image' && mediaLink ) {
 			linkDestinations.push( {
 				linkDestination: LINK_DESTINATION_ATTACHMENT,
-				title: __( 'Attachment Page' ),
+				title: __( 'Link to attachment page' ),
 				url: mediaType === 'image' ? mediaLink : undefined,
-				icon: (
-					<SVG viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
-						<Path d="M0 0h24v24H0V0z" fill="none" />
-						<Path d="M14 2H6c-1.1 0-1.99.9-1.99 2L4 20c0 1.1.89 2 1.99 2H18c1.1 0 2-.9 2-2V8l-6-6zM6 20V4h7v5h5v11H6z" />
-					</SVG>
-				),
+				icon: page,
 			} );
 		}
 		return linkDestinations;
@@ -225,7 +233,7 @@ const ImageURLInputUI = ( {
 			/>
 			<TextControl
 				__nextHasNoMarginBottom
-				label={ __( 'Link CSS Class' ) }
+				label={ __( 'Link CSS class' ) }
 				value={ linkClass || '' }
 				onChange={ onSetLinkClass }
 			/>
@@ -233,6 +241,7 @@ const ImageURLInputUI = ( {
 	);
 
 	const linkEditorValue = urlInput !== null ? urlInput : url;
+	const showLinkEditor = ( ! linkEditorValue && ! lightboxEnabled ) === true;
 
 	const urlLabel = (
 		getLinkDestinations().find(
@@ -245,25 +254,29 @@ const ImageURLInputUI = ( {
 			<ToolbarButton
 				icon={ linkIcon }
 				className="components-toolbar__control"
-				label={ url ? __( 'Edit link' ) : __( 'Insert link' ) }
+				label={ __( 'Link' ) }
 				aria-expanded={ isOpen }
 				onClick={ openLinkUI }
 				ref={ setPopoverAnchor }
-				isActive={ !! url }
+				isActive={ !! url || lightboxEnabled }
 			/>
 			{ isOpen && (
 				<URLPopover
+					ref={ wrapperRef }
 					anchor={ popoverAnchor }
 					onFocusOutside={ onFocusOutside() }
 					onClose={ closeLinkUI }
-					renderSettings={ () => advancedOptions }
+					renderSettings={
+						! lightboxEnabled ? () => advancedOptions : null
+					}
 					additionalControls={
-						! linkEditorValue && (
+						showLinkEditor && (
 							<NavigableMenu>
 								{ getLinkDestinations().map( ( link ) => (
 									<MenuItem
 										key={ link.linkDestination }
 										icon={ link.icon }
+										iconPosition="left"
 										onClick={ () => {
 											setUrlInput( null );
 											onSetHref( link.url );
@@ -273,20 +286,46 @@ const ImageURLInputUI = ( {
 										{ link.title }
 									</MenuItem>
 								) ) }
+								{ showLightboxSetting && (
+									<MenuItem
+										key="expand-on-click"
+										className="block-editor-url-popover__expand-on-click"
+										icon={ fullscreen }
+										info={ __(
+											'Scale the image with a lightbox effect.'
+										) }
+										iconPosition="left"
+										onClick={ () => {
+											setUrlInput( null );
+											onChangeUrl( {
+												linkDestination:
+													LINK_DESTINATION_NONE,
+												href: '',
+											} );
+											onSetLightbox( true );
+											stopEditLink();
+										} }
+									>
+										{ __( 'Expand on click' ) }
+									</MenuItem>
+								) }
 							</NavigableMenu>
 						)
 					}
+					offset={ 13 }
 				>
-					{ ( ! url || isEditingLink ) && (
-						<URLPopover.LinkEditor
-							className="block-editor-format-toolbar__link-container-content"
-							value={ linkEditorValue }
-							onChangeInputValue={ setUrlInput }
-							onSubmit={ onSubmitLinkChange() }
-							autocompleteRef={ autocompleteRef }
-						/>
+					{ ( ! url || isEditingLink ) && ! lightboxEnabled && (
+						<>
+							<URLPopover.LinkEditor
+								className="block-editor-format-toolbar__link-container-content"
+								value={ linkEditorValue }
+								onChangeInputValue={ setUrlInput }
+								onSubmit={ onSubmitLinkChange() }
+								autocompleteRef={ autocompleteRef }
+							/>
+						</>
 					) }
-					{ url && ! isEditingLink && (
+					{ url && ! isEditingLink && ! lightboxEnabled && (
 						<>
 							<URLPopover.LinkViewer
 								className="block-editor-format-toolbar__link-container-content"
@@ -295,12 +334,34 @@ const ImageURLInputUI = ( {
 								urlLabel={ urlLabel }
 							/>
 							<Button
-								icon={ close }
+								icon={ linkOff }
 								label={ __( 'Remove link' ) }
 								onClick={ onLinkRemove }
+								size="compact"
 							/>
 						</>
 					) }
+					{ ! url && ! isEditingLink && lightboxEnabled && (
+						<div className="block-editor-url-popover__expand-on-click">
+							<Icon icon={ fullscreen } />
+							<div className="text">
+								<p>{ __( 'Expand on click' ) }</p>
+								<p className="description">
+									{ __(
+										'Scales the image with a lightbox effect'
+									) }
+								</p>
+							</div>
+							<Button
+								icon={ linkOff }
+								label={ __( 'Disable expand on click' ) }
+								onClick={ () => {
+									onSetLightbox( false );
+								} }
+								size="compact"
+							/>
+						</div>
+					) }
 				</URLPopover>
 			) }
 		</>

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

@@ -2,7 +2,7 @@
  * WordPress dependencies
  */
 import { __ } from '@wordpress/i18n';
-import { useState } from '@wordpress/element';
+import { forwardRef, useState } from '@wordpress/element';
 import {
 	Button,
 	Popover,
@@ -24,81 +24,89 @@ const { __experimentalPopoverLegacyPositionToPlacement } = unlock(
 
 const DEFAULT_PLACEMENT = 'bottom';
 
-function URLPopover( {
-	additionalControls,
-	children,
-	renderSettings,
-	// The DEFAULT_PLACEMENT value is assigned inside the function's body
-	placement,
-	focusOnMount = 'firstElement',
-	// Deprecated
-	position,
-	// Rest
-	...popoverProps
-} ) {
-	if ( position !== undefined ) {
-		deprecated( '`position` prop in wp.blockEditor.URLPopover', {
-			since: '6.2',
-			alternative: '`placement` prop',
-		} );
-	}
+const URLPopover = forwardRef(
+	(
+		{
+			additionalControls,
+			children,
+			renderSettings,
+			// The DEFAULT_PLACEMENT value is assigned inside the function's body
+			placement,
+			focusOnMount = 'firstElement',
+			// Deprecated
+			position,
+			// Rest
+			...popoverProps
+		},
+		ref
+	) => {
+		if ( position !== undefined ) {
+			deprecated( '`position` prop in wp.blockEditor.URLPopover', {
+				since: '6.2',
+				alternative: '`placement` prop',
+			} );
+		}
 
-	// Compute popover's placement:
-	// - give priority to `placement` prop, if defined
-	// - otherwise, compute it from the legacy `position` prop (if defined)
-	// - finally, fallback to the DEFAULT_PLACEMENT.
-	let computedPlacement;
-	if ( placement !== undefined ) {
-		computedPlacement = placement;
-	} else if ( position !== undefined ) {
-		computedPlacement =
-			__experimentalPopoverLegacyPositionToPlacement( position );
-	}
-	computedPlacement = computedPlacement || DEFAULT_PLACEMENT;
+		// Compute popover's placement:
+		// - give priority to `placement` prop, if defined
+		// - otherwise, compute it from the legacy `position` prop (if defined)
+		// - finally, fallback to the DEFAULT_PLACEMENT.
+		let computedPlacement;
+		if ( placement !== undefined ) {
+			computedPlacement = placement;
+		} else if ( position !== undefined ) {
+			computedPlacement =
+				__experimentalPopoverLegacyPositionToPlacement( position );
+		}
+		computedPlacement = computedPlacement || DEFAULT_PLACEMENT;
 
-	const [ isSettingsExpanded, setIsSettingsExpanded ] = useState( false );
+		const [ isSettingsExpanded, setIsSettingsExpanded ] = useState( false );
 
-	const showSettings = !! renderSettings && isSettingsExpanded;
+		const showSettings = !! renderSettings && isSettingsExpanded;
 
-	const toggleSettingsVisibility = () => {
-		setIsSettingsExpanded( ! isSettingsExpanded );
-	};
+		const toggleSettingsVisibility = () => {
+			setIsSettingsExpanded( ! isSettingsExpanded );
+		};
 
-	return (
-		<Popover
-			className="block-editor-url-popover"
-			focusOnMount={ focusOnMount }
-			placement={ computedPlacement }
-			shift
-			{ ...popoverProps }
-		>
-			<div className="block-editor-url-popover__input-container">
-				<div className="block-editor-url-popover__row">
-					{ children }
-					{ !! renderSettings && (
-						<Button
-							className="block-editor-url-popover__settings-toggle"
-							icon={ chevronDown }
-							label={ __( 'Link settings' ) }
-							onClick={ toggleSettingsVisibility }
-							aria-expanded={ isSettingsExpanded }
-						/>
+		return (
+			<Popover
+				ref={ ref }
+				className="block-editor-url-popover"
+				focusOnMount={ focusOnMount }
+				placement={ computedPlacement }
+				shift
+				variant="toolbar"
+				{ ...popoverProps }
+			>
+				<div className="block-editor-url-popover__input-container">
+					<div className="block-editor-url-popover__row">
+						{ children }
+						{ !! renderSettings && (
+							<Button
+								className="block-editor-url-popover__settings-toggle"
+								icon={ chevronDown }
+								label={ __( 'Link settings' ) }
+								onClick={ toggleSettingsVisibility }
+								aria-expanded={ isSettingsExpanded }
+								size="compact"
+							/>
+						) }
+					</div>
+					{ showSettings && (
+						<div className="block-editor-url-popover__row block-editor-url-popover__settings">
+							{ renderSettings() }
+						</div>
 					) }
 				</div>
-				{ showSettings && (
-					<div className="block-editor-url-popover__row block-editor-url-popover__settings">
-						{ renderSettings() }
+				{ additionalControls && ! showSettings && (
+					<div className="block-editor-url-popover__additional-controls">
+						{ additionalControls }
 					</div>
 				) }
-			</div>
-			{ additionalControls && ! showSettings && (
-				<div className="block-editor-url-popover__additional-controls">
-					{ additionalControls }
-				</div>
-			) }
-		</Popover>
-	);
-}
+			</Popover>
+		);
+	}
+);
 
 URLPopover.LinkEditor = LinkEditor;
 

package/src/components/url-popover/link-editor.js

@@ -40,6 +40,7 @@ export default function LinkEditor( {
 				icon={ keyboardReturn }
 				label={ __( 'Apply' ) }
 				type="submit"
+				size="compact"
 			/>
 		</form>
 	);

package/src/components/url-popover/link-viewer.js

@@ -41,6 +41,7 @@ export default function LinkViewer( {
 					icon={ edit }
 					label={ __( 'Edit' ) }
 					onClick={ onEditLinkClick }
+					size="compact"
 				/>
 			) }
 		</div>

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

@@ -1,53 +1,38 @@
 .block-editor-url-popover__additional-controls {
-	border-top: $border-width solid $gray-300;
+	border-top: $border-width solid $gray-900;
+	padding: $grid-unit-10 $grid-unit-10;
 }
 
-.block-editor-url-popover__additional-controls > div[role="menu"] .components-button:not(:disabled):not([aria-disabled="true"]):not(.is-secondary) > svg {
-	box-shadow: none;
-}
-
-.block-editor-url-popover__additional-controls div[role="menu"] > .components-button {
-	padding-left: $grid-unit-15;
+.block-editor-url-popover__input-container {
+	padding: $grid-unit-10;
 }
 
 .block-editor-url-popover__row {
 	display: flex;
+	gap: $grid-unit-05;
 }
 
 // Any children of the popover-row that are not the settings-toggle
 // should take up as much space as possible.
 .block-editor-url-popover__row > :not(.block-editor-url-popover__settings-toggle) {
 	flex-grow: 1;
+	gap: $grid-unit-10;
 }
 
-// Mimic toolbar component styles for the icons in this popover.
-.block-editor-url-popover .components-button.has-icon {
-	padding: 3px;
+.block-editor-url-popover__additional-controls .components-button.has-icon {
+	padding-left: $grid-unit-10;
+	padding-right: $grid-unit-10;
+	height: auto;
+	text-align: left;
 
 	> svg {
-		padding: 5px;
-		border-radius: $radius-block-ui;
-		height: 30px;
-		width: 30px;
-	}
-
-	&:not(:disabled):focus {
-		box-shadow: none;
-
-		> svg {
-			@include block-toolbar-button-style__focus();
-		}
+		margin-right: $grid-unit-10;
 	}
 }
 
 .block-editor-url-popover__settings-toggle {
 	flex-shrink: 0;
 
-	// Add a left divider to the toggle button.
-	border-radius: 0;
-	border-left: $border-width solid $gray-300;
-	margin-left: 1px;
-
 	&[aria-expanded="true"] .dashicon {
 		transform: rotate(180deg);
 	}
@@ -56,7 +41,7 @@
 .block-editor-url-popover__settings {
 	display: block;
 	padding: $grid-unit-20;
-	border-top: $border-width solid $gray-300;
+	border-top: $border-width solid $gray-900;
 }
 
 .block-editor-url-popover__link-editor,
@@ -65,16 +50,42 @@
 }
 
 .block-editor-url-popover__link-viewer-url {
-	margin: $grid-unit-10 - $border-width;
+	display: flex;
+	align-items: center;
 	flex-grow: 1;
 	flex-shrink: 1;
 	overflow: hidden;
 	text-overflow: ellipsis;
 	white-space: nowrap;
-	min-width: 150px;
-	max-width: 500px;
+	margin-right: $grid-unit-10;
+	// Avoids the popover from growing too wide when the URL is long.
+	// See https://github.com/WordPress/gutenberg/issues/58599
+	max-width: $modal-min-width;
 
 	&.has-invalid-link {
 		color: $alert-red;
 	}
 }
+
+.block-editor-url-popover__expand-on-click {
+	display: flex;
+	align-items: center;
+	min-width: $modal-min-width;
+	white-space: nowrap;
+
+	.text {
+		flex-grow: 1;
+
+		p {
+			margin: 0;
+			// This ensures the text and help text is 32px, which with
+			// padding makes the popover same height as the block toolbar.
+			line-height: $grid-unit-20;
+
+			&.description {
+				color: $gray-700;
+				font-size: $helptext-font-size;
+			}
+		}
+	}
+}

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

@@ -23,6 +23,7 @@ import {
 	isPointWithinTopAndBottomBoundariesOfRect,
 } from '../../utils/math';
 import { store as blockEditorStore } from '../../store';
+import { unlock } from '../../lock-unlock';
 
 const THRESHOLD_DISTANCE = 30;
 const MINIMUM_HEIGHT_FOR_THRESHOLD = 120;
@@ -308,9 +309,14 @@ export default function useBlockDropZone( {
 		getDraggedBlockClientIds,
 		getBlockNamesByClientId,
 		getAllowedBlocks,
-	} = useSelect( blockEditorStore );
-	const { showInsertionPoint, hideInsertionPoint } =
-		useDispatch( blockEditorStore );
+		isDragging,
+	} = unlock( useSelect( blockEditorStore ) );
+	const {
+		showInsertionPoint,
+		hideInsertionPoint,
+		startDragging,
+		stopDragging,
+	} = unlock( useDispatch( blockEditorStore ) );
 
 	const onBlockDrop = useOnBlockDrop(
 		dropTarget.operation === 'before' || dropTarget.operation === 'after'
@@ -325,6 +331,11 @@ export default function useBlockDropZone( {
 	const throttled = useThrottle(
 		useCallback(
 			( event, ownerDocument ) => {
+				if ( ! isDragging() ) {
+					// When dragging from the desktop, no drag start event is fired.
+					// So, ensure that the drag state is set when the user drags over a drop zone.
+					startDragging();
+				}
 				const allowedBlocks = getAllowedBlocks( targetRootClientId );
 				const targetBlockName = getBlockNamesByClientId( [
 					targetRootClientId,
@@ -423,6 +434,8 @@ export default function useBlockDropZone( {
 				getBlockIndex,
 				registry,
 				showInsertionPoint,
+				isDragging,
+				startDragging,
 			]
 		),
 		200
@@ -444,6 +457,7 @@ export default function useBlockDropZone( {
 		},
 		onDragEnd() {
 			throttled.cancel();
+			stopDragging();
 			hideInsertionPoint();
 		},
 	} );