Change to not use withSafeTimeout. ref: #19109

WordPress · May 21, 2022 · 8e6ca5d · 8e6ca5d
1 parent 0fa2868
commit 8e6ca5d
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 7 deletions.
diff --git a/packages/components/src/form-token-field/suggestions-list.tsx b/packages/components/src/form-token-field/suggestions-list.tsx
@@ -9,7 +9,7 @@ import classnames from 'classnames';
  * WordPress dependencies
  */
 import { useState } from '@wordpress/element';
-import { withSafeTimeout, useRefEffect } from '@wordpress/compose';
+import { useRefEffect } from '@wordpress/compose';
 
 /**
  * Internal dependencies
@@ -21,7 +21,7 @@ const handleMouseDown = ( e ) => {
 	e.preventDefault();
 };
 
-export const SuggestionsList = withSafeTimeout( function SuggestionsList( {
+export function SuggestionsList( {
 	selectedIndex,
 	scrollIntoView,
 	match = '',
@@ -30,14 +30,16 @@ export const SuggestionsList = withSafeTimeout( function SuggestionsList( {
 	suggestions = [],
 	displayTransform,
 	instanceId,
-	setTimeout,
 }: SuggestionsListProps ) {
 	const [ scrollingIntoView, setScrollingIntoView ] = useState( false );
 
 	const listRef = useRefEffect< HTMLUListElement >(
 		( listNode ) => {
 			// only have to worry about scrolling selected suggestion into view
 			// when already expanded.
+			const { ownerDocument } = listNode;
+			const { defaultView } = ownerDocument;
+			let id;
 			if (
 				selectedIndex > -1 &&
 				scrollIntoView &&
@@ -47,10 +49,16 @@ export const SuggestionsList = withSafeTimeout( function SuggestionsList( {
 				scrollView( listNode.children[ selectedIndex ], listNode, {
 					onlyScrollIfNeeded: true,
 				} );
-				setTimeout( () => {
+				id = defaultView.setTimeout( () => {
 					setScrollingIntoView( false );
 				}, 100 );
 			}
+
+			return () => {
+				if ( id !== undefined ) {
+					defaultView.clearTimeout( id );
+				}
+			};
 		},
 		[ selectedIndex, scrollIntoView ]
 	);
@@ -146,6 +154,6 @@ export const SuggestionsList = withSafeTimeout( function SuggestionsList( {
 			} ) }
 		</ul>
 	);
-} );
+}
 
 export default SuggestionsList;
diff --git a/packages/components/src/form-token-field/types.ts b/packages/components/src/form-token-field/types.ts
@@ -14,8 +14,6 @@ export interface SuggestionsListProps< T = Suggestion > {
 	suggestions: T[];
 	displayTransform: ( value: T ) => string;
 	instanceId: string;
-	setTimeout: ( fn: () => void, delay: number ) => number;
-	clearTimeout: ( id: number ) => void;
 }
 
 export interface TokenProps< T = Suggestion > {