Jetpack Boost: Image Guide compatibility improvements

docs/testing/regression-checklist/mapping.json

@@ -30,7 +30,7 @@
 		"testFile": [ "extensions/blocks/checklist.md" ]
 	},
 	{
-		"regex": "^projects\/plugins\/jetpack\/extensions\/(blocks\/(subscriptions|premium-content)\/|shared\/memberships\.js)",
+		"regex": "^projects/plugins/jetpack/extensions/(blocks/(subscriptions|premium-content)/|shared/memberships.js)",
 		"testFile": [ "extensions/blocks/subscriptions.md" ]
 	}
 ]

projects/plugins/boost/app/features/image-guide/src/index.ts

@@ -104,7 +104,9 @@ function initialize() {
  * we don't need the guides sooner because
  * images have likely not loaded yet.
  */
-window.addEventListener( 'load', () => {
-	initialize();
-	window.addEventListener( 'resize', debounceDimensionUpdates() );
-} );
+if ( ! window.frameElement ) {
+	window.addEventListener( 'load', () => {
+		initialize();
+		window.addEventListener( 'resize', debounceDimensionUpdates() );
+	} );
+}

projects/plugins/boost/app/features/image-guide/src/initialize.ts

@@ -16,36 +16,35 @@ import type { MeasurableImage } from '@automattic/jetpack-image-guide';
 function getClosestContainingAncestor( node: HTMLElement ): HTMLElement | null {
 	let current: HTMLElement | null = node.parentElement;
 
-	// Keep track of ancestor elements that do not have a "z-index" set
-	let elementsWithoutZIndex: HTMLElement[] = [];
-
+	// Keep track of target element
+	let target: HTMLElement;
 	while ( current && current instanceof HTMLElement ) {
 		// Don't go past the body element
 		if ( current === document.body ) {
 			break;
 		}
 
 		const style = getComputedStyle( current );
+
+		// Guide can't be correctly positioned inside inline elements
+		// because they don't have dimensions.
+		const canContainBlockElements = style.display !== 'inline';
+		const isStatic = style.position === 'static';
+		const isRelative = style.position === 'relative';
+		const hasZIndex = style.zIndex !== 'auto';
+		const isRelativeWithZIndex = isRelative && hasZIndex;
+
 		if (
-			style.zIndex === 'auto' &&
-			( style.position === 'static' || style.position === 'relative' )
+			canContainBlockElements &&
+			( ( ! target && ( isStatic || isRelative ) ) || isRelativeWithZIndex )
 		) {
-			elementsWithoutZIndex.push( current );
-		} else {
-			elementsWithoutZIndex = [];
+			target = current;
 		}
 
-		// Move on to the next parent element
 		current = current.parentElement;
 	}
 
-	// Return the first ancestor element that isn't affected by z-index
-	if ( elementsWithoutZIndex.length > 0 ) {
-		return elementsWithoutZIndex[ 0 ];
-	}
-
-	// If no element was found, return the body element
-	return document.body;
+	return target;
 }
 
 /**
@@ -98,10 +97,7 @@ function findContainer( image: MeasurableImage ): HTMLElement | undefined {
 		wrapper.classList.add( 'jetpack-boost-guide' );
 		wrapper.dataset.jetpackBoostGuideId = ( ++wrapperID ).toString();
 		if ( parentStyle.position === 'static' ) {
-			wrapper.classList.add( 'relative' );
-			Array.from( ancestor.children )
-				.reverse()
-				.forEach( child => wrapper.appendChild( child ) );
+			ancestor.style.position = 'relative';
 		}
 
 		ancestor.prepend( wrapper );

projects/plugins/boost/app/features/image-guide/src/ui/Bubble.svelte

@@ -1,4 +1,5 @@
 <script lang="ts">
+	import { createEventDispatcher } from 'svelte';
 	import { backOut } from 'svelte/easing';
 	import { fade, fly } from 'svelte/transition';
 	import Spinner from './Spinner.svelte';
@@ -19,9 +20,27 @@
 		y: 2,
 		easing: backOut,
 	};
+
+	let bubble: HTMLElement;
+	const dispatch = createEventDispatcher();
+	function onHover() {
+		const rect = bubble.getBoundingClientRect();
+		dispatch( 'hover', {
+			index,
+			position: {
+				top: rect.top + rect.height + 10,
+				left: rect.left,
+			},
+		} );
+	}
 </script>
 
-<div class="interaction-area {severity}" on:mouseenter transition:fly={scaleTransition}>
+<div
+	class="interaction-area {severity}"
+	bind:this={bubble}
+	on:mouseenter={onHover}
+	transition:fly={scaleTransition}
+>
 	<div class="bubble">
 		{#if false === $isLoading}
 			<div class="bubble-inner">

projects/plugins/boost/app/features/image-guide/src/ui/Main.svelte

@@ -17,7 +17,16 @@
 		stores.forEach( store => store.updateDimensions() );
 	} );
 
-	function onMouseLeave() {
+	function closeDetails( e ) {
+		// Don't exit when hovering the Portal
+		if (
+			e.relatedTarget &&
+			// Don't exit when hovering the Popup
+			e.relatedTarget.classList.contains( 'keep-guide-open' )
+		) {
+			return;
+		}
+
 		if ( $guideState !== 'always_on' ) {
 			show = false;
 		}
@@ -46,21 +55,37 @@
 
 	$: show = $guideState === 'always_on' ? 0 : false;
 	$: toggleBackdrop( show !== false );
+	let position = {
+		top: 0,
+		left: 0,
+	};
+
+	function hover( e: CustomEvent ) {
+		const detail = e.detail;
+		const index = detail.index;
+		position = detail.position;
+		show = index;
+	}
 </script>
 
 {#if $guideState === 'active' || $guideState === 'always_on'}
-	<div class="guide {size}" class:show={show !== false} on:mouseleave={onMouseLeave}>
+	<div
+		class="guide {size}"
+		class:show={show !== false}
+		class:keep-guide-open={show !== false}
+		on:mouseleave={closeDetails}
+	>
 		<div class="previews">
 			{#each stores as store, index}
-				<Bubble {index} {store} on:mouseenter={() => ( show = index )} />
+				<Bubble {index} {store} on:hover={hover} />
 			{/each}
 		</div>
 		{#if show !== false}
 			<!--
 				Intentionally using only a single component here.
 				See <Popup> component source for details.
 			 -->
-			<Popup store={stores[ show ]} {size} />
+			<Popup store={stores[ show ]} {size} {position} on:mouseleave={closeDetails} />
 		{/if}
 	</div>
 {/if}
@@ -84,14 +109,11 @@
 		position: absolute;
 		top: 0;
 		left: 0;
-		width: 100%;
-		height: 100%;
 		z-index: 8000;
 		line-height: 1.55;
-		padding: 15px;
+		padding: 20px;
 		&.small {
 			font-size: 13px;
-			padding: 15px;
 		}
 
 		&.micro {