@wordpress/editor 13.6.0 → 13.8.0

package/src/components/post-taxonomies/hierarchical-term-selector.js

@@ -9,7 +9,8 @@ import {
 	TextControl,
 	TreeSelect,
 	withFilters,
-	__experimentalVStack as VStack,
+	Flex,
+	FlexItem,
 } from '@wordpress/components';
 import { useDispatch, useSelect } from '@wordpress/data';
 import { useDebounce } from '@wordpress/compose';
@@ -392,11 +393,10 @@ export function HierarchicalTermSelector( { slug } ) {
 	const showFilter = availableTerms.length >= MIN_TERMS_COUNT_FOR_FILTER;
 
 	return (
-		<>
+		<Flex direction="column" gap="4">
 			{ showFilter && (
 				<TextControl
 					__nextHasNoMarginBottom
-					className="editor-post-taxonomies__hierarchical-terms-filter"
 					label={ filterLabel }
 					value={ filterValue }
 					onChange={ setFilter }
@@ -413,18 +413,20 @@ export function HierarchicalTermSelector( { slug } ) {
 				) }
 			</div>
 			{ ! loading && hasCreateAction && (
-				<Button
-					onClick={ onToggleForm }
-					className="editor-post-taxonomies__hierarchical-terms-add"
-					aria-expanded={ showForm }
-					variant="link"
-				>
-					{ newTermButtonLabel }
-				</Button>
+				<FlexItem>
+					<Button
+						onClick={ onToggleForm }
+						className="editor-post-taxonomies__hierarchical-terms-add"
+						aria-expanded={ showForm }
+						variant="link"
+					>
+						{ newTermButtonLabel }
+					</Button>
+				</FlexItem>
 			) }
 			{ showForm && (
 				<form onSubmit={ onAddTerm }>
-					<VStack>
+					<Flex direction="column" gap="4">
 						<TextControl
 							__nextHasNoMarginBottom
 							className="editor-post-taxonomies__hierarchical-terms-input"
@@ -435,6 +437,7 @@ export function HierarchicalTermSelector( { slug } ) {
 						/>
 						{ !! availableTerms.length && (
 							<TreeSelect
+								__nextHasNoMarginBottom
 								label={ parentSelectLabel }
 								noOptionLabel={ noParentOption }
 								onChange={ onChangeFormParent }
@@ -442,17 +445,19 @@ export function HierarchicalTermSelector( { slug } ) {
 								tree={ availableTermsTree }
 							/>
 						) }
-					</VStack>
-					<Button
-						variant="secondary"
-						type="submit"
-						className="editor-post-taxonomies__hierarchical-terms-submit"
-					>
-						{ newTermSubmitLabel }
-					</Button>
+						<FlexItem>
+							<Button
+								variant="secondary"
+								type="submit"
+								className="editor-post-taxonomies__hierarchical-terms-submit"
+							>
+								{ newTermSubmitLabel }
+							</Button>
+						</FlexItem>
+					</Flex>
 				</form>
 			) }
-		</>
+		</Flex>
 	);
 }
 

package/src/components/post-taxonomies/style.scss

@@ -10,32 +10,17 @@
 }
 
 .editor-post-taxonomies__hierarchical-terms-choice {
-	margin-bottom: 8px;
+	margin-bottom: $grid-unit-10;
+	&:last-child {
+		margin-bottom: $grid-unit-05;
+	}
 }
 
 .editor-post-taxonomies__hierarchical-terms-subchoices {
-	margin-top: 8px;
+	margin-top: $grid-unit-10;
 	margin-left: $grid-unit-20;
 }
 
-.components-button.editor-post-taxonomies__hierarchical-terms-submit,
-.components-button.editor-post-taxonomies__hierarchical-terms-add {
-	margin-top: 12px;
-}
-
-.editor-post-taxonomies__hierarchical-terms-label {
-	display: inline-block;
-	margin-top: 12px;
-}
-
-.editor-post-taxonomies__hierarchical-terms-input {
-	margin-top: 8px;
-}
-.editor-post-taxonomies__hierarchical-terms-filter {
-	margin-bottom: 8px;
-	width: 100%;
-}
-
 .editor-post-taxonomies__flat-term-most-used {
 	.editor-post-taxonomies__flat-term-most-used-label {
 		margin-bottom: $grid-unit-05;

package/src/components/post-type-support-check/index.js

@@ -27,7 +27,7 @@ export function PostTypeSupportCheck( { postType, children, supportKeys } ) {
 	if ( postType ) {
 		isSupported = (
 			Array.isArray( supportKeys ) ? supportKeys : [ supportKeys ]
-		 ).some( ( key ) => !! postType.supports[ key ] );
+		).some( ( key ) => !! postType.supports[ key ] );
 	}
 
 	if ( ! isSupported ) {

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

@@ -61,7 +61,7 @@ export default function PostURL( { onClose } ) {
 							{ __( 'The last part of the URL.' ) }{ ' ' }
 							<ExternalLink
 								href={ __(
-									'https://wordpress.org/support/article/settings-sidebar/#permalink'
+									'https://wordpress.org/documentation/article/page-post-settings-sidebar/#permalink'
 								) }
 							>
 								{ __( 'Learn more.' ) }

package/src/components/theme-support-check/index.js

@@ -17,7 +17,7 @@ export function ThemeSupportCheck( {
 } ) {
 	const isSupported = (
 		Array.isArray( supportKeys ) ? supportKeys : [ supportKeys ]
-	 ).some( ( key ) => {
+	).some( ( key ) => {
 		const supported = themeSupports?.[ key ] ?? false;
 		// 'post-thumbnails' can be boolean or an array of post types.
 		// In the latter case, we need to verify `postType` exists

package/src/hooks/custom-sources-backwards-compatibility.js

@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import { mapValues, isEmpty } from 'lodash';
+import { isEmpty } from 'lodash';
 
 /**
  * WordPress dependencies
@@ -57,9 +57,13 @@ const createWithMetaAttributeSource = ( metaAttributes ) =>
 				const mergedAttributes = useMemo(
 					() => ( {
 						...attributes,
-						...mapValues(
-							metaAttributes,
-							( metaKey ) => meta[ metaKey ]
+						...Object.fromEntries(
+							Object.entries( metaAttributes ).map(
+								( [ attributeKey, metaKey ] ) => [
+									attributeKey,
+									meta[ metaKey ],
+								]
+							)
 						),
 					} ),
 					[ attributes, meta ]
@@ -106,13 +110,10 @@ const createWithMetaAttributeSource = ( metaAttributes ) =>
  */
 function shimAttributeSource( settings ) {
 	/** @type {WPMetaAttributeMapping} */
-	const metaAttributes = mapValues(
-		Object.fromEntries(
-			Object.entries( settings.attributes ?? {} ).filter(
-				( [ , { source } ] ) => source === 'meta'
-			)
-		),
-		'meta'
+	const metaAttributes = Object.fromEntries(
+		Object.entries( settings.attributes ?? {} )
+			.filter( ( [ , { source } ] ) => source === 'meta' )
+			.map( ( [ attributeKey, { meta } ] ) => [ attributeKey, meta ] )
 	);
 	if ( ! isEmpty( metaAttributes ) ) {
 		settings.edit = createWithMetaAttributeSource( metaAttributes )(

package/src/utils/terms.js

@@ -1,8 +1,3 @@
-/**
- * External dependencies
- */
-import { groupBy } from 'lodash';
-
 /**
  * WordPress dependencies
  */
@@ -24,10 +19,25 @@ export function buildTermsTree( flatTerms ) {
 		};
 	} );
 
-	const termsByParent = groupBy( flatTermsWithParentAndChildren, 'parent' );
-	if ( termsByParent.null && termsByParent.null.length ) {
+	// All terms should have a `parent` because we're about to index them by it.
+	if (
+		flatTermsWithParentAndChildren.some( ( { parent } ) => parent === null )
+	) {
 		return flatTermsWithParentAndChildren;
 	}
+
+	const termsByParent = flatTermsWithParentAndChildren.reduce(
+		( acc, term ) => {
+			const { parent } = term;
+			if ( ! acc[ parent ] ) {
+				acc[ parent ] = [];
+			}
+			acc[ parent ].push( term );
+			return acc;
+		},
+		{}
+	);
+
 	const fillWithChildren = ( terms ) => {
 		return terms.map( ( term ) => {
 			const children = termsByParent[ term.id ];