Forms: replace jetpack buttons with core #46166

CGastrell · 2025-12-02T15:24:33Z

This is a takeover from #45007

Proposed changes:

Following the original PR, this is a simpler approach just using core/button to replace jetpack/button

Other information:

Have you written new tests for your changes, if applicable?
Have you checked the E2E test CI results, and verified that your changes do not break them?
Have you tested your changes on WordPress.com, if applicable (if so, you'll see a generated comment below with a script to run)?

Jetpack product discussion

None

Does this pull request change what data or activity we track or use?

No

Testing instructions:

(verbatim from original PR)

Existing post smoke-test
- Open a post containing a Contact Form created before this patch (uses Jetpack Button).
- Confirm there are no editor errors; publish / update.
- View front-end and submit the form – it should behave as it always did.
New form
- Insert a fresh Contact Form block.
- Verify the submit control is a Core Button in a Core Buttons wrapper.
- Publish and submit on the front-end – spinner, disable state and success/error handling should work.
Variations
- Insert each Contact-Form variation (RSVP, Registration, Feedback, etc.).
- Confirm each uses a Core Button and submits correctly.
Editor layout
- Editing experience should respect the different core/block options when saving.

github-actions · 2025-12-02T15:25:37Z

Thank you for your PR!

When contributing to Jetpack, we have a few suggestions that can help us test and review your patch:

✅ Include a description of your PR changes.
✅ Add a "[Status]" label (In Progress, Needs Review, ...).
✅ Add a "[Type]" label (Bug, Enhancement, Janitorial, Task).
✅ Add testing instructions.
✅ Specify whether this PR includes any changes to data or privacy.
✅ Add changelog entries to affected projects

This comment will be updated as you work on your PR and make changes. If you think that some of those checks are not needed for your PR, please explain why you think so. Thanks for cooperation 🤖

Follow this PR Review Process:

Ensure all required checks appearing at the bottom of this PR are passing.
Make sure to test your changes on all platforms that it applies to. You're responsible for the quality of the code you ship.
You can use GitHub's Reviewers functionality to request a review.
When it's reviewed and merged, you will be pinged in Slack to deploy the changes to WordPress.com simple once the build is done.

If you have questions about anything, reach out in #jetpack-developers for guidance!

Jetpack plugin:

The Jetpack plugin has different release cadences depending on the platform:

WordPress.com Simple releases happen as soon as you deploy your changes after merging this PR (PCYsg-Jjm-p2).
WoA releases happen weekly.
Releases to self-hosted sites happen monthly:
- Scheduled release: January 6, 2026

If you have any questions about the release process, please ask in the #jetpack-releases channel on Slack.

github-actions · 2025-12-02T15:25:38Z

Are you an Automattician? Please test your changes on all WordPress.com environments to help mitigate accidental explosions.

To test on WoA, go to the Plugins menu on a WoA dev site. Click on the "Upload" button and follow the upgrade flow to be able to upload, install, and activate the Jetpack Beta plugin. Once the plugin is active, go to Jetpack > Jetpack Beta, select your plugin (Jetpack), and enable the replace/forms-jetpack-buttons-core branch.
To test on Simple, run the following command on your sandbox:

bin/jetpack-downloader test jetpack replace/forms-jetpack-buttons-core

Interested in more tips and information?

In your local development environment, use the jetpack rsync command to sync your changes to a WoA dev blog.
Read more about our development workflow here: PCYsg-eg0-p2
Figure out when your changes will be shipped to customers here: PCYsg-eg5-p2

jp-launch-control · 2025-12-02T15:35:41Z

Code Coverage Summary

Coverage changed in 3 files.

File	Coverage	Δ%	Δ Uncovered
projects/packages/forms/src/blocks/contact-form/edit.tsx	0/276 (0.00%)	0.00%	3 ❤️‍🩹
projects/packages/forms/src/contact-form/class-contact-form.php	918/1312 (69.97%)	-0.11%	2 ❤️‍🩹
projects/packages/forms/src/blocks/contact-form/class-contact-form-block.php	518/605 (85.62%)	3.19%	-17 💚

Full summary · PHP report · JS report

_{Coverage check overridden by

Coverage tests to be added later
Use to ignore the Code coverage requirement check when tests will be added in a follow-up PR
.}

lezama · 2025-12-02T18:11:02Z

projects/packages/forms/src/contact-form/class-util.php

                        <!-- wp:jetpack/field-textarea {"label":"Notes"} /-->
-                        <!-- wp:jetpack/button {"element":"button","text":"Book Appointment","lock":{"remove":true}} /-->
+						<!-- wp:button {"tagName":"button","type":"submit","className":"jetpack-form-submit-button"} -->
+							<div class="wp-block-button jetpack-form-submit-button"><button type="submit" class="wp-block-button__link wp-element-button">Book Appointment</button></div>


Do we need to specify the html?

simison · 2025-12-03T15:25:29Z

projects/packages/forms/src/blocks/contact-form/edit.tsx

 				text: __( 'Submit', 'jetpack-forms' ),
+				type: 'submit',
+				tagName: 'button',
+				className: 'wp-block-jetpack-button jetpack-form-submit-button',


Do we necessarily need to add these classes? Since they're not from PHP, feels like we might not be able to trust them staying there anyway, so might as well not assume and use core classes instead?

simison · 2025-12-03T15:25:53Z

projects/packages/forms/src/blocks/contact-form/editor.scss

 			flex: 1 1 100%;
 		}

+		// .wp-block:not(.wp-block-buttons):not(.wp-block-button) {


Just noting that the line needs removing before merging.

simison · 2025-12-03T15:27:37Z

