Merge branch 'release/v2.5.0' into fix/GH-867/linked-image-align

Author: dlh01

apple-news.php

@@ -200,14 +200,3 @@ function apple_news_is_classic_editor_plugin_active() {
 
 	return false;
 }
-
-/**
- * Given a user ID, a post ID, and an action, determines whether a user can
- * perform the action or not.
- *
- * @param int    $post_id The ID of the post to check.
- * @param string $action  The action to check. One of 'publish', 'update', 'delete'.
- * @param int    $user_id The user ID to check.
- *
- * @return bool True if the user can perform the action, false otherwise.
- */

includes/apple-exporter/components/class-body.php

@@ -10,6 +10,7 @@
 
 use Apple_Exporter\Theme;
 use DOMElement;
+use WP_HTML_Tag_Processor;
 
 /**
  * A paragraph component.
@@ -35,6 +36,13 @@ class Body extends Component {
 	 */
 	protected $can_be_anchor_target = true;
 
+	/**
+	 * Set default value for parent text alignment property.
+	 *
+	 * @var string
+	 */
+	protected $text_alignment = 'left';
+
 	/**
 	 * Look for node matches for this component.
 	 *
@@ -146,6 +154,21 @@ public function register_specs(): void {
 			$default_spec
 		);
 
+		$this->register_spec(
+			'default-body-center',
+			__( 'Centered Text', 'apple-news' ),
+			[
+				'textAlignment' => 'center',
+			],
+		);
+		$this->register_spec(
+			'default-body-right',
+			__( 'Right-Aligned Text', 'apple-news' ),
+			[
+				'textAlignment' => 'right',
+			],
+		);
+
 		$dropcap_color_dark            = $theme->get_value( 'dropcap_color_dark' );
 		$dropcap_background_color_dark = $theme->get_value( 'dropcap_background_color_dark' );
 
@@ -290,6 +313,7 @@ private static function split_unsupported_elements( $html, $tag, $open, $close )
 	 * @access protected
 	 */
 	protected function build( $html ) {
+		$origin = $html;
 
 		// If there is no text for this element, bail.
 		$html  = $this->parser->parse( $html );
@@ -298,6 +322,22 @@ protected function build( $html ) {
 			return;
 		}
 
+		// Determine the text alignment from the first tag in the original HTML, which still has the alignment attributes.
+		$proc = new WP_HTML_Tag_Processor( $origin );
+		if ( false !== $proc->next_tag() ) {
+			// `has_class()` is available in 6.4+.
+			$class = (string) $proc->get_attribute( 'class' );
+			$style = (string) $proc->get_attribute( 'style' );
+
+			if ( preg_match( '/\bhas-text-align-center\b/i', $class ) || preg_match( '/\btext-align:\s*center\b/i', $style ) ) {
+				$this->text_alignment = 'center';
+			}
+
+			if ( preg_match( '/\bhas-text-align-right\b/i', $class ) || preg_match( '/\btext-align:\s*right\b/i', $style ) ) {
+				$this->text_alignment = 'right';
+			}
+		}
+
 		// Add the JSON for this component.
 		$this->register_json(
 			'json',
@@ -477,7 +517,7 @@ private function get_default_text_styles() {
 					'fontSize'   => '#cite_size#',
 					'tracking'   => '#cite_tracking#',
 					'lineHeight' => '#cite_line_height#',
-					'textColor'  => '#cite_color',
+					'textColor'  => '#cite_color#',
 				],
 				$conditionals['cite'] ?? []
 			),
@@ -487,7 +527,7 @@ private function get_default_text_styles() {
 					'fontSize'   => '#monospaced_size#',
 					'tracking'   => '#monospaced_tracking#',
 					'lineHeight' => '#monospaced_line_height#',
-					'textColor'  => '#monospaced_color',
+					'textColor'  => '#monospaced_color#',
 				],
 				$conditionals['monospaced'] ?? []
 			),
@@ -523,12 +563,32 @@ private function get_default_text_styles() {
 	 * @access public
 	 */
 	public function set_default_style() {
+		// Always register the default style.
 		$this->register_style(
 			'default-body',
 			'default-body',
 			$this->get_default_style_values(),
 			'textStyle'
 		);
+
+		// If necessary, register the styles that are expected to override the 'textAlignment' property.
+		if ( 'center' === $this->text_alignment ) {
+			$this->register_style(
+				'default-body-center',
+				'default-body-center',
+				[],
+				'textStyle'
+			);
+		}
+
+		if ( 'right' === $this->text_alignment ) {
+			$this->register_style(
+				'default-body-right',
+				'default-body-right',
+				[],
+				'textStyle'
+			);
+		}
 	}
 
 	/**

tests/apple-exporter/components/test-class-body.php

@@ -596,4 +596,28 @@ public function test_without_dropcap() {
 		$this->assertEquals( '<p>Paragraph 2.</p>', $json['components'][3]['text'] );
 		$this->assertEquals( 'default-body', $json['components'][3]['textStyle'] );
 	}
+
+	/**
+	 * Tests alignment textStyles.
+	 */
+	public function test_alignment_textstyles() {
+		$content = <<<HTML
+<!-- wp:paragraph {"align":"center"} -->
+<p class="has-text-align-center">Paragraph 1.</p>
+<!-- /wp:paragraph -->
+
+<!-- wp:paragraph {"align":"right"} -->
+<p class="has-text-align-right">Paragraph 2.</p>
+<!-- /wp:paragraph -->
+HTML;
+
+		$post_id = self::factory()->post->create( [ 'post_content' => $content ] );
+		$json    = $this->get_json_for_post( $post_id );
+
+		$center = array_filter( $json['components'], fn ( $c ) => '<p>Paragraph 1.</p>' === $c['text'] );
+		$right  = array_filter( $json['components'], fn ( $c ) => '<p>Paragraph 2.</p>' === $c['text'] );
+
+		$this->assertSame( 'default-body-center', array_pop( $center )['textStyle'] );
+		$this->assertSame( 'default-body-right', array_pop( $right )['textStyle'] );
+	}
 }