Adjust conditions

WordPress · May 21, 2020 · e947daf · e947daf
1 parent 3b93437
commit e947daf
Show file tree

Hide file tree

Showing 5 changed files with 53 additions and 21 deletions.
diff --git a/packages/block-editor/src/components/block-controls/index.js b/packages/block-editor/src/components/block-controls/index.js
@@ -45,19 +45,35 @@ function BlockControlsFill( { controls, children } ) {
 	);
 }
 
-function BlockControls( { allowMultiple, ...props } ) {
-	const { isSelected, clientId } = useBlockEditContext();
-	const isFirstMultiSelected = useSelect( ( select ) =>
-		select( 'core/block-editor' ).isFirstMultiSelectedBlock( clientId )
+function BlockControls( { __experimentalAllowAnyMultiple, children } ) {
+	const { isSelected, clientId, name } = useBlockEditContext();
+	const isFirstAndSameTypeMultiSelected = useSelect(
+		( select ) => {
+			const {
+				getBlockName,
+				isFirstMultiSelectedBlock,
+				getMultiSelectedBlockClientIds,
+			} = select( 'core/block-editor' );
+
+			if ( ! isFirstMultiSelectedBlock( clientId ) ) {
+				return false;
+			}
+
+			return (
+				__experimentalAllowAnyMultiple ||
+				getMultiSelectedBlockClientIds().every(
+					( id ) => getBlockName( id ) === name
+				)
+			);
+		},
+		[ __experimentalAllowAnyMultiple ]
 	);
 
-	if ( ! isSelected ) {
-		if ( ! allowMultiple || ! isFirstMultiSelected ) {
-			return null;
-		}
+	if ( ! isSelected && ! isFirstAndSameTypeMultiSelected ) {
+		return null;
 	}
 
-	return <BlockControlsFill { ...props } />;
+	return <BlockControlsFill>{ children }</BlockControlsFill>;
 }
 
 BlockControls.Slot = BlockControlsSlot;

diff --git a/packages/block-editor/src/components/inspector-controls/index.js b/packages/block-editor/src/components/inspector-controls/index.js
@@ -11,19 +11,35 @@ import { useBlockEditContext } from '../block-edit/context';
 
 const { Fill, Slot } = createSlotFill( 'InspectorControls' );
 
-function InspectorControls( { allowMultiple, ...props } ) {
-	const { isSelected, clientId } = useBlockEditContext();
-	const isFirstMultiSelected = useSelect( ( select ) =>
-		select( 'core/block-editor' ).isFirstMultiSelectedBlock( clientId )
+function InspectorControls( { __experimentalAllowAnyMultiple, children } ) {
+	const { isSelected, clientId, name } = useBlockEditContext();
+	const isFirstAndSameTypeMultiSelected = useSelect(
+		( select ) => {
+			const {
+				getBlockName,
+				isFirstMultiSelectedBlock,
+				getMultiSelectedBlockClientIds,
+			} = select( 'core/block-editor' );
+
+			if ( ! isFirstMultiSelectedBlock( clientId ) ) {
+				return false;
+			}
+
+			return (
+				__experimentalAllowAnyMultiple ||
+				getMultiSelectedBlockClientIds().every(
+					( id ) => getBlockName( id ) === name
+				)
+			);
+		},
+		[ __experimentalAllowAnyMultiple ]
 	);
 
-	if ( ! isSelected ) {
-		if ( ! allowMultiple || ! isFirstMultiSelected ) {
-			return null;
-		}
+	if ( ! isSelected && ! isFirstAndSameTypeMultiSelected ) {
+		return null;
 	}
 
-	return <Fill { ...props } />;
+	return <Fill>{ children }</Fill>;
 }
 
 InspectorControls.Slot = Slot;

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 allowMultiple>
+		<InspectorControls allowAnyMultiple>
 			<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" allowMultiple>
+				<InspectorControls key="typography" allowAnyMultiple>
 					<PanelBody title={ __( 'Typography' ) }>
 						<FontSizeEdit { ...props } />
 						<LineHeightEdit { ...props } />

diff --git a/packages/block-library/src/paragraph/edit.js b/packages/block-library/src/paragraph/edit.js
@@ -120,7 +120,7 @@ function ParagraphBlock( {
 
 	return (
 		<>
-			<BlockControls allowMultiple>
+			<BlockControls allowAnyMultiple>
 				<AlignmentToolbar
 					value={ align }
 					onChange={ ( newAlign ) =>