diff --git a/packages/block-library/src/paragraph/deprecated.js b/packages/block-library/src/paragraph/deprecated.js index c3f18db62d62c3..d7871b8854ca3a 100644 --- a/packages/block-library/src/paragraph/deprecated.js +++ b/packages/block-library/src/paragraph/deprecated.js @@ -12,6 +12,7 @@ import { } from '@wordpress/element'; import { getColorClassName, + getFontSizeClass, RichText, } from '@wordpress/block-editor'; @@ -61,6 +62,54 @@ const blockAttributes = { }; const deprecated = [ + { + supports, + attributes: blockAttributes, + save( { attributes } ) { + const { + align, + content, + dropCap, + backgroundColor, + textColor, + customBackgroundColor, + customTextColor, + fontSize, + customFontSize, + direction, + } = attributes; + + const textClass = getColorClassName( 'color', textColor ); + const backgroundClass = getColorClassName( 'background-color', backgroundColor ); + const fontSizeClass = getFontSizeClass( fontSize ); + + const className = classnames( { + 'has-text-color': textColor || customTextColor, + 'has-background': backgroundColor || customBackgroundColor, + 'has-drop-cap': dropCap, + [ fontSizeClass ]: fontSizeClass, + [ textClass ]: textClass, + [ backgroundClass ]: backgroundClass, + } ); + + const styles = { + backgroundColor: backgroundClass ? undefined : customBackgroundColor, + color: textClass ? undefined : customTextColor, + fontSize: fontSizeClass ? undefined : customFontSize, + textAlign: align, + }; + + return ( + + ); + }, + }, { supports, attributes: { diff --git a/packages/block-library/src/paragraph/edit.js b/packages/block-library/src/paragraph/edit.js index 021a7369f3422a..c40fae904906fc 100644 --- a/packages/block-library/src/paragraph/edit.js +++ b/packages/block-library/src/paragraph/edit.js @@ -163,6 +163,7 @@ class ParagraphBlock extends Component { 'has-text-color': textColor.color, 'has-background': backgroundColor.color, 'has-drop-cap': dropCap, + [ `has-text-align-${ align }` ]: align, [ backgroundColor.class ]: backgroundColor.class, [ textColor.class ]: textColor.class, [ fontSize.class ]: fontSize.class, @@ -171,7 +172,6 @@ class ParagraphBlock extends Component { backgroundColor: backgroundColor.color, color: textColor.color, fontSize: fontSize.size ? fontSize.size + 'px' : undefined, - textAlign: align, direction, } } value={ content } diff --git a/packages/block-library/src/paragraph/save.js b/packages/block-library/src/paragraph/save.js index b4c3b7c02d0831..b2c1f47a4f32a2 100644 --- a/packages/block-library/src/paragraph/save.js +++ b/packages/block-library/src/paragraph/save.js @@ -34,6 +34,7 @@ export default function save( { attributes } ) { 'has-text-color': textColor || customTextColor, 'has-background': backgroundColor || customBackgroundColor, 'has-drop-cap': dropCap, + [ `has-text-align-${ align }` ]: align, [ fontSizeClass ]: fontSizeClass, [ textClass ]: textClass, [ backgroundClass ]: backgroundClass, @@ -43,7 +44,6 @@ export default function save( { attributes } ) { backgroundColor: backgroundClass ? undefined : customBackgroundColor, color: textClass ? undefined : customTextColor, fontSize: fontSizeClass ? undefined : customFontSize, - textAlign: align, }; return ( diff --git a/packages/e2e-tests/fixtures/blocks/core__cover.html b/packages/e2e-tests/fixtures/blocks/core__cover.html index bea14565390663..00094d59af0fa8 100644 --- a/packages/e2e-tests/fixtures/blocks/core__cover.html +++ b/packages/e2e-tests/fixtures/blocks/core__cover.html @@ -5,7 +5,7 @@ >
-

+

Guten Berg!

diff --git a/packages/e2e-tests/fixtures/blocks/core__cover.json b/packages/e2e-tests/fixtures/blocks/core__cover.json index 93776fce2cdc04..2092e1fc58a1a1 100644 --- a/packages/e2e-tests/fixtures/blocks/core__cover.json +++ b/packages/e2e-tests/fixtures/blocks/core__cover.json @@ -22,7 +22,7 @@ "fontSize": "large" }, "innerBlocks": [], - "originalContent": "

\n\t\t\tGuten Berg!\n\t\t

" + "originalContent": "

\n\t\t\tGuten Berg!\n\t\t

" } ], "originalContent": "\n\t
\n\t\t\n\t
\n
" diff --git a/packages/e2e-tests/fixtures/blocks/core__cover.parsed.json b/packages/e2e-tests/fixtures/blocks/core__cover.parsed.json index d682ebabe0b9f5..c38b616c41d0d7 100644 --- a/packages/e2e-tests/fixtures/blocks/core__cover.parsed.json +++ b/packages/e2e-tests/fixtures/blocks/core__cover.parsed.json @@ -14,9 +14,9 @@ "fontSize": "large" }, "innerBlocks": [], - "innerHTML": "\n\t\t

\n\t\t\tGuten Berg!\n\t\t

\n\t\t", + "innerHTML": "\n\t\t

\n\t\t\tGuten Berg!\n\t\t

\n\t\t", "innerContent": [ - "\n\t\t

\n\t\t\tGuten Berg!\n\t\t

\n\t\t" + "\n\t\t

\n\t\t\tGuten Berg!\n\t\t

\n\t\t" ] } ], diff --git a/packages/e2e-tests/fixtures/blocks/core__cover.serialized.html b/packages/e2e-tests/fixtures/blocks/core__cover.serialized.html index 0539f03f168f8f..5c22f650550e6a 100644 --- a/packages/e2e-tests/fixtures/blocks/core__cover.serialized.html +++ b/packages/e2e-tests/fixtures/blocks/core__cover.serialized.html @@ -1,6 +1,6 @@
-

+

Guten Berg!

diff --git a/packages/e2e-tests/fixtures/blocks/core__cover__deprecated-1.serialized.html b/packages/e2e-tests/fixtures/blocks/core__cover__deprecated-1.serialized.html index 8c80c4c53a580b..d1a8ceecd39b99 100644 --- a/packages/e2e-tests/fixtures/blocks/core__cover__deprecated-1.serialized.html +++ b/packages/e2e-tests/fixtures/blocks/core__cover__deprecated-1.serialized.html @@ -1,5 +1,5 @@
-

Cover Image

+

Cover Image

diff --git a/packages/e2e-tests/fixtures/blocks/core__cover__deprecated-2.serialized.html b/packages/e2e-tests/fixtures/blocks/core__cover__deprecated-2.serialized.html index 90849ff27c4565..29c4fc38d07765 100644 --- a/packages/e2e-tests/fixtures/blocks/core__cover__deprecated-2.serialized.html +++ b/packages/e2e-tests/fixtures/blocks/core__cover__deprecated-2.serialized.html @@ -1,5 +1,5 @@
-

Cover Block

+

Cover Block

diff --git a/packages/e2e-tests/fixtures/blocks/core__cover__deprecated-3.serialized.html b/packages/e2e-tests/fixtures/blocks/core__cover__deprecated-3.serialized.html index a85404c31646ad..0498afe4a1c8db 100644 --- a/packages/e2e-tests/fixtures/blocks/core__cover__deprecated-3.serialized.html +++ b/packages/e2e-tests/fixtures/blocks/core__cover__deprecated-3.serialized.html @@ -1,5 +1,5 @@
-

Cover Block

+

Cover Block

diff --git a/packages/e2e-tests/fixtures/blocks/core__cover__video-overlay.html b/packages/e2e-tests/fixtures/blocks/core__cover__video-overlay.html index 1eb26c9730be69..4f603c49dd06d5 100644 --- a/packages/e2e-tests/fixtures/blocks/core__cover__video-overlay.html +++ b/packages/e2e-tests/fixtures/blocks/core__cover__video-overlay.html @@ -13,7 +13,7 @@
-

+

Guten Berg!

diff --git a/packages/e2e-tests/fixtures/blocks/core__cover__video-overlay.json b/packages/e2e-tests/fixtures/blocks/core__cover__video-overlay.json index f7e2b42ff234cc..8e2486b3bc128b 100644 --- a/packages/e2e-tests/fixtures/blocks/core__cover__video-overlay.json +++ b/packages/e2e-tests/fixtures/blocks/core__cover__video-overlay.json @@ -23,7 +23,7 @@ "fontSize": "large" }, "innerBlocks": [], - "originalContent": "

\n\t\t\tGuten Berg!\n\t\t

" + "originalContent": "

\n\t\t\tGuten Berg!\n\t\t

" } ], "originalContent": "\n\t\n\t\n\t
\n\t\t\n\t
\n
" diff --git a/packages/e2e-tests/fixtures/blocks/core__cover__video-overlay.parsed.json b/packages/e2e-tests/fixtures/blocks/core__cover__video-overlay.parsed.json index 4b72e0d4148e7e..1a01fe89ce68a7 100644 --- a/packages/e2e-tests/fixtures/blocks/core__cover__video-overlay.parsed.json +++ b/packages/e2e-tests/fixtures/blocks/core__cover__video-overlay.parsed.json @@ -16,9 +16,9 @@ "fontSize": "large" }, "innerBlocks": [], - "innerHTML": "\n\t\t

\n\t\t\tGuten Berg!\n\t\t

\n\t\t", + "innerHTML": "\n\t\t

\n\t\t\tGuten Berg!\n\t\t

\n\t\t", "innerContent": [ - "\n\t\t

\n\t\t\tGuten Berg!\n\t\t

\n\t\t" + "\n\t\t

\n\t\t\tGuten Berg!\n\t\t

\n\t\t" ] } ], diff --git a/packages/e2e-tests/fixtures/blocks/core__cover__video-overlay.serialized.html b/packages/e2e-tests/fixtures/blocks/core__cover__video-overlay.serialized.html index 831388b0182b87..1a40bd5a65f740 100644 --- a/packages/e2e-tests/fixtures/blocks/core__cover__video-overlay.serialized.html +++ b/packages/e2e-tests/fixtures/blocks/core__cover__video-overlay.serialized.html @@ -1,6 +1,6 @@
-

+

Guten Berg!

diff --git a/packages/e2e-tests/fixtures/blocks/core__cover__video.html b/packages/e2e-tests/fixtures/blocks/core__cover__video.html index eb50abcb28cf36..96c1c72ea34110 100644 --- a/packages/e2e-tests/fixtures/blocks/core__cover__video.html +++ b/packages/e2e-tests/fixtures/blocks/core__cover__video.html @@ -12,7 +12,7 @@
-

+

Guten Berg!

diff --git a/packages/e2e-tests/fixtures/blocks/core__cover__video.json b/packages/e2e-tests/fixtures/blocks/core__cover__video.json index f91f443e785e15..c5a5abeda49162 100644 --- a/packages/e2e-tests/fixtures/blocks/core__cover__video.json +++ b/packages/e2e-tests/fixtures/blocks/core__cover__video.json @@ -22,7 +22,7 @@ "fontSize": "large" }, "innerBlocks": [], - "originalContent": "

\n\t\t\tGuten Berg!\n\t\t

" + "originalContent": "

\n\t\t\tGuten Berg!\n\t\t

" } ], "originalContent": "\n\t\n\t\n\t
\n\t\t\n\t
\n
" diff --git a/packages/e2e-tests/fixtures/blocks/core__cover__video.parsed.json b/packages/e2e-tests/fixtures/blocks/core__cover__video.parsed.json index c48b676a2f1c5b..7121277dd3b401 100644 --- a/packages/e2e-tests/fixtures/blocks/core__cover__video.parsed.json +++ b/packages/e2e-tests/fixtures/blocks/core__cover__video.parsed.json @@ -15,9 +15,9 @@ "fontSize": "large" }, "innerBlocks": [], - "innerHTML": "\n\t\t

\n\t\t\tGuten Berg!\n\t\t

\n\t\t", + "innerHTML": "\n\t\t

\n\t\t\tGuten Berg!\n\t\t

\n\t\t", "innerContent": [ - "\n\t\t

\n\t\t\tGuten Berg!\n\t\t

\n\t\t" + "\n\t\t

\n\t\t\tGuten Berg!\n\t\t

\n\t\t" ] } ], diff --git a/packages/e2e-tests/fixtures/blocks/core__cover__video.serialized.html b/packages/e2e-tests/fixtures/blocks/core__cover__video.serialized.html index 5f23cddf2fa1c1..5c155d10fa772f 100644 --- a/packages/e2e-tests/fixtures/blocks/core__cover__video.serialized.html +++ b/packages/e2e-tests/fixtures/blocks/core__cover__video.serialized.html @@ -1,6 +1,6 @@
-

+

Guten Berg!

diff --git a/packages/e2e-tests/fixtures/blocks/core__media-text__media-right-custom-width.html b/packages/e2e-tests/fixtures/blocks/core__media-text__media-right-custom-width.html index 45252b7a306b8c..57b21c9f28991c 100644 --- a/packages/e2e-tests/fixtures/blocks/core__media-text__media-right-custom-width.html +++ b/packages/e2e-tests/fixtures/blocks/core__media-text__media-right-custom-width.html @@ -5,7 +5,7 @@
-

My video

+

My video

diff --git a/packages/e2e-tests/fixtures/blocks/core__media-text__media-right-custom-width.json b/packages/e2e-tests/fixtures/blocks/core__media-text__media-right-custom-width.json index c31ac7581e2551..ca372909502bac 100644 --- a/packages/e2e-tests/fixtures/blocks/core__media-text__media-right-custom-width.json +++ b/packages/e2e-tests/fixtures/blocks/core__media-text__media-right-custom-width.json @@ -25,7 +25,7 @@ "fontSize": "large" }, "innerBlocks": [], - "originalContent": "

My video

" + "originalContent": "

My video

" } ], "originalContent": "
\n\t
\n\t\t\n\t
\n\t
\n\t\t\n\t
\n
" diff --git a/packages/e2e-tests/fixtures/blocks/core__media-text__media-right-custom-width.parsed.json b/packages/e2e-tests/fixtures/blocks/core__media-text__media-right-custom-width.parsed.json index ee577a366f0f8a..6939ba85e95b84 100644 --- a/packages/e2e-tests/fixtures/blocks/core__media-text__media-right-custom-width.parsed.json +++ b/packages/e2e-tests/fixtures/blocks/core__media-text__media-right-custom-width.parsed.json @@ -16,9 +16,9 @@ "fontSize": "large" }, "innerBlocks": [], - "innerHTML": "\n\t\t

My video

\n\t\t", + "innerHTML": "\n\t\t

My video

\n\t\t", "innerContent": [ - "\n\t\t

My video

\n\t\t" + "\n\t\t

My video

\n\t\t" ] } ], diff --git a/packages/e2e-tests/fixtures/blocks/core__media-text__media-right-custom-width.serialized.html b/packages/e2e-tests/fixtures/blocks/core__media-text__media-right-custom-width.serialized.html index 857ad7de389cd4..2c2923b7ecf25a 100644 --- a/packages/e2e-tests/fixtures/blocks/core__media-text__media-right-custom-width.serialized.html +++ b/packages/e2e-tests/fixtures/blocks/core__media-text__media-right-custom-width.serialized.html @@ -1,5 +1,5 @@
-

My video

+

My video

diff --git a/packages/e2e-tests/fixtures/blocks/core__paragraph__align-right.html b/packages/e2e-tests/fixtures/blocks/core__paragraph__align-right.html index d41481a57f2e55..e95db5b1554541 100644 --- a/packages/e2e-tests/fixtures/blocks/core__paragraph__align-right.html +++ b/packages/e2e-tests/fixtures/blocks/core__paragraph__align-right.html @@ -1,3 +1,3 @@ -

... like this one, which is separate from the above and right aligned.

+

... like this one, which is separate from the above and right aligned.

diff --git a/packages/e2e-tests/fixtures/blocks/core__paragraph__align-right.json b/packages/e2e-tests/fixtures/blocks/core__paragraph__align-right.json index 2ab7bad89f1928..d0c3fa1495e3df 100644 --- a/packages/e2e-tests/fixtures/blocks/core__paragraph__align-right.json +++ b/packages/e2e-tests/fixtures/blocks/core__paragraph__align-right.json @@ -9,6 +9,6 @@ "dropCap": false }, "innerBlocks": [], - "originalContent": "