projects/packages/forms/src/contact-form/class-contact-form.php

 			} elseif ( $has_submit_button_block && ! $is_single_input_form ) {
 				// Place the error wrapper before the FIRST button block only to avoid duplicates (e.g., navigation buttons in multistep forms).
-				// Replace only the first occurrence.
+				// Replace only the first occurrence for both Jetpack and core Buttons blocks.


Might be helpful for future to note here that old versions of Forms used to use Jetpack Button blocks

simison · 2025-12-03T15:28:17Z

projects/packages/forms/src/contact-form/css/grunion.scss

+	animation: jp-spinner 0.75s linear infinite;
+}
+
+@keyframes jp-spinner {


Not a biggie, but jp-forms-spinner would be more specific to avoid colliding with any other Jetpack feature.

Replaces usage of the custom jetpack/button block with the core/buttons and core/button blocks for submit actions in the contact form. Updates block variations, editor logic, and server-side rendering to support and enhance compatibility with core/buttons, including interactivity attributes and error handling. This change improves alignment with WordPress core blocks and future-proofs the contact form implementation.

Introduces a spinner animation to the submit button when the form is submitting by adding CSS for a loading indicator and keyframes for the spinner effect.

Co-authored-by: Mikael Korpela <mikael@ihminen.org>

Co-authored-by: Manzoor Wani <manzoorwani.jk@gmail.com>

…form-block.php Co-authored-by: Manzoor Wani <manzoorwani.jk@gmail.com>

CGastrell self-assigned this Dec 2, 2025

github-actions bot added [Block] Contact Form Form block (also see Contact Form label) [Feature] Contact Form [Tests] Includes Tests labels Dec 2, 2025

CGastrell force-pushed the replace/forms-jetpack-buttons-core branch from 82662a1 to ef3b913 Compare December 2, 2025 15:53

lezama reviewed Dec 2, 2025

View reviewed changes

CGastrell force-pushed the replace/forms-jetpack-buttons-core branch from ef3b913 to 9efe006 Compare December 3, 2025 15:20

simison reviewed Dec 3, 2025

View reviewed changes

CGastrell force-pushed the replace/forms-jetpack-buttons-core branch from aa4ee3e to 3bac19d Compare December 4, 2025 21:18

lezama and others added 10 commits December 4, 2025 19:40

simpler

172eb2d

Restrict flex styling to specific wp-block elements

610fa48

Add spinner animation for submitting form button

0cc1193

Introduces a spinner animation to the submit button when the form is submitting by adding CSS for a loading indicator and keyframes for the spinner effect.

Restrict tag processing to button and update submit styles

1e4c34f

changelog

6215753

Update projects/packages/forms/src/blocks/contact-form/variations.js

c6b007f

Co-authored-by: Mikael Korpela <mikael@ihminen.org>

Refactor render_submit_button to improve clarity

82764ad

Update projects/packages/forms/src/blocks/contact-form/variations.js

f795505

Co-authored-by: Mikael Korpela <mikael@ihminen.org>

add some tests to improve coverage

b11a368

CGastrell and others added 10 commits December 4, 2025 19:40

fix disabled and submitting states

f382e5f

update tests after attribute addition

708017b

modify useformwrapper to use core/buttons as well

9ebe215

Apply suggestion from @manzoorwanijk

90f3322

Co-authored-by: Manzoor Wani <manzoorwani.jk@gmail.com>

Update projects/packages/forms/src/blocks/contact-form/class-contact-…

1d0a3c2

…form-block.php Co-authored-by: Manzoor Wani <manzoorwani.jk@gmail.com>

change patterns to use core buttons

2b71316

switch core/buttons for core/button

df87d1f

changelog

7e6d324

make core buttons take the same styles as previous jetpack buttons

caa35c7

avoid margins on buttons

add6cad

CGastrell force-pushed the replace/forms-jetpack-buttons-core branch from 3bac19d to add6cad Compare December 4, 2025 22:41

add conditional so php8.5 test doesn't fail due to deprecated method

0678483

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Forms: replace jetpack buttons with core #46166

Forms: replace jetpack buttons with core #46166

Uh oh!

CGastrell commented Dec 2, 2025

Uh oh!

github-actions bot commented Dec 2, 2025 •

edited

Loading

Uh oh!

github-actions bot commented Dec 2, 2025 •

edited

Loading

Uh oh!

jp-launch-control bot commented Dec 2, 2025 •

edited

Loading

Uh oh!

lezama Dec 2, 2025

Uh oh!

simison Dec 3, 2025

Uh oh!

simison Dec 3, 2025

Uh oh!

simison Dec 3, 2025

Uh oh!

simison Dec 3, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Forms: replace jetpack buttons with core #46166

Are you sure you want to change the base?

Forms: replace jetpack buttons with core #46166

Uh oh!

Conversation

CGastrell commented Dec 2, 2025

Proposed changes:

Other information:

Jetpack product discussion

Does this pull request change what data or activity we track or use?

Testing instructions:

Uh oh!

github-actions bot commented Dec 2, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

github-actions bot commented Dec 2, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

jp-launch-control bot commented Dec 2, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Code Coverage Summary

Uh oh!

lezama Dec 2, 2025

Choose a reason for hiding this comment

Uh oh!

simison Dec 3, 2025

Choose a reason for hiding this comment

Uh oh!

simison Dec 3, 2025

Choose a reason for hiding this comment

Uh oh!

simison Dec 3, 2025

Choose a reason for hiding this comment

Uh oh!

simison Dec 3, 2025

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

github-actions bot commented Dec 2, 2025 •

edited

Loading

github-actions bot commented Dec 2, 2025 •

edited

Loading

jp-launch-control bot commented Dec 2, 2025 •

edited

Loading