Merge pull request #6646 from google/bug/6109-incorrect-view-notifica…

…tions-followup

Fix calculation of the sticky header height to account for non-sticky header scenario.

assets/js/util/scroll.js

@@ -76,6 +76,23 @@ export function getHeaderHeight( breakpoint ) {
 export function getHeaderHeightWithoutNav( breakpoint ) {
 	let headerHeight = 0;
 
+	// When the Joyride overlay is present, Site Kit's header is not sticky.
+	const isSiteKitHeaderSticky = ! document.querySelector(
+		'.react-joyride__overlay'
+	);
+
+	if ( ! isSiteKitHeaderSticky ) {
+		// If the Site Kit header is not sticky, we only need to calculate the height of the sticky WordPress admin bar.
+		// Furthermore, the WordPress admin bar is only sticky for breakpoints larger than BREAKPOINT_SMALL. If it's also not sticky then we can return a height of 0.
+		const wpAdminBar = document.querySelector( '#wpadminbar' );
+
+		if ( wpAdminBar && breakpoint !== BREAKPOINT_SMALL ) {
+			return wpAdminBar.offsetHeight;
+		}
+
+		return 0;
+	}
+
 	const header = document.querySelector( '.googlesitekit-header' );
 	if ( header ) {
 		headerHeight =