@wordpress/edit-site 6.35.2-next.dc3f6d3c1.0 → 6.36.1-next.6deb34194.0

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/edit-site",
-	"version": "6.35.2-next.dc3f6d3c1.0",
+	"version": "6.36.1-next.6deb34194.0",
 	"description": "Edit Site Page module for WordPress.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
@@ -40,50 +40,50 @@
 	],
 	"dependencies": {
 		"@react-spring/web": "^9.4.5",
-		"@wordpress/a11y": "^4.35.1-next.dc3f6d3c1.0",
-		"@wordpress/admin-ui": "^1.3.1-next.dc3f6d3c1.0",
-		"@wordpress/api-fetch": "^7.35.1-next.dc3f6d3c1.0",
-		"@wordpress/base-styles": "^6.11.1-next.dc3f6d3c1.0",
-		"@wordpress/blob": "^4.35.1-next.dc3f6d3c1.0",
-		"@wordpress/block-editor": "^15.8.1-next.dc3f6d3c1.0",
-		"@wordpress/block-library": "^9.35.1-next.dc3f6d3c1.0",
-		"@wordpress/blocks": "^15.8.1-next.dc3f6d3c1.0",
-		"@wordpress/commands": "^1.35.1-next.dc3f6d3c1.0",
-		"@wordpress/components": "^30.8.2-next.dc3f6d3c1.0",
-		"@wordpress/compose": "^7.35.1-next.dc3f6d3c1.0",
-		"@wordpress/core-data": "^7.35.1-next.dc3f6d3c1.0",
-		"@wordpress/data": "^10.35.1-next.dc3f6d3c1.0",
-		"@wordpress/dataviews": "^10.4.1-next.dc3f6d3c1.0",
-		"@wordpress/date": "^5.35.1-next.dc3f6d3c1.0",
-		"@wordpress/deprecated": "^4.35.1-next.dc3f6d3c1.0",
-		"@wordpress/dom": "^4.35.1-next.dc3f6d3c1.0",
-		"@wordpress/editor": "^14.35.2-next.dc3f6d3c1.0",
-		"@wordpress/element": "^6.35.1-next.dc3f6d3c1.0",
-		"@wordpress/escape-html": "^3.35.1-next.dc3f6d3c1.0",
-		"@wordpress/fields": "^0.27.1-next.dc3f6d3c1.0",
-		"@wordpress/global-styles-engine": "^1.2.1-next.dc3f6d3c1.0",
-		"@wordpress/global-styles-ui": "^1.2.1-next.dc3f6d3c1.0",
-		"@wordpress/hooks": "^4.35.1-next.dc3f6d3c1.0",
-		"@wordpress/html-entities": "^4.35.1-next.dc3f6d3c1.0",
-		"@wordpress/i18n": "^6.8.1-next.dc3f6d3c1.0",
-		"@wordpress/icons": "^11.2.1-next.dc3f6d3c1.0",
-		"@wordpress/keyboard-shortcuts": "^5.35.1-next.dc3f6d3c1.0",
-		"@wordpress/keycodes": "^4.35.1-next.dc3f6d3c1.0",
-		"@wordpress/media-utils": "^5.35.1-next.dc3f6d3c1.0",
-		"@wordpress/notices": "^5.35.1-next.dc3f6d3c1.0",
-		"@wordpress/patterns": "^2.35.1-next.dc3f6d3c1.0",
-		"@wordpress/plugins": "^7.35.1-next.dc3f6d3c1.0",
-		"@wordpress/preferences": "^4.35.1-next.dc3f6d3c1.0",
-		"@wordpress/primitives": "^4.35.1-next.dc3f6d3c1.0",
-		"@wordpress/private-apis": "^1.35.1-next.dc3f6d3c1.0",
-		"@wordpress/reusable-blocks": "^5.35.1-next.dc3f6d3c1.0",
-		"@wordpress/router": "^1.35.1-next.dc3f6d3c1.0",
-		"@wordpress/style-engine": "^2.35.1-next.dc3f6d3c1.0",
-		"@wordpress/url": "^4.35.1-next.dc3f6d3c1.0",
-		"@wordpress/viewport": "^6.35.1-next.dc3f6d3c1.0",
-		"@wordpress/views": "^1.2.1-next.dc3f6d3c1.0",
-		"@wordpress/widgets": "^4.35.1-next.dc3f6d3c1.0",
-		"@wordpress/wordcount": "^4.35.1-next.dc3f6d3c1.0",
+		"@wordpress/a11y": "^4.36.1-next.6deb34194.0",
+		"@wordpress/admin-ui": "^1.4.1-next.6deb34194.0",
+		"@wordpress/api-fetch": "^7.36.1-next.6deb34194.0",
+		"@wordpress/base-styles": "^6.12.1-next.6deb34194.0",
+		"@wordpress/blob": "^4.36.1-next.6deb34194.0",
+		"@wordpress/block-editor": "^15.9.1-next.6deb34194.0",
+		"@wordpress/block-library": "^9.36.1-next.6deb34194.0",
+		"@wordpress/blocks": "^15.9.1-next.6deb34194.0",
+		"@wordpress/commands": "^1.36.1-next.6deb34194.0",
+		"@wordpress/components": "^31.0.1-next.6deb34194.0",
+		"@wordpress/compose": "^7.36.1-next.6deb34194.0",
+		"@wordpress/core-data": "^7.36.1-next.6deb34194.0",
+		"@wordpress/data": "^10.36.1-next.6deb34194.0",
+		"@wordpress/dataviews": "^11.1.1-next.6deb34194.0",
+		"@wordpress/date": "^5.36.1-next.6deb34194.0",
+		"@wordpress/deprecated": "^4.36.1-next.6deb34194.0",
+		"@wordpress/dom": "^4.36.1-next.6deb34194.0",
+		"@wordpress/editor": "^14.36.1-next.6deb34194.0",
+		"@wordpress/element": "^6.36.1-next.6deb34194.0",
+		"@wordpress/escape-html": "^3.36.1-next.6deb34194.0",
+		"@wordpress/fields": "^0.28.1-next.6deb34194.0",
+		"@wordpress/global-styles-engine": "^1.3.1-next.6deb34194.0",
+		"@wordpress/global-styles-ui": "^1.3.1-next.6deb34194.0",
+		"@wordpress/hooks": "^4.36.1-next.6deb34194.0",
+		"@wordpress/html-entities": "^4.36.1-next.6deb34194.0",
+		"@wordpress/i18n": "^6.9.1-next.6deb34194.0",
+		"@wordpress/icons": "^11.3.1-next.6deb34194.0",
+		"@wordpress/keyboard-shortcuts": "^5.36.1-next.6deb34194.0",
+		"@wordpress/keycodes": "^4.36.1-next.6deb34194.0",
+		"@wordpress/media-utils": "^5.36.1-next.6deb34194.0",
+		"@wordpress/notices": "^5.36.1-next.6deb34194.0",
+		"@wordpress/patterns": "^2.36.1-next.6deb34194.0",
+		"@wordpress/plugins": "^7.36.1-next.6deb34194.0",
+		"@wordpress/preferences": "^4.36.1-next.6deb34194.0",
+		"@wordpress/primitives": "^4.36.1-next.6deb34194.0",
+		"@wordpress/private-apis": "^1.36.1-next.6deb34194.0",
+		"@wordpress/reusable-blocks": "^5.36.1-next.6deb34194.0",
+		"@wordpress/router": "^1.36.1-next.6deb34194.0",
+		"@wordpress/style-engine": "^2.36.1-next.6deb34194.0",
+		"@wordpress/url": "^4.36.1-next.6deb34194.0",
+		"@wordpress/viewport": "^6.36.1-next.6deb34194.0",
+		"@wordpress/views": "^1.3.1-next.6deb34194.0",
+		"@wordpress/widgets": "^4.36.1-next.6deb34194.0",
+		"@wordpress/wordcount": "^4.36.1-next.6deb34194.0",
 		"change-case": "^4.1.2",
 		"clsx": "^2.1.1",
 		"colord": "^2.9.2",
@@ -98,5 +98,5 @@
 	"publishConfig": {
 		"access": "public"
 	},
-	"gitHead": "f73b5e69b34fbaccfb8c47783f4f993059ff1a41"
+	"gitHead": "457096e9e9b3896d2d4fe54fc19d7fb571ee9a44"
 }

