diff --git a/backport-changelog/6.7/6943.md b/backport-changelog/6.7/6943.md
new file mode 100644
index 0000000000000..6d7f2280731f8
--- /dev/null
+++ b/backport-changelog/6.7/6943.md
@@ -0,0 +1,3 @@
+https://github.com/WordPress/wordpress-develop/pull/6943
+
+* https://github.com/WordPress/gutenberg/pull/59891
\ No newline at end of file
diff --git a/lib/compat/wordpress-6.7/kses.php b/lib/compat/wordpress-6.7/kses.php
new file mode 100644
index 0000000000000..8ac74697e0fb4
--- /dev/null
+++ b/lib/compat/wordpress-6.7/kses.php
@@ -0,0 +1,18 @@
+
) }
diff --git a/packages/block-library/src/cover/edit/inspector-controls.js b/packages/block-library/src/cover/edit/inspector-controls.js
index 0b05a004cd06e..aa06eb4da365a 100644
--- a/packages/block-library/src/cover/edit/inspector-controls.js
+++ b/packages/block-library/src/cover/edit/inspector-controls.js
@@ -290,7 +290,7 @@ export default function CoverInspectorControls( {
}
min={ 0 }
max={ 100 }
- step={ 10 }
+ step={ 1 }
required
__next40pxDefaultSize
/>
diff --git a/packages/block-library/src/cover/save.js b/packages/block-library/src/cover/save.js
index f4ee486fb99a7..b4159e9369d1d 100644
--- a/packages/block-library/src/cover/save.js
+++ b/packages/block-library/src/cover/save.js
@@ -19,7 +19,6 @@ import {
import {
IMAGE_BACKGROUND_TYPE,
VIDEO_BACKGROUND_TYPE,
- dimRatioToClass,
isContentPositionCenter,
getPositionClassName,
mediaPosition,
@@ -66,6 +65,7 @@ export default function save( { attributes } ) {
};
const bgStyle = {
+ opacity: dimRatio / 100,
backgroundColor: ! overlayColorClass ? customOverlayColor : undefined,
background: customGradient ? customGradient : undefined,
};
@@ -109,7 +109,6 @@ export default function save( { attributes } ) {
className={ clsx(
'wp-block-cover__background',
overlayColorClass,
- dimRatioToClass( dimRatio ),
{
'has-background-dim': dimRatio !== undefined,
// For backwards compatibility. Former versions of the Cover Block applied
diff --git a/packages/block-library/src/cover/test/__snapshots__/edit.native.js.snap b/packages/block-library/src/cover/test/__snapshots__/edit.native.js.snap
index 25bd83daf06ca..17a8dda40df2f 100644
--- a/packages/block-library/src/cover/test/__snapshots__/edit.native.js.snap
+++ b/packages/block-library/src/cover/test/__snapshots__/edit.native.js.snap
@@ -1,8 +1,8 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP
exports[`color settings clears the selected overlay color and mantains the inner blocks 1`] = `
-"
-
+"
+
"
@@ -10,15 +10,15 @@ exports[`color settings clears the selected overlay color and mantains the inner
exports[`color settings sets a color for the overlay background when the placeholder is visible 1`] = `
"
-
+
"
`;
exports[`color settings sets a gradient overlay background when a solid background was already selected 1`] = `
-"
-
+"
+
"
@@ -26,79 +26,79 @@ exports[`color settings sets a gradient overlay background when a solid backgrou
exports[`color settings toggles between solid colors and gradients 1`] = `
"
-
+
"
`;
exports[`minimum height settings changes the height value between units 1`] = `
-"
-
+"
+
"
`;
exports[`minimum height settings changes the height value to 20(vw) 1`] = `
-"
-
+"
+
"
`;
exports[`minimum height settings disables the decrease button when reaching the minimum value for Pixels (px) 1`] = `
-"
-
+"
+
"
`;
exports[`minimum height settings disables the decrease button when reaching the minimum value for Relative to parent font size (em) 1`] = `
-"
-
+"
+
"
`;
exports[`minimum height settings disables the decrease button when reaching the minimum value for Relative to root font size (rem) 1`] = `
-"
-
+"
+
"
`;
exports[`minimum height settings disables the decrease button when reaching the minimum value for Viewport height (vh) 1`] = `
-"
-
+"
+
"
`;
exports[`minimum height settings disables the decrease button when reaching the minimum value for Viewport width (vw) 1`] = `
-"
-
+"
+
"
`;
exports[`when an image is attached updates background opacity 1`] = `
-"
-
+"
+
"
`;
exports[`when no media is attached and overlay color is set adds image 1`] = `
-"
-
+"
+
"
diff --git a/packages/block-library/src/cover/test/__snapshots__/transforms.native.js.snap b/packages/block-library/src/cover/test/__snapshots__/transforms.native.js.snap
index 1995da7a75876..351c94a36a8ce 100644
--- a/packages/block-library/src/cover/test/__snapshots__/transforms.native.js.snap
+++ b/packages/block-library/src/cover/test/__snapshots__/transforms.native.js.snap
@@ -3,8 +3,8 @@
exports[`Cover block transformations with Image to Columns block 1`] = `
"
-
-
+
@@ -14,8 +14,8 @@ exports[`Cover block transformations with Image to Columns block 1`] = `
exports[`Cover block transformations with Image to Group block 1`] = `
"
-
-
+
@@ -39,8 +39,8 @@ exports[`Cover block transformations with Image to Media & Text block 1`] = `
exports[`Cover block transformations with Video to Columns block 1`] = `
"
-
-
+
@@ -50,8 +50,8 @@ exports[`Cover block transformations with Video to Columns block 1`] = `
exports[`Cover block transformations with Video to Group block 1`] = `
"
-
-
+
diff --git a/packages/block-library/src/cover/test/edit.js b/packages/block-library/src/cover/test/edit.js
index ab99d3c555e3b..cfab118556c08 100644
--- a/packages/block-library/src/cover/test/edit.js
+++ b/packages/block-library/src/cover/test/edit.js
@@ -277,7 +277,7 @@ describe( 'Cover block', () => {
'wp-block-cover__background'
);
- expect( overlay[ 0 ] ).toHaveClass( 'has-background-dim-100' );
+ expect( overlay[ 0 ] ).toHaveStyle( 'opacity: 1;' );
await userEvent.click(
screen.getByRole( 'tab', {
@@ -297,7 +297,7 @@ describe( 'Cover block', () => {
);
} );
- expect( overlay[ 0 ] ).toHaveClass( 'has-background-dim-40' );
+ expect( overlay[ 0 ] ).toHaveStyle( 'opacity: 0.4;' );
} );
test( 'applies selected opacity to block when slider moved', async () => {
@@ -310,7 +310,7 @@ describe( 'Cover block', () => {
'wp-block-cover__background'
);
- expect( overlay[ 0 ] ).toHaveClass( 'has-background-dim-100' );
+ expect( overlay[ 0 ] ).toHaveStyle( 'opacity: 1;' );
await userEvent.click(
screen.getByRole( 'tab', {
@@ -329,7 +329,7 @@ describe( 'Cover block', () => {
);
} );
- expect( overlay[ 0 ] ).toHaveClass( 'has-background-dim-30' );
+ expect( overlay[ 0 ] ).toHaveStyle( 'opacity: 0.3;' );
} );
describe( 'when colors are disabled', () => {
diff --git a/packages/block-library/src/cover/test/edit.native.js b/packages/block-library/src/cover/test/edit.native.js
index 6925cfe3f6221..44cfe246ae0c4 100644
--- a/packages/block-library/src/cover/test/edit.native.js
+++ b/packages/block-library/src/cover/test/edit.native.js
@@ -46,20 +46,20 @@ jest.mock( '@wordpress/compose', () => ( {
} ) );
const COVER_BLOCK_PLACEHOLDER_HTML = `
-
+
`;
const COVER_BLOCK_SOLID_COLOR_HTML = `
-
+
`;
const COVER_BLOCK_IMAGE_HTML = `
-
+
`;
const COVER_BLOCK_CUSTOM_HEIGHT_HTML = `
-
+
`;
diff --git a/packages/block-library/src/cover/test/transforms.native.js b/packages/block-library/src/cover/test/transforms.native.js
index ad3a951a7e9f6..69adc472f568f 100644
--- a/packages/block-library/src/cover/test/transforms.native.js
+++ b/packages/block-library/src/cover/test/transforms.native.js
@@ -12,13 +12,13 @@ import {
const block = 'Cover';
const initialHtmlWithImage = `
-
+
`;
const initialHtmlWithVideo = `
-
+
`;
diff --git a/packages/block-library/src/image/test/__snapshots__/transforms.native.js.snap b/packages/block-library/src/image/test/__snapshots__/transforms.native.js.snap
index 56a5fe3c25912..8bb02f16128cb 100644
--- a/packages/block-library/src/image/test/__snapshots__/transforms.native.js.snap
+++ b/packages/block-library/src/image/test/__snapshots__/transforms.native.js.snap
@@ -12,7 +12,7 @@ exports[`Image block transformations to Columns block 1`] = `
exports[`Image block transformations to Cover block 1`] = `
"
-
+
"
diff --git a/packages/block-library/src/media-text/test/__snapshots__/transforms.native.js.snap b/packages/block-library/src/media-text/test/__snapshots__/transforms.native.js.snap
index 07e18768ec9c2..4cce8b3e23813 100644
--- a/packages/block-library/src/media-text/test/__snapshots__/transforms.native.js.snap
+++ b/packages/block-library/src/media-text/test/__snapshots__/transforms.native.js.snap
@@ -14,7 +14,7 @@ exports[`Media & Text block transformations with Image to Columns block 1`] = `
exports[`Media & Text block transformations with Image to Cover block 1`] = `
"
-
+
"
@@ -50,7 +50,7 @@ exports[`Media & Text block transformations with Video to Columns block 1`] = `
exports[`Media & Text block transformations with Video to Cover block 1`] = `
"
-
+
"
diff --git a/packages/block-library/src/video/test/__snapshots__/transforms.native.js.snap b/packages/block-library/src/video/test/__snapshots__/transforms.native.js.snap
index c0ea73eadc475..8d2483797cc0f 100644
--- a/packages/block-library/src/video/test/__snapshots__/transforms.native.js.snap
+++ b/packages/block-library/src/video/test/__snapshots__/transforms.native.js.snap
@@ -12,7 +12,7 @@ exports[`Video block transforms to Columns block 1`] = `
exports[`Video block transforms to Cover block 1`] = `
"
-
+
"
diff --git a/packages/react-native-editor/src/initial-html.js b/packages/react-native-editor/src/initial-html.js
index 684ca0dfbf8de..7739ca28dbede 100644
--- a/packages/react-native-editor/src/initial-html.js
+++ b/packages/react-native-editor/src/initial-html.js
@@ -151,7 +151,7 @@ export const mediaBlocks = `
-
+
diff --git a/test/integration/fixtures/blocks/core__cover.html b/test/integration/fixtures/blocks/core__cover.html
index 5c69931dd2269..18583c00a6d6e 100644
--- a/test/integration/fixtures/blocks/core__cover.html
+++ b/test/integration/fixtures/blocks/core__cover.html
@@ -1,6 +1,6 @@
-
+
diff --git a/test/integration/fixtures/blocks/core__cover.parsed.json b/test/integration/fixtures/blocks/core__cover.parsed.json
index 4df6d84c29cef..bfe6166578741 100644
--- a/test/integration/fixtures/blocks/core__cover.parsed.json
+++ b/test/integration/fixtures/blocks/core__cover.parsed.json
@@ -20,9 +20,9 @@
]
}
],
- "innerHTML": "\n
\n
\n
\n
\n\t\t\n\t
\n
\n",
+ "innerHTML": "\n
\n
\n
\n
\n\t\t\n\t
\n
\n",
"innerContent": [
- "\n
\n
\n
\n
\n\t\t",
+ "\n
\n
\n
\n
\n\t\t",
null,
"\n\t
\n
\n"
]
diff --git a/test/integration/fixtures/blocks/core__cover.serialized.html b/test/integration/fixtures/blocks/core__cover.serialized.html
index b7eeb8cf4b85d..5e0d5b43087e3 100644
--- a/test/integration/fixtures/blocks/core__cover.serialized.html
+++ b/test/integration/fixtures/blocks/core__cover.serialized.html
@@ -1,5 +1,5 @@
-
+
Guten Berg!
diff --git a/test/integration/fixtures/blocks/core__cover__alt-fixed-background.html b/test/integration/fixtures/blocks/core__cover__alt-fixed-background.html
index 7c8aaa5a7ccbc..386c7b4a2b387 100644
--- a/test/integration/fixtures/blocks/core__cover__alt-fixed-background.html
+++ b/test/integration/fixtures/blocks/core__cover__alt-fixed-background.html
@@ -1,5 +1,5 @@
-
+
\ No newline at end of file
diff --git a/test/integration/fixtures/blocks/core__cover__alt-fixed-background.parsed.json b/test/integration/fixtures/blocks/core__cover__alt-fixed-background.parsed.json
index 9de6f5b24fe0d..78bc653dd39a2 100644
--- a/test/integration/fixtures/blocks/core__cover__alt-fixed-background.parsed.json
+++ b/test/integration/fixtures/blocks/core__cover__alt-fixed-background.parsed.json
@@ -27,9 +27,9 @@
]
}
],
- "innerHTML": "\n
\n",
+ "innerHTML": "\n
\n",
"innerContent": [
- "\n
",
+ "\n
\n"
]
diff --git a/test/integration/fixtures/blocks/core__cover__alt-fixed-background.serialized.html b/test/integration/fixtures/blocks/core__cover__alt-fixed-background.serialized.html
index 438eba81614c4..28d1831609ecb 100644
--- a/test/integration/fixtures/blocks/core__cover__alt-fixed-background.serialized.html
+++ b/test/integration/fixtures/blocks/core__cover__alt-fixed-background.serialized.html
@@ -1,5 +1,5 @@
-
+
diff --git a/test/integration/fixtures/blocks/core__cover__deprecated-1.serialized.html b/test/integration/fixtures/blocks/core__cover__deprecated-1.serialized.html
index 0a535e66bff5b..3019fb19c54ca 100644
--- a/test/integration/fixtures/blocks/core__cover__deprecated-1.serialized.html
+++ b/test/integration/fixtures/blocks/core__cover__deprecated-1.serialized.html
@@ -1,5 +1,5 @@
-
+
diff --git a/test/integration/fixtures/blocks/core__cover__deprecated-10.json b/test/integration/fixtures/blocks/core__cover__deprecated-10.json
index 6286a4b12eb92..ce3dc9eb1d553 100644
--- a/test/integration/fixtures/blocks/core__cover__deprecated-10.json
+++ b/test/integration/fixtures/blocks/core__cover__deprecated-10.json
@@ -4,7 +4,6 @@
"isValid": true,
"attributes": {
"url": "https://w.wiki/59Sd",
- "useFeaturedImage": false,
"id": 609,
"alt": "",
"hasParallax": false,
@@ -12,6 +11,7 @@
"dimRatio": 50,
"backgroundType": "image",
"isDark": true,
+ "useFeaturedImage": false,
"tagName": "div"
},
"innerBlocks": [
diff --git a/test/integration/fixtures/blocks/core__cover__deprecated-10.serialized.html b/test/integration/fixtures/blocks/core__cover__deprecated-10.serialized.html
index d48a8b8e98394..aca07074f683a 100644
--- a/test/integration/fixtures/blocks/core__cover__deprecated-10.serialized.html
+++ b/test/integration/fixtures/blocks/core__cover__deprecated-10.serialized.html
@@ -1,5 +1,5 @@
-
+
diff --git a/test/integration/fixtures/blocks/core__cover__deprecated-12.serialized.html b/test/integration/fixtures/blocks/core__cover__deprecated-12.serialized.html
index d51734e18a541..ff8f89a94c17b 100644
--- a/test/integration/fixtures/blocks/core__cover__deprecated-12.serialized.html
+++ b/test/integration/fixtures/blocks/core__cover__deprecated-12.serialized.html
@@ -1,5 +1,5 @@
-
+
diff --git a/test/integration/fixtures/blocks/core__cover__deprecated-2.serialized.html b/test/integration/fixtures/blocks/core__cover__deprecated-2.serialized.html
index 361eb663bf1f6..3b2761c454bf0 100644
--- a/test/integration/fixtures/blocks/core__cover__deprecated-2.serialized.html
+++ b/test/integration/fixtures/blocks/core__cover__deprecated-2.serialized.html
@@ -1,5 +1,5 @@
-
+
diff --git a/test/integration/fixtures/blocks/core__cover__deprecated-3.serialized.html b/test/integration/fixtures/blocks/core__cover__deprecated-3.serialized.html
index c1cd5a78fbee5..e88d0ba18db91 100644
--- a/test/integration/fixtures/blocks/core__cover__deprecated-3.serialized.html
+++ b/test/integration/fixtures/blocks/core__cover__deprecated-3.serialized.html
@@ -1,5 +1,5 @@
-
+
diff --git a/test/integration/fixtures/blocks/core__cover__deprecated-4.serialized.html b/test/integration/fixtures/blocks/core__cover__deprecated-4.serialized.html
index be37f15331a56..17e1b7b6ae1a2 100644
--- a/test/integration/fixtures/blocks/core__cover__deprecated-4.serialized.html
+++ b/test/integration/fixtures/blocks/core__cover__deprecated-4.serialized.html
@@ -1,5 +1,5 @@
-
+
diff --git a/test/integration/fixtures/blocks/core__cover__deprecated-5.serialized.html b/test/integration/fixtures/blocks/core__cover__deprecated-5.serialized.html
index 2d9a20ba12791..fcbf6beba0b0e 100644
--- a/test/integration/fixtures/blocks/core__cover__deprecated-5.serialized.html
+++ b/test/integration/fixtures/blocks/core__cover__deprecated-5.serialized.html
@@ -1,5 +1,5 @@
-
+
diff --git a/test/integration/fixtures/blocks/core__cover__deprecated-6.serialized.html b/test/integration/fixtures/blocks/core__cover__deprecated-6.serialized.html
index 657c10cc92896..005ae9a74fbfb 100644
--- a/test/integration/fixtures/blocks/core__cover__deprecated-6.serialized.html
+++ b/test/integration/fixtures/blocks/core__cover__deprecated-6.serialized.html
@@ -1,5 +1,5 @@
-
+
Guten Berg!
@@ -7,13 +7,13 @@
-
+
-
+
diff --git a/test/integration/fixtures/blocks/core__cover__deprecated-7.serialized.html b/test/integration/fixtures/blocks/core__cover__deprecated-7.serialized.html
index baa8e32e7e823..7c21e42b7b1c5 100644
--- a/test/integration/fixtures/blocks/core__cover__deprecated-7.serialized.html
+++ b/test/integration/fixtures/blocks/core__cover__deprecated-7.serialized.html
@@ -1,5 +1,5 @@
-
+
Guten Berg!
diff --git a/test/integration/fixtures/blocks/core__cover__deprecated-8.serialized.html b/test/integration/fixtures/blocks/core__cover__deprecated-8.serialized.html
index fd99791a8e524..cf16f22030cdf 100644
--- a/test/integration/fixtures/blocks/core__cover__deprecated-8.serialized.html
+++ b/test/integration/fixtures/blocks/core__cover__deprecated-8.serialized.html
@@ -1,5 +1,5 @@
-
+
Guten Berg!
diff --git a/test/integration/fixtures/blocks/core__cover__deprecated-9.serialized.html b/test/integration/fixtures/blocks/core__cover__deprecated-9.serialized.html
index 8b47c4651e882..509748a9c0507 100644
--- a/test/integration/fixtures/blocks/core__cover__deprecated-9.serialized.html
+++ b/test/integration/fixtures/blocks/core__cover__deprecated-9.serialized.html
@@ -1,5 +1,5 @@
-
+
diff --git a/test/integration/fixtures/blocks/core__cover__duotone-fixed-background.html b/test/integration/fixtures/blocks/core__cover__duotone-fixed-background.html
index 8c77b25cf33fc..b15eea3c39175 100644
--- a/test/integration/fixtures/blocks/core__cover__duotone-fixed-background.html
+++ b/test/integration/fixtures/blocks/core__cover__duotone-fixed-background.html
@@ -1,5 +1,5 @@
-
+
\ No newline at end of file
diff --git a/test/integration/fixtures/blocks/core__cover__duotone-fixed-background.parsed.json b/test/integration/fixtures/blocks/core__cover__duotone-fixed-background.parsed.json
index 22ae61f6258ef..30435a030dc39 100644
--- a/test/integration/fixtures/blocks/core__cover__duotone-fixed-background.parsed.json
+++ b/test/integration/fixtures/blocks/core__cover__duotone-fixed-background.parsed.json
@@ -29,9 +29,9 @@
]
}
],
- "innerHTML": "\n
\n ",
+ "innerHTML": "\n
\n ",
"innerContent": [
- "\n
",
+ "\n
\n "
]
diff --git a/test/integration/fixtures/blocks/core__cover__duotone-fixed-background.serialized.html b/test/integration/fixtures/blocks/core__cover__duotone-fixed-background.serialized.html
index e52c3e993dd10..c39c6561f3e49 100644
--- a/test/integration/fixtures/blocks/core__cover__duotone-fixed-background.serialized.html
+++ b/test/integration/fixtures/blocks/core__cover__duotone-fixed-background.serialized.html
@@ -1,5 +1,5 @@
-
+
diff --git a/test/integration/fixtures/blocks/core__cover__gradient-custom.html b/test/integration/fixtures/blocks/core__cover__gradient-custom.html
index fd0a851735785..25e5465fee43d 100644
--- a/test/integration/fixtures/blocks/core__cover__gradient-custom.html
+++ b/test/integration/fixtures/blocks/core__cover__gradient-custom.html
@@ -1,6 +1,6 @@
-
+
Cover!
diff --git a/test/integration/fixtures/blocks/core__cover__gradient-custom.parsed.json b/test/integration/fixtures/blocks/core__cover__gradient-custom.parsed.json
index 53f6fc55fb277..fce16206a4d22 100644
--- a/test/integration/fixtures/blocks/core__cover__gradient-custom.parsed.json
+++ b/test/integration/fixtures/blocks/core__cover__gradient-custom.parsed.json
@@ -19,9 +19,9 @@
]
}
],
- "innerHTML": "\n
\n",
+ "innerHTML": "\n
\n",
"innerContent": [
- "\n
\n\t
\n\t
\n\t\t",
+ "\n
\n\t
\n\t
\n\t\t",
null,
"\n\t
\n
\n"
]
diff --git a/test/integration/fixtures/blocks/core__cover__gradient-custom.serialized.html b/test/integration/fixtures/blocks/core__cover__gradient-custom.serialized.html
index a6ea10215b7a1..8d11aed1c5cfc 100644
--- a/test/integration/fixtures/blocks/core__cover__gradient-custom.serialized.html
+++ b/test/integration/fixtures/blocks/core__cover__gradient-custom.serialized.html
@@ -1,5 +1,5 @@
-
+
diff --git a/test/integration/fixtures/blocks/core__cover__gradient-image.html b/test/integration/fixtures/blocks/core__cover__gradient-image.html
index dba861ef5bf3f..3a68df3cb60a3 100644
--- a/test/integration/fixtures/blocks/core__cover__gradient-image.html
+++ b/test/integration/fixtures/blocks/core__cover__gradient-image.html
@@ -1,6 +1,6 @@
-
+
diff --git a/test/integration/fixtures/blocks/core__cover__gradient-image.parsed.json b/test/integration/fixtures/blocks/core__cover__gradient-image.parsed.json
index e5e97653e2745..bdbca5942a0dd 100644
--- a/test/integration/fixtures/blocks/core__cover__gradient-image.parsed.json
+++ b/test/integration/fixtures/blocks/core__cover__gradient-image.parsed.json
@@ -21,9 +21,9 @@
]
}
],
- "innerHTML": "\n
\n
\n
\n\t
\n\t\t\n\t
\n
\n",
+ "innerHTML": "\n
\n
\n
\n\t
\n\t\t\n\t
\n
\n",
"innerContent": [
- "\n
\n
\n
\n\t
\n\t\t",
+ "\n
\n
\n
\n\t
\n\t\t",
null,
"\n\t
\n
\n"
]
diff --git a/test/integration/fixtures/blocks/core__cover__gradient-image.serialized.html b/test/integration/fixtures/blocks/core__cover__gradient-image.serialized.html
index 135949383f712..d1f4282a1443e 100644
--- a/test/integration/fixtures/blocks/core__cover__gradient-image.serialized.html
+++ b/test/integration/fixtures/blocks/core__cover__gradient-image.serialized.html
@@ -1,5 +1,5 @@
-
+
diff --git a/test/integration/fixtures/blocks/core__cover__gradient-video.html b/test/integration/fixtures/blocks/core__cover__gradient-video.html
index 1081afe2518b3..f2110ce86c6b5 100644
--- a/test/integration/fixtures/blocks/core__cover__gradient-video.html
+++ b/test/integration/fixtures/blocks/core__cover__gradient-video.html
@@ -1,6 +1,6 @@
-
+
diff --git a/test/integration/fixtures/blocks/core__cover__gradient-video.parsed.json b/test/integration/fixtures/blocks/core__cover__gradient-video.parsed.json
index 8ad72c9c549b2..53367075333d1 100644
--- a/test/integration/fixtures/blocks/core__cover__gradient-video.parsed.json
+++ b/test/integration/fixtures/blocks/core__cover__gradient-video.parsed.json
@@ -22,9 +22,9 @@
]
}
],
- "innerHTML": "\n
\n",
+ "innerHTML": "\n
\n",
"innerContent": [
- "\n
\n\t
\n\t
\n\t
\n\t\t",
+ "\n
\n\t
\n\t
\n\t
\n\t\t",
null,
"\n\t
\n
\n"
]
diff --git a/test/integration/fixtures/blocks/core__cover__gradient-video.serialized.html b/test/integration/fixtures/blocks/core__cover__gradient-video.serialized.html
index 417d8666481dc..01dd70f6528cf 100644
--- a/test/integration/fixtures/blocks/core__cover__gradient-video.serialized.html
+++ b/test/integration/fixtures/blocks/core__cover__gradient-video.serialized.html
@@ -1,5 +1,5 @@
-
+
diff --git a/test/integration/fixtures/blocks/core__cover__gradient.html b/test/integration/fixtures/blocks/core__cover__gradient.html
index 7b20b808c461c..a7be1bcd4dc23 100644
--- a/test/integration/fixtures/blocks/core__cover__gradient.html
+++ b/test/integration/fixtures/blocks/core__cover__gradient.html
@@ -1,6 +1,6 @@
-
+
Cover!
diff --git a/test/integration/fixtures/blocks/core__cover__gradient.parsed.json b/test/integration/fixtures/blocks/core__cover__gradient.parsed.json
index d6f084f048d85..7be38bf29141f 100644
--- a/test/integration/fixtures/blocks/core__cover__gradient.parsed.json
+++ b/test/integration/fixtures/blocks/core__cover__gradient.parsed.json
@@ -20,9 +20,9 @@
]
}
],
- "innerHTML": "\n
\n",
+ "innerHTML": "\n
\n",
"innerContent": [
- "\n
\n
\n\t
\n\t\t",
+ "\n
\n
\n\t
\n\t\t",
null,
"\n\t
\n
\n"
]
diff --git a/test/integration/fixtures/blocks/core__cover__gradient.serialized.html b/test/integration/fixtures/blocks/core__cover__gradient.serialized.html
index 12f535f03d091..434a1d495fccb 100644
--- a/test/integration/fixtures/blocks/core__cover__gradient.serialized.html
+++ b/test/integration/fixtures/blocks/core__cover__gradient.serialized.html
@@ -1,5 +1,5 @@
-
+
diff --git a/test/integration/fixtures/blocks/core__cover__gradient__deprecated-8.html b/test/integration/fixtures/blocks/core__cover__gradient__deprecated-8.html
index 31d1d985c69d5..a9a9e535b8943 100644
--- a/test/integration/fixtures/blocks/core__cover__gradient__deprecated-8.html
+++ b/test/integration/fixtures/blocks/core__cover__gradient__deprecated-8.html
@@ -1,6 +1,6 @@
-
+
Cover!
diff --git a/test/integration/fixtures/blocks/core__cover__gradient__deprecated-8.json b/test/integration/fixtures/blocks/core__cover__gradient__deprecated-8.json
index e4db2a2ece377..83848f858c1cd 100644
--- a/test/integration/fixtures/blocks/core__cover__gradient__deprecated-8.json
+++ b/test/integration/fixtures/blocks/core__cover__gradient__deprecated-8.json
@@ -1,8 +1,9 @@
[
{
"name": "core/cover",
- "isValid": true,
+ "isValid": false,
"attributes": {
+ "useFeaturedImage": false,
"alt": "",
"hasParallax": false,
"isRepeated": false,
diff --git a/test/integration/fixtures/blocks/core__cover__gradient__deprecated-8.parsed.json b/test/integration/fixtures/blocks/core__cover__gradient__deprecated-8.parsed.json
index aeb31aad9fa79..982864f11c4ad 100644
--- a/test/integration/fixtures/blocks/core__cover__gradient__deprecated-8.parsed.json
+++ b/test/integration/fixtures/blocks/core__cover__gradient__deprecated-8.parsed.json
@@ -20,9 +20,9 @@
]
}
],
- "innerHTML": "\n
\n",
+ "innerHTML": "\n
\n",
"innerContent": [
- "\n
\n
\n
\n ",
+ "\n
\n"
]
diff --git a/test/integration/fixtures/blocks/core__cover__gradient__deprecated-8.serialized.html b/test/integration/fixtures/blocks/core__cover__gradient__deprecated-8.serialized.html
index 9dbf400bcff0d..36e8749285247 100644
--- a/test/integration/fixtures/blocks/core__cover__gradient__deprecated-8.serialized.html
+++ b/test/integration/fixtures/blocks/core__cover__gradient__deprecated-8.serialized.html
@@ -1,5 +1,11 @@
-
diff --git a/test/integration/fixtures/blocks/core__cover__solid-color.html b/test/integration/fixtures/blocks/core__cover__solid-color.html
index 2b280936af63b..079695d699869 100644
--- a/test/integration/fixtures/blocks/core__cover__solid-color.html
+++ b/test/integration/fixtures/blocks/core__cover__solid-color.html
@@ -1,6 +1,6 @@
-
+
diff --git a/test/integration/fixtures/blocks/core__cover__solid-color.json b/test/integration/fixtures/blocks/core__cover__solid-color.json
index 4d06b3e616e16..8ddbe7fdbdc7e 100644
--- a/test/integration/fixtures/blocks/core__cover__solid-color.json
+++ b/test/integration/fixtures/blocks/core__cover__solid-color.json
@@ -3,6 +3,7 @@
"name": "core/cover",
"isValid": true,
"attributes": {
+ "useFeaturedImage": false,
"alt": "",
"hasParallax": false,
"isRepeated": false,
@@ -10,9 +11,7 @@
"overlayColor": "primary",
"backgroundType": "image",
"isDark": true,
- "useFeaturedImage": false,
- "tagName": "div",
- "isUserOverlayColor": true
+ "tagName": "div"
},
"innerBlocks": [
{
diff --git a/test/integration/fixtures/blocks/core__cover__solid-color.parsed.json b/test/integration/fixtures/blocks/core__cover__solid-color.parsed.json
index 98e28467d1ab5..18dac2ebc55a2 100644
--- a/test/integration/fixtures/blocks/core__cover__solid-color.parsed.json
+++ b/test/integration/fixtures/blocks/core__cover__solid-color.parsed.json
@@ -19,9 +19,9 @@
]
}
],
- "innerHTML": "\n
\n",
+ "innerHTML": "\n
\n",
"innerContent": [
- "\n
\n
\n\t
\n\t\t",
+ "\n
\n
\n\t
\n\t\t",
null,
"\n\t
\n
\n"
]
diff --git a/test/integration/fixtures/blocks/core__cover__solid-color.serialized.html b/test/integration/fixtures/blocks/core__cover__solid-color.serialized.html
index 333fb817b7283..01afb28056f6f 100644
--- a/test/integration/fixtures/blocks/core__cover__solid-color.serialized.html
+++ b/test/integration/fixtures/blocks/core__cover__solid-color.serialized.html
@@ -1,5 +1,5 @@
-
-
+
+
diff --git a/test/integration/fixtures/blocks/core__cover__video-overlay.html b/test/integration/fixtures/blocks/core__cover__video-overlay.html
index 3d78269821c15..fa6f0dea707c4 100644
--- a/test/integration/fixtures/blocks/core__cover__video-overlay.html
+++ b/test/integration/fixtures/blocks/core__cover__video-overlay.html
@@ -1,6 +1,6 @@
-
+
diff --git a/test/integration/fixtures/blocks/core__cover__video-overlay.json b/test/integration/fixtures/blocks/core__cover__video-overlay.json
index 7916e3f7a20b6..7adcdedd68754 100644
--- a/test/integration/fixtures/blocks/core__cover__video-overlay.json
+++ b/test/integration/fixtures/blocks/core__cover__video-overlay.json
@@ -4,6 +4,7 @@
"isValid": true,
"attributes": {
"url": "data:video/mp4;base64,AAAAHGZ0eXBpc29tAAACAGlzb21pc28ybXA0MQAAAAhmcmVlAAAC721kYXQhEAUgpBv/wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA3pwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcCEQBSCkG//AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADengAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAsJtb292AAAAbG12aGQAAAAAAAAAAAAAAAAAAAPoAAAALwABAAABAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADAAAB7HRyYWsAAABcdGtoZAAAAAMAAAAAAAAAAAAAAAIAAAAAAAAALwAAAAAAAAAAAAAAAQEAAAAAAQAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAACRlZHRzAAAAHGVsc3QAAAAAAAAAAQAAAC8AAAAAAAEAAAAAAWRtZGlhAAAAIG1kaGQAAAAAAAAAAAAAAAAAAKxEAAAIAFXEAAAAAAAtaGRscgAAAAAAAAAAc291bgAAAAAAAAAAAAAAAFNvdW5kSGFuZGxlcgAAAAEPbWluZgAAABBzbWhkAAAAAAAAAAAAAAAkZGluZgAAABxkcmVmAAAAAAAAAAEAAAAMdXJsIAAAAAEAAADTc3RibAAAAGdzdHNkAAAAAAAAAAEAAABXbXA0YQAAAAAAAAABAAAAAAAAAAAAAgAQAAAAAKxEAAAAAAAzZXNkcwAAAAADgICAIgACAASAgIAUQBUAAAAAAfQAAAHz+QWAgIACEhAGgICAAQIAAAAYc3R0cwAAAAAAAAABAAAAAgAABAAAAAAcc3RzYwAAAAAAAAABAAAAAQAAAAIAAAABAAAAHHN0c3oAAAAAAAAAAAAAAAIAAAFzAAABdAAAABRzdGNvAAAAAAAAAAEAAAAsAAAAYnVkdGEAAABabWV0YQAAAAAAAAAhaGRscgAAAAAAAAAAbWRpcmFwcGwAAAAAAAAAAAAAAAAtaWxzdAAAACWpdG9vAAAAHWRhdGEAAAABAAAAAExhdmY1Ni40MC4xMDE=",
+ "useFeaturedImage": false,
"alt": "",
"hasParallax": false,
"isRepeated": false,
@@ -11,9 +12,7 @@
"customOverlayColor": "#3615d9",
"backgroundType": "video",
"isDark": true,
- "useFeaturedImage": false,
- "tagName": "div",
- "isUserOverlayColor": true
+ "tagName": "div"
},
"innerBlocks": [
{
diff --git a/test/integration/fixtures/blocks/core__cover__video-overlay.parsed.json b/test/integration/fixtures/blocks/core__cover__video-overlay.parsed.json
index c766000af5672..ddb6134422b90 100644
--- a/test/integration/fixtures/blocks/core__cover__video-overlay.parsed.json
+++ b/test/integration/fixtures/blocks/core__cover__video-overlay.parsed.json
@@ -22,9 +22,9 @@
]
}
],
- "innerHTML": "\n
\n",
+ "innerHTML": "\n
\n",
"innerContent": [
- "\n
\n\t
\n\t
\n\t
\n\t\t",
+ "\n
\n\t
\n\t
\n\t
\n\t\t",
null,
"\n\t
\n
\n"
]
diff --git a/test/integration/fixtures/blocks/core__cover__video-overlay.serialized.html b/test/integration/fixtures/blocks/core__cover__video-overlay.serialized.html
index 3cbf472fe84c4..f7e9c07402307 100644
--- a/test/integration/fixtures/blocks/core__cover__video-overlay.serialized.html
+++ b/test/integration/fixtures/blocks/core__cover__video-overlay.serialized.html
@@ -1,5 +1,5 @@
-
-
+
+
Guten Berg!
diff --git a/test/integration/fixtures/blocks/core__cover__video.html b/test/integration/fixtures/blocks/core__cover__video.html
index 6dc5bfae8a15e..b371aa810d83d 100644
--- a/test/integration/fixtures/blocks/core__cover__video.html
+++ b/test/integration/fixtures/blocks/core__cover__video.html
@@ -1,6 +1,6 @@
-
+
diff --git a/test/integration/fixtures/blocks/core__cover__video.parsed.json b/test/integration/fixtures/blocks/core__cover__video.parsed.json
index 0ac0886db52f1..d4c8051da7f63 100644
--- a/test/integration/fixtures/blocks/core__cover__video.parsed.json
+++ b/test/integration/fixtures/blocks/core__cover__video.parsed.json
@@ -21,9 +21,9 @@
]
}
],
- "innerHTML": "\n
\n",
+ "innerHTML": "\n
\n",
"innerContent": [
- "\n
\n\t
\n\t
\n\t
\n\t\t",
+ "\n
\n\t
\n\t
\n\t
\n\t\t",
null,
"\n\t
\n
\n"
]
diff --git a/test/integration/fixtures/blocks/core__cover__video.serialized.html b/test/integration/fixtures/blocks/core__cover__video.serialized.html
index 0fb6cbf9e1266..9d67dd5bf179b 100644
--- a/test/integration/fixtures/blocks/core__cover__video.serialized.html
+++ b/test/integration/fixtures/blocks/core__cover__video.serialized.html
@@ -1,5 +1,5 @@
-