Memberships: Prevent subscribe popup from scrolling underlying content (#35553)

pottedmeat · web-flow · commit 4648581cdec6 · 2024-02-12T15:40:04.000-06:00
* Remove scrollTo on modal open
diff --git a/projects/plugins/jetpack/changelog/subscribe-popup-disable-scroll b/projects/plugins/jetpack/changelog/subscribe-popup-disable-scroll
@@ -0,0 +1,4 @@
+Significance: patch
+Type: bugfix
+
+Disable scroll to top when memberships subscribe popup is opened.
diff --git a/projects/plugins/jetpack/extensions/shared/memberships.js b/projects/plugins/jetpack/extensions/shared/memberships.js
@@ -28,8 +28,6 @@ export function handleIframeResult( eventFromIframe ) {
 }
 
 export function showModal( url ) {
-	window.scrollTo( 0, 0 );
-
 	// prevent double scroll bars. We use the entire viewport for the modal so we need to hide overflow on the body element.
 	document.body.classList.add( 'modal-open' );
 
@@ -64,9 +62,6 @@ export function showModal( url ) {
 
 	window.addEventListener( 'message', handleIframeResult, false );
 	dialog.showModal();
-
-	// This line has to come after the modal has opened otherwise Firefox doesn't scroll to the top.
-	window.scrollTo( 0, 0 );
 }
 
 function setUpModal( button ) {

Original file line number	Diff line number	Diff line change
`@@ -28,8 +28,6 @@ export function handleIframeResult( eventFromIframe ) {`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`export function showModal( url ) {`
`31`		`- window.scrollTo( 0, 0 );`
`32`		`-`
`33`	`31`	`// prevent double scroll bars. We use the entire viewport for the modal so we need to hide overflow on the body element.`
`34`	`32`	`document.body.classList.add( 'modal-open' );`
`35`	`33`
`@@ -64,9 +62,6 @@ export function showModal( url ) {`
`64`	`62`
`65`	`63`	`window.addEventListener( 'message', handleIframeResult, false );`
`66`	`64`	`dialog.showModal();`
`67`		`-`
`68`		`- // This line has to come after the modal has opened otherwise Firefox doesn't scroll to the top.`
`69`		`- window.scrollTo( 0, 0 );`
`70`	`65`	`}`
`71`	`66`
`72`	`67`	`function setUpModal( button ) {`