Block Editor: Fix stale insertion point reference (#71559)

Mamaduka · ramonjd · jeryj · web-flow · commit e628379507bc · 2025-09-11T06:25:17.000+04:00
Unlinked contributors: CreativeDive.

Co-authored-by: Mamaduka &lt;mamaduka@git.wordpress.org&gt;
Co-authored-by: ramonjd &lt;ramonopoly@git.wordpress.org&gt;
Co-authored-by: jeryj &lt;jeryj@git.wordpress.org&gt;
Co-authored-by: ndiego &lt;ndiego@git.wordpress.org&gt;
diff --git a/packages/block-editor/src/components/block-tools/insertion-point.js b/packages/block-editor/src/components/block-tools/insertion-point.js
@@ -7,7 +7,12 @@ import clsx from 'clsx';
  * WordPress dependencies
  */
 import { useSelect, useDispatch } from '@wordpress/data';
-import { useRef, createContext, useContext } from '@wordpress/element';
+import {
+	useRef,
+	createContext,
+	useContext,
+	useCallback,
+} from '@wordpress/element';
 import { __unstableMotion as motion } from '@wordpress/components';
 import { useReducedMotion } from '@wordpress/compose';
 
@@ -113,6 +118,18 @@ function InbetweenInsertionPointPopover( {
 		}
 	}
 
+	// Reset the insertion point reference when the Inserter unmounts,
+	// avoids stale references when `onSelectOrClose` is not called.
+	// See: https://github.com/WordPress/gutenberg/issues/65598#issuecomment-3249229264.
+	const maybeResetOpenRef = useCallback(
+		( node ) => {
+			if ( ! node && openRef.current ) {
+				openRef.current = false;
+			}
+		},
+		[ openRef ]
+	);
+
 	const lineVariants = {
 		// Initial position starts from the center and invisible.
 		start: {
@@ -203,6 +220,7 @@ function InbetweenInsertionPointPopover( {
 						) }
 					>
 						<Inserter
+							ref={ maybeResetOpenRef }
 							position="bottom center"
 							clientId={ nextClientId }
 							rootClientId={ rootClientId }
