Fixes scrollbar issue if upsell nudge is loaded in sidebar (#38170)

* Fixes scrollbar issue if upsell nudge is loaded in sidebar.

* changelog

* Update script import code

projects/packages/masterbar/changelog/fix-nav-classic-default--wp-admin

@@ -0,0 +1,4 @@
+Significance: patch
+Type: fixed
+
+Fixes scrollbar issue if upsell nudge is loaded in specific viewport.

projects/packages/masterbar/src/admin-menu/class-admin-menu.php

@@ -7,6 +7,7 @@
 
 namespace Automattic\Jetpack\Masterbar;
 
+use Automattic\Jetpack\Assets;
 use Automattic\Jetpack\Assets\Logo;
 use Automattic\Jetpack\Redirect;
 
@@ -514,6 +515,22 @@ public function wp_ajax_upsell_nudge_jitm() {
 		wp_die();
 	}
 
+	/**
+	 * Fixes scrollbar issue if upsell nudge is loaded.
+	 * https://github.com/Automattic/dotcom-forge/issues/7936
+	 */
+	public function wpcom_upsell_nudge_jitm_fix() {
+		$assets_base_path = '../../dist/admin-menu/';
+		Assets::register_script(
+			'wpcom-upsell-nudge-jitm-fix',
+			$assets_base_path . 'wpcom-upsell-nudge-jitm-fix.js',
+			__FILE__,
+			array(
+				'enqueue' => true,
+			)
+		);
+	}
+
 	/**
 	 * Returns the first available upsell nudge.
 	 * Needs to be implemented separately for each child menu class.

projects/packages/masterbar/src/admin-menu/class-wpcom-admin-menu.php

@@ -33,6 +33,7 @@ protected function __construct() {
 		add_action( 'wp_ajax_sidebar_state', array( $this, 'ajax_sidebar_state' ) );
 		add_action( 'wp_ajax_jitm_dismiss', array( $this, 'wp_ajax_jitm_dismiss' ) );
 		add_action( 'wp_ajax_upsell_nudge_jitm', array( $this, 'wp_ajax_upsell_nudge_jitm' ) );
+		add_action( 'admin_enqueue_scripts', array( $this, 'wpcom_upsell_nudge_jitm_fix' ) );
 		add_action( 'admin_init', array( $this, 'sync_sidebar_collapsed_state' ) );
 		add_action( 'admin_menu', array( $this, 'remove_submenus' ), 140 ); // After hookpress hook at 130.
 	}

projects/packages/masterbar/src/admin-menu/wpcom-upsell-nudge-jitm-fix.js

@@ -0,0 +1,17 @@
+const wpcomFixSidebarScrolling = () => {
+	const observer = new MutationObserver( mutationList => {
+		mutationList.forEach( mutation => {
+			mutation.addedNodes.forEach( node => {
+				// The domain upsell nudge is added.
+				if ( node.id === 'toplevel_page_site-notices' ) {
+					window.dispatchEvent( new Event( 'resize' ) );
+				}
+			} );
+		} );
+	} );
+	observer.observe( document.querySelector( '#adminmenu' ), {
+		childList: true,
+	} );
+};
+
+document.addEventListener( 'DOMContentLoaded', wpcomFixSidebarScrolling );