Update React Native implementation to match web

WordPress · Aug 19, 2021 · 83bc87e · 83bc87e
1 parent b62031c
commit 83bc87e
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 15 deletions.
diff --git a/packages/block-editor/src/components/index.native.js b/packages/block-editor/src/components/index.native.js
@@ -19,7 +19,10 @@ export * from './gradients';
 export * from './font-sizes';
 export { AlignmentControl, AlignmentToolbar } from './alignment-control';
 export { default as InnerBlocks } from './inner-blocks';
-export { default as InspectorControls } from './inspector-controls';
+export {
+	default as InspectorControls,
+	InspectorAdvancedControls,
+} from './inspector-controls';
 export {
 	JustifyToolbar,
 	JustifyContentControl,

diff --git a/...onents/inspector-controls/index.native.js → ...ponents/inspector-controls/fill.native.js b/...onents/inspector-controls/index.native.js → ...ponents/inspector-controls/fill.native.js
@@ -7,18 +7,27 @@ import { View } from 'react-native';
  * WordPress dependencies
  */
 import { Children } from '@wordpress/element';
-import { createSlotFill, BottomSheetConsumer } from '@wordpress/components';
+import { BottomSheetConsumer } from '@wordpress/components';
+import warning from '@wordpress/warning';
 
 /**
  * Internal dependencies
  */
+import groups from './groups';
 import { useBlockEditContext } from '../block-edit/context';
 import { BlockSettingsButton } from '../block-settings';
 
-const { Fill, Slot } = createSlotFill( 'InspectorControls' );
-
-const FillWithSettingsButton = ( { children, ...props } ) => {
+export default function InspectorControlsFill( {
+	children,
+	__experimentalGroup: group = 'default',
+	...props
+} ) {
 	const { isSelected } = useBlockEditContext();
+	const Fill = groups[ group ]?.Fill;
+	if ( ! Fill ) {
+		warning( `Unknown InspectorControl group "${ group }" provided.` );
+		return null;
+	}
 	if ( ! isSelected ) {
 		return null;
 	}
@@ -35,13 +44,4 @@ const FillWithSettingsButton = ( { children, ...props } ) => {
 			{ Children.count( children ) > 0 && <BlockSettingsButton /> }
 		</>
 	);
-};
-
-const InspectorControls = FillWithSettingsButton;
-
-InspectorControls.Slot = Slot;
-
-/**
- * @see https://github.com/WordPress/gutenberg/blob/HEAD/packages/block-editor/src/components/inspector-controls/README.md
- */
-export default InspectorControls;
+}
diff --git a/packages/block-editor/src/components/inspector-controls/slot.native.js b/packages/block-editor/src/components/inspector-controls/slot.native.js
@@ -0,0 +1,22 @@
+/**
+ * WordPress dependencies
+ */
+import warning from '@wordpress/warning';
+
+/**
+ * Internal dependencies
+ */
+import groups from './groups';
+
+export default function InspectorControlsSlot( {
+	__experimentalGroup: group = 'default',
+	...props
+} ) {
+	const Slot = groups[ group ]?.Slot;
+	if ( ! Slot ) {
+		warning( `Unknown InspectorControl group "${ group }" provided.` );
+		return null;
+	}
+
+	return <Slot { ...props } />;
+}