2021-08-26 10:52:45 +00:00
|
|
|
import React from "react";
|
2022-05-04 09:45:57 +00:00
|
|
|
import styled, { createGlobalStyle } from "styled-components";
|
2023-05-15 07:08:58 +00:00
|
|
|
import type { DropdownOption } from "@design-system/widgets-old";
|
|
|
|
|
import { Dropdown, Icon, IconSize } from "@design-system/widgets-old";
|
2021-09-09 15:10:22 +00:00
|
|
|
import { countryToFlag } from "./utilities";
|
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 { ISDCodeProps } from "constants/ISDCodes";
|
|
|
|
|
import { ISDCodeOptions } from "constants/ISDCodes";
|
2021-11-01 14:44:08 +00:00
|
|
|
import { Colors } from "constants/Colors";
|
2022-05-04 09:45:57 +00:00
|
|
|
import { Classes } from "@blueprintjs/core";
|
|
|
|
|
import { lightenColor } from "widgets/WidgetUtils";
|
2021-08-26 10:52:45 +00:00
|
|
|
|
|
|
|
|
const DropdownTriggerIconWrapper = styled.div<{ disabled?: boolean }>`
|
2022-05-04 09:45:57 +00:00
|
|
|
height: 100%;
|
2021-08-26 10:52:45 +00:00
|
|
|
display: flex;
|
|
|
|
|
align-items: center;
|
|
|
|
|
justify-content: space-between;
|
|
|
|
|
font-size: 14px;
|
2021-11-01 14:44:08 +00:00
|
|
|
line-height: ${(props) => (props.disabled ? 36 : 18)}px;
|
2021-08-26 10:52:45 +00:00
|
|
|
letter-spacing: -0.24px;
|
|
|
|
|
color: #090707;
|
2022-05-04 09:45:57 +00:00
|
|
|
cursor: pointer;
|
2021-08-26 10:52:45 +00:00
|
|
|
position: ${(props) => props.disabled && "absolute"};
|
2021-11-01 14:44:08 +00:00
|
|
|
|
|
|
|
|
.dropdown {
|
|
|
|
|
svg {
|
|
|
|
|
width: 14px;
|
|
|
|
|
height: 14px;
|
|
|
|
|
|
|
|
|
|
path {
|
|
|
|
|
fill: ${Colors.GREY_10} !important;
|
|
|
|
|
}
|
|
|
|
|
}
|
2021-08-26 10:52:45 +00:00
|
|
|
}
|
|
|
|
|
`;
|
|
|
|
|
|
2021-11-01 14:44:08 +00:00
|
|
|
const FlagWrapper = styled.span`
|
|
|
|
|
font-size: 20px;
|
|
|
|
|
line-height: 19px;
|
|
|
|
|
`;
|
|
|
|
|
|
2022-05-04 09:45:57 +00:00
|
|
|
export const PopoverStyles = createGlobalStyle<{
|
|
|
|
|
borderRadius: string;
|
|
|
|
|
portalClassName: string;
|
|
|
|
|
accentColor: string;
|
|
|
|
|
}>`
|
|
|
|
|
${(props) => `
|
|
|
|
|
.${props.portalClassName} .${Classes.POPOVER} {
|
|
|
|
|
border-radius: ${props.borderRadius} !important;
|
|
|
|
|
overflow: hidden;
|
|
|
|
|
box-shadow: 0 6px 20px 0px rgba(0, 0, 0, 0.15) !important;
|
|
|
|
|
margin-top: 4px !important;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
.${props.portalClassName} .${Classes.BUTTON} {
|
|
|
|
|
border-radius: ${props.borderRadius} !important;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
.${props.portalClassName} .${Classes.INPUT} {
|
|
|
|
|
border-radius: ${props.borderRadius} !important;
|
|
|
|
|
min-height: 32px;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
.${props.portalClassName} .${Classes.INPUT}:focus, .${
|
|
|
|
|
props.portalClassName
|
|
|
|
|
} .${Classes.INPUT}:active {
|
|
|
|
|
border: 1px solid ${props.accentColor} !important;
|
|
|
|
|
box-shadow: 0px 0px 0px 3px ${lightenColor(
|
|
|
|
|
props.accentColor,
|
|
|
|
|
)} !important;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
.${props.portalClassName} .t--dropdown-option:hover,
|
|
|
|
|
.${props.portalClassName} .t--dropdown-option.selected {
|
|
|
|
|
background-color: ${lightenColor(props.accentColor)} !important;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
.${props.portalClassName} .ads-dropdown-options-wrapper {
|
|
|
|
|
border: 0px solid !important;
|
|
|
|
|
}
|
|
|
|
|
`}
|
|
|
|
|
`;
|
|
|
|
|
|
2021-08-26 10:52:45 +00:00
|
|
|
const getISDCodeOptions = (): Array<DropdownOption> => {
|
|
|
|
|
return ISDCodeOptions.map((item: ISDCodeProps) => {
|
|
|
|
|
return {
|
|
|
|
|
leftElement: countryToFlag(item.code),
|
|
|
|
|
searchText: item.name,
|
|
|
|
|
label: `${item.name} (${item.dial_code})`,
|
|
|
|
|
value: item.code,
|
|
|
|
|
id: item.dial_code,
|
|
|
|
|
};
|
|
|
|
|
});
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
export const ISDCodeDropdownOptions = getISDCodeOptions();
|
|
|
|
|
|
|
|
|
|
export const getSelectedISDCode = (code?: string): DropdownOption => {
|
|
|
|
|
let selectedCountry: ISDCodeProps | undefined = code
|
|
|
|
|
? ISDCodeOptions.find((item: ISDCodeProps) => {
|
|
|
|
|
return item.code === code;
|
|
|
|
|
})
|
|
|
|
|
: undefined;
|
|
|
|
|
if (!selectedCountry) {
|
|
|
|
|
selectedCountry = {
|
|
|
|
|
name: "United States",
|
|
|
|
|
dial_code: "+1",
|
|
|
|
|
code: "US",
|
|
|
|
|
};
|
|
|
|
|
}
|
|
|
|
|
return {
|
|
|
|
|
label: `${selectedCountry.name} (${selectedCountry.dial_code})`,
|
|
|
|
|
searchText: selectedCountry.name,
|
|
|
|
|
value: selectedCountry.code,
|
|
|
|
|
id: selectedCountry.dial_code,
|
|
|
|
|
};
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
interface ISDCodeDropdownProps {
|
|
|
|
|
onISDCodeChange: (code?: string) => void;
|
|
|
|
|
options: Array<DropdownOption>;
|
|
|
|
|
selected: DropdownOption;
|
|
|
|
|
allowCountryCodeChange?: boolean;
|
|
|
|
|
disabled: boolean;
|
2022-05-04 09:45:57 +00:00
|
|
|
borderRadius: string;
|
|
|
|
|
accentColor: string;
|
|
|
|
|
widgetId: string;
|
2021-08-26 10:52:45 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
export default function ISDCodeDropdown(props: ISDCodeDropdownProps) {
|
|
|
|
|
const selectedCountry = getSelectedISDCode(props.selected.value);
|
|
|
|
|
const dropdownTrigger = (
|
|
|
|
|
<DropdownTriggerIconWrapper
|
2022-05-04 09:45:57 +00:00
|
|
|
className="gap-2 px-3 t--input-country-code-change focus:bg-gray-50"
|
2021-08-26 10:52:45 +00:00
|
|
|
disabled={props.disabled}
|
2022-05-04 09:45:57 +00:00
|
|
|
tabIndex={0}
|
2021-08-26 10:52:45 +00:00
|
|
|
>
|
2021-11-01 14:44:08 +00:00
|
|
|
<FlagWrapper>
|
2021-08-26 10:52:45 +00:00
|
|
|
{selectedCountry.value && countryToFlag(selectedCountry.value)}
|
2021-11-01 14:44:08 +00:00
|
|
|
</FlagWrapper>
|
2021-08-26 10:52:45 +00:00
|
|
|
<div className="code">{selectedCountry.id && selectedCountry.id}</div>
|
2021-11-01 14:44:08 +00:00
|
|
|
<Icon className="dropdown" name="down-arrow" size={IconSize.XXS} />
|
2021-08-26 10:52:45 +00:00
|
|
|
</DropdownTriggerIconWrapper>
|
|
|
|
|
);
|
|
|
|
|
if (props.disabled) {
|
|
|
|
|
return dropdownTrigger;
|
|
|
|
|
}
|
|
|
|
|
return (
|
2022-05-04 09:45:57 +00:00
|
|
|
<>
|
|
|
|
|
<Dropdown
|
|
|
|
|
containerClassName="country-type-filter"
|
|
|
|
|
dropdownHeight="139px"
|
|
|
|
|
dropdownTriggerIcon={dropdownTrigger}
|
|
|
|
|
enableSearch
|
|
|
|
|
height="36px"
|
|
|
|
|
onSelect={props.onISDCodeChange}
|
|
|
|
|
optionWidth="340px"
|
|
|
|
|
options={props.options}
|
|
|
|
|
portalClassName={`country-type-filter-dropdown-${props.widgetId}`}
|
|
|
|
|
searchPlaceholder="Search by ISD code or country"
|
|
|
|
|
selected={props.selected}
|
|
|
|
|
showLabelOnly
|
|
|
|
|
/>
|
|
|
|
|
<PopoverStyles
|
|
|
|
|
accentColor={props.accentColor}
|
|
|
|
|
borderRadius={props.borderRadius}
|
|
|
|
|
portalClassName={`country-type-filter-dropdown-${props.widgetId}`}
|
|
|
|
|
/>
|
|
|
|
|
</>
|
2021-08-26 10:52:45 +00:00
|
|
|
);
|
|
|
|
|
}
|