@wordpress/edit-site 7.1.0 → 7.3.0

package/src/components/layout/index.js

@@ -1,11 +1,4 @@
-/**
- * External dependencies
- */
 import clsx from 'clsx';
-
-/**
- * WordPress dependencies
- */
 import { NavigableRegion, getAdminThemeColors } from '@wordpress/admin-ui';
 import {
 	__unstableMotion as motion,
@@ -34,10 +27,6 @@ import { SnackbarNotices, store as noticesStore } from '@wordpress/notices';
 import { useDispatch, useSelect } from '@wordpress/data';
 import { store as preferencesStore } from '@wordpress/preferences';
 import { Tooltip } from '@wordpress/ui';
-
-/**
- * Internal dependencies
- */
 import { SiteHubMobile } from '../site-hub';
 import ResizableFrame from '../resizable-frame';
 import { unlock } from '../../lock-unlock';
@@ -104,7 +93,6 @@ function Layout() {
 			{ canvas === 'view' && <SaveKeyboardShortcut /> }
 			<div
 				{ ...navigateRegionsProps }
-				ref={ navigateRegionsProps.ref }
 				className={ clsx(
 					'edit-site-layout',
 					navigateRegionsProps.className,
@@ -325,8 +313,16 @@ export default function LayoutWithGlobalStylesProvider( props ) {
 			<Tooltip.Provider>
 				{ /** This needs to be within the SlotFillProvider */ }
 				<PluginArea onError={ onPluginAreaError } />
-				<ThemeProvider color={ themeColors }>
-					<Layout { ...props } />
+				<ThemeProvider
+					isRoot
+					color={ {
+						primary: themeColors.primary,
+						...CONTENT_COLOR,
+					} }
+				>
+					<ThemeProvider color={ themeColors }>
+						<Layout { ...props } />
+					</ThemeProvider>
 				</ThemeProvider>
 			</Tooltip.Provider>
 		</SlotFillProvider>

package/src/components/media/index.js

@@ -1,6 +1,3 @@
-/**
- * WordPress dependencies
- */
 import { useEntityRecord } from '@wordpress/core-data';
 
 function Media( { id, size = [ 'large', 'medium', 'thumbnail' ], ...props } ) {

package/src/components/more-menu/index.js

@@ -1,16 +1,9 @@
-/**
- * WordPress dependencies
- */
 import { privateApis as editorPrivateApis } from '@wordpress/editor';
-
-/**
- * Internal dependencies
- */
-import SiteExport from './site-export';
 import WelcomeGuideMenuItem from './welcome-guide-menu-item';
 import { unlock } from '../../lock-unlock';
 
-const { ToolsMoreMenuGroup, PreferencesModal } = unlock( editorPrivateApis );
+const { ToolsMoreMenuGroup, PreferencesModal, SiteExport } =
+	unlock( editorPrivateApis );
 
 export default function MoreMenu() {
 	return (

package/src/components/more-menu/welcome-guide-menu-item.js

@@ -1,6 +1,3 @@
-/**
- * WordPress dependencies
- */
 import { __ } from '@wordpress/i18n';
 import { useDispatch } from '@wordpress/data';
 import { MenuItem } from '@wordpress/components';

package/src/components/page-patterns/actions.js

@@ -1,13 +1,6 @@
-/**
- * WordPress dependencies
- */
 import { DropdownMenu, MenuGroup } from '@wordpress/components';
 import { __ } from '@wordpress/i18n';
 import { moreVertical } from '@wordpress/icons';
-
-/**
- * Internal dependencies
- */
 import AddNewPattern from '../add-new-pattern';
 import RenameCategoryMenuItem from './rename-category-menu-item';
 import DeleteCategoryMenuItem from './delete-category-menu-item';

package/src/components/page-patterns/delete-category-menu-item.js

@@ -1,6 +1,3 @@
-/**
- * WordPress dependencies
- */
 import {
 	MenuItem,
 	__experimentalConfirmDialog as ConfirmDialog,
@@ -12,10 +9,6 @@ import { decodeEntities } from '@wordpress/html-entities';
 import { __, _x, sprintf } from '@wordpress/i18n';
 import { store as noticesStore } from '@wordpress/notices';
 import { privateApis as routerPrivateApis } from '@wordpress/router';
-
-/**
- * Internal dependencies
- */
 import { unlock } from '../../lock-unlock';
 import { PATTERN_TYPES, PATTERN_DEFAULT_CATEGORY } from '../../utils/constants';
 

package/src/components/page-patterns/fields.js

@@ -1,15 +1,8 @@
-/**
- * WordPress dependencies
- */
 import { __ } from '@wordpress/i18n';
 import { useMemo, useId } from '@wordpress/element';
 import { BlockPreview } from '@wordpress/block-editor';
 import { parse } from '@wordpress/blocks';
 import { privateApis as editorPrivateApis } from '@wordpress/editor';
-
-/**
- * Internal dependencies
- */
 import { TEMPLATE_PART_POST_TYPE } from '../../utils/constants';
 import { unlock } from '../../lock-unlock';
 

package/src/components/page-patterns/index.js

@@ -1,6 +1,3 @@
-/**
- * WordPress dependencies
- */
 import { Page } from '@wordpress/admin-ui';
 import { __ } from '@wordpress/i18n';
 import { useMemo } from '@wordpress/element';
@@ -12,10 +9,6 @@ import { privateApis as routerPrivateApis } from '@wordpress/router';
 import { useView, useViewConfig } from '@wordpress/views';
 import { useSelect } from '@wordpress/data';
 import { addQueryArgs } from '@wordpress/url';
-
-/**
- * Internal dependencies
- */
 import {
 	PATTERN_TYPES,
 	TEMPLATE_PART_POST_TYPE,

package/src/components/page-patterns/rename-category-menu-item.js

@@ -1,18 +1,8 @@
-/**
- * WordPress dependencies
- */
 import { MenuItem } from '@wordpress/components';
 import { useState } from '@wordpress/element';
 import { __ } from '@wordpress/i18n';
 import { privateApis as patternsPrivateApis } from '@wordpress/patterns';
-/**
- * Internal dependencies
- */
 import usePatternCategories from '../sidebar-navigation-screen-patterns/use-pattern-categories';
-
-/**
- * Internal dependencies
- */
 import { unlock } from '../../lock-unlock';
 
 const { RenamePatternCategoryModal } = unlock( patternsPrivateApis );

package/src/components/page-patterns/search-items.js

@@ -1,20 +1,8 @@
-/**
- * WordPress dependencies
- */
 import { privateApis as blockEditorPrivateApis } from '@wordpress/block-editor';
-
-/**
- * Internal dependencies
- */
 import { unlock } from '../../lock-unlock';
-
 const { extractWords, getNormalizedSearchTerms, normalizeString } = unlock(
 	blockEditorPrivateApis
 );
-
-/**
- * Internal dependencies
- */
 import {
 	TEMPLATE_PART_ALL_AREAS_CATEGORY,
 	PATTERN_DEFAULT_CATEGORY,

package/src/components/page-patterns/style.scss

@@ -70,6 +70,9 @@
 		.dataviews-view-grid__field-value:has(.fields-field__pattern-sync-status-fully) {
 			background: rgba(var(--wp-block-synced-color--rgb), 0.04);
 			color: var(--wp-block-synced-color);
+			// Override the neutral border the badge's `none` intent applies,
+			// so the outline matches the synced text rather than staying gray.
+			border-color: currentColor;
 		}
 	}
 }

package/src/components/page-patterns/use-pattern-settings.js

@@ -1,16 +1,9 @@
-/**
- * WordPress dependencies
- */
 import { store as coreStore } from '@wordpress/core-data';
 import { useSelect } from '@wordpress/data';
 import { useMemo } from '@wordpress/element';
 import { privateApis as blockEditorPrivateApis } from '@wordpress/block-editor';
 import { privateApis as editorPrivateApis } from '@wordpress/editor';
 import { generateGlobalStyles } from '@wordpress/global-styles-engine';
-
-/**
- * Internal dependencies
- */
 import { unlock } from '../../lock-unlock';
 import { store as editSiteStore } from '../../store';
 import { filterOutDuplicatesByName } from './utils';

package/src/components/page-patterns/use-patterns.js

@@ -1,14 +1,7 @@
-/**
- * WordPress dependencies
- */
 import { parse } from '@wordpress/blocks';
 import { useSelect, createSelector } from '@wordpress/data';
 import { store as coreStore } from '@wordpress/core-data';
 import { useMemo } from '@wordpress/element';
-
-/**
- * Internal dependencies
- */
 import { filterOutDuplicatesByName } from './utils';
 import {
 	EXCLUDED_PATTERN_SOURCES,

package/src/components/page-templates/fields.js

@@ -1,11 +1,4 @@
-/**
- * External dependencies
- */
 import clsx from 'clsx';
-
-/**
- * WordPress dependencies
- */
 import {
 	Icon as WCIcon,
 	__experimentalHStack as HStack,
@@ -25,10 +18,6 @@ import {
 	store as coreStore,
 } from '@wordpress/core-data';
 import { useSelect } from '@wordpress/data';
-
-/**
- * Internal dependencies
- */
 import { useAddedBy } from './hooks';
 import { useDefaultTemplateTypes } from '../add-new-template/utils';
 import usePatternSettings from '../page-patterns/use-pattern-settings';

package/src/components/page-templates/hooks.js

@@ -1,6 +1,3 @@
-/**
- * WordPress dependencies
- */
 import { store as coreStore } from '@wordpress/core-data';
 import { useSelect } from '@wordpress/data';
 import {
@@ -9,10 +6,6 @@ import {
 	plugins as pluginIcon,
 	globe as globeIcon,
 } from '@wordpress/icons';
-
-/**
- * Internal dependencies
- */
 import { TEMPLATE_ORIGINS } from '../../utils/constants';
 
 /** @typedef {'wp_template'|'wp_template_part'} TemplateType */

package/src/components/page-templates/index-legacy.js

@@ -1,6 +1,3 @@
-/**
- * WordPress dependencies
- */
 import { Page } from '@wordpress/admin-ui';
 import { __ } from '@wordpress/i18n';
 import { useState, useMemo, useCallback } from '@wordpress/element';
@@ -11,10 +8,6 @@ import { privateApis as editorPrivateApis } from '@wordpress/editor';
 import { addQueryArgs } from '@wordpress/url';
 import { useEvent } from '@wordpress/compose';
 import { useView, useViewConfig } from '@wordpress/views';
-
-/**
- * Internal dependencies
- */
 import AddNewTemplate from '../add-new-template-legacy';
 import { TEMPLATE_POST_TYPE } from '../../utils/constants';
 import { unlock } from '../../lock-unlock';

package/src/components/page-templates/index.js

@@ -1,6 +1,3 @@
-/**
- * WordPress dependencies
- */
 import { Page } from '@wordpress/admin-ui';
 import { __, sprintf } from '@wordpress/i18n';
 import { decodeEntities } from '@wordpress/html-entities';
@@ -18,10 +15,6 @@ import { useEvent } from '@wordpress/compose';
 import { useView } from '@wordpress/views';
 import { Modal } from '@wordpress/components';
 import { store as noticesStore } from '@wordpress/notices';
-
-/**
- * Internal dependencies
- */
 import AddNewTemplate from '../add-new-template';
 import { TEMPLATE_POST_TYPE } from '../../utils/constants';
 import { unlock } from '../../lock-unlock';

package/src/components/pagination/index.js

@@ -1,11 +1,4 @@
-/**
- * External dependencies
- */
 import clsx from 'clsx';
-
-/**
- * WordPress dependencies
- */
 import {
 	__experimentalHStack as HStack,
 	__experimentalText as WCText,

package/src/components/plugin-template-setting-panel/index.js

@@ -1,10 +1,6 @@
 /**
  * Defines an extensibility slot for the Template sidebar.
  */
-
-/**
- * WordPress dependencies
- */
 import { store as editorStore } from '@wordpress/editor';
 import { useSelect } from '@wordpress/data';
 import { createSlotFill } from '@wordpress/components';

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

@@ -1,6 +1,3 @@
-/**
- * WordPress dependencies
- */
 import { Page } from '@wordpress/admin-ui';
 import { Button } from '@wordpress/components';
 import {
@@ -15,10 +12,6 @@ import { privateApis as editorPrivateApis } from '@wordpress/editor';
 import { useEvent, usePrevious } from '@wordpress/compose';
 import { addQueryArgs } from '@wordpress/url';
 import { useView, useViewConfig } from '@wordpress/views';
-
-/**
- * Internal dependencies
- */
 import {
 	OPERATOR_IS_ANY,
 	OPERATOR_IS_NONE,
@@ -26,14 +19,12 @@ import {
 	OPERATOR_AFTER,
 	LAYOUT_LIST,
 } from '../../utils/constants';
-
 import AddNewPostModal from '../add-new-post';
 import { unlock } from '../../lock-unlock';
 import {
 	useEditPostAction,
 	useQuickEditPostAction,
 } from '../dataviews-actions';
-
 import useNotesCount from './use-notes-count';
 import { QuickEditModal } from './quick-edit-modal';
 

package/src/components/post-list/quick-edit-modal.js

@@ -1,6 +1,3 @@
-/**
- * WordPress dependencies
- */
 import { __ } from '@wordpress/i18n';
 import { useDispatch, useSelect } from '@wordpress/data';
 import { store as coreDataStore } from '@wordpress/core-data';
@@ -12,10 +9,6 @@ import {
 } from '@wordpress/components';
 import { useEffect, useMemo, useState } from '@wordpress/element';
 import { privateApis as editorPrivateApis } from '@wordpress/editor';
-
-/**
- * Internal dependencies
- */
 import { unlock } from '../../lock-unlock';
 
 const { usePostFields, PostCardPanel } = unlock( editorPrivateApis );

package/src/components/post-list/use-notes-count.js

@@ -1,6 +1,3 @@
-/**
- * WordPress dependencies
- */
 import { useMemo } from '@wordpress/element';
 import { useEntityRecords } from '@wordpress/core-data';
 

package/src/components/resizable-frame/index.js

@@ -1,11 +1,4 @@
-/**
- * External dependencies
- */
 import clsx from 'clsx';
-
-/**
- * WordPress dependencies
- */
 import { useState, useRef } from '@wordpress/element';
 import {
 	ResizableBox,
@@ -18,10 +11,6 @@ import { useSelect } from '@wordpress/data';
 import { store as coreStore } from '@wordpress/core-data';
 import { addQueryArgs } from '@wordpress/url';
 import { Tooltip } from '@wordpress/ui';
-
-/**
- * Internal dependencies
- */
 import { unlock } from '../../lock-unlock';
 
 const { useLocation, useHistory } = unlock( routerPrivateApis );

package/src/components/routes/use-title.js

@@ -1,6 +1,3 @@
-/**
- * WordPress dependencies
- */
 import { useEffect, useRef } from '@wordpress/element';
 import { useSelect } from '@wordpress/data';
 import { store as coreStore } from '@wordpress/core-data';
@@ -8,10 +5,6 @@ import { __, sprintf } from '@wordpress/i18n';
 import { speak } from '@wordpress/a11y';
 import { decodeEntities } from '@wordpress/html-entities';
 import { privateApis as routerPrivateApis } from '@wordpress/router';
-
-/**
- * Internal dependencies
- */
 import { unlock } from '../../lock-unlock';
 
 const { useLocation } = unlock( routerPrivateApis );

package/src/components/save-button/index.js

@@ -1,6 +1,3 @@
-/**
- * WordPress dependencies
- */
 import { useSelect, useDispatch } from '@wordpress/data';
 import { Button } from '@wordpress/components';
 import { __, _n, sprintf } from '@wordpress/i18n';
@@ -10,10 +7,6 @@ import {
 } from '@wordpress/core-data';
 import { displayShortcut } from '@wordpress/keycodes';
 import { privateApis as routerPrivateApis } from '@wordpress/router';
-
-/**
- * Internal dependencies
- */
 import { store as editSiteStore } from '../../store';
 import {
 	currentlyPreviewingTheme,

package/src/components/save-hub/index.js

@@ -1,14 +1,7 @@
-/**
- * WordPress dependencies
- */
 import { useSelect } from '@wordpress/data';
 import { Stack } from '@wordpress/ui';
 import { store as coreStore } from '@wordpress/core-data';
 import { check } from '@wordpress/icons';
-
-/**
- * Internal dependencies
- */
 import SaveButton from '../save-button';
 import { isPreviewingTheme } from '../../utils/is-previewing-theme';
 

package/src/components/save-keyboard-shortcut/index.js

@@ -1,6 +1,3 @@
-/**
- * WordPress dependencies
- */
 import { useEffect } from '@wordpress/element';
 import {
 	useShortcut,
@@ -10,10 +7,6 @@ import { __ } from '@wordpress/i18n';
 import { useDispatch, useSelect } from '@wordpress/data';
 import { store as coreStore } from '@wordpress/core-data';
 import { store as editorStore } from '@wordpress/editor';
-
-/**
- * Internal dependencies
- */
 import { store as editSiteStore } from '../../store';
 
 const shortcutName = 'core/edit-site/save';

package/src/components/save-panel/index.js

@@ -1,11 +1,4 @@
-/**
- * External dependencies
- */
 import clsx from 'clsx';
-
-/**
- * WordPress dependencies
- */
 import { NavigableRegion } from '@wordpress/admin-ui';
 import { Button, Modal } from '@wordpress/components';
 import { useDispatch, useSelect } from '@wordpress/data';
@@ -16,10 +9,6 @@ import {
 } from '@wordpress/core-data';
 import { privateApis as routerPrivateApis } from '@wordpress/router';
 import { useEffect } from '@wordpress/element';
-
-/**
- * Internal dependencies
- */
 import { store as editSiteStore } from '../../store';
 import { unlock } from '../../lock-unlock';
 import { useActivateTheme } from '../../utils/use-activate-theme';

package/src/components/sidebar/index.js

@@ -1,11 +1,4 @@
-/**
- * External dependencies
- */
 import clsx from 'clsx';
-
-/**
- * WordPress dependencies
- */
 import {
 	createContext,
 	useContext,

package/src/components/sidebar-button/index.js

@@ -1,11 +1,4 @@
-/**
- * External dependencies
- */
 import clsx from 'clsx';
-
-/**
- * WordPress dependencies
- */
 import { Button } from '@wordpress/components';
 
 export default function SidebarButton( props ) {

package/src/components/sidebar-dataviews/index.js

@@ -1,6 +1,3 @@
-/**
- * WordPress dependencies
- */
 import { __experimentalItemGroup as ItemGroup } from '@wordpress/components';
 import { privateApis as routerPrivateApis } from '@wordpress/router';
 import {
@@ -14,10 +11,6 @@ import {
 } from '@wordpress/icons';
 import { useViewConfig } from '@wordpress/views';
 import { addQueryArgs } from '@wordpress/url';
-
-/**
- * Internal dependencies
- */
 import { unlock } from '../../lock-unlock';
 import SidebarNavigationItem from '../sidebar-navigation-item';
 

package/src/components/sidebar-global-styles/index.js

@@ -1,6 +1,3 @@
-/**
- * WordPress dependencies
- */
 import { Page } from '@wordpress/admin-ui';
 import { __ } from '@wordpress/i18n';
 import { useMemo, useState } from '@wordpress/element';
@@ -11,10 +8,6 @@ import { useSelect } from '@wordpress/data';
 import { Button, __experimentalHStack as HStack } from '@wordpress/components';
 import { addQueryArgs, removeQueryArgs } from '@wordpress/url';
 import { seen } from '@wordpress/icons';
-
-/**
- * Internal dependencies
- */
 import { store as editSiteStore } from '../../store';
 import { unlock } from '../../lock-unlock';
 

package/src/components/sidebar-identity/index.js

@@ -1,12 +1,10 @@
-/**
- * WordPress dependencies
- */
 import { Page } from '@wordpress/admin-ui';
 import { __, _x } from '@wordpress/i18n';
 import { useSelect, useDispatch } from '@wordpress/data';
 import { store as coreStore } from '@wordpress/core-data';
 import { DataForm } from '@wordpress/dataviews';
 import { MediaEdit } from '@wordpress/fields';
+import { decodeEntities } from '@wordpress/html-entities';
 
 const fields = [
 	{
@@ -16,6 +14,7 @@ const fields = [
 		description: __(
 			"Displays in your site's layout via the Site Title block."
 		),
+		getValue: ( { item } ) => decodeEntities( item.title ?? '' ),
 	},
 	{
 		id: 'description',
@@ -24,6 +23,7 @@ const fields = [
 		description: __(
 			"In a few words, explain what this site is about. Displays in your site's layout via the Site Tagline block."
 		),
+		getValue: ( { item } ) => decodeEntities( item.description ?? '' ),
 	},
 	{
 		id: 'site_logo',

package/src/components/sidebar-navigation-item/index.js

@@ -1,21 +1,10 @@
-/**
- * External dependencies
- */
 import clsx from 'clsx';
-
-/**
- * WordPress dependencies
- */
 import { __experimentalItem as Item, FlexBlock } from '@wordpress/components';
 import { Stack } from '@wordpress/ui';
 import { isRTL } from '@wordpress/i18n';
 import { chevronRightSmall, chevronLeftSmall, Icon } from '@wordpress/icons';
 import { privateApis as routerPrivateApis } from '@wordpress/router';
 import { useContext } from '@wordpress/element';
-
-/**
- * Internal dependencies
- */
 import { unlock } from '../../lock-unlock';
 import { SidebarNavigationContext } from '../sidebar';
 

package/src/components/sidebar-navigation-item/style.scss

@@ -8,14 +8,11 @@
 	border: none;
 	min-height: $grid-unit-50;
 
-	&:hover,
 	&:focus,
-	&[aria-current="true"] {
+	&[aria-current="true"],
+	// Bump the specificity above the <Item> component's own `:hover` color.
+	&#{&}:hover {
 		color: var(--wpds-color-foreground-interactive-neutral-weak-active);
-
-		.edit-site-sidebar-navigation-item__drilldown-indicator {
-			fill: var(--wpds-color-foreground-interactive-neutral-weak-active);
-		}
 	}
 
 	&[aria-current="true"] {
@@ -32,10 +29,6 @@
 		transform: translateZ(0);
 	}
 
-	.edit-site-sidebar-navigation-item__drilldown-indicator {
-		fill: var(--wpds-color-foreground-interactive-neutral-weak);
-	}
-
 	&.with-suffix {
 		padding-right: $grid-unit-20;
 	}