Rename Unforward to Unforwarded and export the named const for block …

…toolbar forward refs (#55820) Cleanup work from #55712
WordPress · Nov 2, 2023 · a57e08d · a57e08d
1 parent d506fea
commit a57e08d
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 6 deletions.
diff --git a/packages/block-editor/src/components/block-tools/block-contextual-toolbar.js b/packages/block-editor/src/components/block-tools/block-contextual-toolbar.js
@@ -32,7 +32,7 @@ import BlockToolbar from '../block-toolbar';
 import { store as blockEditorStore } from '../../store';
 import { useHasAnyBlockControls } from '../block-controls/use-has-block-controls';
 
-function UnforwardBlockContextualToolbar(
+function UnforwardedBlockContextualToolbar(
 	{ focusOnMount, isFixed, ...props },
 	ref
 ) {
@@ -226,4 +226,8 @@ function UnforwardBlockContextualToolbar(
 	);
 }
 
-export default forwardRef( UnforwardBlockContextualToolbar );
+export const BlockContextualToolbar = forwardRef(
+	UnforwardedBlockContextualToolbar
+);
+
+export default BlockContextualToolbar;
diff --git a/packages/block-editor/src/components/block-tools/selected-block-tools.js b/packages/block-editor/src/components/block-tools/selected-block-tools.js
@@ -21,7 +21,7 @@ import useBlockToolbarPopoverProps from './use-block-toolbar-popover-props';
 import useSelectedBlockToolProps from './use-selected-block-tool-props';
 import { useShouldContextualToolbarShow } from '../../utils/use-should-contextual-toolbar-show';
 
-function UnforwardSelectedBlockTools(
+function UnforwardedSelectedBlockTools(
 	{ clientId, showEmptyBlockSideInserter, __unstableContentRef },
 	ref
 ) {
@@ -129,4 +129,6 @@ function UnforwardSelectedBlockTools(
 	return null;
 }
 
-export default forwardRef( UnforwardSelectedBlockTools );
+export const SelectedBlockTools = forwardRef( UnforwardedSelectedBlockTools );
+
+export default SelectedBlockTools;
diff --git a/packages/block-editor/src/components/navigable-toolbar/index.js b/packages/block-editor/src/components/navigable-toolbar/index.js
@@ -196,7 +196,7 @@ function useToolbarFocus( {
 	}, [ focusEditorOnEscape, lastFocus, toolbarRef ] );
 }
 
-function UnforwardNavigableToolbar(
+function UnforwardedNavigableToolbar(
 	{
 		children,
 		focusOnMount,
@@ -247,4 +247,6 @@ function UnforwardNavigableToolbar(
 	);
 }
 
-export default forwardRef( UnforwardNavigableToolbar );
+export const NavigableToolbar = forwardRef( UnforwardedNavigableToolbar );
+
+export default NavigableToolbar;