Multi selection: fix intermittent e2e failure (#19865)

WordPress · Jan 25, 2020 · 9a364c9 · 9a364c9
1 parent b3b92f3
commit 9a364c9
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/packages/block-editor/src/components/block-list/block-popover.js b/packages/block-editor/src/components/block-list/block-popover.js
@@ -115,9 +115,17 @@ function BlockPopover( {
 	let anchorRef = node;
 
 	if ( hasMultiSelection ) {
+		const bottomNode = blockNodes[ lastClientId ];
+
+		// Wait to render the popover until the bottom reference is available
+		// as well.
+		if ( ! bottomNode ) {
+			return null;
+		}
+
 		anchorRef = {
-			top: blockNodes[ clientId ],
-			bottom: blockNodes[ lastClientId ],
+			top: node,
+			bottom: bottomNode,
 		};
 	}