Suppress console warnings when unmounting refs

WordPress · Mar 15, 2021 · 7855796 · 7855796
1 parent c3238b9
commit 7855796
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/packages/block-editor/src/components/block-list/insertion-point.js b/packages/block-editor/src/components/block-list/insertion-point.js
@@ -369,7 +369,7 @@ export default function useInsertionPoint( ref ) {
 		ref.current.addEventListener( 'mousemove', onMouseMove );
 
 		return () => {
-			ref.current.removeEventListener( 'mousemove', onMouseMove );
+			ref.current?.removeEventListener( 'mousemove', onMouseMove );
 		};
 	}, [ enableMouseMove, onMouseMove ] );
 

diff --git a/packages/block-editor/src/components/navigable-toolbar/index.js b/packages/block-editor/src/components/navigable-toolbar/index.js
@@ -126,7 +126,7 @@ function useToolbarFocus(
 		}
 		return () => {
 			window.cancelAnimationFrame( raf );
-			if ( ! onIndexChange ) return;
+			if ( ! onIndexChange || ! ref.current ) return;
 			// When the toolbar element is unmounted and onIndexChange is passed, we
 			// pass the focused toolbar item index so it can be hydrated later.
 			const items = getAllToolbarItemsIn( ref.current );