Allow a block to disable being converted into a reusable block; Fix: …

…Column block (#11550)

docs/block-api.md

@@ -504,6 +504,13 @@ inserter: false,
 multiple: false,
 ```
 
+- `reusable` (default `true`): A block may want to disable the ability of being converted into a reusable block.
+By default all blocks can be converted to a reusable block. If supports reusable is set to false, the option to convert the block into a reusable block will not appear.
+
+```js
+// Don't allow the block to be converted into a reusable block.
+reusable: false,
+```
 ## Edit and Save
 
 The `edit` and `save` functions define the editor interface with which a user would interact, and the markup to be serialized back when a post is saved. They are the heart of how a block operates, so they are [covered separately](../docs/block-api/block-edit-save.md).

packages/block-library/src/classic/index.js

@@ -31,6 +31,9 @@ export const settings = {
 	supports: {
 		className: false,
 		customClassName: false,
+		// Hide 'Add to Reusable Blocks' on Classic blocks. Showing it causes a
+		// confusing UX, because of its similarity to the 'Convert to Blocks' button.
+		reusable: false,
 	},
 
 	edit,

packages/block-library/src/columns/column.js

@@ -20,6 +20,7 @@ export const settings = {
 
 	supports: {
 		inserter: false,
+		reusable: false,
 	},
 
 	edit() {

packages/block-library/src/missing/index.js

@@ -66,6 +66,7 @@ export const settings = {
 		customClassName: false,
 		inserter: false,
 		html: false,
+		reusable: false,
 	},
 
 	attributes: {

packages/editor/src/components/block-settings-menu/reusable-block-convert-button.js

@@ -1,15 +1,15 @@
 /**
  * External dependencies
  */
-import { noop, every, map } from 'lodash';
+import { noop, every } from 'lodash';
 
 /**
  * WordPress dependencies
  */
 import { Fragment } from '@wordpress/element';
 import { MenuItem } from '@wordpress/components';
 import { __ } from '@wordpress/i18n';
-import { isReusableBlock } from '@wordpress/blocks';
+import { hasBlockSupport, isReusableBlock } from '@wordpress/blocks';
 import { withSelect, withDispatch } from '@wordpress/data';
 import { compose } from '@wordpress/compose';
 
@@ -50,31 +50,26 @@ export function ReusableBlockConvertButton( {
 export default compose( [
 	withSelect( ( select, { clientIds } ) => {
 		const {
-			getBlock,
+			getBlocksByClientId,
 			canInsertBlockType,
 			__experimentalGetReusableBlock: getReusableBlock,
 		} = select( 'core/editor' );
-		const {
-			getFreeformFallbackBlockName,
-			getUnregisteredFallbackBlockName,
-		} = select( 'core/blocks' );
 
-		const blocks = map( clientIds, ( clientId ) => getBlock( clientId ) );
+		const blocks = getBlocksByClientId( clientIds );
 
 		const isVisible = (
-			// Guard against the case where a regular block has *just* been converted to a
-			// reusable block and doesn't yet exist in the editor store.
-			every( blocks, ( block ) => !! block ) &&
-
 			// Hide 'Add to Reusable Blocks' when Reusable Blocks are disabled, i.e. when
 			// core/block is not in the allowed_block_types filter.
 			canInsertBlockType( 'core/block' ) &&
 
-			// Hide 'Add to Reusable Blocks' on Classic blocks. Showing it causes a
-			// confusing UX, because of its similarity to the 'Convert to Blocks' button.
-			( blocks.length !== 1 || (
-				blocks[ 0 ].name !== getFreeformFallbackBlockName() &&
-				blocks[ 0 ].name !== getUnregisteredFallbackBlockName()
+			every( blocks, ( block ) => (
+				// Guard against the case where a regular block has *just* been converted to a
+				// reusable block and doesn't yet exist in the editor store.
+				!! block &&
+				// Only show the option to covert to reusable blocks on valid blocks.
+				block.isValid &&
+				// Make sure the block supports being converted into a reusable block (by default that is the case).
+				hasBlockSupport( block.name, 'reusable', true )
 			) )
 		);