From 05bcad89ffbc14ba13795ba83734ec5c12cf0748 Mon Sep 17 00:00:00 2001
From: Yash Vibhandik <vibhandikyash@gmail.com>
Date: Wed, 18 Aug 2021 16:01:38 +0530
Subject: [PATCH] FIX #6615 : added check for open filter pane and close if
 before property pane open (#6662)

Hotfix for the RC blocker
---
 .../appsmith/TableComponent/CascadeFields.tsx          |  2 +-
 .../src/utils/hooks/useBlocksToBeDraggedOnCanvas.ts    | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/app/client/src/components/designSystems/appsmith/TableComponent/CascadeFields.tsx b/app/client/src/components/designSystems/appsmith/TableComponent/CascadeFields.tsx
index 89d2365bfa..19af67e63c 100644
--- a/app/client/src/components/designSystems/appsmith/TableComponent/CascadeFields.tsx
+++ b/app/client/src/components/designSystems/appsmith/TableComponent/CascadeFields.tsx
@@ -215,7 +215,7 @@ function RenderOptions(props: {
     trigger: {
       content: (
         <DropdownTrigger className={props.className}>
-          <AutoToolTipComponentWrapper title={selectedValue}>
+          <AutoToolTipComponentWrapper isCellVisible title={selectedValue}>
             {selectedValue}
           </AutoToolTipComponentWrapper>
           <Icon color={Colors.SLATE_GRAY} icon="caret-down" iconSize={16} />
diff --git a/app/client/src/utils/hooks/useBlocksToBeDraggedOnCanvas.ts b/app/client/src/utils/hooks/useBlocksToBeDraggedOnCanvas.ts
index 055675025a..aee212870a 100644
--- a/app/client/src/utils/hooks/useBlocksToBeDraggedOnCanvas.ts
+++ b/app/client/src/utils/hooks/useBlocksToBeDraggedOnCanvas.ts
@@ -8,6 +8,7 @@ import { useSelector } from "store";
 import { AppState } from "reducers";
 import { getSelectedWidgets } from "selectors/ui";
 import { getOccupiedSpaces } from "selectors/editorSelectors";
+import { getTableFilterState } from "selectors/tableFilterSelectors";
 import { OccupiedSpace } from "constants/editorConstants";
 import { getDragDetails, getWidgets } from "sagas/selectors";
 import {
@@ -55,6 +56,9 @@ export const useBlocksToBeDraggedOnCanvas = ({
   const { selectWidget } = useWidgetSelection();
   const containerPadding = noPad ? 0 : CONTAINER_GRID_PADDING;
 
+  // check any table filter is open or not
+  // if filter pane open, close before property pane open
+  const tableFilterPaneState = useSelector(getTableFilterState);
   // dragDetails contains of info needed for a container jump:
   // which parent the dragging widget belongs,
   // which canvas is active(being dragged on),
@@ -244,6 +248,12 @@ export const useBlocksToBeDraggedOnCanvas = ({
         updateWidgetParams.widgetId,
         updateWidgetParams.payload,
       );
+    // close filter pane if any open, before property pane open
+    tableFilterPaneState.isVisible &&
+      dispatch({
+        type: ReduxActionTypes.HIDE_TABLE_FILTER_PANE,
+        payload: { widgetId: tableFilterPaneState.widgetId },
+      });
     // Adding setTimeOut to allow property pane to open only after widget is loaded.
     // Not needed for most widgets except for Modal Widget.
     setTimeout(() => {