Site Editor: use EditorProvider instead of custom logic

WordPress · Nov 10, 2023 · ac35c02 · ac35c02
1 parent cfacc31
commit ac35c02
Show file tree

Hide file tree

Showing 11 changed files with 253 additions and 377 deletions.
diff --git a/...t-site/src/components/block-editor/block-editor-provider/default-block-editor-provider.js b/...t-site/src/components/block-editor/block-editor-provider/default-block-editor-provider.js
diff --git a/packages/edit-site/src/components/block-editor/block-editor-provider/index.js b/packages/edit-site/src/components/block-editor/block-editor-provider/index.js
diff --git a/...ite/src/components/block-editor/block-editor-provider/navigation-block-editor-provider.js b/...ite/src/components/block-editor/block-editor-provider/navigation-block-editor-provider.js
diff --git a/packages/edit-site/src/components/block-editor/index.js b/packages/edit-site/src/components/block-editor/index.js
diff --git a/...-provider/test/use-page-content-blocks.js → ...ck-editor/test/use-page-content-blocks.js b/...-provider/test/use-page-content-blocks.js → ...ck-editor/test/use-page-content-blocks.js
diff --git a/...ditor-provider/use-page-content-blocks.js → ...s/block-editor/use-page-content-blocks.js b/...ditor-provider/use-page-content-blocks.js → ...s/block-editor/use-page-content-blocks.js
@@ -7,7 +7,7 @@ import { createBlock } from '@wordpress/blocks';
 /**
  * Internal dependencies
  */
-import { PAGE_CONTENT_BLOCK_TYPES } from '../../../utils/constants';
+import { PAGE_CONTENT_BLOCK_TYPES } from '../../utils/constants';
 
 /**
  * Helper method to iterate through all blocks, recursing into allowed inner blocks.

diff --git a/packages/edit-site/src/components/block-editor/use-site-editor-settings.js b/packages/edit-site/src/components/block-editor/use-site-editor-settings.js
@@ -87,7 +87,7 @@ function useArchiveLabel( templateSlug ) {
 	);
 }
 
-export default function useSiteEditorSettings() {
+export function useSpecificEditorSettings() {
 	const { setIsInserterOpened } = useDispatch( editSiteStore );
 	const {
 		templateSlug,
@@ -97,8 +97,6 @@ export default function useSiteEditorSettings() {
 		keepCaretInsideBlock,
 		canvasMode,
 		settings,
-		postType,
-		postId,
 	} = useSelect( ( select ) => {
 		const {
 			getEditedPostType,
@@ -164,5 +162,21 @@ export default function useSiteEditorSettings() {
 		archiveLabels.archiveNameLabel,
 	] );
 
+	return defaultEditorSettings;
+}
+
+export default function useSiteEditorSettings() {
+	const defaultEditorSettings = useSpecificEditorSettings();
+	const { postType, postId } = useSelect( ( select ) => {
+		const { getEditedPostType, getEditedPostId } = unlock(
+			select( editSiteStore )
+		);
+		const usedPostType = getEditedPostType();
+		const usedPostId = getEditedPostId();
+		return {
+			postType: usedPostType,
+			postId: usedPostId,
+		};
+	}, [] );
 	return useBlockEditorSettings( defaultEditorSettings, postType, postId );
 }