+ setAttributes( { href: url, ...restAttrs } )
+ }
withBottomSheet={ ! isCompatibleWithSettings }
hasPicker
actions={ linkSettingsActions }
@@ -417,9 +419,9 @@ function ButtonEdit( props ) {
} = props;
const {
placeholder,
- text,
+ content,
style: buttonStyle,
- url,
+ href,
align = 'center',
width,
} = attributes;
@@ -448,7 +450,7 @@ function ButtonEdit( props ) {
// value at least on 1 when `RichText` is focused or when is not focused, but `RichText` value is
// different than empty string.
let minWidth =
- isButtonFocused || ( ! isButtonFocused && text && text !== '' )
+ isButtonFocused || ( ! isButtonFocused && content && content !== '' )
? MIN_WIDTH
: placeholderTextWidth;
if ( width ) {
@@ -461,7 +463,7 @@ function ButtonEdit( props ) {
// a `placeholder` as an empty string when `RichText` is focused,
// because `AztecView` is calculating a `minWidth` based on placeholder text.
const placeholderText =
- isButtonFocused || ( ! isButtonFocused && text && text !== '' )
+ isButtonFocused || ( ! isButtonFocused && content && content !== '' )
? ''
: placeholder || __( 'Add text…' );
@@ -496,14 +498,14 @@ function ButtonEdit( props ) {
diff --git a/packages/block-library/src/button/get-updated-link-attributes.js b/packages/block-library/src/button/get-updated-link-attributes.js
index 97b837a8be20bd..25363b31d8598b 100644
--- a/packages/block-library/src/button/get-updated-link-attributes.js
+++ b/packages/block-library/src/button/get-updated-link-attributes.js
@@ -13,13 +13,13 @@ import { prependHTTP } from '@wordpress/url';
*
* @param {Object} attributes The current block attributes.
* @param {string} attributes.rel The current link rel attribute.
- * @param {string} attributes.url The current link url.
+ * @param {string} attributes.href The current link href.
* @param {boolean} attributes.opensInNewTab Whether the link should open in a new window.
* @param {boolean} attributes.nofollow Whether the link should be marked as nofollow.
*/
export function getUpdatedLinkAttributes( {
rel = '',
- url = '',
+ href = '',
opensInNewTab,
nofollow,
} ) {
@@ -47,7 +47,7 @@ export function getUpdatedLinkAttributes( {
}
return {
- url: prependHTTP( url ),
+ href: prependHTTP( href ),
linkTarget: newLinkTarget,
rel: updatedRel || undefined,
};
diff --git a/packages/block-library/src/button/index.js b/packages/block-library/src/button/index.js
index 2b05b280028abd..1cf48b4648da74 100644
--- a/packages/block-library/src/button/index.js
+++ b/packages/block-library/src/button/index.js
@@ -22,15 +22,15 @@ export const settings = {
example: {
attributes: {
className: 'is-style-fill',
- text: __( 'Call to Action' ),
+ content: __( 'Call to Action' ),
},
},
edit,
save,
deprecated,
- merge: ( a, { text = '' } ) => ( {
+ merge: ( a, { content = '' } ) => ( {
...a,
- text: ( a.text || '' ) + text,
+ content: ( a.content || '' ) + content,
} ),
};
diff --git a/packages/block-library/src/button/save.js b/packages/block-library/src/button/save.js
index 8cb9da6fbfbc18..e0e096bd353b8c 100644
--- a/packages/block-library/src/button/save.js
+++ b/packages/block-library/src/button/save.js
@@ -25,9 +25,9 @@ export default function save( { attributes, className } ) {
linkTarget,
rel,
style,
- text,
+ content,
title,
- url,
+ href,
width,
} = attributes;
@@ -72,10 +72,10 @@ export default function save( { attributes, className } ) {
tagName={ TagName }
type={ isButtonTag ? buttonType : null }
className={ buttonClasses }
- href={ isButtonTag ? null : url }
+ href={ isButtonTag ? null : href }
title={ title }
style={ buttonStyle }
- value={ text }
+ value={ content }
target={ isButtonTag ? null : linkTarget }
rel={ isButtonTag ? null : rel }
/>
diff --git a/packages/block-library/src/button/test/get-updated-link-attributes.js b/packages/block-library/src/button/test/get-updated-link-attributes.js
index af0c3da332110c..08b371d34bce8a 100644
--- a/packages/block-library/src/button/test/get-updated-link-attributes.js
+++ b/packages/block-library/src/button/test/get-updated-link-attributes.js
@@ -3,38 +3,38 @@
*/
import { getUpdatedLinkAttributes } from '../get-updated-link-attributes';
-describe( 'getUpdatedLinkAttributes method', () => {
+describe( 'getUpdatedLinkAttributes function', () => {
it( 'should correctly handle unassigned rel', () => {
const options = {
- url: 'example.com',
+ href: 'example.com',
opensInNewTab: true,
nofollow: false,
};
const result = getUpdatedLinkAttributes( options );
- expect( result.url ).toEqual( 'http://example.com' );
+ expect( result.href ).toEqual( 'http://example.com' );
expect( result.linkTarget ).toEqual( '_blank' );
expect( result.rel ).toEqual( 'noreferrer noopener' );
} );
it( 'should return empty rel value as undefined', () => {
const options = {
- url: 'example.com',
+ href: 'example.com',
opensInNewTab: false,
nofollow: false,
};
const result = getUpdatedLinkAttributes( options );
- expect( result.url ).toEqual( 'http://example.com' );
+ expect( result.href ).toEqual( 'http://example.com' );
expect( result.linkTarget ).toEqual( undefined );
expect( result.rel ).toEqual( undefined );
} );
it( 'should correctly handle rel with existing values', () => {
const options = {
- url: 'example.com',
+ href: 'example.com',
opensInNewTab: true,
nofollow: true,
rel: 'rel_value',
@@ -42,7 +42,7 @@ describe( 'getUpdatedLinkAttributes method', () => {
const result = getUpdatedLinkAttributes( options );
- expect( result.url ).toEqual( 'http://example.com' );
+ expect( result.href ).toEqual( 'http://example.com' );
expect( result.linkTarget ).toEqual( '_blank' );
expect( result.rel ).toEqual(
'rel_value noreferrer noopener nofollow'
@@ -51,7 +51,7 @@ describe( 'getUpdatedLinkAttributes method', () => {
it( 'should correctly update link attributes with opensInNewTab', () => {
const options = {
- url: 'example.com',
+ href: 'example.com',
opensInNewTab: true,
nofollow: false,
rel: 'rel_value',
@@ -59,14 +59,14 @@ describe( 'getUpdatedLinkAttributes method', () => {
const result = getUpdatedLinkAttributes( options );
- expect( result.url ).toEqual( 'http://example.com' );
+ expect( result.href ).toEqual( 'http://example.com' );
expect( result.linkTarget ).toEqual( '_blank' );
expect( result.rel ).toEqual( 'rel_value noreferrer noopener' );
} );
it( 'should correctly update link attributes with nofollow', () => {
const options = {
- url: 'example.com',
+ href: 'example.com',
opensInNewTab: false,
nofollow: true,
rel: 'rel_value',
@@ -74,14 +74,14 @@ describe( 'getUpdatedLinkAttributes method', () => {
const result = getUpdatedLinkAttributes( options );
- expect( result.url ).toEqual( 'http://example.com' );
+ expect( result.href ).toEqual( 'http://example.com' );
expect( result.linkTarget ).toEqual( undefined );
expect( result.rel ).toEqual( 'rel_value nofollow' );
} );
it( 'should correctly handle rel with existing nofollow values and remove duplicates', () => {
const options = {
- url: 'example.com',
+ href: 'example.com',
opensInNewTab: true,
nofollow: true,
rel: 'rel_value nofollow',
@@ -89,7 +89,7 @@ describe( 'getUpdatedLinkAttributes method', () => {
const result = getUpdatedLinkAttributes( options );
- expect( result.url ).toEqual( 'http://example.com' );
+ expect( result.href ).toEqual( 'http://example.com' );
expect( result.linkTarget ).toEqual( '_blank' );
expect( result.rel ).toEqual(
'rel_value nofollow noreferrer noopener'
@@ -98,7 +98,7 @@ describe( 'getUpdatedLinkAttributes method', () => {
it( 'should correctly handle rel with existing new tab values and remove duplicates', () => {
const options = {
- url: 'example.com',
+ href: 'example.com',
opensInNewTab: true,
nofollow: false,
rel: 'rel_value noreferrer noopener',
@@ -106,7 +106,7 @@ describe( 'getUpdatedLinkAttributes method', () => {
const result = getUpdatedLinkAttributes( options );
- expect( result.url ).toEqual( 'http://example.com' );
+ expect( result.href ).toEqual( 'http://example.com' );
expect( result.linkTarget ).toEqual( '_blank' );
expect( result.rel ).toEqual( 'rel_value noreferrer noopener' );
} );
diff --git a/packages/block-library/src/buttons/transforms.js b/packages/block-library/src/buttons/transforms.js
index 9848299f3a99f9..8033bced2ab641 100644
--- a/packages/block-library/src/buttons/transforms.js
+++ b/packages/block-library/src/buttons/transforms.js
@@ -41,19 +41,19 @@ const transforms = {
const { content, metadata } = attributes;
const element = createElement( document, content );
// Remove any HTML tags.
- const text = element.innerText || '';
+ const innerText = element.innerText || '';
// Get first url.
const link = element.querySelector( 'a' );
- const url = link?.getAttribute( 'href' );
+ const href = link?.getAttribute( 'href' );
// Create singular button in the buttons block.
return createBlock( 'core/button', {
- text,
- url,
+ content: innerText,
+ href,
metadata: getTransformedMetadata(
metadata,
'core/button',
( { content: contentBinding } ) => ( {
- text: contentBinding,
+ content: contentBinding,
} )
),
} );
diff --git a/packages/block-library/src/navigation-link/transforms.js b/packages/block-library/src/navigation-link/transforms.js
index ff38589b926877..d018efdb15879a 100644
--- a/packages/block-library/src/navigation-link/transforms.js
+++ b/packages/block-library/src/navigation-link/transforms.js
@@ -118,8 +118,8 @@ const transforms = {
transform: ( { label, url, rel, title, opensInNewTab } ) => {
return createBlock( 'core/buttons', {}, [
createBlock( 'core/button', {
- text: label,
- url,
+ content: label,
+ href: url,
rel,
title,
linkTarget: opensInNewTab ? '_blank' : undefined,
diff --git a/packages/patterns/src/constants.js b/packages/patterns/src/constants.js
index 99563a1a16787f..b7251fb82d8048 100644
--- a/packages/patterns/src/constants.js
+++ b/packages/patterns/src/constants.js
@@ -19,7 +19,7 @@ export const PATTERN_SYNC_TYPES = {
export const PARTIAL_SYNCING_SUPPORTED_BLOCKS = {
'core/paragraph': [ 'content' ],
'core/heading': [ 'content' ],
- 'core/button': [ 'text', 'url', 'linkTarget', 'rel' ],
+ 'core/button': [ 'content', 'href', 'linkTarget', 'rel' ],
'core/image': [ 'id', 'url', 'title', 'alt' ],
};
diff --git a/test/e2e/specs/editor/blocks/buttons.spec.js b/test/e2e/specs/editor/blocks/buttons.spec.js
index f62732470d9747..23aeed3e5470d7 100644
--- a/test/e2e/specs/editor/blocks/buttons.spec.js
+++ b/test/e2e/specs/editor/blocks/buttons.spec.js
@@ -212,8 +212,8 @@ test.describe( 'Buttons', () => {
{
name: 'core/button',
attributes: {
- text: 'WordPress',
- url: 'https://www.wordpress.org/',
+ content: 'WordPress',
+ href: 'https://www.wordpress.org/',
rel: 'noreferrer noopener',
linkTarget: '_blank',
},
@@ -246,8 +246,8 @@ test.describe( 'Buttons', () => {
{
name: 'core/button',
attributes: {
- text: 'WordPress',
- url: 'https://www.wordpress.org/',
+ content: 'WordPress',
+ href: 'https://www.wordpress.org/',
rel: 'noreferrer noopener nofollow',
linkTarget: '_blank',
},
@@ -419,7 +419,9 @@ test.describe( 'Buttons', () => {
const buttonBlock = ( await editor.getBlocks() )[ 0 ]
.innerBlocks[ 0 ];
expect( buttonBlock.name ).toBe( 'core/button' );
- expect( buttonBlock.attributes.text ).toBe( 'initial content' );
+ expect( buttonBlock.attributes.content ).toBe(
+ 'initial content'
+ );
} );
test( 'should preserve the metadata attribute', async ( {
@@ -471,7 +473,7 @@ test.describe( 'Buttons', () => {
expect(
buttonBlock.attributes.metadata.bindings
).toMatchObject( {
- text: {
+ content: {
source: 'core/post-meta',
args: {
key: 'custom_field',
diff --git a/test/e2e/specs/editor/various/block-bindings.spec.js b/test/e2e/specs/editor/various/block-bindings.spec.js
index 222004c7c1bccc..3fdedd8a642ec8 100644
--- a/test/e2e/specs/editor/various/block-bindings.spec.js
+++ b/test/e2e/specs/editor/various/block-bindings.spec.js
@@ -286,11 +286,11 @@ test.describe( 'Block bindings', () => {
{
name: 'core/button',
attributes: {
- text: 'button default text',
- url: '#default-url',
+ content: 'button default text',
+ href: '#default-url',
metadata: {
bindings: {
- text: {
+ content: {
source: 'core/post-meta',
args: { key: 'text_custom_field' },
},
@@ -317,11 +317,11 @@ test.describe( 'Block bindings', () => {
{
name: 'core/button',
attributes: {
- text: 'button default text',
- url: '#default-url',
+ content: 'button default text',
+ href: '#default-url',
metadata: {
bindings: {
- text: {
+ content: {
source: 'core/post-meta',
args: { key: 'text_custom_field' },
},
@@ -379,11 +379,11 @@ test.describe( 'Block bindings', () => {
{
name: 'core/button',
attributes: {
- text: 'button default text',
- url: '#default-url',
+ content: 'button default text',
+ href: '#default-url',
metadata: {
bindings: {
- text: {
+ content: {
source: 'plugin/undefined-source',
args: { key: 'text_custom_field' },
},
@@ -441,11 +441,11 @@ test.describe( 'Block bindings', () => {
{
name: 'core/button',
attributes: {
- text: 'button default text',
- url: '#default-url',
+ content: 'button default text',
+ href: '#default-url',
metadata: {
bindings: {
- url: {
+ href: {
source: 'core/post-meta',
args: { key: 'url_custom_field' },
},
@@ -501,11 +501,11 @@ test.describe( 'Block bindings', () => {
{
name: 'core/button',
attributes: {
- text: 'button default text',
- url: '#default-url',
+ content: 'button default text',
+ href: '#default-url',
metadata: {
bindings: {
- url: {
+ href: {
source: 'plugin/undefined-source',
args: { key: 'url_custom_field' },
},
@@ -561,15 +561,15 @@ test.describe( 'Block bindings', () => {
{
name: 'core/button',
attributes: {
- text: 'button default text',
- url: '#default-url',
+ content: 'button default text',
+ href: '#default-url',
metadata: {
bindings: {
- text: {
+ content: {
source: 'core/post-meta',
args: { key: 'text_custom_field' },
},
- url: {
+ href: {
source: 'core/post-meta',
args: { key: 'url_custom_field' },
},
@@ -1484,11 +1484,11 @@ test.describe( 'Block bindings', () => {
name: 'core/button',
attributes: {
anchor: 'button-text-binding',
- text: 'button default text',
- url: '#default-url',
+ content: 'button default text',
+ href: '#default-url',
metadata: {
bindings: {
- text: {
+ content: {
source: 'core/post-meta',
args: { key: 'text_custom_field' },
},
@@ -1533,11 +1533,11 @@ test.describe( 'Block bindings', () => {
name: 'core/button',
attributes: {
anchor: 'button-url-binding',
- text: 'button default text',
- url: '#default-url',
+ content: 'button default text',
+ href: '#default-url',
metadata: {
bindings: {
- url: {
+ href: {
source: 'core/post-meta',
args: { key: 'url_custom_field' },
},
@@ -1570,15 +1570,15 @@ test.describe( 'Block bindings', () => {
name: 'core/button',
attributes: {
anchor: 'button-multiple-bindings',
- text: 'button default text',
- url: '#default-url',
+ content: 'button default text',
+ href: '#default-url',
metadata: {
bindings: {
- text: {
+ content: {
source: 'core/post-meta',
args: { key: 'text_custom_field' },
},
- url: {
+ href: {
source: 'core/post-meta',
args: { key: 'url_custom_field' },
},
@@ -1614,11 +1614,11 @@ test.describe( 'Block bindings', () => {
name: 'core/button',
attributes: {
anchor: 'button-text-binding',
- text: 'button default text',
- url: '#default-url',
+ content: 'button default text',
+ href: '#default-url',
metadata: {
bindings: {
- text: {
+ content: {
source: 'core/post-meta',
args: { key: 'text_custom_field' },
},
@@ -2022,11 +2022,11 @@ test.describe( 'Block bindings', () => {
name: 'core/button',
attributes: {
anchor: 'button-url-binding',
- text: 'button default text',
- url: '#default-url',
+ content: 'button default text',
+ href: '#default-url',
metadata: {
bindings: {
- url: {
+ href: {
source: 'core/post-meta',
args: { key: 'url_custom_field' },
},
diff --git a/test/e2e/specs/editor/various/copy-cut-paste.spec.js b/test/e2e/specs/editor/various/copy-cut-paste.spec.js
index 4951f99fb6b5b2..520c00519004bb 100644
--- a/test/e2e/specs/editor/various/copy-cut-paste.spec.js
+++ b/test/e2e/specs/editor/various/copy-cut-paste.spec.js
@@ -145,7 +145,7 @@ test.describe( 'Copy/cut/paste', () => {
innerBlocks: [
{
name: 'core/button',
- attributes: { text: 'Click' },
+ attributes: { content: 'Click' },
},
],
} );
@@ -199,7 +199,7 @@ test.describe( 'Copy/cut/paste', () => {
innerBlocks: [
{
name: 'core/button',
- attributes: { text: 'Click' },
+ attributes: { content: 'Click' },
},
],
} );
diff --git a/test/integration/fixtures/blocks/core__button__border_radius__deprecated-2.json b/test/integration/fixtures/blocks/core__button__border_radius__deprecated-2.json
index 6be42ef319f65d..a91afd27970ea5 100644
--- a/test/integration/fixtures/blocks/core__button__border_radius__deprecated-2.json
+++ b/test/integration/fixtures/blocks/core__button__border_radius__deprecated-2.json
@@ -3,7 +3,6 @@
"name": "core/button",
"isValid": true,
"attributes": {
- "text": "Where We Are",
"className": "is-style-outline",
"style": {
"border": {
@@ -12,7 +11,8 @@
"color": {
"text": "#1b9b6c"
}
- }
+ },
+ "content": "Where We Are"
},
"innerBlocks": []
}
diff --git a/test/integration/fixtures/blocks/core__button__border_radius__deprecated.json b/test/integration/fixtures/blocks/core__button__border_radius__deprecated.json
index 35a26785fb4218..781ff157c9b8d1 100644
--- a/test/integration/fixtures/blocks/core__button__border_radius__deprecated.json
+++ b/test/integration/fixtures/blocks/core__button__border_radius__deprecated.json
@@ -3,12 +3,12 @@
"name": "core/button",
"isValid": true,
"attributes": {
- "text": "My button",
"style": {
"border": {
"radius": "25px"
}
- }
+ },
+ "content": "My button"
},
"innerBlocks": []
}
diff --git a/test/integration/fixtures/blocks/core__button__center__deprecated.json b/test/integration/fixtures/blocks/core__button__center__deprecated.json
index 458eebb841b877..3598be2e3c3c4d 100644
--- a/test/integration/fixtures/blocks/core__button__center__deprecated.json
+++ b/test/integration/fixtures/blocks/core__button__center__deprecated.json
@@ -3,9 +3,9 @@
"name": "core/button",
"isValid": true,
"attributes": {
- "url": "https://github.com/WordPress/gutenberg",
- "text": "Help build Gutenberg",
- "className": "aligncenter"
+ "className": "aligncenter",
+ "href": "https://github.com/WordPress/gutenberg",
+ "content": "Help build Gutenberg"
},
"innerBlocks": []
}
diff --git a/test/integration/fixtures/blocks/core__button__deprecated-v10.json b/test/integration/fixtures/blocks/core__button__deprecated-v10.json
index a856e2b851b162..adef987063ba4b 100644
--- a/test/integration/fixtures/blocks/core__button__deprecated-v10.json
+++ b/test/integration/fixtures/blocks/core__button__deprecated-v10.json
@@ -3,8 +3,8 @@
"name": "core/button",
"isValid": true,
"attributes": {
- "text": "My button",
- "fontFamily": "cambria-georgia"
+ "fontFamily": "cambria-georgia",
+ "content": "My button"
},
"innerBlocks": []
}
diff --git a/test/integration/fixtures/blocks/core__button__squared.json b/test/integration/fixtures/blocks/core__button__squared.json
index ef629c91d4be93..fb67f4f97a60d6 100644
--- a/test/integration/fixtures/blocks/core__button__squared.json
+++ b/test/integration/fixtures/blocks/core__button__squared.json
@@ -5,7 +5,7 @@
"attributes": {
"tagName": "a",
"type": "button",
- "text": "My button",
+ "content": "My button",
"style": {
"border": {
"radius": 0
diff --git a/test/integration/fixtures/blocks/core__buttons.json b/test/integration/fixtures/blocks/core__buttons.json
index 74d0c140360609..28aaeb28dca438 100644
--- a/test/integration/fixtures/blocks/core__buttons.json
+++ b/test/integration/fixtures/blocks/core__buttons.json
@@ -16,7 +16,7 @@
"attributes": {
"tagName": "a",
"type": "button",
- "text": "My button 1"
+ "content": "My button 1"
},
"innerBlocks": []
},
@@ -26,7 +26,7 @@
"attributes": {
"tagName": "a",
"type": "button",
- "text": "My button 2"
+ "content": "My button 2"
},
"innerBlocks": []
},
@@ -36,7 +36,7 @@
"attributes": {
"tagName": "a",
"type": "button",
- "text": "My button 3"
+ "content": "My button 3"
},
"innerBlocks": []
},
@@ -46,7 +46,7 @@
"attributes": {
"tagName": "button",
"type": "button",
- "text": "My button 4"
+ "content": "My button 4"
},
"innerBlocks": []
}
diff --git a/test/integration/fixtures/blocks/core__buttons__deprecated-1.json b/test/integration/fixtures/blocks/core__buttons__deprecated-1.json
index ecd87558676944..ed3c5112b1e527 100644
--- a/test/integration/fixtures/blocks/core__buttons__deprecated-1.json
+++ b/test/integration/fixtures/blocks/core__buttons__deprecated-1.json
@@ -13,7 +13,7 @@
"name": "core/button",
"isValid": true,
"attributes": {
- "text": "My button 1"
+ "content": "My button 1"
},
"innerBlocks": []
},
@@ -21,7 +21,7 @@
"name": "core/button",
"isValid": true,
"attributes": {
- "text": "My button 2"
+ "content": "My button 2"
},
"innerBlocks": []
}
diff --git a/test/integration/fixtures/blocks/core__buttons__deprecated-2.json b/test/integration/fixtures/blocks/core__buttons__deprecated-2.json
index 480552cc4b2411..4719521b56374c 100644
--- a/test/integration/fixtures/blocks/core__buttons__deprecated-2.json
+++ b/test/integration/fixtures/blocks/core__buttons__deprecated-2.json
@@ -15,7 +15,7 @@
"name": "core/button",
"isValid": true,
"attributes": {
- "text": "My button 1"
+ "content": "My button 1"
},
"innerBlocks": []
},
@@ -23,7 +23,7 @@
"name": "core/button",
"isValid": true,
"attributes": {
- "text": "My button 2"
+ "content": "My button 2"
},
"innerBlocks": []
}
diff --git a/test/integration/fixtures/blocks/core__buttons__deprecated-v11.html b/test/integration/fixtures/blocks/core__buttons__deprecated-v11.html
new file mode 100644
index 00000000000000..e130ce79258c7f
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__buttons__deprecated-v11.html
@@ -0,0 +1,19 @@
+
+
+
diff --git a/test/integration/fixtures/blocks/core__buttons__deprecated-v11.json b/test/integration/fixtures/blocks/core__buttons__deprecated-v11.json
new file mode 100644
index 00000000000000..28aaeb28dca438
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__buttons__deprecated-v11.json
@@ -0,0 +1,55 @@
+[
+ {
+ "name": "core/buttons",
+ "isValid": true,
+ "attributes": {
+ "align": "wide",
+ "layout": {
+ "type": "flex",
+ "justifyContent": "center"
+ }
+ },
+ "innerBlocks": [
+ {
+ "name": "core/button",
+ "isValid": true,
+ "attributes": {
+ "tagName": "a",
+ "type": "button",
+ "content": "My button 1"
+ },
+ "innerBlocks": []
+ },
+ {
+ "name": "core/button",
+ "isValid": true,
+ "attributes": {
+ "tagName": "a",
+ "type": "button",
+ "content": "My button 2"
+ },
+ "innerBlocks": []
+ },
+ {
+ "name": "core/button",
+ "isValid": true,
+ "attributes": {
+ "tagName": "a",
+ "type": "button",
+ "content": "My button 3"
+ },
+ "innerBlocks": []
+ },
+ {
+ "name": "core/button",
+ "isValid": true,
+ "attributes": {
+ "tagName": "button",
+ "type": "button",
+ "content": "My button 4"
+ },
+ "innerBlocks": []
+ }
+ ]
+ }
+]
diff --git a/test/integration/fixtures/blocks/core__buttons__deprecated-v11.parsed.json b/test/integration/fixtures/blocks/core__buttons__deprecated-v11.parsed.json
new file mode 100644
index 00000000000000..849adbaf491fcb
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__buttons__deprecated-v11.parsed.json
@@ -0,0 +1,66 @@
+[
+ {
+ "blockName": "core/buttons",
+ "attrs": {
+ "align": "wide",
+ "layout": {
+ "type": "flex",
+ "justifyContent": "center"
+ }
+ },
+ "innerBlocks": [
+ {
+ "blockName": "core/button",
+ "attrs": {},
+ "innerBlocks": [],
+ "innerHTML": "\n\t\n\t",
+ "innerContent": [
+ "\n\t\n\t"
+ ]
+ },
+ {
+ "blockName": "core/button",
+ "attrs": {},
+ "innerBlocks": [],
+ "innerHTML": "\n\t\n\t",
+ "innerContent": [
+ "\n\t\n\t"
+ ]
+ },
+ {
+ "blockName": "core/button",
+ "attrs": {
+ "tagName": "a"
+ },
+ "innerBlocks": [],
+ "innerHTML": "\n\t\n\t",
+ "innerContent": [
+ "\n\t\n\t"
+ ]
+ },
+ {
+ "blockName": "core/button",
+ "attrs": {
+ "tagName": "button"
+ },
+ "innerBlocks": [],
+ "innerHTML": "\n\t\n\t",
+ "innerContent": [
+ "\n\t\n\t"
+ ]
+ }
+ ],
+ "innerHTML": "\n\n\t\n\n\t\n\n\t\n\n\t\n
\n",
+ "innerContent": [
+ "\n\n\t",
+ null,
+ "\n\n\t",
+ null,
+ "\n\n\t",
+ null,
+ "\n\n\t",
+ null,
+ "\n
\n"
+ ]
+ }
+]
diff --git a/test/integration/fixtures/blocks/core__buttons__deprecated-v11.serialized.html b/test/integration/fixtures/blocks/core__buttons__deprecated-v11.serialized.html
new file mode 100644
index 00000000000000..452f3e167e78d8
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__buttons__deprecated-v11.serialized.html
@@ -0,0 +1,17 @@
+
+
+
diff --git a/test/integration/fixtures/blocks/core__form-submit-button.json b/test/integration/fixtures/blocks/core__form-submit-button.json
index eca9cbb3f1a5d8..fc6fbe57a4c464 100644
--- a/test/integration/fixtures/blocks/core__form-submit-button.json
+++ b/test/integration/fixtures/blocks/core__form-submit-button.json
@@ -15,7 +15,7 @@
"attributes": {
"tagName": "button",
"type": "submit",
- "text": "Submit"
+ "content": "Submit"
},
"innerBlocks": []
}
diff --git a/test/integration/fixtures/blocks/core__form.json b/test/integration/fixtures/blocks/core__form.json
index d1dd3738a5801b..4fb8f0151cb462 100644
--- a/test/integration/fixtures/blocks/core__form.json
+++ b/test/integration/fixtures/blocks/core__form.json
@@ -75,7 +75,7 @@
"attributes": {
"tagName": "button",
"type": "submit",
- "text": "Submit"
+ "content": "Submit"
},
"innerBlocks": []
}
diff --git a/test/integration/fixtures/blocks/core_buttons__simple__deprecated.json b/test/integration/fixtures/blocks/core_buttons__simple__deprecated.json
index fa8332d1ac6d37..93674ec8475208 100644
--- a/test/integration/fixtures/blocks/core_buttons__simple__deprecated.json
+++ b/test/integration/fixtures/blocks/core_buttons__simple__deprecated.json
@@ -8,7 +8,7 @@
"name": "core/button",
"isValid": true,
"attributes": {
- "text": "My button 1"
+ "content": "My button 1"
},
"innerBlocks": []
},
@@ -16,7 +16,7 @@
"name": "core/button",
"isValid": true,
"attributes": {
- "text": "My button 2"
+ "content": "My button 2"
},
"innerBlocks": []
}