From 3d97591956b56fa17438e369b5e603270098769d Mon Sep 17 00:00:00 2001
From: Evgeny Biriulin <birman111@yandex-team.ru>
Date: Thu, 12 Sep 2024 03:06:46 +0300
Subject: [PATCH] fix: do not allow drag by dropdown menu

---
 src/components/GridLayout/GridLayout.js            | 4 ++--
 src/components/OverlayControls/OverlayControls.tsx | 6 +++++-
 src/constants/common.ts                            | 2 ++
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/components/GridLayout/GridLayout.js b/src/components/GridLayout/GridLayout.js
index 5f8fbfb..45e9c09 100644
--- a/src/components/GridLayout/GridLayout.js
+++ b/src/components/GridLayout/GridLayout.js
@@ -3,7 +3,7 @@ import React from 'react';
 import {
     COMPACT_TYPE_HORIZONTAL_NOWRAP,
     DEFAULT_GROUP,
-    OVERLAY_CONTROLS_CLASS_NAME,
+    DRAGGABLE_CANCEL_CLASS_NAME,
     TEMPORARY_ITEM_ID,
 } from '../../constants';
 import {DashKitContext} from '../../context/DashKitContext';
@@ -534,7 +534,7 @@ export default class GridLayout extends React.PureComponent {
                 key={`group_${group}`}
                 isDraggable={editMode}
                 isResizable={editMode}
-                draggableCancel={`.${OVERLAY_CONTROLS_CLASS_NAME}`}
+                draggableCancel={`.${DRAGGABLE_CANCEL_CLASS_NAME}`}
                 {...(draggableHandleClassName
                     ? {draggableHandle: `.${draggableHandleClassName}`}
                     : null)}
diff --git a/src/components/OverlayControls/OverlayControls.tsx b/src/components/OverlayControls/OverlayControls.tsx
index b756a87..ef35d6e 100644
--- a/src/components/OverlayControls/OverlayControls.tsx
+++ b/src/components/OverlayControls/OverlayControls.tsx
@@ -15,6 +15,7 @@ import noop from 'lodash/noop';
 
 import {
     COPIED_WIDGET_STORE_KEY,
+    DRAGGABLE_CANCEL_CLASS_NAME,
     MenuItems,
     OVERLAY_CONTROLS_CLASS_NAME,
     OVERLAY_ICON_SIZE,
@@ -111,7 +112,7 @@ class OverlayControls extends React.Component<OverlayControlsProps> {
             ? this.getCustomControlsWithWidgets()
             : this.renderControls();
 
-        return <div className={b({position})}>{controls}</div>;
+        return <div className={b({position}, [DRAGGABLE_CANCEL_CLASS_NAME])}>{controls}</div>;
     }
 
     private getItems = () => {
@@ -311,6 +312,9 @@ class OverlayControls extends React.Component<OverlayControlsProps> {
                         <Icon data={Ellipsis} size={OVERLAY_ICON_SIZE} />
                     </Button>
                 )}
+                popupProps={{
+                    contentClassName: DRAGGABLE_CANCEL_CLASS_NAME,
+                }}
             />
         );
     }
diff --git a/src/constants/common.ts b/src/constants/common.ts
index 2322862..911f1fa 100644
--- a/src/constants/common.ts
+++ b/src/constants/common.ts
@@ -22,3 +22,5 @@ export const DEFAULT_WIDGET_WIDTH = 3;
 export const DEFAULT_GROUP = '__default';
 
 export const COMPACT_TYPE_HORIZONTAL_NOWRAP = 'horizontal-nowrap';
+
+export const DRAGGABLE_CANCEL_CLASS_NAME = 'dashkit_draggable_cancel';