2023-02-03 05:47:40 +00:00
|
|
|
import { CANVAS_DEFAULT_MIN_HEIGHT_PX } from "constants/AppConstants";
|
|
|
|
|
import {
|
|
|
|
|
GridDefaults,
|
|
|
|
|
MAIN_CONTAINER_WIDGET_ID,
|
|
|
|
|
} from "constants/WidgetConstants";
|
chore: upgrade to prettier v2 + enforce import types (#21013)Co-authored-by: Satish Gandham <hello@satishgandham.com> Co-authored-by: Satish Gandham <satish.iitg@gmail.com>
## Description
This PR upgrades Prettier to v2 + enforces TypeScript’s [`import
type`](https://www.typescriptlang.org/docs/handbook/release-notes/typescript-3-8.html#type-only-imports-and-export)
syntax where applicable. It’s submitted as a separate PR so we can merge
it easily.
As a part of this PR, we reformat the codebase heavily:
- add `import type` everywhere where it’s required, and
- re-format the code to account for Prettier 2’s breaking changes:
https://prettier.io/blog/2020/03/21/2.0.0.html#breaking-changes
This PR is submitted against `release` to make sure all new code by team
members will adhere to new formatting standards, and we’ll have fewer
conflicts when merging `bundle-optimizations` into `release`. (I’ll
merge `release` back into `bundle-optimizations` once this PR is
merged.)
### Why is this needed?
This PR is needed because, for the Lodash optimization from
https://github.com/appsmithorg/appsmith/commit/7cbb12af886621256224be0c93e6a465dd710ad3,
we need to use `import type`. Otherwise, `babel-plugin-lodash` complains
that `LoDashStatic` is not a lodash function.
However, just using `import type` in the current codebase will give you
this:
<img width="962" alt="Screenshot 2023-03-08 at 17 45 59"
src="https://user-images.githubusercontent.com/2953267/223775744-407afa0c-e8b9-44a1-90f9-b879348da57f.png">
That’s because Prettier 1 can’t parse `import type` at all. To parse it,
we need to upgrade to Prettier 2.
### Why enforce `import type`?
Apart from just enabling `import type` support, this PR enforces
specifying `import type` everywhere it’s needed. (Developers will get
immediate TypeScript and ESLint errors when they forget to do so.)
I’m doing this because I believe `import type` improves DX and makes
refactorings easier.
Let’s say you had a few imports like below. Can you tell which of these
imports will increase the bundle size? (Tip: it’s not all of them!)
```ts
// app/client/src/workers/Linting/utils.ts
import { Position } from "codemirror";
import { LintError as JSHintError, LintOptions } from "jshint";
import { get, isEmpty, isNumber, keys, last, set } from "lodash";
```
It’s pretty hard, right?
What about now?
```ts
// app/client/src/workers/Linting/utils.ts
import type { Position } from "codemirror";
import type { LintError as JSHintError, LintOptions } from "jshint";
import { get, isEmpty, isNumber, keys, last, set } from "lodash";
```
Now, it’s clear that only `lodash` will be bundled.
This helps developers to see which imports are problematic, but it
_also_ helps with refactorings. Now, if you want to see where
`codemirror` is bundled, you can just grep for `import \{.*\} from
"codemirror"` – and you won’t get any type-only imports.
This also helps (some) bundlers. Upon transpiling, TypeScript erases
type-only imports completely. In some environment (not ours), this makes
the bundle smaller, as the bundler doesn’t need to bundle type-only
imports anymore.
## Type of change
- Chore (housekeeping or task changes that don't impact user perception)
## How Has This Been Tested?
This was tested to not break the build.
### 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
- [x] 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
- [x] 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:
- [ ] Test plan has been approved by relevant developers
- [ ] Test plan has been peer reviewed by QA
- [ ] Cypress test cases have been added and approved by either SDET or
manual QA
- [ ] Organized project review call with relevant stakeholders after
Round 1/2 of QA
- [ ] Added Test Plan Approved label after reveiwing all Cypress test
---------
Co-authored-by: Satish Gandham <hello@satishgandham.com>
Co-authored-by: Satish Gandham <satish.iitg@gmail.com>
2023-03-16 11:41:47 +00:00
|
|
|
import type { WidgetProps } from "widgets/BaseWidget";
|
2023-09-06 12:15:04 +00:00
|
|
|
import type { FlattenedWidgetProps } from "WidgetProvider/constants";
|
|
|
|
|
import type { WidgetType } from "../WidgetProvider/factory";
|
|
|
|
|
import WidgetFactory from "../WidgetProvider/factory";
|
2023-02-03 05:47:40 +00:00
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* 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,
|
|
|
|
|
) => {
|
2023-09-06 12:15:04 +00:00
|
|
|
const { getCanvasHeightOffset } = WidgetFactory.getWidgetMethods(widgetType);
|
2023-02-03 05:47:40 +00:00
|
|
|
let offset = 0;
|
2023-09-06 12:15:04 +00:00
|
|
|
|
|
|
|
|
if (getCanvasHeightOffset) {
|
|
|
|
|
offset = getCanvasHeightOffset(props);
|
2023-02-03 05:47:40 +00:00
|
|
|
}
|
2023-09-06 12:15:04 +00:00
|
|
|
|
2023-02-03 05:47:40 +00:00
|
|
|
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) => {
|
feat: Non auto height invisible widgets (#20118)
## 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
2023-02-14 13:36:19 +00:00
|
|
|
if (canvasWidgets[next].detachFromLayout) {
|
|
|
|
|
return prev;
|
|
|
|
|
}
|
|
|
|
|
if (canvasWidgets[next].bottomRow === canvasWidgets[next].topRow) {
|
|
|
|
|
return prev;
|
|
|
|
|
}
|
2023-02-03 05:47:40 +00:00
|
|
|
return canvasWidgets[next].bottomRow > prev
|
|
|
|
|
? canvasWidgets[next].bottomRow
|
|
|
|
|
: prev;
|
|
|
|
|
}, parentHeightInRows);
|
|
|
|
|
|
|
|
|
|
return bottomRow * GridDefaults.DEFAULT_GRID_ROW_HEIGHT;
|
|
|
|
|
}
|
|
|
|
|
return parentHeightInRows * GridDefaults.DEFAULT_GRID_ROW_HEIGHT;
|
|
|
|
|
}
|