From ebf53bce5ae2524a2dd2824887f07d796babad99 Mon Sep 17 00:00:00 2001
From: Tetsuaki Hamano <tetsuaki.hamano@gmail.com>
Date: Mon, 7 Aug 2023 22:02:12 +0900
Subject: [PATCH] Don't use

---
 packages/core-commands/src/hooks.js           |  5 +---
 .../src/hooks/commands/use-common-commands.js | 27 ++++++++-----------
 2 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/packages/core-commands/src/hooks.js b/packages/core-commands/src/hooks.js
index e37c470d91752..6d744e3223234 100644
--- a/packages/core-commands/src/hooks.js
+++ b/packages/core-commands/src/hooks.js
@@ -1,7 +1,6 @@
 /**
  * WordPress dependencies
  */
-import { store as blockEditorStore } from '@wordpress/block-editor';
 import { store as coreStore } from '@wordpress/core-data';
 import { useSelect } from '@wordpress/data';
 
@@ -14,9 +13,7 @@ export function useIsTemplatesAccessible() {
 
 export function useIsBlockBasedTheme() {
 	return useSelect(
-		( select ) =>
-			select( blockEditorStore ).getSettings()
-				.__unstableIsBlockBasedTheme,
+		( select ) => select( coreStore ).getCurrentTheme()?.is_block_theme,
 		[]
 	);
 }
diff --git a/packages/edit-site/src/hooks/commands/use-common-commands.js b/packages/edit-site/src/hooks/commands/use-common-commands.js
index aea79d2148b80..9fc6740bf5c37 100644
--- a/packages/edit-site/src/hooks/commands/use-common-commands.js
+++ b/packages/edit-site/src/hooks/commands/use-common-commands.js
@@ -6,10 +6,7 @@ import { useDispatch, useSelect } from '@wordpress/data';
 import { __ } from '@wordpress/i18n';
 import { trash, backup, help, styles, external } from '@wordpress/icons';
 import { useCommandLoader, useCommand } from '@wordpress/commands';
-import {
-	privateApis as blockEditorPrivateApis,
-	store as blockEditorStore,
-} from '@wordpress/block-editor';
+import { privateApis as blockEditorPrivateApis } from '@wordpress/block-editor';
 import { privateApis as routerPrivateApis } from '@wordpress/router';
 import { store as preferencesStore } from '@wordpress/preferences';
 import { store as coreStore } from '@wordpress/core-data';
@@ -38,16 +35,15 @@ function useGlobalStylesOpenStylesCommands() {
 	const { createInfoNotice } = useDispatch( noticesStore );
 
 	const history = useHistory();
-	const { isDistractionFree, isBlockBasedTheme } = useSelect( ( select ) => {
-		return {
-			isDistractionFree: select( preferencesStore ).get(
-				editSiteStore.name,
-				'distractionFree'
-			),
-			isBlockBasedTheme:
-				select( blockEditorStore ).getSettings()
-					.__unstableIsBlockBasedTheme,
-		};
+	const isDistractionFree = useSelect( ( select ) => {
+		return select( preferencesStore ).get(
+			editSiteStore.name,
+			'distractionFree'
+		);
+	}, [] );
+
+	const isBlockBasedTheme = useSelect( ( select ) => {
+		return select( coreStore ).getCurrentTheme().is_block_theme;
 	}, [] );
 
 	const commands = useMemo( () => {
@@ -114,8 +110,7 @@ function useGlobalStylesToggleWelcomeGuideCommands() {
 
 	const history = useHistory();
 	const isBlockBasedTheme = useSelect( ( select ) => {
-		return select( blockEditorStore ).getSettings()
-			.__unstableIsBlockBasedTheme;
+		return select( coreStore ).getCurrentTheme().is_block_theme;
 	}, [] );
 
 	const commands = useMemo( () => {