Block library: Revert attribute name change for text align

WordPress · Jun 10, 2019 · 04d9423 · 04d9423
1 parent b95ff4d
commit 04d9423
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 20 deletions.
diff --git a/packages/block-library/src/heading/block.json b/packages/block-library/src/heading/block.json
@@ -2,26 +2,26 @@
 	"name": "core/heading",
 	"category": "common",
 	"attributes": {
+		"align": {
+			"type": "string"
+		},
 		"content": {
 			"type": "string",
 			"source": "html",
 			"selector": "h1,h2,h3,h4,h5,h6",
 			"default": ""
 		},
-		"customTextColor": {
-			"type": "string"
-		},
 		"level": {
 			"type": "number",
 			"default": 2
 		},
 		"placeholder": {
 			"type": "string"
 		},
-		"textAlign": {
+		"textColor": {
 			"type": "string"
 		},
-		"textColor": {
+		"customTextColor": {
 			"type": "string"
 		}
 	}

diff --git a/packages/block-library/src/heading/deprecated.js b/packages/block-library/src/heading/deprecated.js
@@ -45,12 +45,6 @@ const deprecated = [
 	{
 		supports: blockSupports,
 		attributes: blockAttributes,
-		migrate( { align, ...attributes } ) {
-			return {
-				...attributes,
-				textAlign: align,
-			};
-		},
 		save( { attributes } ) {
 			const {
 				align,

diff --git a/packages/block-library/src/heading/edit.js b/packages/block-library/src/heading/edit.js
@@ -55,17 +55,17 @@ function HeadingEdit( {
 	textColor,
 	setTextColor,
 } ) {
-	const { content, level, placeholder, textAlign } = attributes;
+	const { align, content, level, placeholder } = attributes;
 	const tagName = 'h' + level;
 
 	return (
 		<>
 			<BlockControls>
 				<HeadingToolbar minLevel={ 2 } maxLevel={ 5 } selectedLevel={ level } onChange={ ( newLevel ) => setAttributes( { level: newLevel } ) } />
 				<AlignmentToolbar
-					value={ textAlign }
+					value={ align }
 					onChange={ ( nextAlign ) => {
-						setAttributes( { textAlign: nextAlign } );
+						setAttributes( { align: nextAlign } );
 					} }
 				/>
 			</BlockControls>
@@ -99,7 +99,7 @@ function HeadingEdit( {
 				onReplace={ onReplace }
 				onRemove={ () => onReplace( [] ) }
 				className={ classnames( className, {
-					[ `has-text-align-${ textAlign }` ]: textAlign,
+					[ `has-text-align-${ align }` ]: align,
 					'has-text-color': textColor.color,
 					[ textColor.class ]: textColor.class,
 				} ) }

diff --git a/packages/block-library/src/heading/save.js b/packages/block-library/src/heading/save.js
@@ -13,10 +13,10 @@ import {
 
 export default function save( { attributes } ) {
 	const {
+		align,
 		content,
 		customTextColor,
 		level,
-		textAlign,
 		textColor,
 	} = attributes;
 	const tagName = 'h' + level;
@@ -25,7 +25,7 @@ export default function save( { attributes } ) {
 
 	const className = classnames( {
 		[ textClass ]: textClass,
-		[ `has-text-align-${ textAlign }` ]: textAlign,
+		[ `has-text-align-${ align }` ]: align,
 	} );
 
 	return (

diff --git a/packages/e2e-tests/fixtures/blocks/core__heading__deprecated-1.json b/packages/e2e-tests/fixtures/blocks/core__heading__deprecated-1.json
@@ -4,9 +4,9 @@
         "name": "core/heading",
         "isValid": true,
         "attributes": {
+            "align": "right",
             "content": "A picture is worth a thousand words, or so the saying goes",
-            "level": 3,
-            "textAlign": "right"
+            "level": 3
         },
         "innerBlocks": [],
         "originalContent": "<h3 style=\"text-align:right\">A picture is worth a thousand words, or so the saying goes</h3>"

diff --git a/packages/e2e-tests/fixtures/blocks/core__heading__deprecated-1.serialized.html b/packages/e2e-tests/fixtures/blocks/core__heading__deprecated-1.serialized.html
@@ -1,3 +1,3 @@
-<!-- wp:heading {"level":3,"textAlign":"right"} -->
+<!-- wp:heading {"align":"right","level":3} -->
 <h3 class="has-text-align-right">A picture is worth a thousand words, or so the saying goes</h3>
 <!-- /wp:heading -->