Styles: remove wp-editor from wp-edit-blocks dependencies (#33496)

WordPress · Sep 20, 2022 · 8988319 · 8988319
1 parent 2c29bff
commit 8988319
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 30 deletions.
diff --git a/lib/client-assets.php b/lib/client-assets.php
@@ -310,7 +310,6 @@ function gutenberg_register_packages_styles( $styles ) {
 
 	$wp_edit_blocks_dependencies = array(
 		'wp-components',
-		'wp-editor',
 		// This need to be added before the block library styles,
 		// The block library styles override the "reset" styles.
 		'wp-reset-editor-styles',
@@ -387,7 +386,7 @@ function gutenberg_register_packages_styles( $styles ) {
 		$styles,
 		'wp-edit-navigation',
 		gutenberg_url( 'build/edit-navigation/style.css' ),
-		array( 'wp-components', 'wp-block-editor', 'wp-edit-blocks' ),
+		array( 'wp-components', 'wp-block-editor', 'wp-editor', 'wp-edit-blocks' ),
 		$version
 	);
 	$styles->add_data( 'wp-edit-navigation', 'rtl', 'replace' );
@@ -396,7 +395,7 @@ function gutenberg_register_packages_styles( $styles ) {
 		$styles,
 		'wp-edit-site',
 		gutenberg_url( 'build/edit-site/style.css' ),
-		array( 'wp-components', 'wp-block-editor', 'wp-edit-blocks' ),
+		array( 'wp-components', 'wp-block-editor', 'wp-editor', 'wp-edit-blocks' ),
 		$version
 	);
 	$styles->add_data( 'wp-edit-site', 'rtl', 'replace' );
@@ -405,7 +404,7 @@ function gutenberg_register_packages_styles( $styles ) {
 		$styles,
 		'wp-edit-widgets',
 		gutenberg_url( 'build/edit-widgets/style.css' ),
-		array( 'wp-components', 'wp-block-editor', 'wp-edit-blocks', 'wp-reusable-blocks', 'wp-widgets' ),
+		array( 'wp-components', 'wp-block-editor', 'wp-editor', 'wp-edit-blocks', 'wp-reusable-blocks', 'wp-widgets' ),
 		$version
 	);
 	$styles->add_data( 'wp-edit-widgets', 'rtl', 'replace' );
@@ -423,7 +422,7 @@ function gutenberg_register_packages_styles( $styles ) {
 		$styles,
 		'wp-customize-widgets',
 		gutenberg_url( 'build/customize-widgets/style.css' ),
-		array( 'wp-components', 'wp-block-editor', 'wp-edit-blocks', 'wp-widgets' ),
+		array( 'wp-components', 'wp-block-editor', 'wp-editor', 'wp-edit-blocks', 'wp-widgets' ),
 		$version
 	);
 	$styles->add_data( 'wp-customize-widgets', 'rtl', 'replace' );

diff --git a/packages/edit-post/src/components/visual-editor/index.js b/packages/edit-post/src/components/visual-editor/index.js
@@ -123,6 +123,7 @@ export default function VisualEditor( { styles } ) {
 		themeSupportsLayout,
 		assets,
 		useRootPaddingAwareAlignments,
+		isFocusMode,
 	} = useSelect( ( select ) => {
 		const _settings = select( blockEditorStore ).getSettings();
 		return {
@@ -131,6 +132,7 @@ export default function VisualEditor( { styles } ) {
 			assets: _settings.__unstableResolvedAssets,
 			useRootPaddingAwareAlignments:
 				_settings.__experimentalFeatures?.useRootPaddingAwareAlignments,
+			isFocusMode: _settings.focusMode,
 		};
 	}, [] );
 	const { clearSelectedBlock } = useDispatch( blockEditorStore );
@@ -265,7 +267,12 @@ export default function VisualEditor( { styles } ) {
 							) }
 						{ ! isTemplateMode && (
 							<div
-								className="edit-post-visual-editor__post-title-wrapper"
+								className={ classnames(
+									'edit-post-visual-editor__post-title-wrapper',
+									{
+										'is-focus-mode': isFocusMode,
+									}
+								) }
 								contentEditable={ false }
 							>
 								<PostTitle ref={ titleRef } />

diff --git a/packages/editor/src/components/post-title/index.js b/packages/editor/src/components/post-title/index.js
@@ -44,25 +44,23 @@ function PostTitle( _, forwardedRef ) {
 	const { editPost } = useDispatch( editorStore );
 	const { insertDefaultBlock, clearSelectedBlock, insertBlocks } =
 		useDispatch( blockEditorStore );
-	const { isCleanNewPost, title, placeholder, isFocusMode, hasFixedToolbar } =
-		useSelect( ( select ) => {
+	const { isCleanNewPost, title, placeholder, hasFixedToolbar } = useSelect(
+		( select ) => {
 			const { getEditedPostAttribute, isCleanNewPost: _isCleanNewPost } =
 				select( editorStore );
 			const { getSettings } = select( blockEditorStore );
-			const {
-				titlePlaceholder,
-				focusMode,
-				hasFixedToolbar: _hasFixedToolbar,
-			} = getSettings();
+			const { titlePlaceholder, hasFixedToolbar: _hasFixedToolbar } =
+				getSettings();
 
 			return {
 				isCleanNewPost: _isCleanNewPost(),
 				title: getEditedPostAttribute( 'title' ),
 				placeholder: titlePlaceholder,
-				isFocusMode: focusMode,
 				hasFixedToolbar: _hasFixedToolbar,
 			};
-		}, [] );
+		},
+		[]
+	);
 
 	useImperativeHandle( forwardedRef, () => ( {
 		focus: () => {
@@ -193,7 +191,6 @@ function PostTitle( _, forwardedRef ) {
 		'wp-block wp-block-post-title block-editor-block-list__block editor-post-title editor-post-title__input rich-text',
 		{
 			'is-selected': isSelected,
-			'is-focus-mode': isFocusMode,
 			'has-fixed-toolbar': hasFixedToolbar,
 		}
 	);

diff --git a/packages/editor/src/components/post-title/style.scss b/packages/editor/src/components/post-title/style.scss
diff --git a/packages/editor/src/style.scss b/packages/editor/src/style.scss
@@ -16,7 +16,6 @@
 @import "./components/post-text-editor/style.scss";
 @import "./components/post-url/style.scss";
 @import "./components/post-visibility/style.scss";
-@import "./components/post-title/style.scss";
 @import "./components/post-trash/style.scss";
 @import "./components/table-of-contents/style.scss";
 @import "./components/template-validation-notice/style.scss";