package/src/components/add-new-template-legacy/add-custom-generic-template-modal-content.js

@@ -0,0 +1,94 @@
+/**
+ * External dependencies
+ */
+import { paramCase as kebabCase } from 'change-case';
+
+/**
+ * WordPress dependencies
+ */
+import { useState, useEffect, useRef } from '@wordpress/element';
+import { __ } from '@wordpress/i18n';
+import {
+	Button,
+	TextControl,
+	__experimentalHStack as HStack,
+	__experimentalVStack as VStack,
+} from '@wordpress/components';
+
+function AddCustomGenericTemplateModalContent( { createTemplate, onBack } ) {
+	const [ title, setTitle ] = useState( '' );
+	const defaultTitle = __( 'Custom Template' );
+	const [ isBusy, setIsBusy ] = useState( false );
+	const inputRef = useRef();
+
+	// Set focus to the name input when the component mounts
+	useEffect( () => {
+		if ( inputRef.current ) {
+			inputRef.current.focus();
+		}
+	}, [] );
+
+	async function onCreateTemplate( event ) {
+		event.preventDefault();
+		if ( isBusy ) {
+			return;
+		}
+		setIsBusy( true );
+		try {
+			await createTemplate(
+				{
+					slug:
+						kebabCase( title || defaultTitle ) ||
+						'wp-custom-template',
+					title: title || defaultTitle,
+				},
+				false
+			);
+		} finally {
+			setIsBusy( false );
+		}
+	}
+	return (
+		<form onSubmit={ onCreateTemplate }>
+			<VStack spacing={ 6 }>
+				<TextControl
+					__next40pxDefaultSize
+					__nextHasNoMarginBottom
+					label={ __( 'Name' ) }
+					value={ title }
+					onChange={ setTitle }
+					placeholder={ defaultTitle }
+					disabled={ isBusy }
+					ref={ inputRef }
+					help={ __(
+						// eslint-disable-next-line no-restricted-syntax -- 'sidebar' is a common web design term for layouts
+						'Describe the template, e.g. "Post with sidebar". A custom template can be manually applied to any post or page.'
+					) }
+				/>
+				<HStack
+					className="edit-site-custom-generic-template__modal-actions"
+					justify="right"
+				>
+					<Button
+						__next40pxDefaultSize
+						variant="tertiary"
+						onClick={ onBack }
+					>
+						{ __( 'Back' ) }
+					</Button>
+					<Button
+						__next40pxDefaultSize
+						variant="primary"
+						type="submit"
+						isBusy={ isBusy }
+						aria-disabled={ isBusy }
+					>
+						{ __( 'Create' ) }
+					</Button>
+				</HStack>
+			</VStack>
+		</form>
+	);
+}
+
+export default AddCustomGenericTemplateModalContent;

