From 848963bae44957f7cf2b2b4861ff02a99c3cce4f Mon Sep 17 00:00:00 2001
From: Aki Hamano <tetsuaki.hamano@gmail.com>
Date: Wed, 26 Nov 2025 23:39:34 +0900
Subject: [PATCH] Block Editor: Restore ToolSelector component for backward
 compatibility

---
 packages/block-editor/README.md               |  4 ++++
 packages/block-editor/src/components/index.js |  4 ++++
 .../src/components/tool-selector/index.js     | 19 +++++++++++++++++++
 3 files changed, 27 insertions(+)
 create mode 100644 packages/block-editor/src/components/tool-selector/index.js

diff --git a/packages/block-editor/README.md b/packages/block-editor/README.md
index a8d6b67d30f981..96d271a5f82062 100644
--- a/packages/block-editor/README.md
+++ b/packages/block-editor/README.md
@@ -847,6 +847,10 @@ _Related_
 
 -   <https://github.com/WordPress/gutenberg/blob/HEAD/packages/data/README.md#registerStore>
 
+### ToolSelector
+
+This component has been deprecated and no longer renders anything.
+
 ### transformStyles
 
 Applies a series of CSS rule transforms to wrap selectors inside a given class and/or rewrite URLs depending on the parameters passed.
diff --git a/packages/block-editor/src/components/index.js b/packages/block-editor/src/components/index.js
index 52aeac32802b82..91e209ccf04985 100644
--- a/packages/block-editor/src/components/index.js
+++ b/packages/block-editor/src/components/index.js
@@ -172,3 +172,7 @@ export { useBlockEditingMode } from './block-editing-mode';
 export { default as BlockEditorProvider } from './provider';
 export { useSettings, useSetting } from './use-settings';
 export { useBlockCommands } from './use-block-commands';
+
+// This component is no longer used in Gutenberg,
+// but kept for backwards compatibility.
+export { default as ToolSelector } from './tool-selector';
diff --git a/packages/block-editor/src/components/tool-selector/index.js b/packages/block-editor/src/components/tool-selector/index.js
new file mode 100644
index 00000000000000..4d5ab659009c3e
--- /dev/null
+++ b/packages/block-editor/src/components/tool-selector/index.js
@@ -0,0 +1,19 @@
+/**
+ * WordPress dependencies
+ */
+import deprecated from '@wordpress/deprecated';
+import { forwardRef } from '@wordpress/element';
+
+function ToolSelector() {
+	deprecated( 'wp.blockEditor.ToolSelector', {
+		since: '6.9',
+		hint: 'The ToolSelector component no longer renders anything.',
+	} );
+
+	return null;
+}
+
+/**
+ * This component has been deprecated and no longer renders anything.
+ */
+export default forwardRef( ToolSelector );