Protei/PromucFlow_constructor
2
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

FIX #6615 : added check for open filter pane and close if before property pane open (#6662)

Browse Source 
Hotfix for the RC blocker
This commit is contained in:
Yash Vibhandik 2021-08-18 16:01:38 +05:30 committed by GitHub
parent 7a75d400ab
commit 05bcad89ff
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/client/src/components/designSystems/appsmith/TableComponent/CascadeFields.tsx
View File

@ -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} />

10
app/client/src/utils/hooks/useBlocksToBeDraggedOnCanvas.ts
View File

@ -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(() => {