## 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
7cbb12af88,
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>
208 lines
6.6 KiB
TypeScript
208 lines
6.6 KiB
TypeScript
import type {
|
|
MouseEventHandler,
|
|
PropsWithChildren,
|
|
ReactNode,
|
|
RefObject,
|
|
} from "react";
|
|
import React, { useCallback, useEffect, useRef } from "react";
|
|
import styled from "styled-components";
|
|
import tinycolor from "tinycolor2";
|
|
import fastdom from "fastdom";
|
|
import { generateClassName, getCanvasClassName } from "utils/generators";
|
|
import type { WidgetStyleContainerProps } from "components/designSystems/appsmith/WidgetStyleContainer";
|
|
import WidgetStyleContainer from "components/designSystems/appsmith/WidgetStyleContainer";
|
|
import type { WidgetType } from "utils/WidgetFactory";
|
|
import { scrollCSS } from "widgets/WidgetUtils";
|
|
|
|
const StyledContainerComponent = styled.div<
|
|
Omit<ContainerWrapperProps, "widgetId">
|
|
>`
|
|
height: 100%;
|
|
width: 100%;
|
|
overflow: hidden;
|
|
${(props) => (!!props.dropDisabled ? `position: relative;` : ``)}
|
|
|
|
${(props) =>
|
|
props.shouldScrollContents && !props.$noScroll ? scrollCSS : ``}
|
|
opacity: ${(props) => (props.resizeDisabled ? "0.8" : "1")};
|
|
|
|
background: ${(props) => props.backgroundColor};
|
|
&:hover {
|
|
background-color: ${(props) => {
|
|
return props.onClickCapture && props.backgroundColor
|
|
? tinycolor(props.backgroundColor).darken(5).toString()
|
|
: props.backgroundColor;
|
|
}};
|
|
z-index: ${(props) => (props.onClickCapture ? "2" : "1")};
|
|
cursor: ${(props) => (props.onClickCapture ? "pointer" : "inherit")};
|
|
}
|
|
`;
|
|
|
|
interface ContainerWrapperProps {
|
|
onClick?: MouseEventHandler<HTMLDivElement>;
|
|
onClickCapture?: MouseEventHandler<HTMLDivElement>;
|
|
resizeDisabled?: boolean;
|
|
shouldScrollContents?: boolean;
|
|
backgroundColor?: string;
|
|
widgetId: string;
|
|
type: WidgetType;
|
|
dropDisabled?: boolean;
|
|
$noScroll: boolean;
|
|
}
|
|
function ContainerComponentWrapper(
|
|
props: PropsWithChildren<ContainerWrapperProps>,
|
|
) {
|
|
const containerRef: RefObject<HTMLDivElement> = useRef<HTMLDivElement>(null);
|
|
|
|
useEffect(() => {
|
|
if (!props.shouldScrollContents) {
|
|
const supportsNativeSmoothScroll =
|
|
"scrollBehavior" in document.documentElement.style;
|
|
|
|
fastdom.mutate(() => {
|
|
if (supportsNativeSmoothScroll) {
|
|
containerRef.current?.scrollTo({ top: 0, behavior: "smooth" });
|
|
} else {
|
|
if (containerRef.current) {
|
|
containerRef.current.scrollTop = 0;
|
|
}
|
|
}
|
|
});
|
|
}
|
|
}, [props.shouldScrollContents]);
|
|
|
|
/**
|
|
* This is for all the container widgets that have the onClickCapture method.
|
|
* The mouse over event makes sure to add the class `hover-styles` so that a
|
|
* darker shade of the background color takes effect to induce the hover effect.
|
|
*
|
|
* Why not use the :hover css selector?
|
|
* For cases like List widget, it can have inner list widgets; so there can be
|
|
* containers inside containers. When the inner container is hovered, the parent container's
|
|
* :hover selector is also triggered making the outer and inner container both having this
|
|
* hover effect.
|
|
*/
|
|
const onMouseOver = useCallback(
|
|
(e: React.MouseEvent<HTMLDivElement>) => {
|
|
const el = e.currentTarget;
|
|
const widgetType = el.getAttribute("type");
|
|
const widgetId = el.dataset.widgetid;
|
|
const isMainContainer = widgetId === "0";
|
|
|
|
if (
|
|
(widgetType === "CONTAINER_WIDGET" && props.onClickCapture) ||
|
|
isMainContainer
|
|
) {
|
|
const elementsHovered = document.getElementsByClassName(
|
|
"hover-styles",
|
|
) as HTMLCollectionOf<HTMLDivElement>;
|
|
|
|
fastdom.mutate(() => {
|
|
for (const elHovered of elementsHovered) {
|
|
elHovered.classList.remove("hover-styles");
|
|
}
|
|
|
|
if (!isMainContainer) {
|
|
el.classList.add("hover-styles");
|
|
}
|
|
});
|
|
}
|
|
},
|
|
[props.onClickCapture],
|
|
);
|
|
|
|
return (
|
|
<StyledContainerComponent
|
|
// Before you remove: generateClassName is used for bounding the resizables within this canvas
|
|
// getCanvasClassName is used to add a scrollable parent.
|
|
$noScroll={props.$noScroll}
|
|
backgroundColor={props.backgroundColor}
|
|
className={`${
|
|
props.shouldScrollContents ? getCanvasClassName() : ""
|
|
} ${generateClassName(props.widgetId)} container-with-scrollbar`}
|
|
data-widgetId={props.widgetId}
|
|
dropDisabled={props.dropDisabled}
|
|
onClick={props.onClick}
|
|
onClickCapture={props.onClickCapture}
|
|
onMouseOver={onMouseOver}
|
|
ref={containerRef}
|
|
resizeDisabled={props.resizeDisabled}
|
|
shouldScrollContents={!!props.shouldScrollContents}
|
|
tabIndex={props.shouldScrollContents ? undefined : 0}
|
|
type={props.type}
|
|
>
|
|
{props.children}
|
|
</StyledContainerComponent>
|
|
);
|
|
}
|
|
|
|
function ContainerComponent(props: ContainerComponentProps) {
|
|
if (props.detachFromLayout) {
|
|
return (
|
|
<ContainerComponentWrapper
|
|
$noScroll={!!props.noScroll}
|
|
dropDisabled={props.dropDisabled}
|
|
onClick={props.onClick}
|
|
onClickCapture={props.onClickCapture}
|
|
resizeDisabled={props.resizeDisabled}
|
|
shouldScrollContents={props.shouldScrollContents}
|
|
type={props.type}
|
|
widgetId={props.widgetId}
|
|
>
|
|
{props.children}
|
|
</ContainerComponentWrapper>
|
|
);
|
|
}
|
|
return (
|
|
<WidgetStyleContainer
|
|
backgroundColor={props.backgroundColor}
|
|
borderColor={props.borderColor}
|
|
borderRadius={props.borderRadius}
|
|
borderWidth={props.borderWidth}
|
|
boxShadow={props.boxShadow}
|
|
className="style-container"
|
|
containerStyle={props.containerStyle}
|
|
selected={props.selected}
|
|
widgetId={props.widgetId}
|
|
>
|
|
<ContainerComponentWrapper
|
|
$noScroll={!!props.noScroll}
|
|
backgroundColor={props.backgroundColor}
|
|
dropDisabled={props.dropDisabled}
|
|
onClick={props.onClick}
|
|
onClickCapture={props.onClickCapture}
|
|
resizeDisabled={props.resizeDisabled}
|
|
shouldScrollContents={props.shouldScrollContents}
|
|
type={props.type}
|
|
widgetId={props.widgetId}
|
|
>
|
|
{props.children}
|
|
</ContainerComponentWrapper>
|
|
</WidgetStyleContainer>
|
|
);
|
|
}
|
|
|
|
export type ContainerStyle = "border" | "card" | "rounded-border" | "none";
|
|
|
|
export interface ContainerComponentProps extends WidgetStyleContainerProps {
|
|
children?: ReactNode;
|
|
shouldScrollContents?: boolean;
|
|
resizeDisabled?: boolean;
|
|
selected?: boolean;
|
|
focused?: boolean;
|
|
detachFromLayout?: boolean;
|
|
onClick?: MouseEventHandler<HTMLDivElement>;
|
|
onClickCapture?: MouseEventHandler<HTMLDivElement>;
|
|
backgroundColor?: string;
|
|
type: WidgetType;
|
|
noScroll?: boolean;
|
|
minHeight?: number;
|
|
useAutoLayout?: boolean;
|
|
direction?: string;
|
|
justifyContent?: string;
|
|
alignItems?: string;
|
|
dropDisabled?: boolean;
|
|
}
|
|
|
|
export default ContainerComponent;
|