... like this one, which is separate from the above and right aligned.

" + "originalContent": "

... like this one, which is separate from the above and right aligned.

" } ] diff --git a/packages/e2e-tests/fixtures/blocks/core__paragraph__align-right.parsed.json b/packages/e2e-tests/fixtures/blocks/core__paragraph__align-right.parsed.json index a8f850f47f72b5..61859738751fb8 100644 --- a/packages/e2e-tests/fixtures/blocks/core__paragraph__align-right.parsed.json +++ b/packages/e2e-tests/fixtures/blocks/core__paragraph__align-right.parsed.json @@ -5,9 +5,9 @@ "align": "right" }, "innerBlocks": [], - "innerHTML": "\n

... like this one, which is separate from the above and right aligned.

\n", + "innerHTML": "\n

... like this one, which is separate from the above and right aligned.

\n", "innerContent": [ - "\n

... like this one, which is separate from the above and right aligned.

\n" + "\n

... like this one, which is separate from the above and right aligned.

\n" ] }, { diff --git a/packages/e2e-tests/fixtures/blocks/core__paragraph__align-right.serialized.html b/packages/e2e-tests/fixtures/blocks/core__paragraph__align-right.serialized.html index 3e18265b5c44b1..3009f606904f61 100644 --- a/packages/e2e-tests/fixtures/blocks/core__paragraph__align-right.serialized.html +++ b/packages/e2e-tests/fixtures/blocks/core__paragraph__align-right.serialized.html @@ -1,3 +1,3 @@ -

