@wordpress/edit-site 7.0.0 → 7.1.0

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

@@ -4,13 +4,12 @@
 import { useSelect, useDispatch } from '@wordpress/data';
 import { Button } from '@wordpress/components';
 import { __, _n, sprintf } from '@wordpress/i18n';
-import { store as coreStore } from '@wordpress/core-data';
+import {
+	store as coreStore,
+	privateApis as coreDataPrivateApis,
+} from '@wordpress/core-data';
 import { displayShortcut } from '@wordpress/keycodes';
 import { privateApis as routerPrivateApis } from '@wordpress/router';
-import {
-	useEntitiesSavedStatesIsDirty,
-	store as editorStore,
-} from '@wordpress/editor';
 
 /**
  * Internal dependencies
@@ -23,6 +22,7 @@ import {
 import { unlock } from '../../lock-unlock';
 
 const { useLocation } = unlock( routerPrivateApis );
+const { useEntitiesSavedStatesIsDirty } = unlock( coreDataPrivateApis );
 
 export default function SaveButton( {
 	className = 'edit-site-save-button__button',
@@ -35,7 +35,7 @@ export default function SaveButton( {
 } ) {
 	const { params } = useLocation();
 	const { setIsSaveViewOpened } = useDispatch( editSiteStore );
-	const { saveDirtyEntities } = unlock( useDispatch( editorStore ) );
+	const { saveDirtyEntities } = unlock( useDispatch( coreStore ) );
 	const { dirtyEntityRecords } = useEntitiesSavedStatesIsDirty();
 	const { isSaving, isSaveViewOpen, previewingThemeName } = useSelect(
 		( select ) => {

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

@@ -8,14 +8,12 @@ import clsx from 'clsx';
  */
 import { NavigableRegion } from '@wordpress/admin-ui';
 import { Button, Modal } from '@wordpress/components';
-import {
-	EntitiesSavedStates,
-	useEntitiesSavedStatesIsDirty,
-	privateApis,
-} from '@wordpress/editor';
 import { useDispatch, useSelect } from '@wordpress/data';
 import { __, sprintf } from '@wordpress/i18n';
-import { store as coreStore } from '@wordpress/core-data';
+import {
+	store as coreStore,
+	privateApis as coreDataPrivateApis,
+} from '@wordpress/core-data';
 import { privateApis as routerPrivateApis } from '@wordpress/router';
 import { useEffect } from '@wordpress/element';
 
@@ -28,8 +26,12 @@ import { useActivateTheme } from '../../utils/use-activate-theme';
 import { useActualCurrentTheme } from '../../utils/use-actual-current-theme';
 import { isPreviewingTheme } from '../../utils/is-previewing-theme';
 
-const { EntitiesSavedStatesExtensible } = unlock( privateApis );
 const { useLocation } = unlock( routerPrivateApis );
+const {
+	EntitiesSavedStatesExtensible,
+	EntitiesSavedStates,
+	useEntitiesSavedStatesIsDirty,
+} = unlock( coreDataPrivateApis );
 
 const EntitiesSavedStatesForPreview = ( {
 	onClose,

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

@@ -5,11 +5,11 @@ 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';
 
 /**
@@ -30,6 +30,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/site-editor-routes/styles.js

@@ -14,12 +14,12 @@ import SidebarNavigationScreenGlobalStyles from '../sidebar-navigation-screen-gl
 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 +31,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 />;