From 0b85cb567e9bc7eb82839c6b725abe42f7b0e8e8 Mon Sep 17 00:00:00 2001 From: johnnyjoy Date: Sat, 1 Feb 2025 22:04:29 +0800 Subject: [PATCH] chore(frontend): fix clsx --- web/src/components/ActivityCalendar.tsx | 7 +++---- web/src/components/Dialog/BaseDialog.tsx | 6 +++--- web/src/components/ExploreSidebar/ExploreSidebar.tsx | 4 ++-- web/src/components/HomeSidebar/HomeSidebar.tsx | 4 ++-- web/src/components/HomeSidebar/TagsSection.tsx | 4 ++-- web/src/components/Inbox/MemoCommentMessage.tsx | 6 +++--- web/src/components/Inbox/VersionUpdateMessage.tsx | 6 +++--- web/src/components/MemoActionMenu.tsx | 4 ++-- web/src/components/MemoContent/CodeBlock.tsx | 6 +++--- .../MemoContent/EmbeddedContent/EmbeddedMemo.tsx | 4 ++-- .../MemoContent/EmbeddedContent/EmbeddedResource.tsx | 4 ++-- web/src/components/MemoContent/List.tsx | 4 ++-- web/src/components/MemoContent/Math.tsx | 4 ++-- web/src/components/MemoContent/Spoiler.tsx | 6 +++--- web/src/components/MemoContent/Tag.tsx | 7 ++----- web/src/components/MemoContent/TaskListItem.tsx | 6 +++--- web/src/components/MemoContent/index.tsx | 4 ++-- .../components/MemoDetailSidebar/MemoDetailSidebar.tsx | 9 +++------ web/src/components/MemoDisplaySettingMenu.tsx | 4 ++-- .../components/MemoEditor/Editor/TagSuggestions.tsx | 4 ++-- web/src/components/MemoEditor/Editor/index.tsx | 7 ++----- web/src/components/MemoFilters.tsx | 6 +++--- .../MemoRelationForceGraph/MemoRelationForceGraph.tsx | 4 ++-- web/src/components/MemoRelationListView.tsx | 6 +++--- web/src/components/MemoView.tsx | 6 +++--- web/src/components/MobileHeader.tsx | 4 ++-- web/src/components/Navigation.tsx | 6 +++--- web/src/components/ReactionSelector.tsx | 6 +++--- web/src/components/ReactionView.tsx | 4 ++-- web/src/components/ResourceIcon.tsx | 8 ++++---- web/src/components/StatisticsView.tsx | 10 +++++----- web/src/components/UserAvatar.tsx | 4 ++-- web/src/components/UserBanner.tsx | 4 ++-- web/src/components/VisibilityIcon.tsx | 4 ++-- web/src/components/kit/OverflowTip.tsx | 4 ++-- web/src/components/ui/Popover.tsx | 6 +++--- web/src/layouts/RootLayout.tsx | 10 +++++----- web/src/locales/en.json | 6 +++--- web/src/pages/Explore.tsx | 6 +++--- web/src/pages/Home.tsx | 6 +++--- web/src/pages/MemoDetail.tsx | 6 +++--- web/src/utils/index.ts | 1 + web/src/utils/utils.ts | 4 ++-- 43 files changed, 111 insertions(+), 120 deletions(-) create mode 100644 web/src/utils/index.ts diff --git a/web/src/components/ActivityCalendar.tsx b/web/src/components/ActivityCalendar.tsx index e89b4382..54f29ae5 100644 --- a/web/src/components/ActivityCalendar.tsx +++ b/web/src/components/ActivityCalendar.tsx @@ -1,11 +1,10 @@ import { Tooltip } from "@mui/joy"; -import clsx from "clsx"; import dayjs from "dayjs"; import { useWorkspaceSettingStore } from "@/store/v1"; import { WorkspaceGeneralSetting } from "@/types/proto/api/v1/workspace_setting_service"; import { WorkspaceSettingKey } from "@/types/proto/store/workspace_setting"; +import { cn } from "@/utils"; import { useTranslate } from "@/utils/i18n"; -import { cn } from "@/utils/utils"; interface Props { month: string; // Format: 2021-1 @@ -66,9 +65,9 @@ const ActivityCalendar = (props: Props) => { } return ( -
+
{weekDays.map((day, index) => ( -
+
{day}
))} diff --git a/web/src/components/Dialog/BaseDialog.tsx b/web/src/components/Dialog/BaseDialog.tsx index fea14bd5..a09d112e 100644 --- a/web/src/components/Dialog/BaseDialog.tsx +++ b/web/src/components/Dialog/BaseDialog.tsx @@ -1,5 +1,4 @@ import { CssVarsProvider } from "@mui/joy"; -import clsx from "clsx"; import { useEffect, useRef } from "react"; import { createRoot } from "react-dom/client"; import { Provider } from "react-redux"; @@ -7,6 +6,7 @@ import CommonContextProvider from "@/layouts/CommonContextProvider"; import store from "@/store"; import { useDialogStore } from "@/store/module"; import theme from "@/theme"; +import { cn } from "@/utils"; import "@/less/base-dialog.less"; interface DialogConfig { @@ -56,8 +56,8 @@ const BaseDialog: React.FC = (props: Props) => { }; return ( -
-
e.stopPropagation()}> +
+
e.stopPropagation()}> {children}
diff --git a/web/src/components/ExploreSidebar/ExploreSidebar.tsx b/web/src/components/ExploreSidebar/ExploreSidebar.tsx index 4c1af790..8c331d67 100644 --- a/web/src/components/ExploreSidebar/ExploreSidebar.tsx +++ b/web/src/components/ExploreSidebar/ExploreSidebar.tsx @@ -1,7 +1,7 @@ -import clsx from "clsx"; import useDebounce from "react-use/lib/useDebounce"; import SearchBar from "@/components/SearchBar"; import { useUserStatsStore } from "@/store/v1"; +import { cn } from "@/utils"; import TagsSection from "../HomeSidebar/TagsSection"; import StatisticsView from "../StatisticsView"; @@ -22,7 +22,7 @@ const ExploreSidebar = (props: Props) => { return (