Handle closing

Automattic · Dec 9, 2024 · 510a683 · 510a683
1 parent d086ad8
commit 510a683
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 12 deletions.
diff --git a/packages/help-center/src/components/help-center-content.tsx b/packages/help-center/src/components/help-center-content.tsx
@@ -59,10 +59,6 @@ const HelpCenterContent: React.FC< { isRelative?: boolean; currentRoute?: string
 	const { data: openSupportInteraction, isLoading: isLoadingOpenSupportInteractions } =
 		useGetSupportInteractions( 'help-center' );
 	const isUserEligibleForPaidSupport = data?.eligibility.is_user_eligible ?? false;
-	const scrollPosition = useArticleScrollPosition(
-		containerRef,
-		location.pathname.includes( '/post' )
-	);
 
 	useEffect( () => {
 		recordTracksEvent( 'calypso_helpcenter_page_open', {
@@ -75,14 +71,23 @@ const HelpCenterContent: React.FC< { isRelative?: boolean; currentRoute?: string
 		} );
 	}, [ location, sectionName, isUserEligibleForPaidSupport ] );
 
-	const { currentSupportInteraction, navigateToRoute, isMinimized } = useSelect( ( select ) => {
-		const store = select( HELP_CENTER_STORE ) as HelpCenterSelect;
-		return {
-			currentSupportInteraction: store.getCurrentSupportInteraction(),
-			navigateToRoute: store.getNavigateToRoute(),
-			isMinimized: store.getIsMinimized(),
-		};
-	}, [] );
+	const { currentSupportInteraction, navigateToRoute, isMinimized, isShown } = useSelect(
+		( select ) => {
+			const store = select( HELP_CENTER_STORE ) as HelpCenterSelect;
+			return {
+				currentSupportInteraction: store.getCurrentSupportInteraction(),
+				navigateToRoute: store.getNavigateToRoute(),
+				isMinimized: store.getIsMinimized(),
+				isShown: store.isHelpCenterShown(),
+			};
+		},
+		[]
+	);
+
+	const scrollPosition = useArticleScrollPosition(
+		containerRef,
+		location.pathname.includes( '/post' ) && Boolean( isShown )
+	);
 
 	useEffect( () => {
 		if (

diff --git a/packages/help-center/src/hooks/use-scroll-position.ts b/packages/help-center/src/hooks/use-scroll-position.ts
@@ -24,6 +24,9 @@ export function useArticleScrollPosition( ref: React.RefObject< HTMLElement >, e
 		};
 		if ( enabled ) {
 			element?.addEventListener( 'scroll', handleScroll );
+		} else {
+			// Reset the cached scroll position when the HC is closed or the article page is unmounted.
+			cachedScrollPosition = 0;
 		}
 		return () => {
 			element?.removeEventListener( 'scroll', handleScroll );