## Description - Remove the config objects from widget and config maps from the widget factory. - Introduce methods in widget development API to dynamically fetch this items. - freeze the widget configuration. #### PR fixes following issue(s) Fixes https://github.com/appsmithorg/appsmith/issues/26008 > if no issue exists, please create an issue and ask the maintainers about this first > > #### Media > A video or a GIF is preferred. when using Loom, don’t embed because it looks like it’s a GIF. instead, just link to the video > > #### Type of change > Please delete options that are not relevant. - Bug fix (non-breaking change which fixes an issue) - New feature (non-breaking change which adds functionality) - Breaking change (fix or feature that would cause existing functionality to not work as expected) - Chore (housekeeping or task changes that don't impact user perception) - This change requires a documentation update > > > ## Testing > #### How Has This Been Tested? > Please describe the tests that you ran to verify your changes. Also list any relevant details for your test configuration. > Delete anything that is not relevant - [x] Manual - [ ] Jest - [ ] Cypress > > #### Test Plan > Add Testsmith test cases links that relate to this PR > > #### Issues raised during DP testing > Link issues raised during DP testing for better visiblity and tracking (copy link from comments dropped on this PR) > > > ## Checklist: #### Dev activity - [ ] My code follows the style guidelines of this project - [ ] I have performed a self-review of my own code - [ ] I have commented my code, particularly in hard-to-understand areas - [ ] I have made corresponding changes to the documentation - [ ] My changes generate no new warnings - [ ] I have added tests that prove my fix is effective or that my feature works - [ ] New and existing unit tests pass locally with my changes - [ ] PR is being merged under a feature flag #### QA activity: - [ ] [Speedbreak features](https://github.com/appsmithorg/TestSmith/wiki/Guidelines-for-test-plans#speedbreakers-) have been covered - [x] Test plan covers all impacted features and [areas of interest](https://github.com/appsmithorg/TestSmith/wiki/Guidelines-for-test-plans#areas-of-interest-) - [ ] Test plan has been peer reviewed by project stakeholders and other QA members - [x] Manually tested functionality on DP - [ ] We had an implementation alignment call with stakeholders post QA Round 2 - [ ] Cypress test cases have been added and approved by SDET/manual QA - [ ] Added `Test Plan Approved` label after Cypress tests were reviewed - [ ] Added `Test Plan Approved` label after JUnit tests were reviewed
174 lines
6.2 KiB
TypeScript
174 lines
6.2 KiB
TypeScript
import { CANVAS_DEFAULT_MIN_HEIGHT_PX } from "constants/AppConstants";
|
|
import {
|
|
GridDefaults,
|
|
MAIN_CONTAINER_WIDGET_ID,
|
|
} from "constants/WidgetConstants";
|
|
import type { WidgetProps } from "widgets/BaseWidget";
|
|
import type { FlattenedWidgetProps } from "WidgetProvider/constants";
|
|
import type { WidgetType } from "../WidgetProvider/factory";
|
|
import WidgetFactory from "../WidgetProvider/factory";
|
|
|
|
/**
|
|
* This returns the number of rows which is not occupied by a Canvas Widget within
|
|
* a parent container like widget of type widgetType
|
|
* For example, the Tabs Widget takes 4 rows for the tabs
|
|
* @param widgetType Type of widget
|
|
* @param props Widget properties
|
|
* @returns the offset in rows
|
|
*/
|
|
export const getCanvasHeightOffset = (
|
|
widgetType: WidgetType,
|
|
props: WidgetProps,
|
|
) => {
|
|
const { getCanvasHeightOffset } = WidgetFactory.getWidgetMethods(widgetType);
|
|
let offset = 0;
|
|
|
|
if (getCanvasHeightOffset) {
|
|
offset = getCanvasHeightOffset(props);
|
|
}
|
|
|
|
return offset;
|
|
};
|
|
|
|
/**
|
|
* This function computes the heights of canvas widgets which may be effected by the changes in other widget properties (updatedWidgetIds)
|
|
* @param updatedWidgetIds Widgets which have updated
|
|
* @param canvasWidgets The widgets in the redux state, used for computations
|
|
* @returns A list of canvas widget ids with their heights in pixels
|
|
*/
|
|
export function getCanvasWidgetHeightsToUpdate(
|
|
updatedWidgetIds: string[],
|
|
canvasWidgets: Record<string, FlattenedWidgetProps>,
|
|
): Record<string, number> {
|
|
const updatedCanvasWidgets: Record<string, number> = {};
|
|
for (const widgetId of updatedWidgetIds) {
|
|
const widget = canvasWidgets[widgetId];
|
|
if (widget) {
|
|
if (
|
|
widget.type !== "CANVAS_WIDGET" &&
|
|
Array.isArray(widget.children) &&
|
|
widget.children.length > 0
|
|
) {
|
|
for (const childCanvasWidgetId of widget.children) {
|
|
if (!updatedCanvasWidgets.hasOwnProperty(childCanvasWidgetId)) {
|
|
const bottomRow = getCanvasBottomRow(
|
|
childCanvasWidgetId,
|
|
canvasWidgets,
|
|
);
|
|
if (bottomRow > 0) {
|
|
updatedCanvasWidgets[childCanvasWidgetId] = bottomRow;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
if (widget.parentId) {
|
|
if (!updatedCanvasWidgets.hasOwnProperty(widget.parentId)) {
|
|
const bottomRow = getCanvasBottomRow(widget.parentId, canvasWidgets);
|
|
if (bottomRow > 0) updatedCanvasWidgets[widget.parentId] = bottomRow;
|
|
}
|
|
}
|
|
} else {
|
|
// This usually means, that we're deleting a widget.
|
|
if (!updatedCanvasWidgets.hasOwnProperty(MAIN_CONTAINER_WIDGET_ID)) {
|
|
const bottomRow = getCanvasBottomRow(
|
|
MAIN_CONTAINER_WIDGET_ID,
|
|
canvasWidgets,
|
|
);
|
|
if (bottomRow > 0)
|
|
updatedCanvasWidgets[MAIN_CONTAINER_WIDGET_ID] = bottomRow;
|
|
}
|
|
}
|
|
}
|
|
return updatedCanvasWidgets;
|
|
}
|
|
|
|
/**
|
|
* A function to compute the height of a given canvas widget (canvasWidgetId) in pixels
|
|
* @param canvasWidgetId The CANVAS_WIDGET's widgetId. This canvas widget is the one whose bottomRow we need to compute
|
|
* @param canvasWidgets The widgets in the redux state. We use this to get appropriate info regarding types, parent and children for computations
|
|
* @returns The canvas widget's height in pixels (this is also the minHight and bottomRow property values)
|
|
*/
|
|
export function getCanvasBottomRow(
|
|
canvasWidgetId: string,
|
|
canvasWidgets: Record<string, FlattenedWidgetProps>,
|
|
) {
|
|
const canvasWidget = canvasWidgets[canvasWidgetId];
|
|
// If this widget is not defined
|
|
// It is likely a part of the list widget's canvases
|
|
if (canvasWidget === undefined) {
|
|
return 0;
|
|
}
|
|
// If this widget is not a CANVAS_WIDGET
|
|
if (canvasWidget.type !== "CANVAS_WIDGET") {
|
|
return canvasWidget.bottomRow;
|
|
}
|
|
|
|
const children = canvasWidget.children;
|
|
let parentHeightInRows = Math.ceil(
|
|
canvasWidget.bottomRow / GridDefaults.DEFAULT_GRID_ROW_HEIGHT,
|
|
);
|
|
|
|
// Hypothetical thoughts:
|
|
// If this is the MainContainer
|
|
// We need some special handling.
|
|
// What we can do is use the viewport height and compute the minimum using that
|
|
// in the edit mode
|
|
// In the view mode, we can do the same?
|
|
// This is because, we might have changed the "bottomRow" somewhere and that will
|
|
// cause it to consider that value, and give us a large scroll.
|
|
|
|
if (canvasWidget.parentId) {
|
|
const parentWidget = canvasWidgets[canvasWidget.parentId];
|
|
// If the parent widget is undefined but the parentId exists
|
|
// It is likely a part of the list widget
|
|
if (parentWidget === undefined) {
|
|
return 0;
|
|
}
|
|
// If the parent is list widget, let's return the canvasWidget.bottomRow
|
|
// We'll be handling this specially in withWidgetProps
|
|
if (parentWidget.type === "LIST_WIDGET") {
|
|
return canvasWidget.bottomRow;
|
|
}
|
|
|
|
// Widgets like Tabs widget have an offset we need to subtract
|
|
const parentHeightOffset = getCanvasHeightOffset(
|
|
parentWidget.type,
|
|
parentWidget,
|
|
);
|
|
// The parent's height in rows
|
|
parentHeightInRows = parentWidget.bottomRow - parentWidget.topRow;
|
|
|
|
// If the parent is modal widget, we need to consider the `height` instead
|
|
// of the bottomRow
|
|
// TODO(abhinav): We could use one or the other and not have both, maybe
|
|
// update the bottomRow of the modal widget instead?
|
|
if (parentWidget.type === "MODAL_WIDGET" && parentWidget.height) {
|
|
parentHeightInRows = Math.floor(
|
|
parentWidget.height / GridDefaults.DEFAULT_GRID_ROW_HEIGHT,
|
|
);
|
|
}
|
|
// Subtract the canvas offset due to some parent elements
|
|
parentHeightInRows = parentHeightInRows - parentHeightOffset;
|
|
} else {
|
|
parentHeightInRows =
|
|
CANVAS_DEFAULT_MIN_HEIGHT_PX / GridDefaults.DEFAULT_GRID_ROW_HEIGHT;
|
|
}
|
|
|
|
if (Array.isArray(children) && children.length > 0) {
|
|
const bottomRow = children.reduce((prev, next) => {
|
|
if (canvasWidgets[next].detachFromLayout) {
|
|
return prev;
|
|
}
|
|
if (canvasWidgets[next].bottomRow === canvasWidgets[next].topRow) {
|
|
return prev;
|
|
}
|
|
return canvasWidgets[next].bottomRow > prev
|
|
? canvasWidgets[next].bottomRow
|
|
: prev;
|
|
}, parentHeightInRows);
|
|
|
|
return bottomRow * GridDefaults.DEFAULT_GRID_ROW_HEIGHT;
|
|
}
|
|
return parentHeightInRows * GridDefaults.DEFAULT_GRID_ROW_HEIGHT;
|
|
}
|