Skip to content

Commit 0753ab9

Browse files
dhasilvadhasilva
authored
Forms: Release Image Select Field to production (#45577)
* move image select field to production * changelog
1 parent 59983f2 commit 0753ab9

File tree

4 files changed

+86
-84
lines changed

4 files changed

+86
-84
lines changed

‎projects/packages/forms/changelog/add-forms-image-select-field‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
Significance: minor
2+
Type: added
3+
4+
Forms: Release Image Select Field to production

‎projects/packages/forms/src/blocks/contact-form/child-blocks.js‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -65,14 +65,10 @@ export const childBlocks = [
6565
JetpackRatingInput,
6666
JetpackFieldSlider,
6767
JetpackSliderInput,
68-
...( getJetpackBlocksVariation() === 'beta'
69-
? [
70-
JetpackTimeField,
71-
JetpackImageSelectField,
72-
JetpackImageOptionsFieldset,
73-
JetpackImageOptionInput,
74-
]
75-
: [] ),
68+
JetpackImageSelectField,
69+
JetpackImageOptionsFieldset,
70+
JetpackImageOptionInput,
71+
...( getJetpackBlocksVariation() === 'beta' ? [ JetpackTimeField ] : [] ),
7672

7773
// The following are required for these blocks to be parsed correctly in block
7874
// deprecations. They have been flagged with `supports.inserter: false` to

‎projects/packages/forms/src/blocks/contact-form/class-contact-form-block.php‎

Lines changed: 74 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -541,97 +541,95 @@ public static function register_child_blocks() {
541541
'jetpack/form-step-container'
542542
);
543543

544-
if ( Blocks::get_variation() === 'beta' ) {
545-
Blocks::jetpack_register_block(
546-
'jetpack/field-image-select',
547-
array(
548-
'render_callback' => array( Contact_Form_Plugin::class, 'gutenblock_render_field_image_select' ),
549-
'provides_context' => array(
550-
'jetpack/field-required' => 'required',
551-
'jetpack/field-image-select-show-labels' => 'showLabels',
552-
'jetpack/field-image-select-is-supersized' => 'isSupersized',
553-
'jetpack/field-image-select-is-multiple' => 'isMultiple',
554-
'jetpack/field-image-select-randomize-options' => 'randomizeOptions',
555-
'jetpack/field-image-select-show-other-option' => 'showOtherOption',
556-
),
557-
)
558-
);
544+
Blocks::jetpack_register_block(
545+
'jetpack/field-image-select',
546+
array(
547+
'render_callback' => array( Contact_Form_Plugin::class, 'gutenblock_render_field_image_select' ),
548+
'provides_context' => array(
549+
'jetpack/field-required' => 'required',
550+
'jetpack/field-image-select-show-labels' => 'showLabels',
551+
'jetpack/field-image-select-is-supersized' => 'isSupersized',
552+
'jetpack/field-image-select-is-multiple' => 'isMultiple',
553+
'jetpack/field-image-select-randomize-options' => 'randomizeOptions',
554+
'jetpack/field-image-select-show-other-option' => 'showOtherOption',
555+
),
556+
)
557+
);
559558

560-
Blocks::jetpack_register_block(
561-
'jetpack/fieldset-image-options',
562-
array(
563-
'uses_context' => array(
564-
'jetpack/field-image-select-is-supersized',
565-
'jetpack/field-image-select-is-multiple',
566-
'jetpack/field-share-attributes',
567-
),
568-
'provides_context' => array(
569-
'jetpack/field-image-options-type' => 'type',
570-
),
571-
)
572-
);
559+
Blocks::jetpack_register_block(
560+
'jetpack/fieldset-image-options',
561+
array(
562+
'uses_context' => array(
563+
'jetpack/field-image-select-is-supersized',
564+
'jetpack/field-image-select-is-multiple',
565+
'jetpack/field-share-attributes',
566+
),
567+
'provides_context' => array(
568+
'jetpack/field-image-options-type' => 'type',
569+
),
570+
)
571+
);
573572

574-
Blocks::jetpack_register_block(
575-
'jetpack/input-image-option',
576-
array(
577-
'supports' => array(
578-
'color' => array(
573+
Blocks::jetpack_register_block(
574+
'jetpack/input-image-option',
575+
array(
576+
'supports' => array(
577+
'color' => array(
578+
'background' => true,
579+
'text' => true,
580+
'gradients' => false,
581+
'__experimentalDefaultControls' => array(
579582
'background' => true,
580583
'text' => true,
581-
'gradients' => false,
582-
'__experimentalDefaultControls' => array(
583-
'background' => true,
584-
'text' => true,
585-
),
586584
),
587-
'typography' => array(
588-
'fontSize' => true,
589-
'lineHeight' => true,
590-
'__experimentalFontFamily' => true,
591-
'__experimentalFontWeight' => true,
592-
'__experimentalFontStyle' => true,
593-
'__experimentalTextTransform' => true,
594-
'__experimentalTextDecoration' => true,
595-
'__experimentalLetterSpacing' => true,
596-
'__experimentalDefaultControls' => array(
597-
'fontSize' => true,
598-
),
585+
),
586+
'typography' => array(
587+
'fontSize' => true,
588+
'lineHeight' => true,
589+
'__experimentalFontFamily' => true,
590+
'__experimentalFontWeight' => true,
591+
'__experimentalFontStyle' => true,
592+
'__experimentalTextTransform' => true,
593+
'__experimentalTextDecoration' => true,
594+
'__experimentalLetterSpacing' => true,
595+
'__experimentalDefaultControls' => array(
596+
'fontSize' => true,
599597
),
600-
'__experimentalBorder' => array(
598+
),
599+
'__experimentalBorder' => array(
600+
'color' => true,
601+
'radius' => true,
602+
'style' => true,
603+
'width' => true,
604+
'__experimentalDefaultControls' => array(
601605
'color' => true,
602606
'radius' => true,
603607
'style' => true,
604608
'width' => true,
605-
'__experimentalDefaultControls' => array(
606-
'color' => true,
607-
'radius' => true,
608-
'style' => true,
609-
'width' => true,
610-
),
611609
),
612-
'spacing' => array(
610+
),
611+
'spacing' => array(
612+
'margin' => true,
613+
'padding' => true,
614+
'__experimentalDefaultControls' => array(
613615
'margin' => true,
614616
'padding' => true,
615-
'__experimentalDefaultControls' => array(
616-
'margin' => true,
617-
'padding' => true,
618-
),
619617
),
620618
),
621-
'uses_context' => array(
622-
'jetpack/field-image-select-is-supersized',
623-
'jetpack/field-image-select-show-labels',
624-
'jetpack/field-image-options-type',
625-
'jetpack/field-share-attributes',
626-
),
627-
'provides_context' => array(
628-
'allowResize' => 'allowResize',
629-
'imageCrop' => 'imageCrop',
630-
'fixedHeight' => 'fixedHeight',
631-
),
632-
)
633-
);
634-
}
619+
),
620+
'uses_context' => array(
621+
'jetpack/field-image-select-is-supersized',
622+
'jetpack/field-image-select-show-labels',
623+
'jetpack/field-image-options-type',
624+
'jetpack/field-share-attributes',
625+
),
626+
'provides_context' => array(
627+
'allowResize' => 'allowResize',
628+
'imageCrop' => 'imageCrop',
629+
'fixedHeight' => 'fixedHeight',
630+
),
631+
)
632+
);
635633
}
636634

637635
/**

‎projects/plugins/jetpack/changelog/add-forms-image-select-field‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
Significance: minor
2+
Type: enhancement
3+
4+
Forms: Release Image Select Field to production

0 commit comments

Comments
 (0)