From 41d4288012c9fe0aed284187c140f2356919df61 Mon Sep 17 00:00:00 2001 From: Alex Lende Date: Fri, 28 Jul 2023 09:09:15 -0500 Subject: [PATCH 1/5] Apply default attributes on block migration --- .../src/api/parser/apply-block-deprecated-versions.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/blocks/src/api/parser/apply-block-deprecated-versions.js b/packages/blocks/src/api/parser/apply-block-deprecated-versions.js index 6c9d81d47b031..f29a0062214b8 100644 --- a/packages/blocks/src/api/parser/apply-block-deprecated-versions.js +++ b/packages/blocks/src/api/parser/apply-block-deprecated-versions.js @@ -113,7 +113,11 @@ export function applyBlockDeprecatedVersions( block, rawBlock, blockType ) { block = { ...block, - attributes: migratedAttributes, + attributes: getBlockAttributes( + blockType, + migratedBlock.originalContent, + migratedAttributes + ), innerBlocks: migratedInnerBlocks, isValid: true, validationIssues: [], From 47b300e978f7e37d78d27722fe5d4e9827be8c7c Mon Sep 17 00:00:00 2001 From: Alex Lende Date: Fri, 28 Jul 2023 10:37:10 -0500 Subject: [PATCH 2/5] Fix incorrect test --- .../src/api/parser/test/apply-block-deprecated-versions.js | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/packages/blocks/src/api/parser/test/apply-block-deprecated-versions.js b/packages/blocks/src/api/parser/test/apply-block-deprecated-versions.js index bea5a4ea30bfd..246cab389d25b 100644 --- a/packages/blocks/src/api/parser/test/apply-block-deprecated-versions.js +++ b/packages/blocks/src/api/parser/test/apply-block-deprecated-versions.js @@ -134,6 +134,13 @@ describe( 'applyBlockDeprecatedVersions', () => { } ); const blockType = registerBlockType( 'core/test-block', { ...defaultBlockSettings, + attributes: { + newFruit: { + type: 'string', + source: 'text', + selector: 'div', + }, + }, save: ( props ) =>
{ props.attributes.fruit }
, deprecated: [ { From be4c5748b879a087fd0d6151d8c1ec28cce26429 Mon Sep 17 00:00:00 2001 From: Alex Lende Date: Fri, 28 Jul 2023 10:39:02 -0500 Subject: [PATCH 3/5] Update block deprecation snapshots --- .../blocks/core__comments__deprecated-1.json | 1 + .../blocks/core__cover__deprecated-1.json | 4 +++ .../core__cover__deprecated-1.serialized.html | 2 +- .../blocks/core__cover__deprecated-2.json | 4 +++ .../core__cover__deprecated-2.serialized.html | 2 +- .../blocks/core__cover__deprecated-3.json | 4 +++ .../core__cover__deprecated-3.serialized.html | 2 +- .../blocks/core__cover__deprecated-4.json | 4 +++ .../core__cover__deprecated-4.serialized.html | 2 +- .../blocks/core__cover__deprecated-5.json | 4 +++ .../core__cover__deprecated-5.serialized.html | 2 +- .../blocks/core__cover__deprecated-6.json | 20 +++++++++---- .../core__cover__deprecated-6.serialized.html | 6 ++-- .../blocks/core__cover__deprecated-7.json | 6 ++-- .../core__cover__deprecated-7.serialized.html | 2 +- .../blocks/core__cover__deprecated-8.json | 1 + .../blocks/core__cover__deprecated-9.json | 1 + .../core__cover__gradient__deprecated-8.json | 1 + .../blocks/core__gallery__deprecated-1.json | 10 +++++-- .../blocks/core__gallery__deprecated-2.json | 23 +++++++++++++-- .../blocks/core__gallery__deprecated-3.json | 21 ++++++++++++-- .../blocks/core__gallery__deprecated-4.json | 28 ++++++++++++++++-- .../blocks/core__gallery__deprecated-5.json | 29 +++++++++++++++++++ .../blocks/core__gallery__deprecated-6.json | 29 +++++++++++++++++++ .../blocks/core__group__deprecated-2.json | 4 +-- .../blocks/core__heading__deprecated-1.json | 4 +-- .../blocks/core__heading__deprecated-4.json | 4 +-- ...e__deprecated-v1-add-responsive-class.json | 4 +-- ...e__deprecated-v2-add-is-resized-class.json | 4 +-- .../core__list__deprecated-v1-nested.json | 2 +- .../blocks/core__list__deprecated-v1.json | 2 +- .../core__media-text__deprecated-v5.json | 2 +- ...ext__deprecated-v6-wide-default-align.json | 4 +-- ...t__image-fill-no-focal-point-selected.json | 2 +- ..._image-fill-with-focal-point-selected.json | 2 +- ...ore__media-text__is-stacked-on-mobile.json | 4 +-- ..._media-right-custom-width__deprecated.json | 4 +-- ...re__media-text__vertical-align-bottom.json | 2 +- .../blocks/core__media-text__video.json | 4 +-- .../core__navigation__deprecated-1.json | 3 ++ .../core__navigation__deprecated-v4.json | 3 ++ .../core__navigation__deprecated-v5.json | 3 ++ .../blocks/core__navigation__deprecated.json | 5 ++++ .../blocks/core__paragraph__deprecated.json | 2 +- ...ore__paragraph__deprecated.serialized.html | 2 +- .../core__post-date__deprecated-v1.json | 1 + ...ullquote__custom-colors__deprecated-4.json | 6 ++-- .../blocks/core__pullquote__deprecated-1.json | 3 +- ...e__pullquote__deprecated-1.serialized.html | 4 +-- .../blocks/core__pullquote__deprecated-4.json | 4 +-- ...lquote__deprecated-5__multi-paragraph.json | 2 +- ...recated-5__multi-paragraph.serialized.html | 2 +- ...ore__pullquote__deprecated-main-color.json | 6 ++-- .../core__query-pagination__deprecated.json | 5 +++- .../core__query-title__deprecated-v1.json | 2 ++ .../blocks/core__query__deprecated-1.json | 4 +-- .../blocks/core__quote__deprecated-1.json | 3 +- .../core__quote__deprecated-1.serialized.html | 2 +- .../blocks/core__quote__deprecated-2.json | 1 + .../core__separator__deprecated-color-v1.json | 4 +-- .../blocks/core__table__deprecated-2.json | 1 + 61 files changed, 251 insertions(+), 73 deletions(-) diff --git a/test/integration/fixtures/blocks/core__comments__deprecated-1.json b/test/integration/fixtures/blocks/core__comments__deprecated-1.json index ff97b76a5f383..2d80f4cb9e0c8 100644 --- a/test/integration/fixtures/blocks/core__comments__deprecated-1.json +++ b/test/integration/fixtures/blocks/core__comments__deprecated-1.json @@ -4,6 +4,7 @@ "isValid": true, "attributes": { "tagName": "div", + "legacy": false, "className": "wp-block-comments-query-loop comments-post-extra", "textColor": "luminous-vivid-orange" }, diff --git a/test/integration/fixtures/blocks/core__cover__deprecated-1.json b/test/integration/fixtures/blocks/core__cover__deprecated-1.json index a432e9992fd33..59cc10eeb476a 100644 --- a/test/integration/fixtures/blocks/core__cover__deprecated-1.json +++ b/test/integration/fixtures/blocks/core__cover__deprecated-1.json @@ -4,10 +4,14 @@ "isValid": true, "attributes": { "url": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==", + "useFeaturedImage": false, "id": 34, + "alt": "", "hasParallax": false, + "isRepeated": false, "dimRatio": 50, "backgroundType": "image", + "isDark": true, "tagName": "div" }, "innerBlocks": [ 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..76523d4145491 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 @@ -
+

Cover Image

diff --git a/test/integration/fixtures/blocks/core__cover__deprecated-2.json b/test/integration/fixtures/blocks/core__cover__deprecated-2.json index 7b9f5696d34ae..bdd94e8892fb4 100644 --- a/test/integration/fixtures/blocks/core__cover__deprecated-2.json +++ b/test/integration/fixtures/blocks/core__cover__deprecated-2.json @@ -4,10 +4,14 @@ "isValid": true, "attributes": { "url": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==", + "useFeaturedImage": false, "id": 34, + "alt": "", "hasParallax": false, + "isRepeated": false, "dimRatio": 50, "backgroundType": "image", + "isDark": true, "tagName": "div" }, "innerBlocks": [ 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..a0a0d5126a7f9 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 @@ -
+

Cover Block

diff --git a/test/integration/fixtures/blocks/core__cover__deprecated-3.json b/test/integration/fixtures/blocks/core__cover__deprecated-3.json index d2fcf5074b1dd..6007c133bae62 100644 --- a/test/integration/fixtures/blocks/core__cover__deprecated-3.json +++ b/test/integration/fixtures/blocks/core__cover__deprecated-3.json @@ -4,10 +4,14 @@ "isValid": true, "attributes": { "url": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==", + "useFeaturedImage": false, "id": 35, + "alt": "", "hasParallax": false, + "isRepeated": false, "dimRatio": 50, "backgroundType": "image", + "isDark": true, "tagName": "div" }, "innerBlocks": [ 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..27718345bb9be 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 @@ -
+

Cover Block

diff --git a/test/integration/fixtures/blocks/core__cover__deprecated-4.json b/test/integration/fixtures/blocks/core__cover__deprecated-4.json index 48c677038ba87..cbf866fc985f7 100644 --- a/test/integration/fixtures/blocks/core__cover__deprecated-4.json +++ b/test/integration/fixtures/blocks/core__cover__deprecated-4.json @@ -4,14 +4,18 @@ "isValid": true, "attributes": { "url": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==", + "useFeaturedImage": false, "id": 35, + "alt": "", "hasParallax": false, + "isRepeated": false, "dimRatio": 50, "backgroundType": "image", "focalPoint": { "x": "0.07", "y": "0.07" }, + "isDark": true, "tagName": "div" }, "innerBlocks": [ 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..86ddb1e85f2e0 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 @@ -
+

Cover Block

diff --git a/test/integration/fixtures/blocks/core__cover__deprecated-5.json b/test/integration/fixtures/blocks/core__cover__deprecated-5.json index 9eee3c4a01684..6596f37194833 100644 --- a/test/integration/fixtures/blocks/core__cover__deprecated-5.json +++ b/test/integration/fixtures/blocks/core__cover__deprecated-5.json @@ -4,10 +4,14 @@ "isValid": true, "attributes": { "url": "data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=", + "useFeaturedImage": false, + "alt": "", "hasParallax": false, + "isRepeated": false, "dimRatio": 50, "backgroundType": "image", "gradient": "midnight", + "isDark": true, "tagName": "div" }, "innerBlocks": [ 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..d9df5e65d1662 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 @@ -
+

Cover

diff --git a/test/integration/fixtures/blocks/core__cover__deprecated-6.json b/test/integration/fixtures/blocks/core__cover__deprecated-6.json index 62bea629e8efe..3def2f664b93d 100644 --- a/test/integration/fixtures/blocks/core__cover__deprecated-6.json +++ b/test/integration/fixtures/blocks/core__cover__deprecated-6.json @@ -4,10 +4,13 @@ "isValid": true, "attributes": { "url": "data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=", + "useFeaturedImage": false, + "alt": "", "hasParallax": false, + "isRepeated": false, "dimRatio": 40, "backgroundType": "image", - "isRepeated": false, + "isDark": true, "tagName": "div" }, "innerBlocks": [ @@ -30,19 +33,22 @@ "isValid": true, "attributes": { "url": "https://example.com/some-background-image.png", + "useFeaturedImage": false, "id": 1933, + "alt": "", "hasParallax": false, + "isRepeated": false, "dimRatio": 0, "backgroundType": "image", "focalPoint": { "x": "0.50", "y": "0.40" }, - "isRepeated": false, "minHeight": 48, "minHeightUnit": "vw", - "align": "full", - "tagName": "div" + "isDark": true, + "tagName": "div", + "align": "full" }, "innerBlocks": [ { @@ -61,13 +67,15 @@ "isValid": true, "attributes": { "url": "http://localhost:8888/wp-content/uploads/2021/02/percy.jpg", + "useFeaturedImage": false, "id": 134, + "alt": "", "hasParallax": false, + "isRepeated": false, "dimRatio": 50, "backgroundType": "image", - "isRepeated": false, "contentPosition": "bottom right", - "alt": "", + "isDark": true, "tagName": "div" }, "innerBlocks": [ 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..fabff758d184e 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 @@ -
+

-
+

test

diff --git a/test/integration/fixtures/blocks/core__cover__deprecated-7.json b/test/integration/fixtures/blocks/core__cover__deprecated-7.json index 1ebd864bd3830..a7ed06e153012 100644 --- a/test/integration/fixtures/blocks/core__cover__deprecated-7.json +++ b/test/integration/fixtures/blocks/core__cover__deprecated-7.json @@ -4,11 +4,13 @@ "isValid": true, "attributes": { "url": "data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=", + "useFeaturedImage": false, + "alt": "", "hasParallax": false, + "isRepeated": false, "dimRatio": 40, "backgroundType": "image", - "isRepeated": false, - "alt": "", + "isDark": true, "tagName": "div" }, "innerBlocks": [ 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..b7eeb8cf4b85d 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.json b/test/integration/fixtures/blocks/core__cover__deprecated-8.json index 9d5142e60fdd5..824c7937260eb 100644 --- a/test/integration/fixtures/blocks/core__cover__deprecated-8.json +++ b/test/integration/fixtures/blocks/core__cover__deprecated-8.json @@ -4,6 +4,7 @@ "isValid": true, "attributes": { "url": "data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=", + "useFeaturedImage": false, "alt": "", "hasParallax": false, "isRepeated": false, diff --git a/test/integration/fixtures/blocks/core__cover__deprecated-9.json b/test/integration/fixtures/blocks/core__cover__deprecated-9.json index 0f492be44c968..ec7b5326d1a5f 100644 --- a/test/integration/fixtures/blocks/core__cover__deprecated-9.json +++ b/test/integration/fixtures/blocks/core__cover__deprecated-9.json @@ -3,6 +3,7 @@ "name": "core/cover", "isValid": true, "attributes": { + "useFeaturedImage": false, "alt": "", "hasParallax": false, "isRepeated": false, 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..aaccc6d71542f 100644 --- a/test/integration/fixtures/blocks/core__cover__gradient__deprecated-8.json +++ b/test/integration/fixtures/blocks/core__cover__gradient__deprecated-8.json @@ -3,6 +3,7 @@ "name": "core/cover", "isValid": true, "attributes": { + "useFeaturedImage": false, "alt": "", "hasParallax": false, "isRepeated": false, diff --git a/test/integration/fixtures/blocks/core__gallery__deprecated-1.json b/test/integration/fixtures/blocks/core__gallery__deprecated-1.json index 9e15ee7f1c714..15da5c9489766 100644 --- a/test/integration/fixtures/blocks/core__gallery__deprecated-1.json +++ b/test/integration/fixtures/blocks/core__gallery__deprecated-1.json @@ -3,11 +3,17 @@ "name": "core/gallery", "isValid": true, "attributes": { + "images": [], + "ids": [], + "shortCodeTransforms": [], "columns": 2, + "caption": "", "imageCrop": true, + "fixedHeight": true, "linkTo": "none", - "align": "wide", - "allowResize": false + "sizeSlug": "large", + "allowResize": false, + "align": "wide" }, "innerBlocks": [ { diff --git a/test/integration/fixtures/blocks/core__gallery__deprecated-2.json b/test/integration/fixtures/blocks/core__gallery__deprecated-2.json index a60776801eb33..49b1e6fdf8823 100644 --- a/test/integration/fixtures/blocks/core__gallery__deprecated-2.json +++ b/test/integration/fixtures/blocks/core__gallery__deprecated-2.json @@ -3,11 +3,30 @@ "name": "core/gallery", "isValid": true, "attributes": { + "images": [ + { + "url": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==", + "alt": "title", + "id": "1", + "caption": "" + }, + { + "url": "data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=", + "alt": "title", + "id": "2", + "caption": "" + } + ], + "ids": [], + "shortCodeTransforms": [], "columns": 2, + "caption": "", "imageCrop": true, + "fixedHeight": true, "linkTo": "none", - "align": "wide", - "allowResize": false + "sizeSlug": "large", + "allowResize": false, + "align": "wide" }, "innerBlocks": [ { diff --git a/test/integration/fixtures/blocks/core__gallery__deprecated-3.json b/test/integration/fixtures/blocks/core__gallery__deprecated-3.json index 9ac2c197819ce..d0b15a6d597db 100644 --- a/test/integration/fixtures/blocks/core__gallery__deprecated-3.json +++ b/test/integration/fixtures/blocks/core__gallery__deprecated-3.json @@ -3,10 +3,27 @@ "name": "core/gallery", "isValid": true, "attributes": { + "images": [ + { + "url": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==", + "alt": "title", + "caption": "" + }, + { + "url": "data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=", + "alt": "title", + "caption": "" + } + ], + "ids": [], + "shortCodeTransforms": [], + "caption": "", "imageCrop": true, + "fixedHeight": true, "linkTo": "none", - "align": "wide", - "allowResize": false + "sizeSlug": "large", + "allowResize": false, + "align": "wide" }, "innerBlocks": [ { diff --git a/test/integration/fixtures/blocks/core__gallery__deprecated-4.json b/test/integration/fixtures/blocks/core__gallery__deprecated-4.json index dad150cc96b48..a72ec69cbc3da 100644 --- a/test/integration/fixtures/blocks/core__gallery__deprecated-4.json +++ b/test/integration/fixtures/blocks/core__gallery__deprecated-4.json @@ -3,11 +3,35 @@ "name": "core/gallery", "isValid": true, "attributes": { + "images": [ + { + "url": "https://sergioestevaofolio.files.wordpress.com/2016/09/cropped-img_9054-1.jpg?w=190", + "alt": "", + "id": "1421", + "caption": "" + }, + { + "url": "https://sergioestevaofolio.files.wordpress.com/2017/09/cropped-l1001498-1.jpg?w=580", + "alt": "", + "id": "1440", + "caption": "" + }, + { + "url": "https://sergioestevaofolio.files.wordpress.com/2017/05/cropped-l1005945-2-2.jpg?w=580", + "alt": "", + "id": "1362", + "caption": "" + } + ], + "ids": [], + "shortCodeTransforms": [], "caption": "", "imageCrop": true, + "fixedHeight": true, "linkTo": "none", - "align": "wide", - "allowResize": false + "sizeSlug": "large", + "allowResize": false, + "align": "wide" }, "innerBlocks": [ { diff --git a/test/integration/fixtures/blocks/core__gallery__deprecated-5.json b/test/integration/fixtures/blocks/core__gallery__deprecated-5.json index 9ef1f03ba0934..16b5453f682c0 100644 --- a/test/integration/fixtures/blocks/core__gallery__deprecated-5.json +++ b/test/integration/fixtures/blocks/core__gallery__deprecated-5.json @@ -3,8 +3,37 @@ "name": "core/gallery", "isValid": true, "attributes": { + "images": [ + { + "url": "http://wptest.local/wp-content/uploads/2020/09/test-image-edited-1-682x1024.jpg", + "fullUrl": "http://wptest.local/wp-content/uploads/2020/09/test-image-edited-1-scaled.jpg", + "link": "http://wptest.local/classic/test-image-3/", + "alt": "", + "id": "705", + "caption": "" + }, + { + "url": "http://wptest.local/wp-content/uploads/2020/09/test-image-edited-1024x682.jpg", + "fullUrl": "http://wptest.local/wp-content/uploads/2020/09/test-image-edited-scaled.jpg", + "link": "http://wptest.local/test-image-2/", + "alt": "", + "id": "704", + "caption": "" + }, + { + "url": "http://wptest.local/wp-content/uploads/2020/04/test-image-1024x683.jpg", + "fullUrl": "http://wptest.local/wp-content/uploads/2020/04/test-image-scaled.jpg", + "link": "http://wptest.local/test-image/", + "alt": "", + "id": "703", + "caption": "" + } + ], + "ids": [], + "shortCodeTransforms": [], "caption": "", "imageCrop": true, + "fixedHeight": true, "linkTo": "media", "sizeSlug": "large", "allowResize": false diff --git a/test/integration/fixtures/blocks/core__gallery__deprecated-6.json b/test/integration/fixtures/blocks/core__gallery__deprecated-6.json index 9ef1f03ba0934..16b5453f682c0 100644 --- a/test/integration/fixtures/blocks/core__gallery__deprecated-6.json +++ b/test/integration/fixtures/blocks/core__gallery__deprecated-6.json @@ -3,8 +3,37 @@ "name": "core/gallery", "isValid": true, "attributes": { + "images": [ + { + "url": "http://wptest.local/wp-content/uploads/2020/09/test-image-edited-1-682x1024.jpg", + "fullUrl": "http://wptest.local/wp-content/uploads/2020/09/test-image-edited-1-scaled.jpg", + "link": "http://wptest.local/classic/test-image-3/", + "alt": "", + "id": "705", + "caption": "" + }, + { + "url": "http://wptest.local/wp-content/uploads/2020/09/test-image-edited-1024x682.jpg", + "fullUrl": "http://wptest.local/wp-content/uploads/2020/09/test-image-edited-scaled.jpg", + "link": "http://wptest.local/test-image-2/", + "alt": "", + "id": "704", + "caption": "" + }, + { + "url": "http://wptest.local/wp-content/uploads/2020/04/test-image-1024x683.jpg", + "fullUrl": "http://wptest.local/wp-content/uploads/2020/04/test-image-scaled.jpg", + "link": "http://wptest.local/test-image/", + "alt": "", + "id": "703", + "caption": "" + } + ], + "ids": [], + "shortCodeTransforms": [], "caption": "", "imageCrop": true, + "fixedHeight": true, "linkTo": "media", "sizeSlug": "large", "allowResize": false diff --git a/test/integration/fixtures/blocks/core__group__deprecated-2.json b/test/integration/fixtures/blocks/core__group__deprecated-2.json index e281b0eaa56f0..7f543ed30560c 100644 --- a/test/integration/fixtures/blocks/core__group__deprecated-2.json +++ b/test/integration/fixtures/blocks/core__group__deprecated-2.json @@ -3,8 +3,8 @@ "name": "core/group", "isValid": true, "attributes": { - "textColor": "accent", - "tagName": "div" + "tagName": "div", + "textColor": "accent" }, "innerBlocks": [ { diff --git a/test/integration/fixtures/blocks/core__heading__deprecated-1.json b/test/integration/fixtures/blocks/core__heading__deprecated-1.json index 3a07b26aaf4aa..6d91ff3005d2a 100644 --- a/test/integration/fixtures/blocks/core__heading__deprecated-1.json +++ b/test/integration/fixtures/blocks/core__heading__deprecated-1.json @@ -3,9 +3,9 @@ "name": "core/heading", "isValid": true, "attributes": { + "textAlign": "right", "content": "A picture is worth a thousand words, or so the saying goes", - "level": 3, - "textAlign": "right" + "level": 3 }, "innerBlocks": [] } diff --git a/test/integration/fixtures/blocks/core__heading__deprecated-4.json b/test/integration/fixtures/blocks/core__heading__deprecated-4.json index 6df62f0a1646a..e5f9050227ef8 100644 --- a/test/integration/fixtures/blocks/core__heading__deprecated-4.json +++ b/test/integration/fixtures/blocks/core__heading__deprecated-4.json @@ -3,10 +3,10 @@ "name": "core/heading", "isValid": true, "attributes": { + "textAlign": "center", "content": "Text", "level": 2, - "textColor": "accent", - "textAlign": "center" + "textColor": "accent" }, "innerBlocks": [] } diff --git a/test/integration/fixtures/blocks/core__image__deprecated-v1-add-responsive-class.json b/test/integration/fixtures/blocks/core__image__deprecated-v1-add-responsive-class.json index 6b2f1a80f52c6..e5d1dcba576aa 100644 --- a/test/integration/fixtures/blocks/core__image__deprecated-v1-add-responsive-class.json +++ b/test/integration/fixtures/blocks/core__image__deprecated-v1-add-responsive-class.json @@ -3,10 +3,10 @@ "name": "core/image", "isValid": true, "attributes": { + "align": "left", "url": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==", "alt": "", - "caption": [], - "align": "left" + "caption": "" }, "innerBlocks": [] } diff --git a/test/integration/fixtures/blocks/core__image__deprecated-v2-add-is-resized-class.json b/test/integration/fixtures/blocks/core__image__deprecated-v2-add-is-resized-class.json index a0ad3b755587b..bae213510011a 100644 --- a/test/integration/fixtures/blocks/core__image__deprecated-v2-add-is-resized-class.json +++ b/test/integration/fixtures/blocks/core__image__deprecated-v2-add-is-resized-class.json @@ -3,10 +3,10 @@ "name": "core/image", "isValid": true, "attributes": { + "align": "left", "url": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==", "alt": "", - "caption": [], - "align": "left", + "caption": "", "width": 100, "height": 100 }, diff --git a/test/integration/fixtures/blocks/core__list__deprecated-v1-nested.json b/test/integration/fixtures/blocks/core__list__deprecated-v1-nested.json index 0e5c001e4e036..8fc3fd6256f9c 100644 --- a/test/integration/fixtures/blocks/core__list__deprecated-v1-nested.json +++ b/test/integration/fixtures/blocks/core__list__deprecated-v1-nested.json @@ -4,7 +4,7 @@ "isValid": true, "attributes": { "ordered": false, - "values": "" + "values": "
  • Item
    • " }, "innerBlocks": [ { diff --git a/test/integration/fixtures/blocks/core__list__deprecated-v1.json b/test/integration/fixtures/blocks/core__list__deprecated-v1.json index 80cd87e4eb69e..874fab473252d 100644 --- a/test/integration/fixtures/blocks/core__list__deprecated-v1.json +++ b/test/integration/fixtures/blocks/core__list__deprecated-v1.json @@ -4,7 +4,7 @@ "isValid": true, "attributes": { "ordered": false, - "values": "" + "values": "
  • Text & Headings
  • Images & Videos
  • Galleries
  • Embeds, like YouTube, Tweets, or other WordPress posts.
  • Layout blocks, like Buttons, Hero Images, Separators, etc.
  • And Lists like this one of course :)
    • " }, "innerBlocks": [ { diff --git a/test/integration/fixtures/blocks/core__media-text__deprecated-v5.json b/test/integration/fixtures/blocks/core__media-text__deprecated-v5.json index 1f252de69c1ad..c4052d8634882 100644 --- a/test/integration/fixtures/blocks/core__media-text__deprecated-v5.json +++ b/test/integration/fixtures/blocks/core__media-text__deprecated-v5.json @@ -6,10 +6,10 @@ "align": "wide", "mediaAlt": "My alt text", "mediaPosition": "left", + "mediaUrl": "data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=", "mediaType": "image", "mediaWidth": 50, "isStackedOnMobile": true, - "mediaUrl": "data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=", "imageFill": true, "focalPoint": { "x": "0.56", diff --git a/test/integration/fixtures/blocks/core__media-text__deprecated-v6-wide-default-align.json b/test/integration/fixtures/blocks/core__media-text__deprecated-v6-wide-default-align.json index bbe1bf7fc90de..99158c68ba337 100644 --- a/test/integration/fixtures/blocks/core__media-text__deprecated-v6-wide-default-align.json +++ b/test/integration/fixtures/blocks/core__media-text__deprecated-v6-wide-default-align.json @@ -6,10 +6,10 @@ "align": "wide", "mediaAlt": "", "mediaPosition": "left", + "mediaUrl": "data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=", "mediaType": "image", "mediaWidth": 50, - "isStackedOnMobile": true, - "mediaUrl": "data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=" + "isStackedOnMobile": true }, "innerBlocks": [ { diff --git a/test/integration/fixtures/blocks/core__media-text__image-fill-no-focal-point-selected.json b/test/integration/fixtures/blocks/core__media-text__image-fill-no-focal-point-selected.json index bf195f6fa1c95..9e184932848ca 100644 --- a/test/integration/fixtures/blocks/core__media-text__image-fill-no-focal-point-selected.json +++ b/test/integration/fixtures/blocks/core__media-text__image-fill-no-focal-point-selected.json @@ -6,10 +6,10 @@ "align": "wide", "mediaAlt": "My alt text", "mediaPosition": "left", + "mediaUrl": "data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=", "mediaType": "image", "mediaWidth": 50, "isStackedOnMobile": true, - "mediaUrl": "data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=", "imageFill": true }, "innerBlocks": [ diff --git a/test/integration/fixtures/blocks/core__media-text__image-fill-with-focal-point-selected.json b/test/integration/fixtures/blocks/core__media-text__image-fill-with-focal-point-selected.json index 986e049099541..fcae892bf1304 100644 --- a/test/integration/fixtures/blocks/core__media-text__image-fill-with-focal-point-selected.json +++ b/test/integration/fixtures/blocks/core__media-text__image-fill-with-focal-point-selected.json @@ -6,10 +6,10 @@ "align": "wide", "mediaAlt": "My alt text", "mediaPosition": "left", + "mediaUrl": "data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=", "mediaType": "image", "mediaWidth": 50, "isStackedOnMobile": true, - "mediaUrl": "data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=", "imageFill": true, "focalPoint": { "x": 0.84, diff --git a/test/integration/fixtures/blocks/core__media-text__is-stacked-on-mobile.json b/test/integration/fixtures/blocks/core__media-text__is-stacked-on-mobile.json index cce4ca41239c5..4536d933eb8dd 100644 --- a/test/integration/fixtures/blocks/core__media-text__is-stacked-on-mobile.json +++ b/test/integration/fixtures/blocks/core__media-text__is-stacked-on-mobile.json @@ -6,10 +6,10 @@ "align": "wide", "mediaAlt": "", "mediaPosition": "left", + "mediaUrl": "data:video/mp4;base64,AAAAHGZ0eXBpc29tAAACAGlzb21pc28ybXA0MQAAAAhmcmVlAAAC721kYXQhEAUgpBv/wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA3pwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcCEQBSCkG//AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADengAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAsJtb292AAAAbG12aGQAAAAAAAAAAAAAAAAAAAPoAAAALwABAAABAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADAAAB7HRyYWsAAABcdGtoZAAAAAMAAAAAAAAAAAAAAAIAAAAAAAAALwAAAAAAAAAAAAAAAQEAAAAAAQAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAACRlZHRzAAAAHGVsc3QAAAAAAAAAAQAAAC8AAAAAAAEAAAAAAWRtZGlhAAAAIG1kaGQAAAAAAAAAAAAAAAAAAKxEAAAIAFXEAAAAAAAtaGRscgAAAAAAAAAAc291bgAAAAAAAAAAAAAAAFNvdW5kSGFuZGxlcgAAAAEPbWluZgAAABBzbWhkAAAAAAAAAAAAAAAkZGluZgAAABxkcmVmAAAAAAAAAAEAAAAMdXJsIAAAAAEAAADTc3RibAAAAGdzdHNkAAAAAAAAAAEAAABXbXA0YQAAAAAAAAABAAAAAAAAAAAAAgAQAAAAAKxEAAAAAAAzZXNkcwAAAAADgICAIgACAASAgIAUQBUAAAAAAfQAAAHz+QWAgIACEhAGgICAAQIAAAAYc3R0cwAAAAAAAAABAAAAAgAABAAAAAAcc3RzYwAAAAAAAAABAAAAAQAAAAIAAAABAAAAHHN0c3oAAAAAAAAAAAAAAAIAAAFzAAABdAAAABRzdGNvAAAAAAAAAAEAAAAsAAAAYnVkdGEAAABabWV0YQAAAAAAAAAhaGRscgAAAAAAAAAAbWRpcmFwcGwAAAAAAAAAAAAAAAAtaWxzdAAAACWpdG9vAAAAHWRhdGEAAAABAAAAAExhdmY1Ni40MC4xMDE=", "mediaType": "video", "mediaWidth": 50, - "isStackedOnMobile": true, - "mediaUrl": "data:video/mp4;base64,AAAAHGZ0eXBpc29tAAACAGlzb21pc28ybXA0MQAAAAhmcmVlAAAC721kYXQhEAUgpBv/wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA3pwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcCEQBSCkG//AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADengAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAsJtb292AAAAbG12aGQAAAAAAAAAAAAAAAAAAAPoAAAALwABAAABAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADAAAB7HRyYWsAAABcdGtoZAAAAAMAAAAAAAAAAAAAAAIAAAAAAAAALwAAAAAAAAAAAAAAAQEAAAAAAQAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAACRlZHRzAAAAHGVsc3QAAAAAAAAAAQAAAC8AAAAAAAEAAAAAAWRtZGlhAAAAIG1kaGQAAAAAAAAAAAAAAAAAAKxEAAAIAFXEAAAAAAAtaGRscgAAAAAAAAAAc291bgAAAAAAAAAAAAAAAFNvdW5kSGFuZGxlcgAAAAEPbWluZgAAABBzbWhkAAAAAAAAAAAAAAAkZGluZgAAABxkcmVmAAAAAAAAAAEAAAAMdXJsIAAAAAEAAADTc3RibAAAAGdzdHNkAAAAAAAAAAEAAABXbXA0YQAAAAAAAAABAAAAAAAAAAAAAgAQAAAAAKxEAAAAAAAzZXNkcwAAAAADgICAIgACAASAgIAUQBUAAAAAAfQAAAHz+QWAgIACEhAGgICAAQIAAAAYc3R0cwAAAAAAAAABAAAAAgAABAAAAAAcc3RzYwAAAAAAAAABAAAAAQAAAAIAAAABAAAAHHN0c3oAAAAAAAAAAAAAAAIAAAFzAAABdAAAABRzdGNvAAAAAAAAAAEAAAAsAAAAYnVkdGEAAABabWV0YQAAAAAAAAAhaGRscgAAAAAAAAAAbWRpcmFwcGwAAAAAAAAAAAAAAAAtaWxzdAAAACWpdG9vAAAAHWRhdGEAAAABAAAAAExhdmY1Ni40MC4xMDE=" + "isStackedOnMobile": true }, "innerBlocks": [ { diff --git a/test/integration/fixtures/blocks/core__media-text__media-right-custom-width__deprecated.json b/test/integration/fixtures/blocks/core__media-text__media-right-custom-width__deprecated.json index 746a1cb641dbd..280b695c5e5a2 100644 --- a/test/integration/fixtures/blocks/core__media-text__media-right-custom-width__deprecated.json +++ b/test/integration/fixtures/blocks/core__media-text__media-right-custom-width__deprecated.json @@ -6,10 +6,10 @@ "align": "full", "mediaAlt": "", "mediaPosition": "right", + "mediaUrl": "data:video/mp4;base64,AAAAHGZ0eXBpc29tAAACAGlzb21pc28ybXA0MQAAAAhmcmVlAAAC721kYXQhEAUgpBv/wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA3pwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcCEQBSCkG//AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADengAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAsJtb292AAAAbG12aGQAAAAAAAAAAAAAAAAAAAPoAAAALwABAAABAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADAAAB7HRyYWsAAABcdGtoZAAAAAMAAAAAAAAAAAAAAAIAAAAAAAAALwAAAAAAAAAAAAAAAQEAAAAAAQAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAACRlZHRzAAAAHGVsc3QAAAAAAAAAAQAAAC8AAAAAAAEAAAAAAWRtZGlhAAAAIG1kaGQAAAAAAAAAAAAAAAAAAKxEAAAIAFXEAAAAAAAtaGRscgAAAAAAAAAAc291bgAAAAAAAAAAAAAAAFNvdW5kSGFuZGxlcgAAAAEPbWluZgAAABBzbWhkAAAAAAAAAAAAAAAkZGluZgAAABxkcmVmAAAAAAAAAAEAAAAMdXJsIAAAAAEAAADTc3RibAAAAGdzdHNkAAAAAAAAAAEAAABXbXA0YQAAAAAAAAABAAAAAAAAAAAAAgAQAAAAAKxEAAAAAAAzZXNkcwAAAAADgICAIgACAASAgIAUQBUAAAAAAfQAAAHz+QWAgIACEhAGgICAAQIAAAAYc3R0cwAAAAAAAAABAAAAAgAABAAAAAAcc3RzYwAAAAAAAAABAAAAAQAAAAIAAAABAAAAHHN0c3oAAAAAAAAAAAAAAAIAAAFzAAABdAAAABRzdGNvAAAAAAAAAAEAAAAsAAAAYnVkdGEAAABabWV0YQAAAAAAAAAhaGRscgAAAAAAAAAAbWRpcmFwcGwAAAAAAAAAAAAAAAAtaWxzdAAAACWpdG9vAAAAHWRhdGEAAAABAAAAAExhdmY1Ni40MC4xMDE=", "mediaType": "video", "mediaWidth": 41, - "isStackedOnMobile": true, - "mediaUrl": "data:video/mp4;base64,AAAAHGZ0eXBpc29tAAACAGlzb21pc28ybXA0MQAAAAhmcmVlAAAC721kYXQhEAUgpBv/wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA3pwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcCEQBSCkG//AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADengAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAsJtb292AAAAbG12aGQAAAAAAAAAAAAAAAAAAAPoAAAALwABAAABAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADAAAB7HRyYWsAAABcdGtoZAAAAAMAAAAAAAAAAAAAAAIAAAAAAAAALwAAAAAAAAAAAAAAAQEAAAAAAQAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAACRlZHRzAAAAHGVsc3QAAAAAAAAAAQAAAC8AAAAAAAEAAAAAAWRtZGlhAAAAIG1kaGQAAAAAAAAAAAAAAAAAAKxEAAAIAFXEAAAAAAAtaGRscgAAAAAAAAAAc291bgAAAAAAAAAAAAAAAFNvdW5kSGFuZGxlcgAAAAEPbWluZgAAABBzbWhkAAAAAAAAAAAAAAAkZGluZgAAABxkcmVmAAAAAAAAAAEAAAAMdXJsIAAAAAEAAADTc3RibAAAAGdzdHNkAAAAAAAAAAEAAABXbXA0YQAAAAAAAAABAAAAAAAAAAAAAgAQAAAAAKxEAAAAAAAzZXNkcwAAAAADgICAIgACAASAgIAUQBUAAAAAAfQAAAHz+QWAgIACEhAGgICAAQIAAAAYc3R0cwAAAAAAAAABAAAAAgAABAAAAAAcc3RzYwAAAAAAAAABAAAAAQAAAAIAAAABAAAAHHN0c3oAAAAAAAAAAAAAAAIAAAFzAAABdAAAABRzdGNvAAAAAAAAAAEAAAAsAAAAYnVkdGEAAABabWV0YQAAAAAAAAAhaGRscgAAAAAAAAAAbWRpcmFwcGwAAAAAAAAAAAAAAAAtaWxzdAAAACWpdG9vAAAAHWRhdGEAAAABAAAAAExhdmY1Ni40MC4xMDE=" + "isStackedOnMobile": true }, "innerBlocks": [ { diff --git a/test/integration/fixtures/blocks/core__media-text__vertical-align-bottom.json b/test/integration/fixtures/blocks/core__media-text__vertical-align-bottom.json index f7d0516a85a64..f4f729efb84e8 100644 --- a/test/integration/fixtures/blocks/core__media-text__vertical-align-bottom.json +++ b/test/integration/fixtures/blocks/core__media-text__vertical-align-bottom.json @@ -6,10 +6,10 @@ "align": "wide", "mediaAlt": "My alt text", "mediaPosition": "left", + "mediaUrl": "data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=", "mediaType": "image", "mediaWidth": 50, "isStackedOnMobile": true, - "mediaUrl": "data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=", "verticalAlignment": "bottom" }, "innerBlocks": [ diff --git a/test/integration/fixtures/blocks/core__media-text__video.json b/test/integration/fixtures/blocks/core__media-text__video.json index cce4ca41239c5..4536d933eb8dd 100644 --- a/test/integration/fixtures/blocks/core__media-text__video.json +++ b/test/integration/fixtures/blocks/core__media-text__video.json @@ -6,10 +6,10 @@ "align": "wide", "mediaAlt": "", "mediaPosition": "left", + "mediaUrl": "data:video/mp4;base64,AAAAHGZ0eXBpc29tAAACAGlzb21pc28ybXA0MQAAAAhmcmVlAAAC721kYXQhEAUgpBv/wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA3pwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcCEQBSCkG//AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADengAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAsJtb292AAAAbG12aGQAAAAAAAAAAAAAAAAAAAPoAAAALwABAAABAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADAAAB7HRyYWsAAABcdGtoZAAAAAMAAAAAAAAAAAAAAAIAAAAAAAAALwAAAAAAAAAAAAAAAQEAAAAAAQAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAACRlZHRzAAAAHGVsc3QAAAAAAAAAAQAAAC8AAAAAAAEAAAAAAWRtZGlhAAAAIG1kaGQAAAAAAAAAAAAAAAAAAKxEAAAIAFXEAAAAAAAtaGRscgAAAAAAAAAAc291bgAAAAAAAAAAAAAAAFNvdW5kSGFuZGxlcgAAAAEPbWluZgAAABBzbWhkAAAAAAAAAAAAAAAkZGluZgAAABxkcmVmAAAAAAAAAAEAAAAMdXJsIAAAAAEAAADTc3RibAAAAGdzdHNkAAAAAAAAAAEAAABXbXA0YQAAAAAAAAABAAAAAAAAAAAAAgAQAAAAAKxEAAAAAAAzZXNkcwAAAAADgICAIgACAASAgIAUQBUAAAAAAfQAAAHz+QWAgIACEhAGgICAAQIAAAAYc3R0cwAAAAAAAAABAAAAAgAABAAAAAAcc3RzYwAAAAAAAAABAAAAAQAAAAIAAAABAAAAHHN0c3oAAAAAAAAAAAAAAAIAAAFzAAABdAAAABRzdGNvAAAAAAAAAAEAAAAsAAAAYnVkdGEAAABabWV0YQAAAAAAAAAhaGRscgAAAAAAAAAAbWRpcmFwcGwAAAAAAAAAAAAAAAAtaWxzdAAAACWpdG9vAAAAHWRhdGEAAAABAAAAAExhdmY1Ni40MC4xMDE=", "mediaType": "video", "mediaWidth": 50, - "isStackedOnMobile": true, - "mediaUrl": "data:video/mp4;base64,AAAAHGZ0eXBpc29tAAACAGlzb21pc28ybXA0MQAAAAhmcmVlAAAC721kYXQhEAUgpBv/wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA3pwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcCEQBSCkG//AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADengAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAsJtb292AAAAbG12aGQAAAAAAAAAAAAAAAAAAAPoAAAALwABAAABAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADAAAB7HRyYWsAAABcdGtoZAAAAAMAAAAAAAAAAAAAAAIAAAAAAAAALwAAAAAAAAAAAAAAAQEAAAAAAQAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAACRlZHRzAAAAHGVsc3QAAAAAAAAAAQAAAC8AAAAAAAEAAAAAAWRtZGlhAAAAIG1kaGQAAAAAAAAAAAAAAAAAAKxEAAAIAFXEAAAAAAAtaGRscgAAAAAAAAAAc291bgAAAAAAAAAAAAAAAFNvdW5kSGFuZGxlcgAAAAEPbWluZgAAABBzbWhkAAAAAAAAAAAAAAAkZGluZgAAABxkcmVmAAAAAAAAAAEAAAAMdXJsIAAAAAEAAADTc3RibAAAAGdzdHNkAAAAAAAAAAEAAABXbXA0YQAAAAAAAAABAAAAAAAAAAAAAgAQAAAAAKxEAAAAAAAzZXNkcwAAAAADgICAIgACAASAgIAUQBUAAAAAAfQAAAHz+QWAgIACEhAGgICAAQIAAAAYc3R0cwAAAAAAAAABAAAAAgAABAAAAAAcc3RzYwAAAAAAAAABAAAAAQAAAAIAAAABAAAAHHN0c3oAAAAAAAAAAAAAAAIAAAFzAAABdAAAABRzdGNvAAAAAAAAAAEAAAAsAAAAYnVkdGEAAABabWV0YQAAAAAAAAAhaGRscgAAAAAAAAAAbWRpcmFwcGwAAAAAAAAAAAAAAAAtaWxzdAAAACWpdG9vAAAAHWRhdGEAAAABAAAAAExhdmY1Ni40MC4xMDE=" + "isStackedOnMobile": true }, "innerBlocks": [ { diff --git a/test/integration/fixtures/blocks/core__navigation__deprecated-1.json b/test/integration/fixtures/blocks/core__navigation__deprecated-1.json index e6a76135e65b6..c834961fb18a1 100644 --- a/test/integration/fixtures/blocks/core__navigation__deprecated-1.json +++ b/test/integration/fixtures/blocks/core__navigation__deprecated-1.json @@ -6,6 +6,9 @@ "showSubmenuIcon": true, "openSubmenusOnClick": false, "overlayMenu": "mobile", + "icon": "handle", + "hasIcon": true, + "maxNestingLevel": 5, "layout": { "type": "flex", "orientation": "horizontal" diff --git a/test/integration/fixtures/blocks/core__navigation__deprecated-v4.json b/test/integration/fixtures/blocks/core__navigation__deprecated-v4.json index 11e5d53a2b7ec..a2499197f0403 100644 --- a/test/integration/fixtures/blocks/core__navigation__deprecated-v4.json +++ b/test/integration/fixtures/blocks/core__navigation__deprecated-v4.json @@ -6,6 +6,9 @@ "showSubmenuIcon": true, "openSubmenusOnClick": false, "overlayMenu": "never", + "icon": "handle", + "hasIcon": true, + "maxNestingLevel": 5, "fontFamily": "cambria-georgia", "layout": { "type": "flex", diff --git a/test/integration/fixtures/blocks/core__navigation__deprecated-v5.json b/test/integration/fixtures/blocks/core__navigation__deprecated-v5.json index af2dfd454ade0..ac3b5935bd5a2 100644 --- a/test/integration/fixtures/blocks/core__navigation__deprecated-v5.json +++ b/test/integration/fixtures/blocks/core__navigation__deprecated-v5.json @@ -6,6 +6,9 @@ "showSubmenuIcon": true, "openSubmenusOnClick": false, "overlayMenu": "never", + "icon": "handle", + "hasIcon": true, + "maxNestingLevel": 5, "layout": { "type": "flex", "justifyContent": "center", diff --git a/test/integration/fixtures/blocks/core__navigation__deprecated.json b/test/integration/fixtures/blocks/core__navigation__deprecated.json index c5f0d42453f7f..23709c6524447 100644 --- a/test/integration/fixtures/blocks/core__navigation__deprecated.json +++ b/test/integration/fixtures/blocks/core__navigation__deprecated.json @@ -4,6 +4,11 @@ "isValid": true, "attributes": { "showSubmenuIcon": true, + "openSubmenusOnClick": false, + "overlayMenu": "mobile", + "icon": "handle", + "hasIcon": true, + "maxNestingLevel": 5, "style": { "typography": { "textTransform": "lowercase", diff --git a/test/integration/fixtures/blocks/core__paragraph__deprecated.json b/test/integration/fixtures/blocks/core__paragraph__deprecated.json index b70c34daae118..20ad7dfe08727 100644 --- a/test/integration/fixtures/blocks/core__paragraph__deprecated.json +++ b/test/integration/fixtures/blocks/core__paragraph__deprecated.json @@ -3,7 +3,7 @@ "name": "core/paragraph", "isValid": true, "attributes": { - "content": "Unwrapped is still valid.", + "content": "", "dropCap": false }, "innerBlocks": [] diff --git a/test/integration/fixtures/blocks/core__paragraph__deprecated.serialized.html b/test/integration/fixtures/blocks/core__paragraph__deprecated.serialized.html index ddc0a9d9a1cf4..9a84a2185f415 100644 --- a/test/integration/fixtures/blocks/core__paragraph__deprecated.serialized.html +++ b/test/integration/fixtures/blocks/core__paragraph__deprecated.serialized.html @@ -1,3 +1,3 @@ -

    Unwrapped is still valid.

    +

    diff --git a/test/integration/fixtures/blocks/core__post-date__deprecated-v1.json b/test/integration/fixtures/blocks/core__post-date__deprecated-v1.json index 40f38dda700ee..15fa93f1cb770 100644 --- a/test/integration/fixtures/blocks/core__post-date__deprecated-v1.json +++ b/test/integration/fixtures/blocks/core__post-date__deprecated-v1.json @@ -4,6 +4,7 @@ "isValid": true, "attributes": { "isLink": false, + "displayType": "date", "fontFamily": "cambria-georgia" }, "innerBlocks": [] diff --git a/test/integration/fixtures/blocks/core__pullquote__custom-colors__deprecated-4.json b/test/integration/fixtures/blocks/core__pullquote__custom-colors__deprecated-4.json index f8b0e72914ac4..8963ecdf008d1 100644 --- a/test/integration/fixtures/blocks/core__pullquote__custom-colors__deprecated-4.json +++ b/test/integration/fixtures/blocks/core__pullquote__custom-colors__deprecated-4.json @@ -4,14 +4,14 @@ "isValid": true, "attributes": { "value": "Pullquote custom color", + "citation": "my citation", "className": "has-background is-style-default", + "textColor": "subtle-background", "style": { "border": { "color": "#2207d0" } - }, - "citation": "my citation", - "textColor": "subtle-background" + } }, "innerBlocks": [] } diff --git a/test/integration/fixtures/blocks/core__pullquote__deprecated-1.json b/test/integration/fixtures/blocks/core__pullquote__deprecated-1.json index 5b2ecb98985b4..b7338db11606e 100644 --- a/test/integration/fixtures/blocks/core__pullquote__deprecated-1.json +++ b/test/integration/fixtures/blocks/core__pullquote__deprecated-1.json @@ -4,8 +4,7 @@ "isValid": true, "attributes": { "value": "Testing deprecated pullquote block...", - "citation": "...with a caption", - "align": "none" + "citation": "" }, "innerBlocks": [] } diff --git a/test/integration/fixtures/blocks/core__pullquote__deprecated-1.serialized.html b/test/integration/fixtures/blocks/core__pullquote__deprecated-1.serialized.html index b3010f99233ae..cca99714e2848 100644 --- a/test/integration/fixtures/blocks/core__pullquote__deprecated-1.serialized.html +++ b/test/integration/fixtures/blocks/core__pullquote__deprecated-1.serialized.html @@ -1,3 +1,3 @@ - -

    Testing deprecated pullquote block...

    ...with a caption
    + +

    Testing deprecated pullquote block...

    diff --git a/test/integration/fixtures/blocks/core__pullquote__deprecated-4.json b/test/integration/fixtures/blocks/core__pullquote__deprecated-4.json index 67bcab0bc07fc..ea4f11b0b1f20 100644 --- a/test/integration/fixtures/blocks/core__pullquote__deprecated-4.json +++ b/test/integration/fixtures/blocks/core__pullquote__deprecated-4.json @@ -4,10 +4,10 @@ "isValid": true, "attributes": { "value": "pullquote", + "citation": "before block supports", + "textAlign": "left", "className": "is-style-solid-color", "backgroundColor": "black", - "textAlign": "left", - "citation": "before block supports", "textColor": "white" }, "innerBlocks": [] diff --git a/test/integration/fixtures/blocks/core__pullquote__deprecated-5__multi-paragraph.json b/test/integration/fixtures/blocks/core__pullquote__deprecated-5__multi-paragraph.json index 27f956b801db2..468134b9b4106 100644 --- a/test/integration/fixtures/blocks/core__pullquote__deprecated-5__multi-paragraph.json +++ b/test/integration/fixtures/blocks/core__pullquote__deprecated-5__multi-paragraph.json @@ -3,7 +3,7 @@ "name": "core/pullquote", "isValid": true, "attributes": { - "value": "Paragraph one
    Paragraph two", + "value": "Paragraph one", "citation": "by whomever" }, "innerBlocks": [] diff --git a/test/integration/fixtures/blocks/core__pullquote__deprecated-5__multi-paragraph.serialized.html b/test/integration/fixtures/blocks/core__pullquote__deprecated-5__multi-paragraph.serialized.html index ff0af0251aa39..2ce2674c40fcb 100644 --- a/test/integration/fixtures/blocks/core__pullquote__deprecated-5__multi-paragraph.serialized.html +++ b/test/integration/fixtures/blocks/core__pullquote__deprecated-5__multi-paragraph.serialized.html @@ -1,3 +1,3 @@ -

    Paragraph one
    Paragraph two

    by whomever
    +

    Paragraph one

    by whomever
    diff --git a/test/integration/fixtures/blocks/core__pullquote__deprecated-main-color.json b/test/integration/fixtures/blocks/core__pullquote__deprecated-main-color.json index 60d94c9d1fbe0..9036b3646ad77 100644 --- a/test/integration/fixtures/blocks/core__pullquote__deprecated-main-color.json +++ b/test/integration/fixtures/blocks/core__pullquote__deprecated-main-color.json @@ -4,14 +4,14 @@ "isValid": true, "attributes": { "value": "Pullquote custom color", + "citation": "my citation", "className": "is-style-default", + "textColor": "subtle-background", "style": { "border": { "color": "#2207d0" } - }, - "citation": "my citation", - "textColor": "subtle-background" + } }, "innerBlocks": [] } diff --git a/test/integration/fixtures/blocks/core__query-pagination__deprecated.json b/test/integration/fixtures/blocks/core__query-pagination__deprecated.json index 2f8ef3d3ca432..49d6992bac3a5 100644 --- a/test/integration/fixtures/blocks/core__query-pagination__deprecated.json +++ b/test/integration/fixtures/blocks/core__query-pagination__deprecated.json @@ -2,7 +2,10 @@ { "name": "core/query-pagination", "isValid": true, - "attributes": {}, + "attributes": { + "paginationArrow": "none", + "showLabel": true + }, "innerBlocks": [] } ] diff --git a/test/integration/fixtures/blocks/core__query-title__deprecated-v1.json b/test/integration/fixtures/blocks/core__query-title__deprecated-v1.json index 79e060d0fab7b..de8228071dfde 100644 --- a/test/integration/fixtures/blocks/core__query-title__deprecated-v1.json +++ b/test/integration/fixtures/blocks/core__query-title__deprecated-v1.json @@ -4,6 +4,8 @@ "isValid": true, "attributes": { "level": 1, + "showPrefix": true, + "showSearchTerm": true, "fontFamily": "cambria-georgia" }, "innerBlocks": [] diff --git a/test/integration/fixtures/blocks/core__query__deprecated-1.json b/test/integration/fixtures/blocks/core__query__deprecated-1.json index 6e3a11ea6db5d..7ff68cd5f24eb 100644 --- a/test/integration/fixtures/blocks/core__query__deprecated-1.json +++ b/test/integration/fixtures/blocks/core__query__deprecated-1.json @@ -16,9 +16,7 @@ "sticky": "", "inherit": true }, - "displayLayout": { - "type": "list" - } + "tagName": "div" }, "innerBlocks": [] } diff --git a/test/integration/fixtures/blocks/core__quote__deprecated-1.json b/test/integration/fixtures/blocks/core__quote__deprecated-1.json index ea4a9a2319658..ba4be15d29444 100644 --- a/test/integration/fixtures/blocks/core__quote__deprecated-1.json +++ b/test/integration/fixtures/blocks/core__quote__deprecated-1.json @@ -3,7 +3,8 @@ "name": "core/quote", "isValid": true, "attributes": { - "citation": "...with a caption" + "value": "

    Testing deprecated quote block...

    ", + "citation": "" }, "innerBlocks": [ { diff --git a/test/integration/fixtures/blocks/core__quote__deprecated-1.serialized.html b/test/integration/fixtures/blocks/core__quote__deprecated-1.serialized.html index 9f06d2409dc7a..f7f6b4deb6842 100644 --- a/test/integration/fixtures/blocks/core__quote__deprecated-1.serialized.html +++ b/test/integration/fixtures/blocks/core__quote__deprecated-1.serialized.html @@ -1,5 +1,5 @@

    Testing deprecated quote block...

    -...with a caption
    + diff --git a/test/integration/fixtures/blocks/core__quote__deprecated-2.json b/test/integration/fixtures/blocks/core__quote__deprecated-2.json index 2599674eeec7f..5ce7b45418a90 100644 --- a/test/integration/fixtures/blocks/core__quote__deprecated-2.json +++ b/test/integration/fixtures/blocks/core__quote__deprecated-2.json @@ -3,6 +3,7 @@ "name": "core/quote", "isValid": true, "attributes": { + "value": "

    Testing deprecated quote block...

    ", "citation": "...with a caption", "align": "right" }, diff --git a/test/integration/fixtures/blocks/core__separator__deprecated-color-v1.json b/test/integration/fixtures/blocks/core__separator__deprecated-color-v1.json index 6e0ddf0dbef55..d1e924579cd2e 100644 --- a/test/integration/fixtures/blocks/core__separator__deprecated-color-v1.json +++ b/test/integration/fixtures/blocks/core__separator__deprecated-color-v1.json @@ -3,8 +3,8 @@ "name": "core/separator", "isValid": true, "attributes": { - "backgroundColor": "accent", - "opacity": "css" + "opacity": "css", + "backgroundColor": "accent" }, "innerBlocks": [] } diff --git a/test/integration/fixtures/blocks/core__table__deprecated-2.json b/test/integration/fixtures/blocks/core__table__deprecated-2.json index 7e21c0f9a5c7f..a694b52a94c39 100644 --- a/test/integration/fixtures/blocks/core__table__deprecated-2.json +++ b/test/integration/fixtures/blocks/core__table__deprecated-2.json @@ -4,6 +4,7 @@ "isValid": true, "attributes": { "hasFixedLayout": false, + "caption": "", "head": [ { "cells": [ From f94929a95303c7736804d63e21bd5026a639952c Mon Sep 17 00:00:00 2001 From: Alex Lende Date: Mon, 28 Aug 2023 15:40:10 -0500 Subject: [PATCH 4/5] Try adding a new function for applying the block attributes --- .../parser/apply-block-deprecated-versions.js | 11 +++++----- .../src/api/parser/get-block-attributes.js | 20 +++++++++++++++++++ 2 files changed, 25 insertions(+), 6 deletions(-) diff --git a/packages/blocks/src/api/parser/apply-block-deprecated-versions.js b/packages/blocks/src/api/parser/apply-block-deprecated-versions.js index f29a0062214b8..a9bd7e0ef46f5 100644 --- a/packages/blocks/src/api/parser/apply-block-deprecated-versions.js +++ b/packages/blocks/src/api/parser/apply-block-deprecated-versions.js @@ -3,7 +3,10 @@ */ import { DEPRECATED_ENTRY_KEYS } from '../constants'; import { validateBlock } from '../validation'; -import { getBlockAttributes } from './get-block-attributes'; +import { + applyDefaultAttributes, + getBlockAttributes, +} from './get-block-attributes'; import { applyBuiltInValidationFixes } from './apply-built-in-validation-fixes'; import { omit } from '../utils'; @@ -113,11 +116,7 @@ export function applyBlockDeprecatedVersions( block, rawBlock, blockType ) { block = { ...block, - attributes: getBlockAttributes( - blockType, - migratedBlock.originalContent, - migratedAttributes - ), + attributes: applyDefaultAttributes( blockType, migratedAttributes ), innerBlocks: migratedInnerBlocks, isValid: true, validationIssues: [], diff --git a/packages/blocks/src/api/parser/get-block-attributes.js b/packages/blocks/src/api/parser/get-block-attributes.js index cc81c10800552..0bcadf777fb82 100644 --- a/packages/blocks/src/api/parser/get-block-attributes.js +++ b/packages/blocks/src/api/parser/get-block-attributes.js @@ -295,3 +295,23 @@ export function getBlockAttributes( attributes ); } + +/** + * Applies default attributes from a block type to a set of attributes. + * + * @param {string|Object} blockTypeOrName Block type or name. + * @param {?Object} attributes Known block attributes (from delimiters). + * + * @return {Object} Block attributes with defaults applied. + */ +export function applyDefaultAttributes( blockTypeOrName, attributes = {} ) { + const blockType = normalizeBlockType( blockTypeOrName ); + + const blockAttributes = Object.fromEntries( + Object.entries( blockType.attributes ?? {} ).map( + ( [ key, schema ] ) => [ key, attributes[ key ] ?? schema.default ] + ) + ); + + return blockAttributes; +} From 3895f81d156118b96d1484de957359277ec6ab09 Mon Sep 17 00:00:00 2001 From: Alex Lende Date: Mon, 28 Aug 2023 15:43:09 -0500 Subject: [PATCH 5/5] Only apply defaults to undefined values --- packages/blocks/src/api/parser/get-block-attributes.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/packages/blocks/src/api/parser/get-block-attributes.js b/packages/blocks/src/api/parser/get-block-attributes.js index 0bcadf777fb82..98fbdc2946f64 100644 --- a/packages/blocks/src/api/parser/get-block-attributes.js +++ b/packages/blocks/src/api/parser/get-block-attributes.js @@ -309,7 +309,12 @@ export function applyDefaultAttributes( blockTypeOrName, attributes = {} ) { const blockAttributes = Object.fromEntries( Object.entries( blockType.attributes ?? {} ).map( - ( [ key, schema ] ) => [ key, attributes[ key ] ?? schema.default ] + ( [ key, schema ] ) => [ + key, + attributes[ key ] === undefined + ? schema.default + : attributes[ key ], + ] ) );