... like this one, which is separate from the above and right aligned.

+

... like this one, which is separate from the above and right aligned.

diff --git a/packages/e2e-tests/fixtures/blocks/core__paragraph__deprecated-4.html b/packages/e2e-tests/fixtures/blocks/core__paragraph__deprecated-4.html new file mode 100644 index 00000000000000..d41481a57f2e55 --- /dev/null +++ b/packages/e2e-tests/fixtures/blocks/core__paragraph__deprecated-4.html @@ -0,0 +1,3 @@ + +

... like this one, which is separate from the above and right aligned.

+ diff --git a/packages/e2e-tests/fixtures/blocks/core__paragraph__deprecated-4.json b/packages/e2e-tests/fixtures/blocks/core__paragraph__deprecated-4.json new file mode 100644 index 00000000000000..2ab7bad89f1928 --- /dev/null +++ b/packages/e2e-tests/fixtures/blocks/core__paragraph__deprecated-4.json @@ -0,0 +1,14 @@ +[ + { + "clientId": "_clientId_0", + "name": "core/paragraph", + "isValid": true, + "attributes": { + "align": "right", + "content": "... like this one, which is separate from the above and right aligned.", + "dropCap": false + }, + "innerBlocks": [], + "originalContent": "

... like this one, which is separate from the above and right aligned.

" + } +] diff --git a/packages/e2e-tests/fixtures/blocks/core__paragraph__deprecated-4.parsed.json b/packages/e2e-tests/fixtures/blocks/core__paragraph__deprecated-4.parsed.json new file mode 100644 index 00000000000000..a8f850f47f72b5 --- /dev/null +++ b/packages/e2e-tests/fixtures/blocks/core__paragraph__deprecated-4.parsed.json @@ -0,0 +1,22 @@ +[ + { + "blockName": "core/paragraph", + "attrs": { + "align": "right" + }, + "innerBlocks": [], + "innerHTML": "\n

... like this one, which is separate from the above and right aligned.

\n", + "innerContent": [ + "\n

... like this one, which is separate from the above and right aligned.

\n" + ] + }, + { + "blockName": null, + "attrs": {}, + "innerBlocks": [], + "innerHTML": "\n", + "innerContent": [ + "\n" + ] + } +] diff --git a/packages/e2e-tests/fixtures/blocks/core__paragraph__deprecated-4.serialized.html b/packages/e2e-tests/fixtures/blocks/core__paragraph__deprecated-4.serialized.html new file mode 100644 index 00000000000000..3009f606904f61 --- /dev/null +++ b/packages/e2e-tests/fixtures/blocks/core__paragraph__deprecated-4.serialized.html @@ -0,0 +1,3 @@ + +

... like this one, which is separate from the above and right aligned.

+ diff --git a/packages/e2e-tests/specs/__snapshots__/block-transforms.test.js.snap b/packages/e2e-tests/specs/__snapshots__/block-transforms.test.js.snap index f1d778e920aeba..3288fac0c027a6 100644 --- a/packages/e2e-tests/specs/__snapshots__/block-transforms.test.js.snap +++ b/packages/e2e-tests/specs/__snapshots__/block-transforms.test.js.snap @@ -79,7 +79,7 @@ exports[`Block transforms correctly transform block Heading in fixture core__hea exports[`Block transforms correctly transform block Image in fixture core__image into the Cover block 1`] = ` "
-

+

" `; @@ -115,7 +115,7 @@ exports[`Block transforms correctly transform block Image in fixture core__image exports[`Block transforms correctly transform block Image in fixture core__image__attachment-link into the Cover block 1`] = ` "
-

+

" `; @@ -143,7 +143,7 @@ exports[`Block transforms correctly transform block Image in fixture core__image exports[`Block transforms correctly transform block Image in fixture core__image__center-caption into the Cover block 1`] = ` "
-

+

" `; @@ -171,7 +171,7 @@ exports[`Block transforms correctly transform block Image in fixture core__image exports[`Block transforms correctly transform block Image in fixture core__image__custom-link into the Cover block 1`] = ` "
-

+

" `; @@ -199,7 +199,7 @@ exports[`Block transforms correctly transform block Image in fixture core__image exports[`Block transforms correctly transform block Image in fixture core__image__custom-link-class into the Cover block 1`] = ` "
-

+

" `; @@ -227,7 +227,7 @@ exports[`Block transforms correctly transform block Image in fixture core__image exports[`Block transforms correctly transform block Image in fixture core__image__custom-link-rel into the Cover block 1`] = ` "
-

+

" `; @@ -255,7 +255,7 @@ exports[`Block transforms correctly transform block Image in fixture core__image exports[`Block transforms correctly transform block Image in fixture core__image__media-link into the Cover block 1`] = ` "
-

+

" `; @@ -363,7 +363,7 @@ exports[`Block transforms correctly transform block Media & Text in fixture core exports[`Block transforms correctly transform block Paragraph in fixture core__paragraph__align-right into the Group block 1`] = ` "
-

... like this one, which is separate from the above and right aligned.

+

... like this one, which is separate from the above and right aligned.

" `; @@ -489,7 +489,7 @@ exports[`Block transforms correctly transform block Verse in fixture core__verse exports[`Block transforms correctly transform block Video in fixture core__video into the Cover block 1`] = ` "
-

+

" `; diff --git a/post-content.php b/post-content.php index 032c4ad10be6ab..1a5014c061a2e4 100644 --- a/post-content.php +++ b/post-content.php @@ -8,7 +8,7 @@ ?>
-

+

@@ -21,7 +21,7 @@ -

+

@@ -156,7 +156,7 @@ -

+

-

+

-

👋

+

👋