Improve and refactor clearTimeoutRef

WordPress · Mar 20, 2020 · b5f7d33 · b5f7d33
1 parent aa4efb1
commit b5f7d33
Showing 1 changed file with 12 additions and 5 deletions.
diff --git a/packages/block-editor/src/components/block-toolbar/utils.js b/packages/block-editor/src/components/block-toolbar/utils.js
@@ -38,16 +38,21 @@ export function useDebouncedShowMovers( {
 		return ! isFocused && ! isHovered;
 	};
 
+	const clearTimeoutRef = () => {
+		const timeout = timeoutRef.current;
+
+		if ( timeout && clearTimeout ) {
+			clearTimeout( timeout );
+		}
+	};
+
 	const debouncedShowMovers = ( event ) => {
 		if ( event ) {
 			event.stopPropagation();
 		}
 
-		const timeout = timeoutRef.current;
+		clearTimeoutRef();
 
-		if ( timeout && clearTimeout ) {
-			clearTimeout( timeout );
-		}
 		if ( ! showMovers ) {
 			handleOnChange( true );
 		}
@@ -58,14 +63,16 @@ export function useDebouncedShowMovers( {
 			event.stopPropagation();
 		}
 
+		clearTimeoutRef();
+
 		timeoutRef.current = setTimeout( () => {
 			if ( shouldHideMovers() ) {
 				handleOnChange( false );
 			}
 		}, debounceTimeout );
 	};
 
-	useEffect( () => () => clearTimeout( timeoutRef.current ), [] );
+	useEffect( () => () => clearTimeoutRef(), [] );
 
 	return {
 		showMovers,