Skip to content

Commit 7b55679

Browse files
Merge branch 'preview' of github.com:makeplane/plane into fix-external-user-comment-and-reaction
2 parents f823b97 + 473535f commit 7b55679

File tree

6 files changed

+42
-43
lines changed

6 files changed

+42
-43
lines changed

apps/web/core/components/profile/overview/priority-distribution.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ export const ProfilePriorityDistribution: React.FC<Props> = ({ userProfile }) =>
4444
key: "count",
4545
label: "Count",
4646
stackId: "bar-one",
47-
fill: (payload) => priorityColors[payload.key as keyof typeof priorityColors],
47+
fill: (payload: any) => priorityColors[payload.key as keyof typeof priorityColors], // TODO: fix types
4848
textClassName: "",
4949
showPercentage: false,
5050
showTopBorderRadius: () => true,

apps/web/core/components/project/form.tsx

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,8 @@ import { useTranslation } from "@plane/i18n";
99
import { EmojiPicker } from "@plane/propel/emoji-icon-picker";
1010
import { Tooltip } from "@plane/propel/tooltip";
1111
import { IProject, IWorkspace } from "@plane/types";
12-
import {
13-
Button,
14-
CustomSelect,
15-
Input,
16-
TextArea,
17-
TOAST_TYPE,
18-
setToast,
19-
CustomEmojiIconPicker,
20-
EmojiIconPickerTypes,
21-
} from "@plane/ui";
22-
import { renderFormattedDate, convertHexEmojiToDecimal, getFileURL } from "@plane/utils";
12+
import { Button, CustomSelect, Input, TextArea, TOAST_TYPE, setToast, EmojiIconPickerTypes } from "@plane/ui";
13+
import { renderFormattedDate, getFileURL } from "@plane/utils";
2314
// components
2415
import { Logo } from "@/components/common/logo";
2516
import { ImagePickerPopover } from "@/components/core/image-picker-popover";
@@ -212,7 +203,8 @@ export const ProjectDetailsForm: FC<IProjectDetailsForm> = (props) => {
212203
className="flex items-center justify-center"
213204
buttonClassName="flex h-[52px] w-[52px] flex-shrink-0 items-center justify-center rounded-lg bg-white/10"
214205
label={<Logo logo={value} size={28} />}
215-
onChange={(val) => {
206+
// TODO: fix types
207+
onChange={(val: any) => {
216208
let logoValue = {};
217209

218210
if (val?.type === "emoji")

apps/web/core/components/views/form.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,8 @@ export const ProjectViewForm: React.FC<Props> = observer((props) => {
176176
</>
177177
</span>
178178
}
179-
onChange={(val) => {
179+
// TODO: fix types
180+
onChange={(val: any) => {
180181
let logoValue = {};
181182

182183
if (val?.type === "emoji")

packages/propel/package.json

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -16,22 +16,22 @@
1616
"build-storybook": "storybook build"
1717
},
1818
"exports": {
19-
"./avatar": "./src/avatar/index.ts",
20-
"./charts/*": "./src/charts/*/index.ts",
21-
"./dialog": "./src/dialog/index.ts",
22-
"./menu": "./src/menu/index.ts",
23-
"./table": "./src/table/index.ts",
24-
"./tabs": "./src/tabs/index.ts",
25-
"./popover": "./src/popover/index.ts",
26-
"./command": "./src/command/index.ts",
27-
"./combobox": "./src/combobox/index.ts",
28-
"./tooltip": "./src/tooltip/index.ts",
29-
"./styles/fonts": "./src/styles/fonts/index.css",
30-
"./switch": "./src/switch/index.ts",
31-
"./emoji-icon-picker": "./src/emoji-icon-picker/index.ts",
32-
"./utils": "./src/utils/index.ts",
33-
"./accordion": "./src/accordion/index.ts",
34-
"./card": "./src/card/index.ts"
19+
"./accordion": "./dist/accordion/index.ts",
20+
"./avatar": "./dist/avatar/index.ts",
21+
"./card": "./dist/card/index.ts",
22+
"./charts/*": "./dist/charts/*/index.ts",
23+
"./combobox": "./dist/combobox/index.ts",
24+
"./command": "./dist/command/index.ts",
25+
"./dialog": "./dist/dialog/index.ts",
26+
"./emoji-icon-picker": "./dist/emoji-icon-picker/index.ts",
27+
"./menu": "./dist/menu/index.ts",
28+
"./popover": "./dist/popover/index.ts",
29+
"./styles/fonts": "./dist/styles/fonts/index.css",
30+
"./switch": "./dist/switch/index.ts",
31+
"./table": "./dist/table/index.ts",
32+
"./tabs": "./dist/tabs/index.ts",
33+
"./tooltip": "./dist/tooltip/index.ts",
34+
"./utils": "./dist/utils/index.ts"
3535
},
3636
"dependencies": {
3737
"@base-ui-components/react": "^1.0.0-beta.2",

packages/propel/src/emoji-icon-picker/helper.tsx

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,33 @@
11
import { TPlacement, TSide, TAlign } from "../utils/placement";
22

3-
export enum EmojiIconPickerTypes {
4-
EMOJI = "emoji",
5-
ICON = "icon",
6-
}
3+
export const EmojiIconPickerTypes = {
4+
EMOJI: "emoji",
5+
ICON: "icon",
6+
} as const;
77

88
export type TChangeHandlerProps =
99
| {
10-
type: EmojiIconPickerTypes.EMOJI;
10+
type: typeof EmojiIconPickerTypes.EMOJI;
1111
value: string;
1212
}
1313
| {
14-
type: EmojiIconPickerTypes.ICON;
14+
type: typeof EmojiIconPickerTypes.ICON;
1515
value: {
1616
name: string;
1717
color: string;
1818
};
1919
};
2020

21+
export type TEmojiIconPickerTypes = typeof EmojiIconPickerTypes.EMOJI | typeof EmojiIconPickerTypes.ICON;
22+
2123
export type TCustomEmojiPicker = {
2224
isOpen: boolean;
2325
handleToggle: (value: boolean) => void;
2426
buttonClassName?: string;
2527
className?: string;
2628
closeOnSelect?: boolean;
2729
defaultIconColor?: string;
28-
defaultOpen?: EmojiIconPickerTypes;
30+
defaultOpen?: TEmojiIconPickerTypes;
2931
disabled?: boolean;
3032
dropdownClassName?: string;
3133
label: React.ReactNode;

packages/propel/tsdown.config.ts

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,24 @@ import { defineConfig } from "tsdown";
22

33
export default defineConfig({
44
entry: [
5+
"src/accordion/index.ts",
56
"src/avatar/index.ts",
6-
"src/charts/index.ts",
7+
"src/card/index.ts",
8+
"src/charts/*/index.ts",
9+
"src/combobox/index.ts",
10+
"src/command/index.ts",
711
"src/dialog/index.ts",
12+
"src/emoji-icon-picker/index.ts",
813
"src/menu/index.ts",
14+
"src/popover/index.ts",
15+
"src/switch/index.ts",
916
"src/table/index.ts",
1017
"src/tabs/index.ts",
11-
"src/popover/index.ts",
12-
"src/command/index.ts",
13-
"src/combobox/index.ts",
1418
"src/tooltip/index.ts",
15-
"src/card/index.ts",
16-
"src/switch/index.ts",
19+
"src/utils/index.ts",
1720
],
1821
outDir: "dist",
1922
format: ["esm", "cjs"],
2023
dts: true,
24+
copy: ["src/styles"],
2125
});

0 commit comments

Comments
 (0)