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

Newsletters: Enhance Subscription Modal Display Logic #38079

Merged
merged 4 commits into from
Jul 10, 2024

Conversation

lezama
Copy link
Contributor

@lezama lezama commented Jun 27, 2024

Fixes p1719421326241939/1719262060.786719-slack-C02NQ4HMJKV

Proposed changes:

  • This PR introduces improvements to the logic controlling the display of the subscription modal.

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?

Testing instructions:

  • Go to '..'
@lezama lezama marked this pull request as ready for review June 27, 2024 00:58
@lezama lezama requested a review from a team June 27, 2024 00:58
Copy link
Contributor

github-actions bot commented Jun 27, 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 update/subscribe-modal-behaviour branch.

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

    bin/jetpack-downloader test jetpack update/subscribe-modal-behaviour
    

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 [Feature] Subscriptions All subscription-related things such as paid and unpaid, user management, and newsletter settings. [Plugin] Jetpack Issues about the Jetpack plugin. https://wordpress.org/plugins/jetpack/ labels Jun 27, 2024
Copy link
Contributor

github-actions bot commented Jun 27, 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 August 6, 2024 (scheduled code freeze on August 5, 2024).

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

@simison
Copy link
Member

simison commented Jul 1, 2024

Intersection observer API is now has good enough support, we should use that instead; it's more performant and simpler.

I'm thinking if just relying on full page height works well in all cases, because sometimes sites have a lot of footer content too. 🤔

Some ideas:

  • Use main or article HTML tag and observe scroll position only within that element, if they exist.
  • Use entry-content class, which is pretty ubiquitous across themes
  • Use some of the new classes coming from block templates
    image
@simison simison requested a review from crisbusquets July 5, 2024 16:06
@simison
Copy link
Member

simison commented Jul 5, 2024

@lezama when Cris is back next week, can you work with her to find good trigger point for these modals?

@lezama lezama force-pushed the update/subscribe-modal-behaviour branch from 132c762 to 119e2bb Compare July 9, 2024 19:56
@lezama lezama added [Status] Needs Review To request a review from Crew. Label will be renamed soon. and removed [Status] In Progress labels Jul 9, 2024
@lezama
Copy link
Contributor Author

lezama commented Jul 10, 2024

Intersection observer API is now has good enough support, we should use that instead; it's more performant and simpler.

I tried using the Intersection Observer API without success. Although it’s great for detecting when two elements intersect, it doesn’t seem straightforward for our use case. Since a post occupies the entire viewport, it always intersects at the same proportion.

@lezama
Copy link
Contributor Author

lezama commented Jul 10, 2024

I’ve just pushed a simplification. I believe it’s ready for testing.

cc @enejb

@lezama
Copy link
Contributor Author

lezama commented Jul 10, 2024

Use entry-content class, which is pretty ubiquitous across themes

it now uses .entry-content or fallbacks to document

@lezama lezama mentioned this pull request Jul 10, 2024
3 tasks
Copy link
Member

@enejb enejb left a comment

Choose a reason for hiding this comment

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

Still need to test this but I think we should rename the filter since the numbers might not make sense for users that area currently using them.

};
function onScroll() {
if ( ! hasLoaded ) {
requestAnimationFrame( () => {
Copy link
Member

Choose a reason for hiding this comment

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

❤️ good call on the requestAnimationFrame

@@ -64,17 +64,35 @@ public function enqueue_assets() {
wp_enqueue_script( 'subscribe-modal-js', plugins_url( 'subscribe-modal.js', __FILE__ ), array( 'wp-dom-ready' ), JETPACK__VERSION, true );

/**
* Filter how many milliseconds a user must scroll for until the Subscribe Modal appears.
* Filter how many milliseconds until the Subscribe Modal appears.
*
* @module subscriptions
*
* @since 13.4
*
* @param int 300 Time in milliseconds for the Subscribe Modal to appear upon scrolling.
Copy link
Member

Choose a reason for hiding this comment

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

We should update this default comment since it changed.

Copy link
Member

Choose a reason for hiding this comment

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

Should we introduce a slightly different filter name since this one might be in use already.
cc: @Aurorum for awareness and feedback, since you introduced the original filter. :)

Copy link
Contributor

Choose a reason for hiding this comment

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

No strong views from me! It was added to allow users to customise the default value for the load time; if the default value still changes, I don’t think that’s a big deal.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

We should update this default comment since it changed.

done!

@@ -57,6 +75,7 @@ domReady( function () {
hasLoaded = true;
setModalDismissedCookie();
window.addEventListener( 'keydown', closeModalOnEscapeKeydown );
window.removeEventListener( 'scroll', onScroll );
Copy link
Member

Choose a reason for hiding this comment

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

Good call on removing this event listener.

@enejb
Copy link
Member

enejb commented Jul 10, 2024

I tested the change on mobile and desktop and it works really nice!

Copy link
Member

@enejb enejb 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!

@lezama lezama merged commit 6aeaff7 into trunk Jul 10, 2024
56 checks passed
@lezama lezama deleted the update/subscribe-modal-behaviour branch July 10, 2024 20:11
@github-actions github-actions bot added this to the jetpack/13.7 milestone Jul 10, 2024
@github-actions github-actions bot removed the [Status] Needs Review To request a review from Crew. Label will be renamed soon. label Jul 10, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
[Feature] Subscriptions All subscription-related things such as paid and unpaid, user management, and newsletter settings. [Plugin] Jetpack Issues about the Jetpack plugin. https://wordpress.org/plugins/jetpack/
4 participants