@wordpress/block-editor 12.18.1 → 12.18.2

package/build-style/style-rtl.css

@@ -128,11 +128,11 @@ iframe[name=editor-canvas] {
   display: block;
 }
 
-iframe[name=editor-canvas]:not(.has-history) {
+iframe[name=editor-canvas]:not(.has-editor-padding) {
   background-color: #fff;
 }
 
-iframe[name=editor-canvas].has-history {
+iframe[name=editor-canvas].has-editor-padding {
   padding: 48px 48px 0;
 }
 
@@ -2692,7 +2692,7 @@ iframe[name=editor-canvas].has-history {
   margin-bottom: 8px;
 }
 .block-editor-media-flow__url-input .block-editor-link-control {
-  width: 300px;
+  width: 200px;
 }
 .block-editor-media-flow__url-input .block-editor-link-control .block-editor-url-input {
   padding: 0;
@@ -3094,47 +3094,37 @@ iframe[name=editor-canvas].has-history {
 }
 
 .block-editor-url-popover__additional-controls {
-  border-top: 1px solid #ddd;
-}
-
-.block-editor-url-popover__additional-controls > div[role=menu] .components-button:not(:disabled):not([aria-disabled=true]):not(.is-secondary) > svg {
-  box-shadow: none;
+  border-top: 1px solid #1e1e1e;
+  padding: 8px 8px;
 }
 
-.block-editor-url-popover__additional-controls div[role=menu] > .components-button {
-  padding-right: 12px;
+.block-editor-url-popover__input-container {
+  padding: 8px;
+  padding-right: 16px;
 }
 
 .block-editor-url-popover__row {
   display: flex;
+  gap: 4px;
 }
 
 .block-editor-url-popover__row > :not(.block-editor-url-popover__settings-toggle) {
   flex-grow: 1;
+  gap: 4px;
 }
 
-.block-editor-url-popover .components-button.has-icon {
-  padding: 3px;
-}
-.block-editor-url-popover .components-button.has-icon > svg {
-  padding: 5px;
-  border-radius: 2px;
-  height: 30px;
-  width: 30px;
-}
-.block-editor-url-popover .components-button.has-icon:not(:disabled):focus {
-  box-shadow: none;
+.block-editor-url-popover__additional-controls .components-button.has-icon {
+  padding-right: 8px;
+  padding-left: 8px;
+  height: auto;
+  text-align: right;
 }
-.block-editor-url-popover .components-button.has-icon:not(:disabled):focus > svg {
-  box-shadow: inset 0 0 0 1px var(--wp-components-color-background, #fff), 0 0 0 var(--wp-admin-border-width-focus) var(--wp-components-color-accent, var(--wp-admin-theme-color, #3858e9));
-  outline: 2px solid transparent;
+.block-editor-url-popover__additional-controls .components-button.has-icon > svg {
+  margin-left: 8px;
 }
 
 .block-editor-url-popover__settings-toggle {
   flex-shrink: 0;
-  border-radius: 0;
-  border-right: 1px solid #ddd;
-  margin-right: 1px;
 }
 .block-editor-url-popover__settings-toggle[aria-expanded=true] .dashicon {
   transform: rotate(-180deg);
@@ -3143,7 +3133,7 @@ iframe[name=editor-canvas].has-history {
 .block-editor-url-popover__settings {
   display: block;
   padding: 16px;
-  border-top: 1px solid #ddd;
+  border-top: 1px solid #1e1e1e;
 }
 
 .block-editor-url-popover__link-editor,
@@ -3152,19 +3142,46 @@ iframe[name=editor-canvas].has-history {
 }
 
 .block-editor-url-popover__link-viewer-url {
-  margin: 7px;
+  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-left: 8px;
 }
 .block-editor-url-popover__link-viewer-url.has-invalid-link {
   color: #cc1818;
 }
 
+.block-editor-url-popover__expand-on-click {
+  display: flex;
+  align-items: center;
+  min-width: 350px;
+  overflow: hidden;
+  white-space: nowrap;
+}
+.block-editor-url-popover__expand-on-click .fullscreen-icon {
+  padding-left: 4px;
+}
+.block-editor-url-popover__expand-on-click .fullscreen-icon > svg {
+  width: 24px;
+  height: 24px;
+}
+.block-editor-url-popover__expand-on-click .text {
+  flex-grow: 1;
+}
+.block-editor-url-popover__expand-on-click .text p {
+  margin: 0;
+}
+.block-editor-url-popover__expand-on-click .description {
+  color: #949494;
+}
+.block-editor-url-popover__expand-on-click .remove-link {
+  margin-left: 8px;
+}
+
 .html-anchor-control .components-external-link {
   display: block;
   margin-top: 8px;

package/build-style/style.css

@@ -128,11 +128,11 @@ iframe[name=editor-canvas] {
   display: block;
 }
 
-iframe[name=editor-canvas]:not(.has-history) {
+iframe[name=editor-canvas]:not(.has-editor-padding) {
   background-color: #fff;
 }
 
-iframe[name=editor-canvas].has-history {
+iframe[name=editor-canvas].has-editor-padding {
   padding: 48px 48px 0;
 }
 
@@ -2693,7 +2693,7 @@ iframe[name=editor-canvas].has-history {
   margin-bottom: 8px;
 }
 .block-editor-media-flow__url-input .block-editor-link-control {
-  width: 300px;
+  width: 200px;
 }
 .block-editor-media-flow__url-input .block-editor-link-control .block-editor-url-input {
   padding: 0;
@@ -3095,47 +3095,37 @@ iframe[name=editor-canvas].has-history {
 }
 
 .block-editor-url-popover__additional-controls {
-  border-top: 1px solid #ddd;
-}
-
-.block-editor-url-popover__additional-controls > div[role=menu] .components-button:not(:disabled):not([aria-disabled=true]):not(.is-secondary) > svg {
-  box-shadow: none;
+  border-top: 1px solid #1e1e1e;
+  padding: 8px 8px;
 }
 
-.block-editor-url-popover__additional-controls div[role=menu] > .components-button {
-  padding-left: 12px;
+.block-editor-url-popover__input-container {
+  padding: 8px;
+  padding-left: 16px;
 }
 
 .block-editor-url-popover__row {
   display: flex;
+  gap: 4px;
 }
 
 .block-editor-url-popover__row > :not(.block-editor-url-popover__settings-toggle) {
   flex-grow: 1;
+  gap: 4px;
 }
 
-.block-editor-url-popover .components-button.has-icon {
-  padding: 3px;
-}
-.block-editor-url-popover .components-button.has-icon > svg {
-  padding: 5px;
-  border-radius: 2px;
-  height: 30px;
-  width: 30px;
-}
-.block-editor-url-popover .components-button.has-icon:not(:disabled):focus {
-  box-shadow: none;
+.block-editor-url-popover__additional-controls .components-button.has-icon {
+  padding-left: 8px;
+  padding-right: 8px;
+  height: auto;
+  text-align: left;
 }
-.block-editor-url-popover .components-button.has-icon:not(:disabled):focus > svg {
-  box-shadow: inset 0 0 0 1px var(--wp-components-color-background, #fff), 0 0 0 var(--wp-admin-border-width-focus) var(--wp-components-color-accent, var(--wp-admin-theme-color, #3858e9));
-  outline: 2px solid transparent;
+.block-editor-url-popover__additional-controls .components-button.has-icon > svg {
+  margin-right: 8px;
 }
 
 .block-editor-url-popover__settings-toggle {
   flex-shrink: 0;
-  border-radius: 0;
-  border-left: 1px solid #ddd;
-  margin-left: 1px;
 }
 .block-editor-url-popover__settings-toggle[aria-expanded=true] .dashicon {
   transform: rotate(180deg);
@@ -3144,7 +3134,7 @@ iframe[name=editor-canvas].has-history {
 .block-editor-url-popover__settings {
   display: block;
   padding: 16px;
-  border-top: 1px solid #ddd;
+  border-top: 1px solid #1e1e1e;
 }
 
 .block-editor-url-popover__link-editor,
@@ -3153,19 +3143,46 @@ iframe[name=editor-canvas].has-history {
 }
 
 .block-editor-url-popover__link-viewer-url {
-  margin: 7px;
+  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: 8px;
 }
 .block-editor-url-popover__link-viewer-url.has-invalid-link {
   color: #cc1818;
 }
 
+.block-editor-url-popover__expand-on-click {
+  display: flex;
+  align-items: center;
+  min-width: 350px;
+  overflow: hidden;
+  white-space: nowrap;
+}
+.block-editor-url-popover__expand-on-click .fullscreen-icon {
+  padding-right: 4px;
+}
+.block-editor-url-popover__expand-on-click .fullscreen-icon > svg {
+  width: 24px;
+  height: 24px;
+}
+.block-editor-url-popover__expand-on-click .text {
+  flex-grow: 1;
+}
+.block-editor-url-popover__expand-on-click .text p {
+  margin: 0;
+}
+.block-editor-url-popover__expand-on-click .description {
+  color: #949494;
+}
+.block-editor-url-popover__expand-on-click .remove-link {
+  margin-right: 8px;
+}
+
 .html-anchor-control .components-external-link {
   display: block;
   margin-top: 8px;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/block-editor",
-	"version": "12.18.1",
+	"version": "12.18.2",
 	"description": "Generic block editor.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
@@ -87,5 +87,5 @@
 	"publishConfig": {
 		"access": "public"
 	},
-	"gitHead": "c2f6d07ffab7d68b9ac3c423ce7e11af91f6e45e"
+	"gitHead": "fefb6f718fbfd5df9390f366d5733369f613084a"
 }

package/src/components/block-canvas/style.scss

@@ -4,10 +4,10 @@ iframe[name="editor-canvas"] {
 	display: block;
 }
 
-iframe[name="editor-canvas"]:not(.has-history) {
+iframe[name="editor-canvas"]:not(.has-editor-padding) {
 	background-color: $white;
 }
 
-iframe[name="editor-canvas"].has-history {
+iframe[name="editor-canvas"].has-editor-padding {
 	padding: $grid-unit-60 $grid-unit-60 0;
 }

package/src/components/global-styles/hooks.js

@@ -67,7 +67,6 @@ const VALID_SETTINGS = [
 	'spacing.units',
 	'typography.fluid',
 	'typography.customFontSize',
-	'typography.defaultFontSizes',
 	'typography.dropCap',
 	'typography.fontFamilies',
 	'typography.fontSizes',
@@ -240,7 +239,6 @@ export function useSettingsForBlockElement(
 				...updatedSettings.typography,
 				fontSizes: {},
 				customFontSize: false,
-				defaultFontSizes: false,
 			};
 		}
 

package/src/components/global-styles/typography-panel.js

@@ -22,7 +22,7 @@ import TextTransformControl from '../text-transform-control';
 import TextDecorationControl from '../text-decoration-control';
 import WritingModeControl from '../writing-mode-control';
 import { getValueFromVariable, TOOLSPANEL_DROPDOWNMENU_PROPS } from './utils';
-import { setImmutably, uniqByProperty } from '../../utils/object';
+import { setImmutably } from '../../utils/object';
 
 const MIN_TEXT_COLUMNS = 1;
 const MAX_TEXT_COLUMNS = 6;
@@ -53,10 +53,7 @@ export function useHasTypographyPanel( settings ) {
 
 function useHasFontSizeControl( settings ) {
 	return (
-		( settings?.typography?.defaultFontSizes !== false &&
-			settings?.typography?.fontSizes?.default?.length ) ||
-		settings?.typography?.fontSizes?.theme?.length ||
-		settings?.typography?.fontSizes?.custom?.length ||
+		hasMergedOrigins( settings?.typography?.fontSizes ) ||
 		settings?.typography?.customFontSize
 	);
 }
@@ -103,45 +100,16 @@ function useHasTextColumnsControl( settings ) {
 	return settings?.typography?.textColumns;
 }
 
-/**
- * TODO: The reversing and filtering of default font sizes is a hack so the
- * dropdown UI matches what is generated in the global styles CSS stylesheet.
- *
- * This is a temporary solution until #57733 is resolved. At which point,
- * the mergedFontSizes would just need to be the concatenated array of all
- * presets or a custom dropdown with sections for each.
- *
- * @see {@link https://github.com/WordPress/gutenberg/issues/57733}
- *
- * @param {Object} settings The global styles settings.
- *
- * @return {Array} The merged font sizes.
- */
-function getMergedFontSizes( settings ) {
-	// The font size presets are merged in reverse order so that the duplicates
-	// that may defined later in the array have higher priority to match the CSS.
-	const mergedFontSizesAll = uniqByProperty(
-		[
-			settings?.typography?.fontSizes?.custom,
-			settings?.typography?.fontSizes?.theme,
-			settings?.typography?.fontSizes?.default,
-		].flatMap( ( presets ) => presets?.toReversed() ?? [] ),
-		'slug'
-	).reverse();
-
-	// Default presets exist in the global styles CSS no matter the setting, so
-	// filtering them out in the UI has to be done after merging.
-	const mergedFontSizes =
-		settings?.typography?.defaultFontSizes === false
-			? mergedFontSizesAll.filter(
-					( { slug } ) =>
-						! [ 'small', 'medium', 'large', 'x-large' ].includes(
-							slug
-						)
-			  )
-			: mergedFontSizesAll;
-
-	return mergedFontSizes;
+function getUniqueFontSizesBySlug( settings ) {
+	const fontSizes = settings?.typography?.fontSizes;
+	const mergedFontSizes = fontSizes ? mergeOrigins( fontSizes ) : [];
+	const uniqueSizes = [];
+	for ( const currentSize of mergedFontSizes ) {
+		if ( ! uniqueSizes.some( ( { slug } ) => slug === currentSize.slug ) ) {
+			uniqueSizes.push( currentSize );
+		}
+	}
+	return uniqueSizes;
 }
 
 function TypographyToolsPanel( {
@@ -217,7 +185,7 @@ export default function TypographyPanel( {
 	// Font Size
 	const hasFontSizeEnabled = useHasFontSizeControl( settings );
 	const disableCustomFontSizes = ! settings?.typography?.customFontSize;
-	const mergedFontSizes = getMergedFontSizes( settings );
+	const mergedFontSizes = getUniqueFontSizesBySlug( settings );
 
 	const fontSize = decodeValue( inheritedValue?.typography?.fontSize );
 	const setFontSize = ( newValue, metadata ) => {

package/src/components/media-replace-flow/style.scss

@@ -27,7 +27,7 @@
 	}
 
 	.block-editor-link-control {
-		width: 300px; // Hardcoded width avoids resizing of control when switching between preview/edit.
+		width: 200px; // Hardcoded width avoids resizing of control when switching between preview/edit.
 
 		.block-editor-url-input {
 			padding: 0; // Cancel unnecessary default 1px padding in this case.

package/src/components/rich-text/index.js

@@ -160,8 +160,7 @@ export function RichTextWrapper(
 				if (
 					blockTypeAttributes?.[ attribute ]?.source ===
 						'rich-text' &&
-					getBlockBindingsSource( args.source.name )
-						?.lockAttributesEditing
+					getBlockBindingsSource( args.source )?.lockAttributesEditing
 				) {
 					shouldDisableEditing = true;
 					break;

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

@@ -6,15 +6,19 @@ import { useRef, useState } from '@wordpress/element';
 import {
 	ToolbarButton,
 	Button,
-	NavigableMenu,
 	MenuItem,
 	ToggleControl,
 	TextControl,
-	SVG,
-	Path,
+	MenuGroup,
 	__experimentalVStack as VStack,
 } from '@wordpress/components';
-import { link as linkIcon, close } from '@wordpress/icons';
+import {
+	link as linkIcon,
+	image,
+	page,
+	fullscreen,
+	linkOff,
+} from '@wordpress/icons';
 
 /**
  * Internal dependencies
@@ -27,14 +31,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 +41,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
@@ -138,6 +137,7 @@ const ImageURLInputUI = ( {
 				onChangeUrl( {
 					href: urlInput,
 					linkDestination: selectedDestination,
+					lightbox: { enabled: false },
 				} );
 			}
 			stopEditLink();
@@ -157,22 +157,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 +220,7 @@ const ImageURLInputUI = ( {
 			/>
 			<TextControl
 				__nextHasNoMarginBottom
-				label={ __( 'Link CSS Class' ) }
+				label={ __( 'Link CSS class' ) }
 				value={ linkClass || '' }
 				onChange={ onSetLinkClass }
 			/>
@@ -233,6 +228,7 @@ const ImageURLInputUI = ( {
 	);
 
 	const linkEditorValue = urlInput !== null ? urlInput : url;
+	const showLinkEditor = ( ! linkEditorValue && ! lightboxEnabled ) === true;
 
 	const urlLabel = (
 		getLinkDestinations().find(
@@ -245,7 +241,7 @@ const ImageURLInputUI = ( {
 			<ToolbarButton
 				icon={ linkIcon }
 				className="components-toolbar__control"
-				label={ url ? __( 'Edit link' ) : __( 'Insert link' ) }
+				label={ url ? __( 'Edit link' ) : __( 'Add link' ) }
 				aria-expanded={ isOpen }
 				onClick={ openLinkUI }
 				ref={ setPopoverAnchor }
@@ -256,14 +252,17 @@ const ImageURLInputUI = ( {
 					anchor={ popoverAnchor }
 					onFocusOutside={ onFocusOutside() }
 					onClose={ closeLinkUI }
-					renderSettings={ () => advancedOptions }
+					renderSettings={
+						! lightboxEnabled ? () => advancedOptions : null
+					}
 					additionalControls={
-						! linkEditorValue && (
-							<NavigableMenu>
+						showLinkEditor && (
+							<MenuGroup>
 								{ getLinkDestinations().map( ( link ) => (
 									<MenuItem
 										key={ link.linkDestination }
 										icon={ link.icon }
+										iconPosition="left"
 										onClick={ () => {
 											setUrlInput( null );
 											onSetHref( link.url );
@@ -273,20 +272,45 @@ const ImageURLInputUI = ( {
 										{ link.title }
 									</MenuItem>
 								) ) }
-							</NavigableMenu>
+								{ 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>
+								) }
+							</MenuGroup>
 						)
 					}
 				>
-					{ ( ! 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 +319,37 @@ 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">
+							<div className="fullscreen-icon">
+								{ fullscreen }
+							</div>
+							<div className="text">
+								<p>{ __( 'Expand on click' ) }</p>
+								<p className="description">
+									{ __(
+										'Scales the image with a lightbox effect'
+									) }
+								</p>
+							</div>
+							<Button
+								icon={ linkOff }
+								className="remove-link"
+								label={ __( 'Disable expand on click' ) }
+								onClick={ () => {
+									onSetLightbox( false );
+								} }
+								size="compact"
+							/>
+						</div>
+					) }
 				</URLPopover>
 			) }
 		</>

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

@@ -70,6 +70,7 @@ function URLPopover( {
 			focusOnMount={ focusOnMount }
 			placement={ computedPlacement }
 			shift
+			variant="toolbar"
 			{ ...popoverProps }
 		>
 			<div className="block-editor-url-popover__input-container">
@@ -82,6 +83,7 @@ function URLPopover( {
 							label={ __( 'Link settings' ) }
 							onClick={ toggleSettingsVisibility }
 							aria-expanded={ isSettingsExpanded }
+							size="compact"
 						/>
 					) }
 				</div>

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>
 	);