## Description This PR adds another feature update we had planned for Auto Height - [ ] For new applications, in View and Preview mode, any widget which is invisible will let go of its space and collapse if it's either on the main Canvas or a container-like widget which has Auto-height enabled. - [ ] Widgets within a container-like Widget, say Tabs, that doesn't have Auto-height enabled, will now let go of their space if they're invisible. - [ ] The experience in Edit mode has not changed. TL;DR: In new applications, in the Preview and Published _AKA_ View modes, if a widget is invisible and within an Auto-height-enabled container like a Tab, a Modal, a Form, or the main Canvas, it will fully collapse, allowing widgets below it to move up and take its space. This changes the behavior today prior to the release of this PR for Auto-height-enabled widgets. Fixes #19983 Fixes #18681
146 lines
4.2 KiB
TypeScript
146 lines
4.2 KiB
TypeScript
import { createImmerReducer } from "utils/ReducerUtils";
|
|
import {
|
|
ReduxActionTypes,
|
|
UpdateCanvasPayload,
|
|
ReduxAction,
|
|
} from "@appsmith/constants/ReduxActionConstants";
|
|
import { WidgetProps } from "widgets/BaseWidget";
|
|
import { uniq, get, set } from "lodash";
|
|
import { Diff, diff } from "deep-diff";
|
|
import {
|
|
getCanvasBottomRow,
|
|
getCanvasWidgetHeightsToUpdate,
|
|
} from "utils/WidgetSizeUtils";
|
|
|
|
/* This type is an object whose keys are widgetIds and values are arrays with property paths
|
|
and property values
|
|
For example:
|
|
{ "xyz123": [{ propertyPath: "bottomRow", propertyValue: 20 }] }
|
|
*/
|
|
export type UpdateWidgetsPayload = Record<
|
|
string,
|
|
Array<{
|
|
propertyPath: string;
|
|
propertyValue: unknown;
|
|
}>
|
|
>;
|
|
|
|
const initialState: CanvasWidgetsReduxState = {};
|
|
|
|
export type FlattenedWidgetProps<orType = never> =
|
|
| (WidgetProps & {
|
|
children?: string[];
|
|
})
|
|
| orType;
|
|
|
|
/**
|
|
*
|
|
* @param updateLayoutDiff
|
|
* @returns list of widgets that were updated
|
|
*/
|
|
function getUpdatedWidgetLists(
|
|
updateLayoutDiff: Diff<
|
|
CanvasWidgetsReduxState,
|
|
{
|
|
[widgetId: string]: WidgetProps;
|
|
}
|
|
>[],
|
|
) {
|
|
return uniq(
|
|
updateLayoutDiff
|
|
.map((diff: Diff<CanvasWidgetsReduxState>) => diff.path?.[0])
|
|
.filter((widgetId) => !!widgetId),
|
|
);
|
|
}
|
|
|
|
const canvasWidgetsReducer = createImmerReducer(initialState, {
|
|
[ReduxActionTypes.INIT_CANVAS_LAYOUT]: (
|
|
state: CanvasWidgetsReduxState,
|
|
action: ReduxAction<UpdateCanvasPayload>,
|
|
) => {
|
|
const { widgets } = action.payload;
|
|
for (const [widgetId, widgetProps] of Object.entries(widgets)) {
|
|
if (widgetProps.type === "CANVAS_WIDGET") {
|
|
const bottomRow = getCanvasBottomRow(widgetId, widgets);
|
|
widgets[widgetId].bottomRow = bottomRow;
|
|
}
|
|
}
|
|
return widgets;
|
|
},
|
|
[ReduxActionTypes.UPDATE_LAYOUT]: (
|
|
state: CanvasWidgetsReduxState,
|
|
action: ReduxAction<UpdateCanvasPayload>,
|
|
) => {
|
|
let listOfUpdatedWidgets;
|
|
// if payload has knowledge of which widgets were changed, use that
|
|
if (action.payload.updatedWidgetIds) {
|
|
listOfUpdatedWidgets = action.payload.updatedWidgetIds;
|
|
} // else diff out the widgets that need to be updated
|
|
else {
|
|
const updatedLayoutDiffs = diff(state, action.payload.widgets);
|
|
if (!updatedLayoutDiffs) return state;
|
|
|
|
listOfUpdatedWidgets = getUpdatedWidgetLists(updatedLayoutDiffs);
|
|
}
|
|
|
|
//update only the widgets that need to be updated.
|
|
for (const widgetId of listOfUpdatedWidgets) {
|
|
const updatedWidget = action.payload.widgets[widgetId];
|
|
if (updatedWidget) {
|
|
state[widgetId] = updatedWidget;
|
|
} else {
|
|
delete state[widgetId];
|
|
}
|
|
}
|
|
|
|
const canvasWidgetHeightsToUpdate: Record<
|
|
string,
|
|
number
|
|
> = getCanvasWidgetHeightsToUpdate(listOfUpdatedWidgets, state);
|
|
|
|
for (const widgetId in canvasWidgetHeightsToUpdate) {
|
|
state[widgetId].bottomRow = canvasWidgetHeightsToUpdate[widgetId];
|
|
}
|
|
},
|
|
[ReduxActionTypes.UPDATE_MULTIPLE_WIDGET_PROPERTIES]: (
|
|
state: CanvasWidgetsReduxState,
|
|
action: ReduxAction<{
|
|
widgetsToUpdate: UpdateWidgetsPayload;
|
|
shouldEval: boolean;
|
|
}>,
|
|
) => {
|
|
// For each widget whose properties we would like to update
|
|
for (const [widgetId, propertyPathsToUpdate] of Object.entries(
|
|
action.payload.widgetsToUpdate,
|
|
)) {
|
|
// Iterate through each property to update in `widgetId`
|
|
propertyPathsToUpdate.forEach(({ propertyPath, propertyValue }) => {
|
|
const path = `${widgetId}.${propertyPath}`;
|
|
// Get original value in reducer
|
|
const originalPropertyValue = get(state, path);
|
|
// If the original and new values are different
|
|
if (propertyValue !== originalPropertyValue)
|
|
// Set the new values
|
|
set(state, path, propertyValue);
|
|
});
|
|
}
|
|
|
|
const canvasWidgetHeightsToUpdate: Record<
|
|
string,
|
|
number
|
|
> = getCanvasWidgetHeightsToUpdate(
|
|
Object.keys(action.payload.widgetsToUpdate),
|
|
state,
|
|
);
|
|
for (const widgetId in canvasWidgetHeightsToUpdate) {
|
|
state[widgetId].bottomRow = canvasWidgetHeightsToUpdate[widgetId];
|
|
}
|
|
},
|
|
});
|
|
|
|
export interface CanvasWidgetsReduxState {
|
|
[widgetId: string]: FlattenedWidgetProps;
|
|
}
|
|
|
|
export default canvasWidgetsReducer;
|