@wordpress/edit-site 7.0.0 → 7.2.0

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

@@ -1,11 +1,4 @@
-/**
- * WordPress dependencies
- */
 import { __ } from '@wordpress/i18n';
-
-/**
- * Internal dependencies
- */
 import SidebarNavigationScreen from '../sidebar-navigation-screen';
 import { MainSidebarNavigationContent } from '../sidebar-navigation-screen-main';
 

package/src/components/sidebar-navigation-screen-main/index.js

@@ -1,6 +1,3 @@
-/**
- * WordPress dependencies
- */
 import { __experimentalItemGroup as ItemGroup } from '@wordpress/components';
 import { __, _x } from '@wordpress/i18n';
 import {
@@ -13,10 +10,6 @@ import {
 } from '@wordpress/icons';
 import { useSelect } from '@wordpress/data';
 import { store as coreStore } from '@wordpress/core-data';
-
-/**
- * Internal dependencies
- */
 import SidebarNavigationScreen from '../sidebar-navigation-screen';
 import SidebarNavigationItem from '../sidebar-navigation-item';
 

package/src/components/sidebar-navigation-screen-navigation-menu/delete-confirm-dialog.js

@@ -1,6 +1,3 @@
-/**
- * WordPress dependencies
- */
 import { __experimentalConfirmDialog as ConfirmDialog } from '@wordpress/components';
 import { __ } from '@wordpress/i18n';
 

package/src/components/sidebar-navigation-screen-navigation-menu/index.js

@@ -1,16 +1,9 @@
-/**
- * WordPress dependencies
- */
 import { useEntityRecord, store as coreStore } from '@wordpress/core-data';
 import { Spinner } from '@wordpress/components';
 import { __ } from '@wordpress/i18n';
 import { useSelect } from '@wordpress/data';
 import { decodeEntities } from '@wordpress/html-entities';
 import { privateApis as routerPrivateApis } from '@wordpress/router';
-
-/**
- * Internal dependencies
- */
 import { SidebarNavigationScreenWrapper } from '../sidebar-navigation-screen-navigation-menus';
 import ScreenNavigationMoreMenu from './more-menu';
 import SingleNavigationMenu from './single-navigation-menu';

package/src/components/sidebar-navigation-screen-navigation-menu/more-menu.js

@@ -1,15 +1,8 @@
-/**
- * WordPress dependencies
- */
 import { DropdownMenu, MenuItem, MenuGroup } from '@wordpress/components';
 import { moreVertical } from '@wordpress/icons';
 import { __ } from '@wordpress/i18n';
 import { useState } from '@wordpress/element';
 import { privateApis as routerPrivateApis } from '@wordpress/router';
-
-/**
- * Internal dependencies
- */
 import RenameModal from './rename-modal';
 import DeleteConfirmDialog from './delete-confirm-dialog';
 import { unlock } from '../../lock-unlock';

package/src/components/sidebar-navigation-screen-navigation-menu/navigation-menu-editor.js

@@ -1,15 +1,8 @@
-/**
- * WordPress dependencies
- */
 import { useMemo } from '@wordpress/element';
 import { useSelect } from '@wordpress/data';
 import { BlockEditorProvider } from '@wordpress/block-editor';
 import { createBlock } from '@wordpress/blocks';
 import { __experimentalFetchLinkSuggestions as fetchLinkSuggestions } from '@wordpress/core-data';
-
-/**
- * Internal dependencies
- */
 import { unlock } from '../../lock-unlock';
 import { store as editSiteStore } from '../../store';
 import NavigationMenuContent from '../sidebar-navigation-screen-navigation-menus/navigation-menu-content';

package/src/components/sidebar-navigation-screen-navigation-menu/rename-modal.js

@@ -1,6 +1,3 @@
-/**
- * WordPress dependencies
- */
 import {
 	__experimentalHStack as HStack,
 	__experimentalVStack as VStack,

package/src/components/sidebar-navigation-screen-navigation-menu/single-navigation-menu.js

@@ -1,11 +1,5 @@
-/**
- * WordPress dependencies
- */
 import { __ } from '@wordpress/i18n';
 import { decodeEntities } from '@wordpress/html-entities';
-/**
- * Internal dependencies
- */
 import { SidebarNavigationScreenWrapper } from '../sidebar-navigation-screen-navigation-menus';
 import ScreenNavigationMoreMenu from './more-menu';
 import NavigationMenuEditor from './navigation-menu-editor';

package/src/components/sidebar-navigation-screen-navigation-menu/use-navigation-menu-handlers.js

@@ -1,15 +1,8 @@
-/**
- * WordPress dependencies
- */
 import { store as coreStore } from '@wordpress/core-data';
 import { __, _x, sprintf } from '@wordpress/i18n';
 import { useSelect, useDispatch } from '@wordpress/data';
 import { store as noticesStore } from '@wordpress/notices';
 import { privateApis as routerPrivateApis } from '@wordpress/router';
-
-/**
- * Internal dependencies
- */
 import { postType } from '.';
 import { NAVIGATION_POST_TYPE } from '../../utils/constants';
 import { unlock } from '../../lock-unlock';

package/src/components/sidebar-navigation-screen-navigation-menus/build-navigation-label.js

@@ -1,6 +1,3 @@
-/**
- * WordPress dependencies
- */
 import { __, _x, sprintf } from '@wordpress/i18n';
 import { decodeEntities } from '@wordpress/html-entities';
 

package/src/components/sidebar-navigation-screen-navigation-menus/index.js

@@ -1,20 +1,12 @@
-/**
- * WordPress dependencies
- */
 import { __, _x, sprintf } from '@wordpress/i18n';
 import { useEntityRecords, store as coreStore } from '@wordpress/core-data';
 import { useSelect } from '@wordpress/data';
-
 import { decodeEntities } from '@wordpress/html-entities';
 import {
 	__experimentalItemGroup as ItemGroup,
 	Spinner,
 } from '@wordpress/components';
 import { navigation } from '@wordpress/icons';
-
-/**
- * Internal dependencies
- */
 import SidebarNavigationScreen from '../sidebar-navigation-screen';
 import SidebarNavigationItem from '../sidebar-navigation-item';
 import { PRELOADED_NAVIGATION_MENUS_QUERY } from './constants';

package/src/components/sidebar-navigation-screen-navigation-menus/leaf-more-menu.js

@@ -1,7 +1,3 @@
-/**
- * WordPress dependencies
- */
-
 import { chevronUp, chevronDown, moreVertical } from '@wordpress/icons';
 import { DropdownMenu, MenuItem, MenuGroup } from '@wordpress/components';
 import { useDispatch, useSelect } from '@wordpress/data';
@@ -9,15 +5,10 @@ import { useCallback } from '@wordpress/element';
 import { __, sprintf } from '@wordpress/i18n';
 import { BlockTitle, store as blockEditorStore } from '@wordpress/block-editor';
 import { privateApis as routerPrivateApis } from '@wordpress/router';
-
 const POPOVER_PROPS = {
 	className: 'block-editor-block-settings-menu__popover',
 	placement: 'bottom-start',
 };
-
-/**
- * Internal dependencies
- */
 import { unlock } from '../../lock-unlock';
 
 const { useHistory, useLocation } = unlock( routerPrivateApis );
@@ -25,8 +16,7 @@ const { useHistory, useLocation } = unlock( routerPrivateApis );
 export default function LeafMoreMenu( props ) {
 	const history = useHistory();
 	const { path } = useLocation();
-	const { block } = props;
-	const { clientId } = block;
+	const { clientId } = props;
 	const { moveBlocksDown, moveBlocksUp, removeBlocks } =
 		useDispatch( blockEditorStore );
 
@@ -42,39 +32,40 @@ export default function LeafMoreMenu( props ) {
 		BlockTitle( { clientId, maximumLength: 25 } )
 	);
 
-	const rootClientId = useSelect(
+	const { rootClientId, blockName, attributes } = useSelect(
 		( select ) => {
-			const { getBlockRootClientId } = select( blockEditorStore );
+			const { getBlockRootClientId, getBlockName, getBlockAttributes } =
+				select( blockEditorStore );
 
-			return getBlockRootClientId( clientId );
+			return {
+				rootClientId: getBlockRootClientId( clientId ),
+				blockName: getBlockName( clientId ),
+				attributes: getBlockAttributes( clientId ),
+			};
 		},
 		[ clientId ]
 	);
 
-	const onGoToPage = useCallback(
-		( selectedBlock ) => {
-			const { attributes, name } = selectedBlock;
-			if (
-				attributes.kind === 'post-type' &&
-				attributes.id &&
-				attributes.type &&
-				history
-			) {
-				history.navigate(
-					`/${ attributes.type }/${ attributes.id }?canvas=edit`,
-					{
-						state: { backPath: path },
-					}
-				);
-			}
-			if ( name === 'core/page-list-item' && attributes.id && history ) {
-				history.navigate( `/page/${ attributes.id }?canvas=edit`, {
+	const onGoToPage = useCallback( () => {
+		if (
+			attributes.kind === 'post-type' &&
+			attributes.id &&
+			attributes.type &&
+			history
+		) {
+			history.navigate(
+				`/${ attributes.type }/${ attributes.id }?canvas=edit`,
+				{
 					state: { backPath: path },
-				} );
-			}
-		},
-		[ path, history ]
-	);
+				}
+			);
+		}
+		if ( blockName === 'core/page-list-item' && attributes.id && history ) {
+			history.navigate( `/page/${ attributes.id }?canvas=edit`, {
+				state: { backPath: path },
+			} );
+		}
+	}, [ path, history, attributes, blockName ] );
 
 	return (
 		<DropdownMenu
@@ -106,17 +97,16 @@ export default function LeafMoreMenu( props ) {
 						>
 							{ __( 'Move down' ) }
 						</MenuItem>
-						{ block.attributes?.type === 'page' &&
-							block.attributes?.id && (
-								<MenuItem
-									onClick={ () => {
-										onGoToPage( block );
-										onClose();
-									} }
-								>
-									{ goToLabel }
-								</MenuItem>
-							) }
+						{ attributes?.type === 'page' && attributes?.id && (
+							<MenuItem
+								onClick={ () => {
+									onGoToPage();
+									onClose();
+								} }
+							>
+								{ goToLabel }
+							</MenuItem>
+						) }
 					</MenuGroup>
 					<MenuGroup>
 						<MenuItem

package/src/components/sidebar-navigation-screen-navigation-menus/navigation-menu-content.js

@@ -1,6 +1,3 @@
-/**
- * WordPress dependencies
- */
 import {
 	privateApis as blockEditorPrivateApis,
 	store as blockEditorStore,
@@ -11,10 +8,6 @@ import { createBlock } from '@wordpress/blocks';
 import { useCallback } from '@wordpress/element';
 import { store as coreStore } from '@wordpress/core-data';
 import { privateApis as blockLibraryPrivateApis } from '@wordpress/block-library';
-
-/**
- * Internal dependencies
- */
 import { unlock } from '../../lock-unlock';
 import LeafMoreMenu from './leaf-more-menu';
 

package/src/components/sidebar-navigation-screen-patterns/category-item.js

@@ -1,6 +1,3 @@
-/**
- * Internal dependencies
- */
 import SidebarNavigationItem from '../sidebar-navigation-item';
 
 export default function CategoryItem( {

package/src/components/sidebar-navigation-screen-patterns/index.js

@@ -1,20 +1,13 @@
-/**
- * WordPress dependencies
- */
 import {
 	__experimentalItemGroup as ItemGroup,
 	__experimentalItem as Item,
 } from '@wordpress/components';
-import { getTemplatePartIcon } from '@wordpress/editor';
 import { useMemo } from '@wordpress/element';
 import { __ } from '@wordpress/i18n';
 import { file } from '@wordpress/icons';
 import { privateApis as routerPrivateApis } from '@wordpress/router';
+import { privateApis as coreDataPrivateApis } from '@wordpress/core-data';
 import { useViewConfig } from '@wordpress/views';
-
-/**
- * Internal dependencies
- */
 import SidebarNavigationScreen from '../sidebar-navigation-screen';
 import CategoryItem from './category-item';
 import {
@@ -30,6 +23,7 @@ import { unlock } from '../../lock-unlock';
 const VIEW_CONFIG_FIELDS = [ 'view_list' ];
 
 const { useLocation } = unlock( routerPrivateApis );
+const { getTemplatePartIcon } = unlock( coreDataPrivateApis );
 
 function CategoriesGroup( {
 	templatePartViews,

package/src/components/sidebar-navigation-screen-patterns/use-default-pattern-categories.js

@@ -1,12 +1,5 @@
-/**
- * WordPress dependencies
- */
 import { store as coreStore } from '@wordpress/core-data';
 import { useSelect } from '@wordpress/data';
-
-/**
- * Internal dependencies
- */
 import { unlock } from '../../lock-unlock';
 import { store as editSiteStore } from '../../store';
 

package/src/components/sidebar-navigation-screen-patterns/use-pattern-categories.js

@@ -1,12 +1,5 @@
-/**
- * WordPress dependencies
- */
 import { useMemo } from '@wordpress/element';
 import { __ } from '@wordpress/i18n';
-
-/**
- * Internal dependencies
- */
 import useDefaultPatternCategories from './use-default-pattern-categories';
 import useThemePatterns from './use-theme-patterns';
 import usePatterns from '../page-patterns/use-patterns';

package/src/components/sidebar-navigation-screen-patterns/use-template-part-areas.js

@@ -1,13 +1,6 @@
-/**
- * WordPress dependencies
- */
 import { useEntityRecords, store as coreStore } from '@wordpress/core-data';
 import { useSelect } from '@wordpress/data';
 import { privateApis as blockLibraryPrivateApis } from '@wordpress/block-library';
-
-/**
- * Internal dependencies
- */
 import {
 	TEMPLATE_PART_AREA_DEFAULT_CATEGORY,
 	TEMPLATE_PART_POST_TYPE,

package/src/components/sidebar-navigation-screen-patterns/use-theme-patterns.js

@@ -1,13 +1,6 @@
-/**
- * WordPress dependencies
- */
 import { store as coreStore } from '@wordpress/core-data';
 import { useSelect } from '@wordpress/data';
 import { useMemo } from '@wordpress/element';
-
-/**
- * Internal dependencies
- */
 import { filterOutDuplicatesByName } from '../page-patterns/utils';
 import { EXCLUDED_PATTERN_SOURCES } from '../../utils/constants';
 import { unlock } from '../../lock-unlock';

package/src/components/sidebar-navigation-screen-templates-browse/content-legacy.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,
 } from '@wordpress/icons';
-
-/**
- * Internal dependencies
- */
 import { TEMPLATE_POST_TYPE } from '../../utils/constants';
 import DataViewsSidebarContent from '../sidebar-dataviews';
 

package/src/components/sidebar-navigation-screen-templates-browse/content.js

@@ -1,19 +1,12 @@
-/**
- * WordPress dependencies
- */
 import { useEntityRecords } from '@wordpress/core-data';
 import { useMemo } from '@wordpress/element';
 import { __experimentalItemGroup as ItemGroup } from '@wordpress/components';
 import { __ } from '@wordpress/i18n';
 import { privateApis as routerPrivateApis } from '@wordpress/router';
 import { addQueryArgs } from '@wordpress/url';
-
-/**
- * Internal dependencies
- */
+import { commentAuthorAvatar, published } from '@wordpress/icons';
 import SidebarNavigationItem from '../sidebar-navigation-item';
 import { useAddedBy } from '../page-templates/hooks';
-import { commentAuthorAvatar, published } from '@wordpress/icons';
 import { unlock } from '../../lock-unlock';
 
 const { useLocation } = unlock( routerPrivateApis );

package/src/components/sidebar-navigation-screen-templates-browse/index.js

@@ -1,11 +1,4 @@
-/**
- * WordPress dependencies
- */
 import { __ } from '@wordpress/i18n';
-
-/**
- * Internal dependencies
- */
 import SidebarNavigationScreen from '../sidebar-navigation-screen';
 import DataviewsTemplatesSidebarContent from './content';
 import DataviewsTemplatesSidebarContentLegacy from './content-legacy';

package/src/components/sidebar-navigation-screen-unsupported/index.js

@@ -1,6 +1,3 @@
-/**
- * WordPress dependencies
- */
 import { __ } from '@wordpress/i18n';
 import { Notice, __experimentalSpacer as Spacer } from '@wordpress/components';
 

package/src/components/site-editor-routes/home.js

@@ -1,6 +1,3 @@
-/**
- * Internal dependencies
- */
 import SidebarNavigationScreenMain from '../sidebar-navigation-screen-main';
 import SidebarNavigationScreenUnsupported from '../sidebar-navigation-screen-unsupported';
 import Editor from '../editor';

package/src/components/site-editor-routes/identity.js

@@ -1,6 +1,3 @@
-/**
- * Internal dependencies
- */
 import Editor from '../editor';
 import SidebarNavigationScreenIdentity from '../sidebar-navigation-screen-identity';
 import SidebarIdentity from '../sidebar-identity';

package/src/components/site-editor-routes/index.js

@@ -1,12 +1,5 @@
-/**
- * WordPress dependencies
- */
 import { useRegistry, useDispatch } from '@wordpress/data';
 import { useEffect } from '@wordpress/element';
-
-/**
- * Internal dependencies
- */
 import { unlock } from '../../lock-unlock';
 import { store as siteEditorStore } from '../../store';
 import { homeRoute } from './home';

package/src/components/site-editor-routes/navigation-item.js

@@ -1,6 +1,3 @@
-/**
- * Internal dependencies
- */
 import Editor from '../editor';
 import SidebarNavigationScreenNavigationMenu from '../sidebar-navigation-screen-navigation-menu';
 import SidebarNavigationScreenUnsupported from '../sidebar-navigation-screen-unsupported';

package/src/components/site-editor-routes/navigation.js

@@ -1,6 +1,3 @@
-/**
- * Internal dependencies
- */
 import Editor from '../editor';
 import SidebarNavigationScreenNavigationMenus from '../sidebar-navigation-screen-navigation-menus';
 import SidebarNavigationScreenUnsupported from '../sidebar-navigation-screen-unsupported';

package/src/components/site-editor-routes/notfound.js

@@ -1,11 +1,4 @@
-/**
- * WordPress dependencies
- */
 import { __ } from '@wordpress/i18n';
-
-/**
- * Internal dependencies
- */
 import { Notice, __experimentalSpacer as Spacer } from '@wordpress/components';
 import SidebarNavigationScreenMain from '../sidebar-navigation-screen-main';
 

package/src/components/site-editor-routes/page-item.js

@@ -1,11 +1,4 @@
-/**
- * WordPress dependencies
- */
 import { __ } from '@wordpress/i18n';
-
-/**
- * Internal dependencies
- */
 import Editor from '../editor';
 import DataViewsSidebarContent from '../sidebar-dataviews';
 import SidebarNavigationScreen from '../sidebar-navigation-screen';

package/src/components/site-editor-routes/pages.js

@@ -1,14 +1,7 @@
-/**
- * WordPress dependencies
- */
 import { __ } from '@wordpress/i18n';
 import { resolveSelect } from '@wordpress/data';
 import { store as coreStore } from '@wordpress/core-data';
 import { loadView } from '@wordpress/views';
-
-/**
- * Internal dependencies
- */
 import Editor from '../editor';
 import SidebarNavigationScreen from '../sidebar-navigation-screen';
 import SidebarNavigationScreenUnsupported from '../sidebar-navigation-screen-unsupported';

package/src/components/site-editor-routes/pattern-item.js

@@ -1,6 +1,3 @@
-/**
- * Internal dependencies
- */
 import Editor from '../editor';
 import SidebarNavigationScreenPatterns from '../sidebar-navigation-screen-patterns';
 import { isClassicThemeWithStyleBookSupport } from './utils';

package/src/components/site-editor-routes/patterns.js

@@ -1,6 +1,3 @@
-/**
- * Internal dependencies
- */
 import SidebarNavigationScreenPatterns from '../sidebar-navigation-screen-patterns';
 import PagePatterns from '../page-patterns';
 import { isClassicThemeWithStyleBookSupport } from './utils';

package/src/components/site-editor-routes/stylebook.js

@@ -1,12 +1,5 @@
-/**
- * WordPress dependencies
- */
 import { __ } from '@wordpress/i18n';
 import { privateApis as editorPrivateApis } from '@wordpress/editor';
-
-/**
- * Internal dependencies
- */
 import SidebarNavigationScreen from '../sidebar-navigation-screen';
 import SidebarNavigationScreenUnsupported from '../sidebar-navigation-screen-unsupported';
 import { unlock } from '../../lock-unlock';

package/src/components/site-editor-routes/styles.js

@@ -1,25 +1,18 @@
-/**
- * WordPress dependencies
- */
 import { privateApis as routerPrivateApis } from '@wordpress/router';
 import { privateApis as editorPrivateApis } from '@wordpress/editor';
 import { addQueryArgs } from '@wordpress/url';
-
-/**
- * Internal dependencies
- */
 import Editor from '../editor';
 import { unlock } from '../../lock-unlock';
 import SidebarNavigationScreenGlobalStyles from '../sidebar-navigation-screen-global-styles';
 import SidebarGlobalStyles from '../sidebar-global-styles';
 
 const { useLocation, useHistory } = unlock( routerPrivateApis );
-const { StyleBookPreview } = unlock( editorPrivateApis );
+const { StyleBookPreview, useGlobalStyles } = unlock( editorPrivateApis );
 
-function StylesPreviewArea( { siteData } ) {
+function StyleBookPreviewArea( { siteData } ) {
 	const { path, query } = useLocation();
 	const history = useHistory();
-	const isStylebook = query.preview === 'stylebook';
+	const { user: userConfig } = useGlobalStyles();
 
 	// Get section from URL query params
 	const section = query.section ?? '/';
@@ -31,14 +24,22 @@ function StylesPreviewArea( { siteData } ) {
 		);
 	};
 
-	if ( isStylebook ) {
-		return (
-			<StyleBookPreview
-				path={ section }
-				onPathChange={ onChangeSection }
-				settings={ siteData.editorSettings }
-			/>
-		);
+	return (
+		<StyleBookPreview
+			path={ section }
+			onPathChange={ onChangeSection }
+			settings={ siteData.editorSettings }
+			// Without userConfig the preview falls back to the static `settings` styles and unsaved global styles edits are not shown.
+			userConfig={ userConfig }
+		/>
+	);
+}
+
+function StylesPreviewArea( { siteData } ) {
+	const { query } = useLocation();
+
+	if ( query.preview === 'stylebook' ) {
+		return <StyleBookPreviewArea siteData={ siteData } />;
 	}
 
 	return <Editor />;

package/src/components/site-editor-routes/template-item.js

@@ -1,6 +1,3 @@
-/**
- * Internal dependencies
- */
 import Editor from '../editor';
 import SidebarNavigationScreenTemplatesBrowse from '../sidebar-navigation-screen-templates-browse';
 import SidebarNavigationScreenUnsupported from '../sidebar-navigation-screen-unsupported';

package/src/components/site-editor-routes/template-part-item.js

@@ -1,6 +1,3 @@
-/**
- * Internal dependencies
- */
 import Editor from '../editor';
 import SidebarNavigationScreenPatterns from '../sidebar-navigation-screen-patterns';