Simplify block schema slightly, make the check for the background.bac…

…kgroundImage property

lib/block-supports/background.php

@@ -42,7 +42,7 @@ function gutenberg_register_background_support( $block_type ) {
 function gutenberg_render_background_support( $block_content, $block ) {
 	$block_type                   = WP_Block_Type_Registry::get_instance()->get_registered( $block['blockName'] );
 	$block_attributes             = $block['attrs'];
-	$has_background_image_support = block_has_support( $block_type, array( 'background' ), false );
+	$has_background_image_support = block_has_support( $block_type, array( 'background', 'backgroundImage' ), false );
 
 	if (
 		! $has_background_image_support ||

schemas/json/block.json

@@ -259,21 +259,15 @@
 					"default": false
 				},
 				"background": {
-					"default": false,
+					"type": "object",
 					"description": "This value signals that a block supports some of the properties related to background, especially background image. When it does, the block editor will show UI controls for the user to set their values.\n\nWhen the block declares support for a specific background property, its attributes definition is extended to include the style attribute.",
-					"oneOf": [
-						{ "type": "boolean" },
-						{
-							"type": "object",
-							"properties": {
-								"backgroundImage": {
-									"type": "boolean",
-									"description": "Exposes a control that allows setting a background image. Background size defaults to `cover`.",
-									"default": true
-								}
-							}
+					"properties": {
+						"backgroundImage": {
+							"type": "boolean",
+							"description": "Exposes a control that allows setting a background image. Background size defaults to `cover`.",
+							"default": false
 						}
-					]
+					}
 				},
 				"behaviors": {
 					"type": "object",