package/src/components/add-new-template-legacy/add-custom-template-modal-content.js

@@ -0,0 +1,314 @@
+/**
+ * WordPress dependencies
+ */
+import { useState, useMemo, useEffect } from '@wordpress/element';
+import { __ } from '@wordpress/i18n';
+import {
+	Button,
+	Flex,
+	FlexItem,
+	SearchControl,
+	TextHighlight,
+	Composite,
+	__experimentalText as Text,
+	__experimentalVStack as VStack,
+} from '@wordpress/components';
+import { useEntityRecords } from '@wordpress/core-data';
+import { decodeEntities } from '@wordpress/html-entities';
+import { useDebouncedInput } from '@wordpress/compose';
+import { focus } from '@wordpress/dom';
+import { safeDecodeURI } from '@wordpress/url';
+
+/**
+ * Internal dependencies
+ */
+import { mapToIHasNameAndId } from './utils';
+
+const EMPTY_ARRAY = [];
+
+function SuggestionListItem( {
+	suggestion,
+	search,
+	onSelect,
+	entityForSuggestions,
+} ) {
+	const baseCssClass =
+		'edit-site-custom-template-modal__suggestions_list__list-item';
+	return (
+		<Composite.Item
+			render={
+				<Button
+					__next40pxDefaultSize
+					role="option"
+					className={ baseCssClass }
+					onClick={ () =>
+						onSelect(
+							entityForSuggestions.config.getSpecificTemplate(
+								suggestion
+							)
+						)
+					}
+				/>
+			}
+		>
+			<Text
+				size="body"
+				lineHeight={ 1.53846153846 } // 20px
+				weight={ 500 }
+				className={ `${ baseCssClass }__title` }
+			>
+				<TextHighlight
+					text={ decodeEntities( suggestion.name ) }
+					highlight={ search }
+				/>
+			</Text>
+			{ suggestion.link && (
+				<Text
+					size="body"
+					lineHeight={ 1.53846153846 } // 20px
+					className={ `${ baseCssClass }__info` }
+				>
+					{ safeDecodeURI( suggestion.link ) }
+				</Text>
+			) }
+		</Composite.Item>
+	);
+}
+
+function useSearchSuggestions( entityForSuggestions, search ) {
+	const { config } = entityForSuggestions;
+	const query = useMemo(
+		() => ( {
+			order: 'asc',
+			context: 'view',
+			search,
+			per_page: search ? 20 : 10,
+			...config.queryArgs( search ),
+		} ),
+		[ search, config ]
+	);
+	const { records: searchResults, hasResolved: searchHasResolved } =
+		useEntityRecords(
+			entityForSuggestions.type,
+			entityForSuggestions.slug,
+			query
+		);
+	const [ suggestions, setSuggestions ] = useState( EMPTY_ARRAY );
+	useEffect( () => {
+		if ( ! searchHasResolved ) {
+			return;
+		}
+		let newSuggestions = EMPTY_ARRAY;
+		if ( searchResults?.length ) {
+			newSuggestions = searchResults;
+			if ( config.recordNamePath ) {
+				newSuggestions = mapToIHasNameAndId(
+					newSuggestions,
+					config.recordNamePath
+				);
+			}
+		}
+		// Update suggestions only when the query has resolved, so as to keep
+		// the previous results in the UI.
+		setSuggestions( newSuggestions );
+	}, [ searchResults, searchHasResolved ] );
+	return suggestions;
+}
+
+function SuggestionList( { entityForSuggestions, onSelect } ) {
+	const [ search, setSearch, debouncedSearch ] = useDebouncedInput();
+	const suggestions = useSearchSuggestions(
+		entityForSuggestions,
+		debouncedSearch
+	);
+	const { labels } = entityForSuggestions;
+	const [ showSearchControl, setShowSearchControl ] = useState( false );
+	if ( ! showSearchControl && suggestions?.length > 9 ) {
+		setShowSearchControl( true );
+	}
+	return (
+		<>
+			{ showSearchControl && (
+				<SearchControl
+					__nextHasNoMarginBottom
+					onChange={ setSearch }
+					value={ search }
+					label={ labels.search_items }
+					placeholder={ labels.search_items }
+				/>
+			) }
+			{ !! suggestions?.length && (
+				<Composite
+					orientation="vertical"
+					role="listbox"
+					className="edit-site-custom-template-modal__suggestions_list"
+					aria-label={ __( 'Suggestions list' ) }
+				>
+					{ suggestions.map( ( suggestion ) => (
+						<SuggestionListItem
+							key={ suggestion.slug }
+							suggestion={ suggestion }
+							search={ debouncedSearch }
+							onSelect={ onSelect }
+							entityForSuggestions={ entityForSuggestions }
+						/>
+					) ) }
+				</Composite>
+			) }
+			{ debouncedSearch && ! suggestions?.length && (
+				<Text
+					as="p"
+					className="edit-site-custom-template-modal__no-results"
+				>
+					{ labels.not_found }
+				</Text>
+			) }
+		</>
+	);
+}
+
+function AddCustomTemplateModalContent( {
+	onSelect,
+	entityForSuggestions,
+	onBack,
+	containerRef,
+} ) {
+	const [ showSearchEntities, setShowSearchEntities ] = useState(
+		entityForSuggestions.hasGeneralTemplate
+	);
+
+	// Focus on the first focusable element when the modal opens.
+	// We handle focus management in the parent modal, just need to focus on the first focusable element.
+	useEffect( () => {
+		if ( containerRef.current ) {
+			const [ firstFocusable ] = focus.focusable.find(
+				containerRef.current
+			);
+			firstFocusable?.focus();
+		}
+	}, [ showSearchEntities ] );
+
+	return (
+		<VStack
+			spacing={ 4 }
+			className="edit-site-custom-template-modal__contents-wrapper"
+			alignment="left"
+		>
+			{ ! showSearchEntities && (
+				<>
+					<Text as="p">
+						{ __(
+							'Select whether to create a single template for all items or a specific one.'
+						) }
+					</Text>
+					<Flex
+						className="edit-site-custom-template-modal__contents"
+						gap="4"
+						align="initial"
+					>
+						<FlexItem
+							isBlock
+							as={ Button }
+							onClick={ () => {
+								const {
+									slug,
+									title,
+									description,
+									templatePrefix,
+								} = entityForSuggestions.template;
+								onSelect( {
+									slug,
+									title,
+									description,
+									templatePrefix,
+								} );
+							} }
+						>
+							<Text
+								as="span"
+								weight={ 500 }
+								lineHeight={ 1.53846153846 } // 20px
+							>
+								{ entityForSuggestions.labels.all_items }
+							</Text>
+							<Text
+								as="span"
+								lineHeight={ 1.53846153846 } // 20px
+							>
+								{
+									// translators: The user is given the choice to set up a template for all items of a post type or taxonomy, or just a specific one.
+									__( 'For all items' )
+								}
+							</Text>
+						</FlexItem>
+						<FlexItem
+							isBlock
+							as={ Button }
+							onClick={ () => {
+								setShowSearchEntities( true );
+							} }
+						>
+							<Text
+								as="span"
+								weight={ 500 }
+								lineHeight={ 1.53846153846 } // 20px
+							>
+								{ entityForSuggestions.labels.singular_name }
+							</Text>
+							<Text
+								as="span"
+								lineHeight={ 1.53846153846 } // 20px
+							>
+								{
+									// translators: The user is given the choice to set up a template for all items of a post type or taxonomy, or just a specific one.
+									__( 'For a specific item' )
+								}
+							</Text>
+						</FlexItem>
+					</Flex>
+					<Flex justify="right">
+						<Button
+							__next40pxDefaultSize
+							variant="tertiary"
+							onClick={ onBack }
+						>
+							{ __( 'Back' ) }
+						</Button>
+					</Flex>
+				</>
+			) }
+			{ showSearchEntities && (
+				<>
+					<Text as="p">
+						{ __(
+							'This template will be used only for the specific item chosen.'
+						) }
+					</Text>
+					<SuggestionList
+						entityForSuggestions={ entityForSuggestions }
+						onSelect={ onSelect }
+					/>
+					<Flex justify="right">
+						<Button
+							__next40pxDefaultSize
+							variant="tertiary"
+							onClick={ () => {
+								// If general template exists, go directly back to main screen
+								// instead of showing the choice screen
+								if ( entityForSuggestions.hasGeneralTemplate ) {
+									onBack();
+								} else {
+									setShowSearchEntities( false );
+								}
+							} }
+						>
+							{ __( 'Back' ) }
+						</Button>
+					</Flex>
+				</>
+			) }
+		</VStack>
+	);
+}
+
+export default AddCustomTemplateModalContent;