| @@ -11,8 +11,12 @@ | ||
| 11 | 11 | |
| 12 | 12 | use Automattic\Jetpack\Blocks; |
| 13 | 13 | use Jetpack_Gutenberg; |
| 14 | 14 | |
| 15 | +if ( ! defined( 'ABSPATH' ) ) { | |
| 16 | + exit( 0 ); | |
| 17 | +} | |
| 18 | + | |
| 15 | 19 | const FEATURE_NAME = 'button'; |
| 16 | 20 | const BLOCK_NAME = 'jetpack/' . FEATURE_NAME; |
| 17 | 21 | |
| 18 | 22 | /** |
| @@ -23,10 +27,14 @@ | ||
| 23 | 27 | function register_block() { |
| 24 | 28 | Blocks::jetpack_register_block( |
| 25 | 29 | BLOCK_NAME, |
| 26 | 30 | array( |
| 27 | - 'render_callback' => __NAMESPACE__ . '\render_block', | |
| 28 | - 'uses_context' => array( 'jetpack/parentBlockWidth' ), | |
| 31 | + 'render_callback' => __NAMESPACE__ . '\render_block', | |
| 32 | + 'render_email_callback' => __NAMESPACE__ . '\render_email', | |
| 33 | + 'uses_context' => array( 'jetpack/parentBlockWidth' ), | |
| 34 | + 'selectors' => array( | |
| 35 | + 'border' => '.wp-block-jetpack-button .wp-block-button__link', | |
| 36 | + ), | |
| 29 | 37 | ) |
| 30 | 38 | ); |
| 31 | 39 | } |
| 32 | 40 | add_action( 'init', __NAMESPACE__ . '\register_block' ); |
| @@ -83,17 +91,129 @@ | ||
| 83 | 91 | } elseif ( 'input' === $element ) { |
| 84 | 92 | $button_attributes .= sprintf( ' type="submit" value="%s"', esc_attr( wp_strip_all_tags( $text, true ) ) ); |
| 85 | 93 | } |
| 86 | 94 | |
| 95 | + $button_attributes .= ' data-wp-class--is-submitting="state.isSubmitting" data-wp-bind--aria-disabled="state.isAriaDisabled"'; | |
| 96 | + | |
| 97 | + $svg = '<svg width="24" height="24" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="M12,1A11,11,0,1,0,23,12,11,11,0,0,0,12,1Zm0,19a8,8,0,1,1,8-8A8,8,0,0,1,12,20Z" opacity=".25"/><path d="M10.14,1.16a11,11,0,0,0-9,8.92A1.59,1.59,0,0,0,2.46,12,1.52,1.52,0,0,0,4.11,10.7a8,8,0,0,1,6.66-6.61A1.42,1.42,0,0,0,12,2.69h0A1.57,1.57,0,0,0,10.14,1.16Z"><animateTransform attributeName="transform" type="rotate" dur="0.75s" values="0 12 12;360 12 12" repeatCount="indefinite"/></path></svg>'; | |
| 98 | + $form_submitting_text = '<span class="is-visually-hidden">' . __( 'Submitting form', 'jetpack' ) . '</span>'; | |
| 99 | + $spinner = '<span class="spinner" aria-hidden="true">' . $svg . $form_submitting_text . '</span>'; | |
| 100 | + | |
| 87 | 101 | $button = 'input' === $element |
| 88 | 102 | ? '<' . $element . $button_attributes . ' />' |
| 89 | - : '<' . $element . $button_attributes . '>' . $text . '</' . $element . '>'; | |
| 103 | + : '<' . $element . $button_attributes . '>' . $text . $spinner . '</' . $element . '>'; | |
| 90 | 104 | |
| 91 | - // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped | |
| 92 | 105 | return '<div' . $wrapper_attributes . '>' . $button . '</div>'; |
| 93 | 106 | } |
| 94 | 107 | |
| 95 | 108 | /** |
| 109 | + * WooCommerce Email Editor render callback for the button block. | |
| 110 | + * | |
| 111 | + * @param string $block_content The block content. | |
| 112 | + * @param array $parsed_block The parsed block data. | |
| 113 | + * @param object $rendering_context The email rendering context. | |
| 114 | + * | |
| 115 | + * @return string | |
| 116 | + */ | |
| 117 | +function render_email( $block_content, array $parsed_block, $rendering_context ) { | |
| 118 | + // Validate input parameters and required dependencies | |
| 119 | + if ( ! isset( $parsed_block['attrs'] ) || ! is_array( $parsed_block['attrs'] ) || | |
| 120 | + ! class_exists( '\Automattic\WooCommerce\EmailEditor\Integrations\Core\Renderer\Blocks\Button' ) ) { | |
| 121 | + return ''; | |
| 122 | + } | |
| 123 | + | |
| 124 | + $attributes = $parsed_block['attrs']; | |
| 125 | + | |
| 126 | + // Create a mock innerHTML that WooCommerce's button renderer can parse | |
| 127 | + $button_text = ! empty( $attributes['text'] ) ? sanitize_text_field( $attributes['text'] ) : __( 'Click here', 'jetpack' ); | |
| 128 | + $button_url = ! empty( $attributes['url'] ) ? $attributes['url'] : '#'; | |
| 129 | + | |
| 130 | + // Create the innerHTML that WooCommerce's button renderer expects | |
| 131 | + $inner_html = sprintf( | |
| 132 | + '<div class="wp-block-button"><a class="wp-block-button__link" href="%s">%s</a></div>', | |
| 133 | + esc_url( $button_url ), | |
| 134 | + esc_html( $button_text ) | |
| 135 | + ); | |
| 136 | + | |
| 137 | + // Format attributes for WooCommerce's Styles_Helper | |
| 138 | + $formatted_attributes = format_attributes_for_woocommerce( $attributes ); | |
| 139 | + | |
| 140 | + // Create a mock parsed block that WooCommerce's button renderer can handle | |
| 141 | + $mock_parsed_block = array( | |
| 142 | + 'innerHTML' => $inner_html, | |
| 143 | + 'attrs' => $formatted_attributes, | |
| 144 | + ); | |
| 145 | + | |
| 146 | + // Use WooCommerce's core button renderer | |
| 147 | + $woo_button_renderer = new \Automattic\WooCommerce\EmailEditor\Integrations\Core\Renderer\Blocks\Button(); | |
| 148 | + | |
| 149 | + return $woo_button_renderer->render( $block_content, $mock_parsed_block, $rendering_context ); | |
| 150 | +} | |
| 151 | + | |
| 152 | +/** | |
| 153 | + * Format button attributes for WooCommerce's Styles_Helper. | |
| 154 | + * | |
| 155 | + * @param array $attributes The original attributes. | |
| 156 | + * @return array The formatted attributes. | |
| 157 | + */ | |
| 158 | +function format_attributes_for_woocommerce( $attributes ) { | |
| 159 | + $formatted = array(); | |
| 160 | + | |
| 161 | + // Handle background colors (prioritize subscription attributes) | |
| 162 | + // Named colors go in backgroundColor, hex colors go in style.color.background | |
| 163 | + if ( ! empty( $attributes['buttonBackgroundColor'] ) ) { | |
| 164 | + $formatted['backgroundColor'] = $attributes['buttonBackgroundColor']; | |
| 165 | + } elseif ( ! empty( $attributes['backgroundColor'] ) ) { | |
| 166 | + $formatted['backgroundColor'] = $attributes['backgroundColor']; | |
| 167 | + } | |
| 168 | + | |
| 169 | + if ( ! empty( $attributes['customButtonBackgroundColor'] ) ) { | |
| 170 | + $formatted['style']['color']['background'] = $attributes['customButtonBackgroundColor']; | |
| 171 | + } elseif ( ! empty( $attributes['customBackgroundColor'] ) ) { | |
| 172 | + $formatted['style']['color']['background'] = $attributes['customBackgroundColor']; | |
| 173 | + } | |
| 174 | + | |
| 175 | + // Named colors go in textColor, hex colors go in style.color.text | |
| 176 | + if ( ! empty( $attributes['textColor'] ) ) { | |
| 177 | + $formatted['textColor'] = $attributes['textColor']; | |
| 178 | + } | |
| 179 | + if ( ! empty( $attributes['customTextColor'] ) ) { | |
| 180 | + $formatted['style']['color']['text'] = $attributes['customTextColor']; | |
| 181 | + } | |
| 182 | + | |
| 183 | + // Handle typography (font size) | |
| 184 | + if ( ! empty( $attributes['fontSize'] ) ) { | |
| 185 | + $formatted['style']['typography']['fontSize'] = $attributes['fontSize']; | |
| 186 | + } | |
| 187 | + if ( ! empty( $attributes['customFontSize'] ) ) { | |
| 188 | + $formatted['style']['typography']['fontSize'] = $attributes['customFontSize']; | |
| 189 | + } | |
| 190 | + | |
| 191 | + // Handle borders | |
| 192 | + if ( ! empty( $attributes['borderRadius'] ) ) { | |
| 193 | + $formatted['style']['border']['radius'] = $attributes['borderRadius'] . 'px'; | |
| 194 | + } | |
| 195 | + // Named colors go in borderColor, hex colors go in style.color.border | |
| 196 | + if ( ! empty( $attributes['borderColor'] ) ) { | |
| 197 | + $formatted['borderColor'] = $attributes['borderColor']; | |
| 198 | + } | |
| 199 | + if ( ! empty( $attributes['customBorderColor'] ) ) { | |
| 200 | + $formatted['style']['border']['color'] = $attributes['customBorderColor']; | |
| 201 | + } | |
| 202 | + // Handle border weight (subscription block uses borderWeight, button block expects style.border.width) | |
| 203 | + if ( ! empty( $attributes['borderWeight'] ) ) { | |
| 204 | + $formatted['style']['border']['width'] = $attributes['borderWeight'] . 'px'; | |
| 205 | + } | |
| 206 | + | |
| 207 | + // Handle padding | |
| 208 | + if ( ! empty( $attributes['padding'] ) ) { | |
| 209 | + $formatted['style']['spacing']['padding'] = $attributes['padding'] . 'px'; | |
| 210 | + } | |
| 211 | + | |
| 212 | + return $formatted; | |
| 213 | +} | |
| 214 | + | |
| 215 | +/** | |
| 96 | 216 | * Get the Button block classes. |
| 97 | 217 | * |
| 98 | 218 | * @param array $attributes Array containing the block attributes. |
| 99 | 219 | * |
| @@ -109,8 +229,9 @@ | ||
| 109 | 229 | $has_named_gradient = array_key_exists( 'gradient', $attributes ); |
| 110 | 230 | $has_custom_gradient = array_key_exists( 'customGradient', $attributes ); |
| 111 | 231 | $has_border_radius = array_key_exists( 'borderRadius', $attributes ); |
| 112 | 232 | $has_font_size = array_key_exists( 'fontSize', $attributes ); |
| 233 | + $has_named_border_color = array_key_exists( 'borderColor', $attributes ); | |
| 113 | 234 | |
| 114 | 235 | if ( $has_font_size ) { |
| 115 | 236 | $classes[] = 'has-' . $attributes['fontSize'] . '-font-size'; |
| 116 | 237 | $classes[] = 'has-custom-font-size'; |
| @@ -126,8 +247,12 @@ | ||
| 126 | 247 | if ( $has_named_text_color ) { |
| 127 | 248 | $classes[] = sprintf( 'has-%s-color', $attributes['textColor'] ); |
| 128 | 249 | } |
| 129 | 250 | |
| 251 | + if ( $has_named_border_color ) { | |
| 252 | + $classes[] = sprintf( 'has-%s-border-color', $attributes['borderColor'] ); | |
| 253 | + } | |
| 254 | + | |
| 130 | 255 | if ( |
| 131 | 256 | $has_named_background_color || |
| 132 | 257 | $has_custom_background_color || |
| 133 | 258 | $has_named_gradient || |
| @@ -165,14 +290,26 @@ | ||
| 165 | 290 | $has_custom_background_color = array_key_exists( 'customBackgroundColor', $attributes ); |
| 166 | 291 | $has_named_gradient = array_key_exists( 'gradient', $attributes ); |
| 167 | 292 | $has_custom_gradient = array_key_exists( 'customGradient', $attributes ); |
| 168 | 293 | $has_border_radius = array_key_exists( 'borderRadius', $attributes ); |
| 169 | - $has_width = array_key_exists( 'width', $attributes ); | |
| 170 | 294 | $has_font_family = array_key_exists( 'fontFamily', $attributes ); |
| 171 | 295 | $has_typography_styles = array_key_exists( 'style', $attributes ) && array_key_exists( 'typography', $attributes['style'] ); |
| 172 | 296 | $has_custom_font_size = $has_typography_styles && array_key_exists( 'fontSize', $attributes['style']['typography'] ); |
| 173 | 297 | $has_custom_text_transform = $has_typography_styles && array_key_exists( 'textTransform', $attributes['style']['typography'] ); |
| 298 | + $border_styles = array(); | |
| 299 | + $border_attribute = $attributes['style']['border'] ?? null; | |
| 300 | + $is_border_style_array = is_array( $border_attribute ); | |
| 174 | 301 | |
| 302 | + $has_custom_border_color = $is_border_style_array && isset( $border_attribute['color'] ); | |
| 303 | + $has_border_style = $is_border_style_array && isset( $border_attribute['style'] ); | |
| 304 | + $has_border_width = $is_border_style_array && isset( $border_attribute['width'] ); | |
| 305 | + $has_individual_borders = $is_border_style_array && ( | |
| 306 | + isset( $border_attribute['top'] ) || | |
| 307 | + isset( $border_attribute['right'] ) || | |
| 308 | + isset( $border_attribute['bottom'] ) || | |
| 309 | + isset( $border_attribute['left'] ) | |
| 310 | + ); | |
| 311 | + | |
| 175 | 312 | if ( $has_font_family ) { |
| 176 | 313 | $styles[] = sprintf( 'font-family: %s;', $attributes['fontFamily'] ); |
| 177 | 314 | } |
| 178 | 315 | |
| @@ -205,13 +342,39 @@ | ||
| 205 | 342 | if ( $has_border_radius && 0 != $attributes['borderRadius'] ) { |
| 206 | 343 | $styles[] = sprintf( 'border-radius: %spx;', $attributes['borderRadius'] ); |
| 207 | 344 | } |
| 208 | 345 | |
| 209 | - if ( $has_width ) { | |
| 210 | - $styles[] = sprintf( 'width: %s;', $attributes['width'] ); | |
| 211 | - $styles[] = 'max-width: 100%'; | |
| 346 | + if ( $has_custom_border_color ) { | |
| 347 | + $border_styles['color'] = $attributes['style']['border']['color']; | |
| 212 | 348 | } |
| 213 | 349 | |
| 350 | + if ( $has_border_style ) { | |
| 351 | + $border_styles['style'] = $attributes['style']['border']['style']; | |
| 352 | + } | |
| 353 | + | |
| 354 | + if ( $has_border_width ) { | |
| 355 | + $border_styles['width'] = $attributes['style']['border']['width']; | |
| 356 | + } | |
| 357 | + | |
| 358 | + if ( $has_individual_borders ) { | |
| 359 | + foreach ( array( 'top', 'right', 'bottom', 'left' ) as $side ) { | |
| 360 | + $border = $attributes['style']['border'][ $side ] ?? null; | |
| 361 | + if ( is_array( $border ) ) { | |
| 362 | + $border_side_values = array( | |
| 363 | + 'width' => $border['width'] ?? null, | |
| 364 | + 'color' => $border['color'] ?? null, | |
| 365 | + 'style' => $border['style'] ?? null, | |
| 366 | + ); | |
| 367 | + $border_styles[ $side ] = $border_side_values; | |
| 368 | + } | |
| 369 | + } | |
| 370 | + } | |
| 371 | + | |
| 372 | + $border_styles = wp_style_engine_get_styles( array( 'border' => $border_styles ) ); | |
| 373 | + if ( isset( $border_styles['css'] ) ) { | |
| 374 | + $styles[] = $border_styles['css']; | |
| 375 | + } | |
| 376 | + | |
| 214 | 377 | return implode( ' ', $styles ); |
| 215 | 378 | } |
| 216 | 379 | |
| 217 | 380 | /** |
| @@ -224,10 +387,10 @@ | ||
| 224 | 387 | function get_button_wrapper_styles( $attributes ) { |
| 225 | 388 | $styles = array(); |
| 226 | 389 | $has_width = array_key_exists( 'width', $attributes ); |
| 227 | 390 | |
| 228 | - if ( $has_width ) { | |
| 229 | - $styles[] = 'max-width: 100%'; | |
| 391 | + if ( $has_width && ! empty( $attributes['width'] ) ) { | |
| 392 | + $styles[] = sprintf( 'width: %s;', $attributes['width'] ); | |
| 230 | 393 | } |
| 231 | 394 | |
| 232 | 395 | return implode( ' ', $styles ); |
| 233 | 396 | } |
| @@ -249,8 +412,25 @@ | ||
| 249 | 412 | 'url' => '#', |
| 250 | 413 | 'element' => 'a', |
| 251 | 414 | 'saveInPostContent' => false, |
| 252 | 415 | ); |
| 416 | + | |
| 417 | + if ( 'element' === $attribute_name ) { | |
| 418 | + /** | |
| 419 | + * Filter the HTML element the Button block falls back to when the block itself | |
| 420 | + * does not specify one. | |
| 421 | + * | |
| 422 | + * Jetpack Forms uses this to default its submit button to `button` while a form | |
| 423 | + * renders, since an `a` inside a form can never submit it. | |
| 424 | + * | |
| 425 | + * Values outside 'a', 'button' and 'input' are ignored by the render callback. | |
| 426 | + * | |
| 427 | + * @since 16.2 | |
| 428 | + * | |
| 429 | + * @param string $element The default element. One of 'a', 'button', or 'input'. | |
| 430 | + */ | |
| 431 | + return apply_filters( 'jetpack_button_default_element', $default_attributes['element'] ); | |
| 432 | + } | |
| 253 | 433 | |
| 254 | 434 | if ( isset( $default_attributes[ $attribute_name ] ) ) { |
| 255 | 435 | return $default_attributes[ $attribute_name ]; |
| 256 | 436 | } |
