π₯π₯π₯ Open-source Jira, Linear, Monday, and ClickUp alternative. Plane is a modern project management platform to manage tasks, sprints, docs, and triage.
TypeScript boardsbug-trackerdjangodockerganttissue-trackerjirajira-alternativekanbanlinearpostgresqlproduct-managementproject-managementproject-planningpythonreactredistypesciptvitework-management
refactor: remove cn helper function from the editor package (#6217)
Aaryan Khandelwal580c4b193068
diff --git a/packages/editor/package.json b/packages/editor/package.jsonindex 8f7295a0ed..9aa2f31d4d 100644--- a/packages/editor/package.json+++ b/packages/editor/package.json@@ -57,7 +57,6 @@"@tiptap/starter-kit": "^2.1.13","@tiptap/suggestion": "^2.0.13","class-variance-authority": "^0.7.0",- "clsx": "^1.2.1","highlight.js": "^11.8.0","jsx-dom-cjs": "^8.0.3","linkifyjs": "^4.1.3",@@ -66,7 +65,6 @@"prosemirror-codemark": "^0.4.2","prosemirror-utils": "^1.2.2","react-moveable": "^0.54.2",- "tailwind-merge": "^1.14.0","tippy.js": "^6.3.7","tiptap-markdown": "^0.8.9","uuid": "^10.0.0",diff --git a/packages/editor/src/core/components/editors/editor-container.tsx b/packages/editor/src/core/components/editors/editor-container.tsxindex e070d7e45e..d6563f7b08 100644--- a/packages/editor/src/core/components/editors/editor-container.tsx+++ b/packages/editor/src/core/components/editors/editor-container.tsx@@ -1,9 +1,9 @@import { FC, ReactNode } from "react";import { Editor } from "@tiptap/react";+// plane utils+import { cn } from "@plane/utils";// constantsimport { DEFAULT_DISPLAY_CONFIG } from "@/constants/config";-// helpers-import { cn } from "@/helpers/common";// typesimport { TDisplayConfig } from "@/types";diff --git a/packages/editor/src/core/components/menus/ai-menu.tsx b/packages/editor/src/core/components/menus/ai-menu.tsxindex 43793fae35..42b45509f7 100644--- a/packages/editor/src/core/components/menus/ai-menu.tsx+++ b/packages/editor/src/core/components/menus/ai-menu.tsx@@ -1,7 +1,7 @@import { useCallback, useEffect, useRef, useState } from "react";import tippy, { Instance } from "tippy.js";-// helpers-import { cn } from "@/helpers/common";+// plane utils+import { cn } from "@plane/utils";// typesimport { TAIHandler } from "@/types";diff --git a/packages/editor/src/core/components/menus/bubble-menu/alignment-selector.tsx b/packages/editor/src/core/components/menus/bubble-menu/alignment-selector.tsxindex e3ccc6cf62..24dfeceafd 100644--- a/packages/editor/src/core/components/menus/bubble-menu/alignment-selector.tsx+++ b/packages/editor/src/core/components/menus/bubble-menu/alignment-selector.tsx@@ -1,9 +1,9 @@import { Editor } from "@tiptap/core";import { AlignCenter, AlignLeft, AlignRight, LucideIcon } from "lucide-react";+// plane utils+import { cn } from "@plane/utils";// componentsimport { TextAlignItem } from "@/components/menus";-// helpers-import { cn } from "@/helpers/common";// typesimport { TEditorCommands } from "@/types";diff --git a/packages/editor/src/core/components/menus/bubble-menu/color-selector.tsx b/packages/editor/src/core/components/menus/bubble-menu/color-selector.tsxindex bc7f5a56f1..ba9278b675 100644--- a/packages/editor/src/core/components/menus/bubble-menu/color-selector.tsx+++ b/packages/editor/src/core/components/menus/bubble-menu/color-selector.tsx@@ -1,10 +1,11 @@import { Dispatch, FC, SetStateAction } from "react";import { Editor } from "@tiptap/react";import { ALargeSmall, Ban } from "lucide-react";+// plane utils+import { cn } from "@plane/utils";// constantsimport { COLORS_LIST } from "@/constants/common";// helpers-import { cn } from "@/helpers/common";import { BackgroundColorItem, TextColorItem } from "../menu-items";type Props = {diff --git a/packages/editor/src/core/components/menus/bubble-menu/link-selector.tsx b/packages/editor/src/core/components/menus/bubble-menu/link-selector.tsxindex eaa20ed26b..fe651fa4e1 100644--- a/packages/editor/src/core/components/menus/bubble-menu/link-selector.tsx+++ b/packages/editor/src/core/components/menus/bubble-menu/link-selector.tsx@@ -1,8 +1,10 @@import { Dispatch, FC, SetStateAction, useCallback, useEffect, useRef } from "react";import { Editor } from "@tiptap/core";import { Check, Link, Trash } from "lucide-react";+// plane utils+import { cn } from "@plane/utils";// helpers-import { cn, isValidHttpUrl } from "@/helpers/common";+import { isValidHttpUrl } from "@/helpers/common";import { setLinkEditor, unsetLinkEditor } from "@/helpers/editor-commands";type Props = {diff --git a/packages/editor/src/core/components/menus/bubble-menu/node-selector.tsx b/packages/editor/src/core/components/menus/bubble-menu/node-selector.tsxindex a121c48ef1..7d1378800c 100644--- a/packages/editor/src/core/components/menus/bubble-menu/node-selector.tsx+++ b/packages/editor/src/core/components/menus/bubble-menu/node-selector.tsx@@ -1,6 +1,8 @@import { Dispatch, FC, SetStateAction } from "react";import { Editor } from "@tiptap/react";import { Check, ChevronDown } from "lucide-react";+// plane utils+import { cn } from "@plane/utils";// componentsimport {BulletListItem,@@ -17,8 +19,6 @@ import {HeadingSixItem,EditorMenuItem,} from "@/components/menus";-// helpers-import { cn } from "@/helpers/common";// typesimport { TEditorCommands } from "@/types";diff --git a/packages/editor/src/core/components/menus/bubble-menu/root.tsx b/packages/editor/src/core/components/menus/bubble-menu/root.tsxindex 18079f089e..4ed3709f40 100644--- a/packages/editor/src/core/components/menus/bubble-menu/root.tsx+++ b/packages/editor/src/core/components/menus/bubble-menu/root.tsx@@ -1,5 +1,7 @@import { FC, useEffect, useState } from "react";import { BubbleMenu, BubbleMenuProps, Editor, isNodeSelection } from "@tiptap/react";+// plane utils+import { cn } from "@plane/utils";// componentsimport {BoldItem,@@ -13,8 +15,6 @@ import {} from "@/components/menus";// extensionsimport { isCellSelection } from "@/extensions/table/table/utilities/is-cell-selection";-// helpers-import { cn } from "@/helpers/common";// local componentsimport { TextAlignmentSelector } from "./alignment-selector";diff --git a/packages/editor/src/core/extensions/callout/color-selector.tsx b/packages/editor/src/core/extensions/callout/color-selector.tsxindex 489b051666..ddc3b879cf 100644--- a/packages/editor/src/core/extensions/callout/color-selector.tsx+++ b/packages/editor/src/core/extensions/callout/color-selector.tsx@@ -1,8 +1,8 @@import { Ban, ChevronDown } from "lucide-react";+// plane utils+import { cn } from "@plane/utils";// constantsimport { COLORS_LIST } from "@/constants/common";-// helpers-import { cn } from "@/helpers/common";type Props = {disabled: boolean;diff --git a/packages/editor/src/core/extensions/callout/logo-selector.tsx b/packages/editor/src/core/extensions/callout/logo-selector.tsxindex 4c78a2c047..8ea47d50d0 100644--- a/packages/editor/src/core/extensions/callout/logo-selector.tsx+++ b/packages/editor/src/core/extensions/callout/logo-selector.tsx@@ -2,8 +2,8 @@import { convertHexEmojiToDecimal } from "@plane/utils";// plane uiimport { EmojiIconPicker, EmojiIconPickerTypes, Logo, TEmojiLogoProps } from "@plane/ui";-// helpers-import { cn } from "@/helpers/common";+// plane utils+import { cn } from "@plane/utils";// typesimport { TCalloutBlockAttributes } from "./types";// utilsdiff --git a/packages/editor/src/core/extensions/code/code-block-node-view.tsx b/packages/editor/src/core/extensions/code/code-block-node-view.tsxindex 8dbdb044f1..a06d839908 100644--- a/packages/editor/src/core/extensions/code/code-block-node-view.tsx+++ b/packages/editor/src/core/extensions/code/code-block-node-view.tsx@@ -8,8 +8,8 @@ import { common, createLowlight } from "lowlight";import { CopyIcon, CheckIcon } from "lucide-react";// uiimport { Tooltip } from "@plane/ui";-// helpers-import { cn } from "@/helpers/common";+// plane utils+import { cn } from "@plane/utils";// we just have ts support for nowconst lowlight = createLowlight(common);diff --git a/packages/editor/src/core/extensions/custom-image/components/image-block.tsx b/packages/editor/src/core/extensions/custom-image/components/image-block.tsxindex b5b27e2718..89194aae0c 100644--- a/packages/editor/src/core/extensions/custom-image/components/image-block.tsx+++ b/packages/editor/src/core/extensions/custom-image/components/image-block.tsx@@ -1,9 +1,9 @@import React, { useRef, useState, useCallback, useLayoutEffect, useEffect } from "react";import { NodeSelection } from "@tiptap/pm/state";+// plane utils+import { cn } from "@plane/utils";// extensionsimport { CustoBaseImageNodeViewProps, ImageToolbarRoot } from "@/extensions/custom-image";-// helpers-import { cn } from "@/helpers/common";const MIN_SIZE = 100;diff --git a/packages/editor/src/core/extensions/custom-image/components/image-uploader.tsx b/packages/editor/src/core/extensions/custom-image/components/image-uploader.tsxindex 8ad99bc443..bcf78fe74b 100644--- a/packages/editor/src/core/extensions/custom-image/components/image-uploader.tsx+++ b/packages/editor/src/core/extensions/custom-image/components/image-uploader.tsx@@ -1,7 +1,7 @@import { ChangeEvent, useCallback, useEffect, useMemo, useRef } from "react";import { ImageIcon } from "lucide-react";-// helpers-import { cn } from "@/helpers/common";+// plane utils+import { cn } from "@plane/utils";// hooksimport { useUploader, useDropZone, uploadFirstImageAndInsertRemaining } from "@/hooks/use-file-upload";// extensionsdiff --git a/packages/editor/src/core/extensions/custom-image/components/toolbar/full-screen.tsx b/packages/editor/src/core/extensions/custom-image/components/toolbar/full-screen.tsxindex 38ea23c992..92b5904fbf 100644--- a/packages/editor/src/core/extensions/custom-image/components/toolbar/full-screen.tsx+++ b/packages/editor/src/core/extensions/custom-image/components/toolbar/full-screen.tsx@@ -1,7 +1,7 @@import { useCallback, useEffect, useMemo, useRef, useState } from "react";import { ExternalLink, Maximize, Minus, Plus, X } from "lucide-react";-// helpers-import { cn } from "@/helpers/common";+// plane utils+import { cn } from "@plane/utils";type Props = {image: {diff --git a/packages/editor/src/core/extensions/custom-image/components/toolbar/root.tsx b/packages/editor/src/core/extensions/custom-image/components/toolbar/root.tsxindex d42d875cc9..3179db0d4c 100644--- a/packages/editor/src/core/extensions/custom-image/components/toolbar/root.tsx+++ b/packages/editor/src/core/extensions/custom-image/components/toolbar/root.tsx@@ -1,6 +1,6 @@import { useState } from "react";-// helpers-import { cn } from "@/helpers/common";+// plane utils+import { cn } from "@plane/utils";// componentsimport { ImageFullScreenAction } from "./full-screen";diff --git a/packages/editor/src/core/extensions/mentions/mention-node-view.tsx b/packages/editor/src/core/extensions/mentions/mention-node-view.tsxindex 5121eae4af..0bf088ca58 100644--- a/packages/editor/src/core/extensions/mentions/mention-node-view.tsx+++ b/packages/editor/src/core/extensions/mentions/mention-node-view.tsx@@ -5,8 +5,8 @@// @ts-nocheckimport { useEffect, useState } from "react";import { NodeViewWrapper } from "@tiptap/react";-// helpers-import { cn } from "@/helpers/common";+// plane utils+import { cn } from "@plane/utils";// typesimport { IMentionHighlight } from "@/types";diff --git a/packages/editor/src/core/extensions/mentions/mentions-list.tsx b/packages/editor/src/core/extensions/mentions/mentions-list.tsxindex 279567a203..ed8d0ba4af 100644--- a/packages/editor/src/core/extensions/mentions/mentions-list.tsx+++ b/packages/editor/src/core/extensions/mentions/mentions-list.tsx@@ -5,8 +5,8 @@ import { Editor } from "@tiptap/react";import { v4 as uuidv4 } from "uuid";// uiimport { Avatar } from "@plane/ui";-// helpers-import { cn } from "@/helpers/common";+// plane utils+import { cn } from "@plane/utils";// typesimport { IMentionSuggestion } from "@/types";diff --git a/packages/editor/src/core/extensions/slash-commands/command-menu-item.tsx b/packages/editor/src/core/extensions/slash-commands/command-menu-item.tsxindex 3a03c3b6a7..bd8ce2aecd 100644--- a/packages/editor/src/core/extensions/slash-commands/command-menu-item.tsx+++ b/packages/editor/src/core/extensions/slash-commands/command-menu-item.tsx@@ -1,5 +1,5 @@-// helpers-import { cn } from "@/helpers/common";+// plane utils+import { cn } from "@plane/utils";// typesimport { ISlashCommandItem } from "@/types";diff --git a/packages/editor/src/core/helpers/common.ts b/packages/editor/src/core/helpers/common.tsindex 0fb32310d6..8638d2c151 100644--- a/packages/editor/src/core/helpers/common.ts+++ b/packages/editor/src/core/helpers/common.ts@@ -1,6 +1,6 @@import { EditorState, Selection } from "@tiptap/pm/state";-import { clsx, type ClassValue } from "clsx";-import { twMerge } from "tailwind-merge";+// plane utils+import { cn } from "@plane/utils";interface EditorClassNames {noBorder?: boolean;@@ -18,10 +18,6 @@ export const getEditorClassNames = ({ noBorder, borderOnFocus, containerClassNamcontainerClassName);-export function cn(...inputs: ClassValue[]) {- return twMerge(clsx(inputs));-}-// Helper function to find the parent node of a specific typeexport function findParentNodeOfType(selection: Selection, typeName: string) {let depth = selection.$anchor.depth;diff --git a/packages/editor/src/core/props/props.tsx b/packages/editor/src/core/props/props.tsxindex 4bda3e51a2..ee0b9e5000 100644--- a/packages/editor/src/core/props/props.tsx+++ b/packages/editor/src/core/props/props.tsx@@ -1,6 +1,6 @@import { EditorProps } from "@tiptap/pm/view";-// helpers-import { cn } from "@/helpers/common";+// plane utils+import { cn } from "@plane/utils";export type TCoreEditorProps = {editorClassName: string;diff --git a/packages/editor/src/core/props/read-only.tsx b/packages/editor/src/core/props/read-only.tsxindex aaa635a508..ea5bf09f3a 100644--- a/packages/editor/src/core/props/read-only.tsx+++ b/packages/editor/src/core/props/read-only.tsx@@ -1,6 +1,6 @@import { EditorProps } from "@tiptap/pm/view";-// helpers-import { cn } from "@/helpers/common";+// plane utils+import { cn } from "@plane/utils";// propsimport { TCoreEditorProps } from "@/props";diff --git a/packages/utils/package.json b/packages/utils/package.jsonindex a0e0ecca14..69519e5704 100644--- a/packages/utils/package.json+++ b/packages/utils/package.json@@ -15,8 +15,10 @@"lint:errors": "eslint src --ext .ts,.tsx --quiet"},"dependencies": {+ "clsx": "^2.1.1","isomorphic-dompurify": "^2.16.0",- "react": "^18.3.1"+ "react": "^18.3.1",+ "tailwind-merge": "^2.5.5"},"devDependencies": {"@plane/eslint-config": "*",diff --git a/packages/utils/src/common.ts b/packages/utils/src/common.tsnew file mode 100644index 0000000000..a500a73858--- /dev/null+++ b/packages/utils/src/common.ts@@ -0,0 +1,4 @@+import { clsx, type ClassValue } from "clsx";+import { twMerge } from "tailwind-merge";++export const cn = (...inputs: ClassValue[]) => twMerge(clsx(inputs));diff --git a/packages/utils/src/index.ts b/packages/utils/src/index.tsindex 7e63eed792..cf62953452 100644--- a/packages/utils/src/index.ts+++ b/packages/utils/src/index.ts@@ -1,3 +1,4 @@export * from "./color";+export * from "./common";export * from "./emoji";export * from "./string";diff --git a/space/core/components/issues/issue-layouts/kanban/block-reactions.tsx b/space/core/components/issues/issue-layouts/kanban/block-reactions.tsxindex 241a087e78..a7ffd38ae8 100644--- a/space/core/components/issues/issue-layouts/kanban/block-reactions.tsx+++ b/space/core/components/issues/issue-layouts/kanban/block-reactions.tsx@@ -1,7 +1,7 @@import { observer } from "mobx-react";import { useParams } from "next/navigation";-//plane-import { cn } from "@plane/editor";+// plane utils+import { cn } from "@plane/utils";// componentsimport { IssueEmojiReactions, IssueVotes } from "@/components/issues/reactions";// hooksdiff --git a/space/core/components/issues/issue-layouts/kanban/block.tsx b/space/core/components/issues/issue-layouts/kanban/block.tsxindex 7c246cc339..1975963cc1 100644--- a/space/core/components/issues/issue-layouts/kanban/block.tsx+++ b/space/core/components/issues/issue-layouts/kanban/block.tsx@@ -4,10 +4,12 @@ import { MutableRefObject } from "react";import { observer } from "mobx-react";import Link from "next/link";import { useParams, useSearchParams } from "next/navigation";-// plane-import { cn } from "@plane/editor";+// plane typesimport { IIssueDisplayProperties } from "@plane/types";+// plane uiimport { Tooltip } from "@plane/ui";+// plane utils+import { cn } from "@plane/utils";// componentsimport { WithDisplayPropertiesHOC } from "@/components/issues/issue-layouts/with-display-properties-HOC";// helpersdiff --git a/space/core/components/issues/issue-layouts/list/block.tsx b/space/core/components/issues/issue-layouts/list/block.tsxindex 39a298448a..6d4fb0983f 100644--- a/space/core/components/issues/issue-layouts/list/block.tsx+++ b/space/core/components/issues/issue-layouts/list/block.tsx@@ -4,10 +4,12 @@ import { useRef } from "react";import { observer } from "mobx-react";import Link from "next/link";import { useParams, useSearchParams } from "next/navigation";-// types-import { cn } from "@plane/editor";+// plane typesimport { IIssueDisplayProperties } from "@plane/types";+// plane uiimport { Tooltip } from "@plane/ui";+// plane utils+import { cn } from "@plane/utils";// helpersimport { queryParamGenerator } from "@/helpers/query-param-generator";// hooksdiff --git a/space/core/components/issues/issue-layouts/list/list-group.tsx b/space/core/components/issues/issue-layouts/list/list-group.tsxindex 742cfeef15..75d280d0d0 100644--- a/space/core/components/issues/issue-layouts/list/list-group.tsx+++ b/space/core/components/issues/issue-layouts/list/list-group.tsx@@ -2,9 +2,10 @@import { Fragment, MutableRefObject, forwardRef, useRef, useState } from "react";import { observer } from "mobx-react";-import { cn } from "@plane/editor";-// plane+// plane typesimport { IGroupByColumn, TIssueGroupByOptions, IIssueDisplayProperties, TPaginationData, TLoader } from "@plane/types";+// plane utils+import { cn } from "@plane/utils";// hooksimport { useIntersectionObserver } from "@/hooks/use-intersection-observer";//diff --git a/space/core/components/issues/issue-layouts/properties/all-properties.tsx b/space/core/components/issues/issue-layouts/properties/all-properties.tsxindex 3c596cb53c..66e9ab2960 100644--- a/space/core/components/issues/issue-layouts/properties/all-properties.tsx+++ b/space/core/components/issues/issue-layouts/properties/all-properties.tsx@@ -2,11 +2,12 @@import { observer } from "mobx-react";import { Layers, Link, Paperclip } from "lucide-react";-// types-import { cn } from "@plane/editor";+// plane typesimport { IIssueDisplayProperties } from "@plane/types";+// plane uiimport { Tooltip } from "@plane/ui";-// ui+// plane utils+import { cn } from "@plane/utils";// componentsimport {IssueBlockDate,diff --git a/space/core/components/issues/issue-layouts/properties/cycle.tsx b/space/core/components/issues/issue-layouts/properties/cycle.tsxindex 52c1057897..1774781cd3 100644--- a/space/core/components/issues/issue-layouts/properties/cycle.tsx+++ b/space/core/components/issues/issue-layouts/properties/cycle.tsx@@ -1,9 +1,10 @@"use client";import { observer } from "mobx-react";-// ui-import { cn } from "@plane/editor";+// plane uiimport { ContrastIcon, Tooltip } from "@plane/ui";+// plane utils+import { cn } from "@plane/utils";//hooksimport { useCycle } from "@/hooks/store/use-cycle";diff --git a/space/core/components/issues/issue-layouts/properties/member.tsx b/space/core/components/issues/issue-layouts/properties/member.tsxindex bac44d5232..9ae3314f18 100644--- a/space/core/components/issues/issue-layouts/properties/member.tsx+++ b/space/core/components/issues/issue-layouts/properties/member.tsx@@ -3,9 +3,10 @@import { observer } from "mobx-react";// iconsimport { LucideIcon, Users } from "lucide-react";-// ui-import { cn } from "@plane/editor";+// plane uiimport { Avatar, AvatarGroup } from "@plane/ui";+// plane utils+import { cn } from "@plane/utils";// hooksimport { useMember } from "@/hooks/store/use-member";//diff --git a/space/core/components/issues/issue-layouts/properties/modules.tsx b/space/core/components/issues/issue-layouts/properties/modules.tsxindex eaa30d9908..465f469c0b 100644--- a/space/core/components/issues/issue-layouts/properties/modules.tsx+++ b/space/core/components/issues/issue-layouts/properties/modules.tsx@@ -1,9 +1,10 @@"use client";import { observer } from "mobx-react";-// planes-import { cn } from "@plane/editor";+// plane uiimport { DiceIcon, Tooltip } from "@plane/ui";+// plane utils+import { cn } from "@plane/utils";// hooksimport { useModule } from "@/hooks/store/use-module";diff --git a/space/core/components/issues/issue-layouts/properties/state.tsx b/space/core/components/issues/issue-layouts/properties/state.tsxindex 56a09bcd99..1d2d1c6fe8 100644--- a/space/core/components/issues/issue-layouts/properties/state.tsx+++ b/space/core/components/issues/issue-layouts/properties/state.tsx@@ -1,9 +1,10 @@"use client";import { observer } from "mobx-react";-// ui-import { cn } from "@plane/editor";+// plane uiimport { StateGroupIcon, Tooltip } from "@plane/ui";+// plane utils+import { cn } from "@plane/utils";//hooksimport { useStates } from "@/hooks/store";diff --git a/web/ce/components/workflow/add-state-transition.tsx b/web/ce/components/workflow/add-state-transition.tsxindex 48ba6c02ab..a22769ba25 100644--- a/web/ce/components/workflow/add-state-transition.tsx+++ b/web/ce/components/workflow/add-state-transition.tsx@@ -1,6 +1,6 @@import { Plus } from "lucide-react";-// Plane-import { cn } from "@plane/editor";+// plane utils+import { cn } from "@plane/utils";type Props = {workspaceSlug: string;diff --git a/web/core/components/common/access-field.tsx b/web/core/components/common/access-field.tsxindex dd7606a3ae..b619dde44f 100644--- a/web/core/components/common/access-field.tsx+++ b/web/core/components/common/access-field.tsx@@ -1,6 +1,8 @@import { LucideIcon } from "lucide-react";-import { cn } from "@plane/editor";+// plane uiimport { Tooltip } from "@plane/ui";+// plane utils+import { cn } from "@plane/utils";type Props = {onChange: (value: number) => void;diff --git a/web/core/components/dropdowns/layout.tsx b/web/core/components/dropdowns/layout.tsxindex 7864d1849d..826475c69c 100644--- a/web/core/components/dropdowns/layout.tsx+++ b/web/core/components/dropdowns/layout.tsx@@ -1,9 +1,10 @@import { useCallback, useMemo } from "react";import { observer } from "mobx-react";import { Check } from "lucide-react";-// plane packages-import { cn } from "@plane/editor";+// plane uiimport { Dropdown } from "@plane/ui";+// plane utils+import { cn } from "@plane/utils";// constantsimport { EIssueLayoutTypes, ISSUE_LAYOUT_MAP } from "@/constants/issue";diff --git a/web/core/components/dropdowns/member/avatar.tsx b/web/core/components/dropdowns/member/avatar.tsxindex 9907de3599..0b2189f651 100644--- a/web/core/components/dropdowns/member/avatar.tsx+++ b/web/core/components/dropdowns/member/avatar.tsx@@ -3,8 +3,9 @@import { observer } from "mobx-react";import { LucideIcon, Users } from "lucide-react";// plane ui-import { cn } from "@plane/editor";import { Avatar, AvatarGroup } from "@plane/ui";+// plane utils+import { cn } from "@plane/utils";// helpersimport { getFileURL } from "@/helpers/file.helper";// hooksdiff --git a/web/core/components/gantt-chart/chart/views/quarter.tsx b/web/core/components/gantt-chart/chart/views/quarter.tsxindex 421d0bdfec..ee1a11c573 100644--- a/web/core/components/gantt-chart/chart/views/quarter.tsx+++ b/web/core/components/gantt-chart/chart/views/quarter.tsx@@ -1,7 +1,7 @@import { FC } from "react";import { observer } from "mobx-react";-// Plane-import { cn } from "@plane/editor";+// plane utils+import { cn } from "@plane/utils";// hooksimport { useTimeLineChartStore } from "@/hooks/use-timeline-chart";//diff --git a/web/core/components/gantt-chart/chart/views/week.tsx b/web/core/components/gantt-chart/chart/views/week.tsxindex 2096acbc2b..7c38d97ee8 100644--- a/web/core/components/gantt-chart/chart/views/week.tsx+++ b/web/core/components/gantt-chart/chart/views/week.tsx@@ -1,7 +1,7 @@import { FC } from "react";import { observer } from "mobx-react";-// Plane-import { cn } from "@plane/editor";+// plane utils+import { cn } from "@plane/utils";// hooksimport { useTimeLineChartStore } from "@/hooks/use-timeline-chart";//diff --git a/web/core/components/gantt-chart/helpers/blockResizables/left-resizable.tsx b/web/core/components/gantt-chart/helpers/blockResizables/left-resizable.tsxindex b5f0de5c15..99b96e786d 100644--- a/web/core/components/gantt-chart/helpers/blockResizables/left-resizable.tsx+++ b/web/core/components/gantt-chart/helpers/blockResizables/left-resizable.tsx@@ -1,7 +1,7 @@import { useState } from "react";import { observer } from "mobx-react";-// Plane-import { cn } from "@plane/editor";+// plane utils+import { cn } from "@plane/utils";//helpersimport { renderFormattedDate } from "@/helpers/date-time.helper";//hooksdiff --git a/web/core/components/gantt-chart/helpers/blockResizables/right-resizable.tsx b/web/core/components/gantt-chart/helpers/blockResizables/right-resizable.tsxindex bb262875b5..8370a7630a 100644--- a/web/core/components/gantt-chart/helpers/blockResizables/right-resizable.tsx+++ b/web/core/components/gantt-chart/helpers/blockResizables/right-resizable.tsx@@ -1,7 +1,7 @@import { useState } from "react";import { observer } from "mobx-react";-// Plane-import { cn } from "@plane/editor";+// plane utils+import { cn } from "@plane/utils";//helpersimport { renderFormattedDate } from "@/helpers/date-time.helper";//hooksdiff --git a/web/core/components/inbox/inbox-filter/root.tsx b/web/core/components/inbox/inbox-filter/root.tsxindex 0476103310..df4fcf69fb 100644--- a/web/core/components/inbox/inbox-filter/root.tsx+++ b/web/core/components/inbox/inbox-filter/root.tsx@@ -1,8 +1,10 @@import { FC } from "react";import { ChevronDown, ListFilter } from "lucide-react";-// components-import { cn } from "@plane/editor";+// plane uiimport { getButtonStyling } from "@plane/ui";+// plane utils+import { cn } from "@plane/utils";+// componentsimport { InboxIssueFilterSelection, InboxIssueOrderByDropdown } from "@/components/inbox/inbox-filter";import { FiltersDropdown } from "@/components/issues";import useSize from "@/hooks/use-window-size";diff --git a/web/core/components/issues/issue-layouts/list/list-group.tsx b/web/core/components/issues/issue-layouts/list/list-group.tsxindex 7e8f3d2912..ece6f1253d 100644--- a/web/core/components/issues/issue-layouts/list/list-group.tsx+++ b/web/core/components/issues/issue-layouts/list/list-group.tsx@@ -4,8 +4,7 @@ import { MutableRefObject, useEffect, useRef, useState } from "react";import { combine } from "@atlaskit/pragmatic-drag-and-drop/combine";import { dropTargetForElements } from "@atlaskit/pragmatic-drag-and-drop/element/adapter";import { observer } from "mobx-react";-import { cn } from "@plane/editor";-// plane packages+// plane uiimport {IGroupByColumn,TIssueMap,@@ -16,6 +15,8 @@ import {TIssueKanbanFilters,} from "@plane/types";import { Row, setToast, TOAST_TYPE } from "@plane/ui";+// plane utils+import { cn } from "@plane/utils";// componentsimport { ListLoaderItemRow } from "@/components/ui";// constantsdiff --git a/web/core/components/modules/module-view-header.tsx b/web/core/components/modules/module-view-header.tsxindex 592c1e80d7..04403d2320 100644--- a/web/core/components/modules/module-view-header.tsx+++ b/web/core/components/modules/module-view-header.tsx@@ -3,10 +3,9 @@import React, { FC, useCallback, useEffect, useRef, useState } from "react";import { observer } from "mobx-react";import { useParams } from "next/navigation";-// iconsimport { ListFilter, Search, X } from "lucide-react";-// editor-import { cn } from "@plane/editor";+// plane utils+import { cn } from "@plane/utils";// plane helpersimport { useOutsideClickDetector } from "@plane/hooks";// typesdiff --git a/web/core/components/project/create/common-attributes.tsx b/web/core/components/project/create/common-attributes.tsxindex f753d0ae75..53da57d28d 100644--- a/web/core/components/project/create/common-attributes.tsx+++ b/web/core/components/project/create/common-attributes.tsx@@ -1,9 +1,10 @@import { ChangeEvent } from "react";import { Controller, useFormContext, UseFormSetValue } from "react-hook-form";import { Info } from "lucide-react";-import { cn } from "@plane/editor";-// ui+// plane uiimport { Input, TextArea, Tooltip } from "@plane/ui";+// plane utils+import { cn } from "@plane/utils";// constantsimport { ETabIndices } from "@/constants/tab-indices";// helpersdiff --git a/web/core/components/project/filters.tsx b/web/core/components/project/filters.tsxindex 9434f79951..2465bbc369 100644--- a/web/core/components/project/filters.tsx+++ b/web/core/components/project/filters.tsx@@ -2,9 +2,10 @@ import { useCallback } from "react";import { observer } from "mobx-react";import { useParams } from "next/navigation";import { ListFilter } from "lucide-react";-// types-import { cn } from "@plane/editor";+// plane typesimport { TProjectFilters } from "@plane/types";+// plane utils+import { cn } from "@plane/utils";// componentsimport { FiltersDropdown } from "@/components/issues";import { ProjectFiltersSelection, ProjectOrderByDropdown } from "@/components/project";diff --git a/web/core/components/ui/loader/layouts/kanban-layout-loader.tsx b/web/core/components/ui/loader/layouts/kanban-layout-loader.tsxindex ebf92445e8..9cf250a189 100644--- a/web/core/components/ui/loader/layouts/kanban-layout-loader.tsx+++ b/web/core/components/ui/loader/layouts/kanban-layout-loader.tsx@@ -1,7 +1,9 @@import { forwardRef } from "react";import range from "lodash/range";-import { cn } from "@plane/editor";+// plane uiimport { ContentWrapper } from "@plane/ui";+// plane utils+import { cn } from "@plane/utils";export const KanbanIssueBlockLoader = forwardRef<HTMLSpanElement, { cardHeight?: number; shouldAnimate?: boolean }>(({ cardHeight = 100, shouldAnimate = true }, ref) => (diff --git a/web/core/components/ui/loader/layouts/list-layout-loader.tsx b/web/core/components/ui/loader/layouts/list-layout-loader.tsxindex 65d4d1565a..fdcaf88984 100644--- a/web/core/components/ui/loader/layouts/list-layout-loader.tsx+++ b/web/core/components/ui/loader/layouts/list-layout-loader.tsx@@ -1,7 +1,9 @@import { Fragment, forwardRef } from "react";import range from "lodash/range";-import { cn } from "@plane/editor";+// plane uiimport { Row } from "@plane/ui";+// plane utils+import { cn } from "@plane/utils";import { getRandomInt, getRandomLength } from "../utils";export const ListLoaderItemRow = forwardRef<diff --git a/web/core/components/workspace/logo.tsx b/web/core/components/workspace/logo.tsxindex 4407205e07..460e076c5f 100644--- a/web/core/components/workspace/logo.tsx+++ b/web/core/components/workspace/logo.tsx@@ -1,5 +1,6 @@+// plane utils+import { cn } from "@plane/utils";// helpers-import { cn } from "@plane/editor";import { getFileURL } from "@/helpers/file.helper";type Props = {diff --git a/yarn.lock b/yarn.lockindex 26849e4e99..ca19c7554a 100644--- a/yarn.lock+++ b/yarn.lock@@ -5400,11 +5400,6 @@ clone@^2.1.2:resolved "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz"integrity sha512-3Pe/CF1Nn94hyhIYpjtiLhdCoEoz0DqQ+988E9gmeEdQZlojxnOb74wctFyuwWQHzqyf9X7C7MG8juUpqBJT8w==-clsx@^1.2.1:- version "1.2.1"- resolved "https://registry.npmjs.org/clsx/-/clsx-1.2.1.tgz"- integrity sha512-EcR6r5a8bj6pu3ycsa/E/cKVGuTgZJZdsyUYHOksG/UHIiKfjxzRxYJpyVBwYaQeOvghal9fcc4PidlgzugAQg==-clsx@^2.0.0, clsx@^2.1.0, clsx@^2.1.1:version "2.1.1"resolved "https://registry.npmjs.org/clsx/-/clsx-2.1.1.tgz"@@ -11271,16 +11266,7 @@ streamx@^2.15.0, streamx@^2.20.0:optionalDependencies:bare-events "^2.2.0"-"string-width-cjs@npm:string-width@^4.2.0":- version "4.2.3"- resolved "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz"- integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==- dependencies:- emoji-regex "^8.0.0"- is-fullwidth-code-point "^3.0.0"- strip-ansi "^6.0.1"--string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:+"string-width-cjs@npm:string-width@^4.2.0", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:version "4.2.3"resolved "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz"integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==@@ -11368,14 +11354,7 @@ string_decoder@^1.1.1, string_decoder@^1.3.0:dependencies:safe-buffer "~5.2.0"-"strip-ansi-cjs@npm:strip-ansi@^6.0.1":- version "6.0.1"- resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz"- integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==- dependencies:- ansi-regex "^5.0.1"--strip-ansi@^6.0.0, strip-ansi@^6.0.1:+"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1:version "6.0.1"resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz"integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==@@ -11516,12 +11495,7 @@ tabbable@^6.0.0:resolved "https://registry.npmjs.org/tabbable/-/tabbable-6.2.0.tgz"integrity sha512-Cat63mxsVJlzYvN51JmVXIgNoUokrIaT2zLclCXjRd8boZ0004U4KCs/sToJ75C6sdlByWxpYnb5Boif1VSFew==-tailwind-merge@^1.14.0:- version "1.14.0"- resolved "https://registry.npmjs.org/tailwind-merge/-/tailwind-merge-1.14.0.tgz"- integrity sha512-3mFKyCo/MBcgyOTlrY8T7odzZFx+w+qKSMAmdFzRvqBfLlSigU6TZnlFHK0lkMwj9Bj8OYU+9yW9lmGuS0QEnQ==--tailwind-merge@^2.0.0:+tailwind-merge@^2.0.0, tailwind-merge@^2.5.5:version "2.5.5"resolved "https://registry.npmjs.org/tailwind-merge/-/tailwind-merge-2.5.5.tgz"integrity sha512-0LXunzzAZzo0tEPxV3I297ffKZPlKDrjj7NXphC8V5ak9yHC5zRmxnOe2m/Rd/7ivsOMJe3JZ2JVocoDdQTRBA==@@ -12631,16 +12605,7 @@ word-wrap@^1.2.5:resolved "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz"integrity sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==-"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0":- version "7.0.0"- resolved "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz"- integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==- dependencies:- ansi-styles "^4.0.0"- string-width "^4.1.0"- strip-ansi "^6.0.0"--wrap-ansi@^7.0.0:+"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0:version "7.0.0"resolved "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz"integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==