Skip to content

Conversation

@zutigrm
Copy link
Collaborator

@zutigrm zutigrm commented Oct 24, 2025

Summary

Addresses issue:

Relevant technical choices

PR Author Checklist

  • My code is tested and passes existing unit tests.
  • My code has an appropriate set of unit tests which all pass.
  • My code is backward-compatible with WordPress 5.2 and PHP 7.4.
  • My code follows the WordPress coding standards.
  • My code has proper inline documentation.
  • I have added a QA Brief on the issue linked above.
  • I have signed the Contributor License Agreement (see https://cla.developers.google.com/).

Do not alter or remove anything below. The following sections will be managed by moderators only.

Code Reviewer Checklist

  • Run the code.
  • Ensure the acceptance criteria are satisfied.
  • Reassess the implementation with the IB.
  • Ensure no unrelated changes are included.
  • Ensure CI checks pass.
  • Check Storybook where applicable.
  • Ensure there is a QA Brief.
  • Ensure there are no unexpected significant changes to file sizes.

Merge Reviewer Checklist

  • Ensure the PR has the correct target branch.
  • Double-check that the PR is okay to be merged.
  • Ensure the corresponding issue has a ZenHub release assigned.
  • Add a changelog message to the issue.

@github-actions
Copy link

Storybook is ready:

@github-actions
Copy link

github-actions bot commented Oct 24, 2025

Build files for bf37ad6 have been deleted.

@github-actions
Copy link

github-actions bot commented Oct 24, 2025

Size Change: +769 B (+0.04%)

Total Size: 2.18 MB

ℹ️ View Unchanged
Filename Size Change
./dist/assets/blocks/reader-revenue-manager/block-editor-plugin/editor-styles.css 124 B 0 B
./dist/assets/blocks/reader-revenue-manager/block-editor-plugin/editor-styles.js 20 B 0 B
./dist/assets/blocks/reader-revenue-manager/block-editor-plugin/index.js 42.7 kB 0 B
./dist/assets/blocks/reader-revenue-manager/common/editor-styles.css 307 B 0 B
./dist/assets/blocks/reader-revenue-manager/common/editor-styles.js 20 B 0 B
./dist/assets/blocks/reader-revenue-manager/contribute-with-google/index.js 5.88 kB 0 B
./dist/assets/blocks/reader-revenue-manager/contribute-with-google/non-site-kit-user.js 5.07 kB 0 B
./dist/assets/blocks/reader-revenue-manager/subscribe-with-google/index.js 5.88 kB 0 B
./dist/assets/blocks/reader-revenue-manager/subscribe-with-google/non-site-kit-user.js 5.07 kB 0 B
./dist/assets/blocks/sign-in-with-google/editor-styles.css 84 B 0 B
./dist/assets/blocks/sign-in-with-google/editor-styles.js 20 B 0 B
./dist/assets/blocks/sign-in-with-google/index.js 18.6 kB +769 B (+4.31%)
./dist/assets/css/googlesitekit-admin-css-********************.min.css 64.2 kB 0 B
./dist/assets/css/googlesitekit-adminbar-css-********************.min.css 11.7 kB 0 B
./dist/assets/css/googlesitekit-authorize-application-css-********************.min.css 846 B 0 B
./dist/assets/css/googlesitekit-wp-dashboard-css-********************.min.css 8.43 kB 0 B
./dist/assets/js/146-********************.js 963 B 0 B
./dist/assets/js/201-********************.js 2.85 kB 0 B
./dist/assets/js/314-********************.js 100 kB 0 B
./dist/assets/js/315-********************.js 3.08 kB 0 B
./dist/assets/js/379-********************.js 3.7 kB 0 B
./dist/assets/js/590-********************.js 1.89 kB 0 B
./dist/assets/js/640-********************.js 2.36 kB 0 B
./dist/assets/js/909-********************.js 1.01 kB 0 B
./dist/assets/js/analytics-advanced-tracking-********************.js 475 B 0 B
./dist/assets/js/googlesitekit-activation-********************.js 24 kB 0 B
./dist/assets/js/googlesitekit-ad-blocking-recovery-********************.js 54.8 kB 0 B
./dist/assets/js/googlesitekit-adminbar-********************.js 34.4 kB 0 B
./dist/assets/js/googlesitekit-api-********************.js 7.79 kB 0 B
./dist/assets/js/googlesitekit-block-tracking-********************.js 5.51 kB 0 B
./dist/assets/js/googlesitekit-components-********************.js 5.74 kB 0 B
./dist/assets/js/googlesitekit-consent-mode-********************.js 25.5 kB 0 B
./dist/assets/js/googlesitekit-data-********************.js 1.7 kB 0 B
./dist/assets/js/googlesitekit-datastore-forms-********************.js 6.99 kB 0 B
./dist/assets/js/googlesitekit-datastore-location-********************.js 1.51 kB 0 B
./dist/assets/js/googlesitekit-datastore-site-********************.js 17.3 kB 0 B
./dist/assets/js/googlesitekit-datastore-ui-********************.js 7.11 kB 0 B
./dist/assets/js/googlesitekit-datastore-user-********************.js 22.8 kB 0 B
./dist/assets/js/googlesitekit-entity-dashboard-********************.js 61.5 kB 0 B
./dist/assets/js/googlesitekit-events-provider-contact-form-7-********************.js 1.77 kB 0 B
./dist/assets/js/googlesitekit-events-provider-easy-digital-downloads-********************.js 745 B 0 B
./dist/assets/js/googlesitekit-events-provider-mailchimp-********************.js 1.77 kB 0 B
./dist/assets/js/googlesitekit-events-provider-ninja-forms-********************.js 1.69 kB 0 B
./dist/assets/js/googlesitekit-events-provider-optin-monster-********************.js 1.72 kB 0 B
./dist/assets/js/googlesitekit-events-provider-popup-maker-********************.js 1.79 kB 0 B
./dist/assets/js/googlesitekit-events-provider-woocommerce-********************.js 1.13 kB 0 B
./dist/assets/js/googlesitekit-events-provider-wpforms-********************.js 1.77 kB 0 B
./dist/assets/js/googlesitekit-i18n-********************.js 6.16 kB 0 B
./dist/assets/js/googlesitekit-key-metrics-setup-********************.js 42 kB 0 B
./dist/assets/js/googlesitekit-main-dashboard-********************.js 131 kB 0 B
./dist/assets/js/googlesitekit-metric-selection-********************.js 52.6 kB 0 B
./dist/assets/js/googlesitekit-modules-ads-********************.js 47.5 kB 0 B
./dist/assets/js/googlesitekit-modules-adsense-********************.js 123 kB 0 B
./dist/assets/js/googlesitekit-modules-analytics-4-********************.js 186 kB 0 B
./dist/assets/js/googlesitekit-modules-********************.js 19.8 kB 0 B
./dist/assets/js/googlesitekit-modules-pagespeed-insights-********************.js 23.5 kB 0 B
./dist/assets/js/googlesitekit-modules-reader-revenue-manager-********************.js 43.5 kB 0 B
./dist/assets/js/googlesitekit-modules-search-console-********************.js 65.2 kB 0 B
./dist/assets/js/googlesitekit-modules-sign-in-with-google-********************.js 33.9 kB 0 B
./dist/assets/js/googlesitekit-modules-tagmanager-********************.js 30 kB 0 B
./dist/assets/js/googlesitekit-notifications-********************.js 66.1 kB 0 B
./dist/assets/js/googlesitekit-polyfills-********************.js 230 B 0 B
./dist/assets/js/googlesitekit-settings-********************.js 124 kB 0 B
./dist/assets/js/googlesitekit-splash-********************.js 73 kB 0 B
./dist/assets/js/googlesitekit-user-input-********************.js 45.9 kB 0 B
./dist/assets/js/googlesitekit-vendor-********************.js 322 kB 0 B
./dist/assets/js/googlesitekit-widgets-********************.js 104 kB 0 B
./dist/assets/js/googlesitekit-wp-dashboard-********************.js 59.1 kB 0 B
./dist/assets/js/runtime-********************.js 1.93 kB 0 B

compressed-size-action

@zutigrm
Copy link
Collaborator Author

zutigrm commented Oct 24, 2025

JS test is failing for unrelated reason. E2E nightly is failing for all blocks as it requires V3 of json config, but it is outside of scope of this issue.

Comment on lines +112 to +113
__next40pxDefaultSize
__nextHasNoMarginBottom
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

SelectControl and TextControl are getting depricated php notices unless these props are included

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's add some documentation for that in the actual component then, preferably with links to the props or the code you found this in, since without any context these look strange/unintuitive.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I extracted it from the deprication notice that was raised in CI e2e. Added as short inline comment

Copy link
Collaborator

@tofumatt tofumatt left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me and works well, just needs a few things adjusted before merging 👍🏻

Comment on lines 64 to 66
function getSelectValue( value ) {
return value ?? '';
}
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is probably more "don't repeat yourself" than is needed; it's fine to inline ?? '' for the three values this applies to 😅

Suggested change
function getSelectValue( value ) {
return value ?? '';
}

Comment on lines +112 to +113
__next40pxDefaultSize
__nextHasNoMarginBottom
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's add some documentation for that in the actual component then, preferably with links to the props or the code you found this in, since without any context these look strange/unintuitive.

<TextControl
label={ __( 'CSS class', 'google-site-kit' ) }
help={ __(
'Add optional classes to customise the button in the editor and on the frontend.',
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(We supply localisation strings in American English, not International English.)

Suggested change
'Add optional classes to customise the button in the editor and on the frontend.',
'Add optional classes to customize the button in the editor and on the frontend.',

__nextHasNoMarginBottom
/>
<TextControl
label={ __( 'CSS class', 'google-site-kit' ) }
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

"HTML class" kinda seems more appropriate, but I'm fine with either 😅

Copy link
Collaborator

@tofumatt tofumatt left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just one question about the version numbers in the comment here, then we're good-to-go. 👍🏻

options={ createSelectOptions(
SIGN_IN_WITH_GOOGLE_SHAPES
) }
// Opt in to new WP components styles (6.7–7.1):
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
// Opt in to new WP components styles (6.7–7.1):
// Opt-in to new WordPress components styles (6.7–7.1):

Also—what do the version numbers mean? Are they the only versions of WordPress that are being opted-in to the new styles? What about pre-6.7 users? We do support older versions of WordPress than 6.7.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I updated the comment to mention this is needed for v6.7+ but it doesn't affect pre 6-7, as it will be ignored

@tofumatt tofumatt changed the base branch from develop to main October 28, 2025 00:22
@tofumatt tofumatt merged commit a36928e into main Oct 28, 2025
29 of 31 checks passed
@tofumatt tofumatt deleted the enhancement/10475-siwg-block-options branch October 28, 2025 18:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants