Update in response to code review

WordPress · Jul 19, 2018 · 60674d8 · 60674d8
1 parent 6385022
commit 60674d8
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/core-blocks/text-columns/index.js b/core-blocks/text-columns/index.js
@@ -26,8 +26,10 @@ import './editor.scss';
 export const name = 'core/text-columns';
 
 export const settings = {
-	// Use an empty parent array to indicate this block should no longer be available for insertion.
-	parent: [],
+	// Disable insertion as this block is deprecated and ultimately replaced by the Columns block.
+	supports: {
+		inserter: false,
+	},
 
 	title: __( 'Text Columns' ),
 
@@ -69,7 +71,6 @@ export const settings = {
 		const { width, content, columns } = attributes;
 
 		deprecated( 'The Text Columns block', {
-			version: 'a future version',
 			alternative: 'the Columns block',
 			plugin: 'Gutenberg',
 		} );

diff --git a/core-blocks/text-columns/test/index.js b/core-blocks/text-columns/test/index.js
@@ -10,8 +10,7 @@ describe( 'core/text-columns', () => {
 
 		expect( wrapper ).toMatchSnapshot();
 		expect( console ).toHaveWarnedWith(
-			'The Text Columns block is deprecated and will be removed from Gutenberg in a future version. ' +
-			'Please use the Columns block instead.'
+			'The Text Columns block is deprecated and will be removed. Please use the Columns block instead.'
 		);
 	} );
 } );
diff --git a/docs/reference/deprecated.md b/docs/reference/deprecated.md
@@ -15,6 +15,7 @@ Gutenberg's deprecation policy is intended to support backwards-compatibility fo
  - All references to a block's `uid` have been replaced with equivalent props and selectors for `clientId`.
  - The `wp.editor.MediaPlaceholder` component `onSelectUrl` prop has been renamed to `onSelectURL`.
  - The `wp.editor.UrlInput` component has been renamed to `wp.editor.URLInput`.
+ - The Text Columns block has been removed. Please use the Columns block instead.
 
 ## 3.4.0