From 3b08836b05780740fc65a7ec1d271ff4bbdf08aa Mon Sep 17 00:00:00 2001
From: Riad Benguella <benguella@gmail.com>
Date: Fri, 22 Apr 2022 08:36:43 +0100
Subject: [PATCH] Fix clicking movers

---
 .../src/components/block-popover/inbetween.js          |  7 ++++++-
 .../src/components/block-popover/style.scss            | 10 +++++++---
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/packages/block-editor/src/components/block-popover/inbetween.js b/packages/block-editor/src/components/block-popover/inbetween.js
index 1c3ddb0933b3c..a585e9f1172e9 100644
--- a/packages/block-editor/src/components/block-popover/inbetween.js
+++ b/packages/block-editor/src/components/block-popover/inbetween.js
@@ -184,7 +184,12 @@ function BlockPopoverInbetween( {
 				props.className
 			) }
 		>
-			<div style={ style }>{ children }</div>
+			<div
+				className="block-editor-block-popover__inbetween-container"
+				style={ style }
+			>
+				{ children }
+			</div>
 		</Popover>
 	);
 	/* eslint-enable jsx-a11y/no-static-element-interactions, jsx-a11y/click-events-have-key-events */
diff --git a/packages/block-editor/src/components/block-popover/style.scss b/packages/block-editor/src/components/block-popover/style.scss
index 86d11ed94007f..01e9cf327a690 100644
--- a/packages/block-editor/src/components/block-popover/style.scss
+++ b/packages/block-editor/src/components/block-popover/style.scss
@@ -14,11 +14,15 @@
 
 		// Allow clicking through the toolbar holder.
 		pointer-events: none;
-
-		// Position the block toolbar.
-		> * {
+		> div > * {
 			pointer-events: all;
 		}
 	}
 }
 
+.block-editor-block-popover__inbetween-container {
+	pointer-events: none !important;
+	> div > * {
+		pointer-events: all;
+	}
+}