Fix unit tests

WordPress · May 27, 2020 · fdb5b84 · fdb5b84
1 parent 2ed83d5
commit fdb5b84
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 12 deletions.
diff --git a/packages/block-editor/src/components/block-controls/test/__snapshots__/index.js.snap b/packages/block-editor/src/components/block-controls/test/__snapshots__/index.js.snap
@@ -15,7 +15,7 @@ exports[`BlockControls should render a dynamic toolbar of controls 1`] = `
   <WithFilters(Edit)
     isSelected={true}
   >
-    <BlockControls
+    <IfDisplayBlockControls(BlockControlsFill)
       controls={
         Array [
           Object {
@@ -60,7 +60,7 @@ exports[`BlockControls should render a dynamic toolbar of controls 1`] = `
       <p>
         Child
       </p>
-    </BlockControls>
+    </IfDisplayBlockControls(BlockControlsFill)>
   </WithFilters(Edit)>
 </ContextProvider>
 `;
diff --git a/packages/block-editor/src/components/if-display-block-controls/index.js b/packages/block-editor/src/components/if-display-block-controls/index.js
@@ -2,14 +2,15 @@
  * WordPress dependencies
  */
 import { useSelect } from '@wordpress/data';
+import { createHigherOrderComponent } from '@wordpress/compose';
 
 /**
  * Internal dependencies
  */
 import { useBlockEditContext } from '../block-edit/context';
 
-export default function ifDisplayBlockControls( Component ) {
-	return ( { children } ) => {
+export default createHigherOrderComponent(
+	( Component ) => ( { children } ) => {
 		const { isSelected, clientId, name } = useBlockEditContext();
 		const isFirstAndSameTypeMultiSelected = useSelect(
 			( select ) => {
@@ -35,5 +36,6 @@ export default function ifDisplayBlockControls( Component ) {
 		}
 
 		return <Component>{ children }</Component>;
-	};
-}
+	},
+	'ifDisplayBlockControls'
+);
diff --git a/packages/block-editor/src/hooks/color-panel.js b/packages/block-editor/src/hooks/color-panel.js
@@ -50,7 +50,7 @@ export default function ColorPanel( {
 	} );
 
 	return (
-		<InspectorControls allowAnyMultiple>
+		<InspectorControls>
 			<PanelColorGradientSettings
 				title={ __( 'Color settings' ) }
 				initialOpen={ false }

diff --git a/packages/block-editor/src/hooks/style.js b/packages/block-editor/src/hooks/style.js
@@ -146,7 +146,7 @@ export const withBlockControls = createHigherOrderComponent(
 
 		return [
 			Platform.OS === 'web' && hasTypographySupport && (
-				<InspectorControls key="typography" allowAnyMultiple>
+				<InspectorControls key="typography">
 					<PanelBody title={ __( 'Typography' ) }>
 						<FontSizeEdit { ...props } />
 						<LineHeightEdit { ...props } />

diff --git a/packages/block-library/src/more/test/__snapshots__/edit.js.snap b/packages/block-library/src/more/test/__snapshots__/edit.js.snap
@@ -2,7 +2,7 @@
 
 exports[`core/more/edit should match snapshot when noTeaser is false 1`] = `
 <React.Fragment>
-  <InspectorControls>
+  <IfDisplayBlockControls(InspectorControlsFill)>
     <ForwardRef(PanelBody)>
       <WithInstanceId(ToggleControl)
         checked={false}
@@ -11,7 +11,7 @@ exports[`core/more/edit should match snapshot when noTeaser is false 1`] = `
         onChange={[Function]}
       />
     </ForwardRef(PanelBody)>
-  </InspectorControls>
+  </IfDisplayBlockControls(InspectorControlsFill)>
   <div
     className="wp-block-more"
   >
@@ -32,7 +32,7 @@ exports[`core/more/edit should match snapshot when noTeaser is false 1`] = `
 
 exports[`core/more/edit should match snapshot when noTeaser is true 1`] = `
 <React.Fragment>
-  <InspectorControls>
+  <IfDisplayBlockControls(InspectorControlsFill)>
     <ForwardRef(PanelBody)>
       <WithInstanceId(ToggleControl)
         checked={true}
@@ -41,7 +41,7 @@ exports[`core/more/edit should match snapshot when noTeaser is true 1`] = `
         onChange={[Function]}
       />
     </ForwardRef(PanelBody)>
-  </InspectorControls>
+  </IfDisplayBlockControls(InspectorControlsFill)>
   <div
     className="wp-block-more"
   >