Allow the column block in the inserter (#20502)

WordPress · May 6, 2020 · 245e21b · 245e21b
1 parent 76d7127
commit 245e21b
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/packages/block-library/src/column/index.js b/packages/block-library/src/column/index.js
@@ -21,7 +21,6 @@ export const settings = {
 	icon,
 	description: __( 'A single column within a columns block.' ),
 	supports: {
-		inserter: false,
 		reusable: false,
 		html: false,
 		lightBlockWrapper: true,

diff --git a/packages/block-library/src/columns/edit.js b/packages/block-library/src/columns/edit.js
@@ -8,7 +8,7 @@ import { dropRight, get, map, times } from 'lodash';
  * WordPress dependencies
  */
 import { __ } from '@wordpress/i18n';
-import { PanelBody, RangeControl } from '@wordpress/components';
+import { PanelBody, RangeControl, Notice } from '@wordpress/components';
 
 import {
 	InspectorControls,
@@ -78,8 +78,15 @@ function ColumnsEditContainer( {
 						value={ count }
 						onChange={ ( value ) => updateColumns( count, value ) }
 						min={ 2 }
-						max={ 6 }
+						max={ Math.max( 6, count ) }
 					/>
+					{ count > 6 && (
+						<Notice status="warning" isDismissible={ false }>
+							{ __(
+								'This column count exceeds the recommended amount and may cause visual breakage.'
+							) }
+						</Notice>
+					) }
 				</PanelBody>
 			</InspectorControls>
 			<InnerBlocks
@@ -89,6 +96,7 @@ function ColumnsEditContainer( {
 				__experimentalPassedProps={ {
 					className: classes,
 				} }
+				renderAppender={ false }
 			/>
 		</>
 	);

diff --git a/packages/e2e-tests/specs/editor/blocks/columns.test.js b/packages/e2e-tests/specs/editor/blocks/columns.test.js
@@ -26,6 +26,6 @@ describe( 'Columns', () => {
 		 )[ 0 ];
 		await columnBlockMenuItem.click();
 		await openGlobalBlockInserter();
-		expect( await getAllBlockInserterItemTitles() ).toHaveLength( 0 );
+		expect( await getAllBlockInserterItemTitles() ).toHaveLength( 1 );
 	} );
 } );