From 75b3efbb15434721a2ee42bfafb2687b38abc46c Mon Sep 17 00:00:00 2001 From: Mikael Korpela Date: Wed, 13 Aug 2025 16:47:14 +0300 Subject: [PATCH 1/3] Forms: consolidate beta blocks, remove forms_alpha filter --- .../contact-form/class-contact-form-block.php | 83 +++++++++---------- 1 file changed, 41 insertions(+), 42 deletions(-) diff --git a/projects/packages/forms/src/blocks/contact-form/class-contact-form-block.php b/projects/packages/forms/src/blocks/contact-form/class-contact-form-block.php index bdfe0206d0561..da9376898ef32 100644 --- a/projects/packages/forms/src/blocks/contact-form/class-contact-form-block.php +++ b/projects/packages/forms/src/blocks/contact-form/class-contact-form-block.php @@ -58,7 +58,7 @@ public static function register_block() { */ public static function register_feature( $features ) { // Features under development. - $features['image-select-field'] = apply_filters( 'forms_alpha', false ); + $features['image-select-field'] = Blocks::get_variation() === 'beta'; // Features that are only available to users with a paid plan. $features['multistep-form'] = Current_Plan::supports( 'multistep-form' ); @@ -226,22 +226,6 @@ public static function register_child_blocks() { ) ); - if ( Blocks::get_variation() === 'beta' ) { - Blocks::jetpack_register_block( - 'jetpack/input-rating', - array( - 'supports' => array( - 'color' => array( - 'text' => true, - 'background' => false, - ), - 'typography' => array( - 'fontSize' => true, - ), - ), - ) - ); - } // Field render methods. Blocks::jetpack_register_block( 'jetpack/field-text', @@ -370,7 +354,30 @@ public static function register_child_blocks() { ) ); + // Blocks under development if ( Blocks::get_variation() === 'beta' ) { + Blocks::jetpack_register_block( + 'jetpack/field-image-select', + array( + 'render_callback' => array( Contact_Form_Plugin::class, 'gutenblock_render_field_image_select' ), + 'provides_context' => array( 'jetpack/field-required' => 'required' ), + ) + ); + + Blocks::jetpack_register_block( + 'jetpack/form-image-select-choices', + array( + 'render_callback' => array( Contact_Form_Plugin::class, 'gutenblock_render_form_image_select_choices' ), + ) + ); + + Blocks::jetpack_register_block( + 'jetpack/form-image-select-choice', + array( + 'render_callback' => array( Contact_Form_Plugin::class, 'gutenblock_render_form_image_select_choice' ), + ) + ); + Blocks::jetpack_register_block( 'jetpack/field-rating', array( @@ -380,6 +387,22 @@ public static function register_child_blocks() { ), ) ); + + Blocks::jetpack_register_block( + 'jetpack/input-rating', + array( + 'supports' => array( + 'color' => array( + 'text' => true, + 'background' => false, + ), + 'typography' => array( + 'fontSize' => true, + ), + ), + ) + ); + Blocks::jetpack_register_block( 'jetpack/field-slider', array( @@ -387,6 +410,7 @@ public static function register_child_blocks() { 'provides_context' => array( 'jetpack/field-required' => 'required' ), ) ); + Blocks::jetpack_register_block( 'jetpack/field-time', array( @@ -450,31 +474,6 @@ public static function register_child_blocks() { Blocks::jetpack_register_block( 'jetpack/form-step-container' ); - - // Block under development. - if ( apply_filters( 'forms_alpha', false ) ) { - Blocks::jetpack_register_block( - 'jetpack/field-image-select', - array( - 'render_callback' => array( Contact_Form_Plugin::class, 'gutenblock_render_field_image_select' ), - 'provides_context' => array( 'jetpack/field-required' => 'required' ), - ) - ); - - Blocks::jetpack_register_block( - 'jetpack/form-image-select-choices', - array( - 'render_callback' => array( Contact_Form_Plugin::class, 'gutenblock_render_form_image_select_choices' ), - ) - ); - - Blocks::jetpack_register_block( - 'jetpack/form-image-select-choice', - array( - 'render_callback' => array( Contact_Form_Plugin::class, 'gutenblock_render_form_image_select_choice' ), - ) - ); - } } /** From f5c3c4cf9c00f095e67eda82232d90a88e65eb72 Mon Sep 17 00:00:00 2001 From: Mikael Korpela Date: Wed, 13 Aug 2025 16:47:54 +0300 Subject: [PATCH 2/3] changelog --- .../forms/changelog/update-forms-consolidate-beta-blocks | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 projects/packages/forms/changelog/update-forms-consolidate-beta-blocks diff --git a/projects/packages/forms/changelog/update-forms-consolidate-beta-blocks b/projects/packages/forms/changelog/update-forms-consolidate-beta-blocks new file mode 100644 index 0000000000000..09f6665c581a5 --- /dev/null +++ b/projects/packages/forms/changelog/update-forms-consolidate-beta-blocks @@ -0,0 +1,4 @@ +Significance: minor +Type: changed + +Forms: consolidate beta blocks, remove forms_alpha filter From b590a3c3f8058f83069777ae1e2e0900e6e59da9 Mon Sep 17 00:00:00 2001 From: Mikael Korpela Date: Wed, 13 Aug 2025 17:05:56 +0300 Subject: [PATCH 3/3] Add back forms_alpha filter --- .../contact-form/class-contact-form-block.php | 48 ++++++++++--------- 1 file changed, 26 insertions(+), 22 deletions(-) diff --git a/projects/packages/forms/src/blocks/contact-form/class-contact-form-block.php b/projects/packages/forms/src/blocks/contact-form/class-contact-form-block.php index da9376898ef32..f98cb8bb3cbb0 100644 --- a/projects/packages/forms/src/blocks/contact-form/class-contact-form-block.php +++ b/projects/packages/forms/src/blocks/contact-form/class-contact-form-block.php @@ -58,7 +58,7 @@ public static function register_block() { */ public static function register_feature( $features ) { // Features under development. - $features['image-select-field'] = Blocks::get_variation() === 'beta'; + $features['image-select-field'] = Blocks::get_variation() === 'beta' && apply_filters( 'forms_alpha', false ); // Features that are only available to users with a paid plan. $features['multistep-form'] = Current_Plan::supports( 'multistep-form' ); @@ -356,27 +356,6 @@ public static function register_child_blocks() { // Blocks under development if ( Blocks::get_variation() === 'beta' ) { - Blocks::jetpack_register_block( - 'jetpack/field-image-select', - array( - 'render_callback' => array( Contact_Form_Plugin::class, 'gutenblock_render_field_image_select' ), - 'provides_context' => array( 'jetpack/field-required' => 'required' ), - ) - ); - - Blocks::jetpack_register_block( - 'jetpack/form-image-select-choices', - array( - 'render_callback' => array( Contact_Form_Plugin::class, 'gutenblock_render_form_image_select_choices' ), - ) - ); - - Blocks::jetpack_register_block( - 'jetpack/form-image-select-choice', - array( - 'render_callback' => array( Contact_Form_Plugin::class, 'gutenblock_render_form_image_select_choice' ), - ) - ); Blocks::jetpack_register_block( 'jetpack/field-rating', @@ -418,6 +397,31 @@ public static function register_child_blocks() { 'provides_context' => array( 'jetpack/field-required' => 'required' ), ) ); + + // Blocks under heavy development, not ready for testing yet + if ( apply_filters( 'forms_alpha', false ) ) { + Blocks::jetpack_register_block( + 'jetpack/field-image-select', + array( + 'render_callback' => array( Contact_Form_Plugin::class, 'gutenblock_render_field_image_select' ), + 'provides_context' => array( 'jetpack/field-required' => 'required' ), + ) + ); + + Blocks::jetpack_register_block( + 'jetpack/form-image-select-choices', + array( + 'render_callback' => array( Contact_Form_Plugin::class, 'gutenblock_render_form_image_select_choices' ), + ) + ); + + Blocks::jetpack_register_block( + 'jetpack/form-image-select-choice', + array( + 'render_callback' => array( Contact_Form_Plugin::class, 'gutenblock_render_form_image_select_choice' ), + ) + ); + } } // Paid file field block