Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Like Block: Fix styling conflicts and update editor styles #37719

Merged
merged 6 commits into from
Jun 13, 2024

Conversation

ivan-ottinger
Copy link
Contributor

@ivan-ottinger ivan-ottinger commented Jun 5, 2024

Fixes Automattic/wp-calypso#87082.

Proposed changes:

  • fix Like block editor and theme styling conflicts (changes in projects/plugins/jetpack/extensions/blocks/like/tools/update-editor-styles.js); when it comes to the code review, these are the changes that are worth looking at. The rest (editor.scss) is generated by the script that loads the latest style changes from WPCOM
  • update Like block's editor.scss with the latest styles
Before After
Markup on 2024-06-06 at 14:22:45 Markup on 2024-06-06 at 14:27:27

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

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

No, it does not.

Testing instructions:

  1. Sync the changes to your Simple test site with rsync (Like Block: Fix styling conflicts and update editor styles #37719 (comment)) and sandbox the site.
  2. Add the Like block to a post / page.
  3. The Like block formatting in the editor should be correct. Try clicking on the avatars, buttons and number of likes. There should be no overlays, nor hover effects (as in the After screenshot).
  4. Please try several different themes; I have observed the original issues with Twenty Twenty-One and Twenty Twenty, but you don't need to feel limited to these two themes.
  5. Feel free to test with self-hosted and WoA sites. Taking into account the scope of changes in this PR, testing with Simple sites should be sufficient.

@ivan-ottinger ivan-ottinger self-assigned this Jun 5, 2024
Copy link
Contributor

github-actions bot commented Jun 5, 2024

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 WordPress.com Simple 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, and enable the fix/like-block-editor-styling branch.

  • To test on Simple, run the following command on your sandbox:

    bin/jetpack-downloader test jetpack fix/like-block-editor-styling
    

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

@github-actions github-actions bot added [Block] Like [Plugin] Jetpack Issues about the Jetpack plugin. https://wordpress.org/plugins/jetpack/ [Status] In Progress labels Jun 5, 2024
Copy link
Contributor

github-actions bot commented Jun 5, 2024

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 Team Review, ...).
  • ✅ 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 🤖


The e2e test report can be found here. Please note that it can take a few minutes after the e2e tests checks are complete for the report to be available.


Once your PR is ready for review, check one last time that all required checks appearing at the bottom of this PR are passing or skipped.
Then, add the "[Status] Needs Team Review" label and ask someone from your team review the code. Once reviewed, it can then be merged.
If you need an extra review from someone familiar with the codebase, you can update the labels from "[Status] Needs Team Review" to "[Status] Needs Review", and in that case Jetpack Approvers will do a final review of your PR.


Jetpack plugin:

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

  • WordPress.com Simple releases happen daily.
  • WoA releases happen weekly.
  • Releases to self-hosted sites happen monthly. The next release is scheduled for July 2, 2024 (scheduled code freeze on July 1, 2024).

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

@ivan-ottinger ivan-ottinger marked this pull request as ready for review June 6, 2024 12:37
@ivan-ottinger ivan-ottinger changed the title Like block: Fix and update editor styling Like block: Fix styling conflicts and update editor styles Jun 6, 2024
@ivan-ottinger ivan-ottinger requested a review from a team June 6, 2024 12:41
@JuanLucha
Copy link
Contributor

Hi @ivan-ottinger !
I tried the changes using the Bedrock theme (https://wordpress.com/theme/bedrock/your-domain.wordpress.com?tab_filter=recommended) and feels like the block is not getting aligned like the others:
Screenshot 2024-06-06 at 16 57 31
But only happens in the editor, look at the site:
Screenshot 2024-06-06 at 16 57 43
Do you think this fits the scope of the PR?

@JuanLucha
Copy link
Contributor

Hi @ivan-ottinger ! I tried the changes using the Bedrock theme (https://wordpress.com/theme/bedrock/your-domain.wordpress.com?tab_filter=recommended) and feels like the block is not getting aligned like the others: Screenshot 2024-06-06 at 16 57 31 But only happens in the editor, look at the site: Screenshot 2024-06-06 at 16 57 43 Do you think this fits the scope of the PR?

Ok, it seems to be an editor glitch. After closing the editor and opening the page again on it, it works as expected 👍

JuanLucha
JuanLucha previously approved these changes Jun 6, 2024
Copy link
Contributor

@JuanLucha JuanLucha left a comment

Choose a reason for hiding this comment

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

Tested and works great on different themes.

@ivan-ottinger ivan-ottinger changed the title Like block: Fix styling conflicts and update editor styles Like Block: Fix styling conflicts and update editor styles Jun 7, 2024
@ivan-ottinger ivan-ottinger force-pushed the fix/like-block-editor-styling branch 2 times, most recently from 01af19e to b07c0f9 Compare June 11, 2024 09:22
@ivan-ottinger
Copy link
Contributor Author

ivan-ottinger commented Jun 11, 2024

After the latest commits to this PR I have tested the changes in all three kinds of sites: Simple, WoA and self-hosted.

The Like block is displaying correctly in the block editor with different themes active and also when placed inside other blocks (e.g. Columns). Tested with LTR and RTL as well.

@ivan-ottinger ivan-ottinger merged commit ca97348 into trunk Jun 13, 2024
57 checks passed
@ivan-ottinger ivan-ottinger deleted the fix/like-block-editor-styling branch June 13, 2024 11:48
@github-actions github-actions bot added this to the jetpack/13.6 milestone Jun 13, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
[Block] Like [Plugin] Jetpack Issues about the Jetpack plugin. https://wordpress.org/plugins/jetpack/
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Like block: Block placeholder elements shouldn't change style on click
2 participants