From ddf040dc0a165468c5c5f310e6009e2811d3b4fd Mon Sep 17 00:00:00 2001 From: moonrailgun Date: Tue, 1 Nov 2022 16:19:19 +0800 Subject: [PATCH] refactor: move all Icon import source to tailchat-design --- client/web/src/components/AvatarPicker.tsx | 2 +- client/web/src/components/AvatarUploader.tsx | 2 +- client/web/src/components/ChatBox/ChatInputBox/Addon.tsx | 2 +- .../ChatBox/ChatMessageList/useChatMessageItemAction.tsx | 2 +- .../ChatMessageList/useRenderPluginMessageInterpreter.tsx | 2 +- client/web/src/components/ChatBox/ChatReply.tsx | 2 +- client/web/src/components/GroupSection.tsx | 2 +- client/web/src/components/Icon.tsx | 6 ------ client/web/src/components/IsDeveloping.tsx | 2 +- client/web/src/components/Modal.tsx | 2 +- client/web/src/components/Panel/group/MembersPanel.tsx | 2 +- client/web/src/components/Spinner.tsx | 2 +- client/web/src/components/TipIcon.tsx | 2 +- .../web/src/components/modals/CreateGroupInvite/index.tsx | 2 +- client/web/src/components/modals/SettingsView/About.tsx | 2 +- client/web/src/plugin/component/index.tsx | 3 +-- client/web/src/routes/Entry/ForgetPasswordView.tsx | 2 +- client/web/src/routes/Entry/GuestView.tsx | 2 +- client/web/src/routes/Entry/LoginView.tsx | 2 +- client/web/src/routes/Entry/RegisterView.tsx | 2 +- client/web/src/routes/Main/Navbar/MobileMenuBtn.tsx | 2 +- client/web/src/routes/Main/Navbar/SettingBtn.tsx | 2 +- 22 files changed, 21 insertions(+), 28 deletions(-) delete mode 100644 client/web/src/components/Icon.tsx diff --git a/client/web/src/components/AvatarPicker.tsx b/client/web/src/components/AvatarPicker.tsx index 45ef20cf..81ed343b 100644 --- a/client/web/src/components/AvatarPicker.tsx +++ b/client/web/src/components/AvatarPicker.tsx @@ -2,7 +2,7 @@ import React, { PropsWithChildren, useRef, useState } from 'react'; import { closeModal, openModal } from './Modal'; import { showToasts, t } from 'tailchat-shared'; import { Avatar } from 'antd'; -import { Icon } from '@/components/Icon'; +import { Icon } from 'tailchat-design'; import { ModalAvatarCropper } from './modals/AvatarCropper'; import { isGIF } from '@/utils/file-helper'; diff --git a/client/web/src/components/AvatarUploader.tsx b/client/web/src/components/AvatarUploader.tsx index 24cdb622..aa857ec4 100644 --- a/client/web/src/components/AvatarUploader.tsx +++ b/client/web/src/components/AvatarUploader.tsx @@ -1,5 +1,5 @@ import { blobUrlToFile } from '@/utils/file-helper'; -import { Icon } from '@/components/Icon'; +import { Icon } from 'tailchat-design'; import clsx from 'clsx'; import React, { PropsWithChildren, useState } from 'react'; import { uploadFile, UploadFileResult, useAsyncRequest } from 'tailchat-shared'; diff --git a/client/web/src/components/ChatBox/ChatInputBox/Addon.tsx b/client/web/src/components/ChatBox/ChatInputBox/Addon.tsx index 914ef0a4..3a00f005 100644 --- a/client/web/src/components/ChatBox/ChatInputBox/Addon.tsx +++ b/client/web/src/components/ChatBox/ChatInputBox/Addon.tsx @@ -3,7 +3,7 @@ import { getMessageTextDecorators, pluginChatInputActions, } from '@/plugin/common'; -import { Icon } from '@/components/Icon'; +import { Icon } from 'tailchat-design'; import { Dropdown, Menu } from 'antd'; import React from 'react'; import { t } from 'tailchat-shared'; diff --git a/client/web/src/components/ChatBox/ChatMessageList/useChatMessageItemAction.tsx b/client/web/src/components/ChatBox/ChatMessageList/useChatMessageItemAction.tsx index cf400f46..40c3b876 100644 --- a/client/web/src/components/ChatBox/ChatMessageList/useChatMessageItemAction.tsx +++ b/client/web/src/components/ChatBox/ChatMessageList/useChatMessageItemAction.tsx @@ -1,4 +1,4 @@ -import { Icon } from '@/components/Icon'; +import { Icon } from 'tailchat-design'; import { Menu } from 'antd'; import React, { useCallback } from 'react'; import { diff --git a/client/web/src/components/ChatBox/ChatMessageList/useRenderPluginMessageInterpreter.tsx b/client/web/src/components/ChatBox/ChatMessageList/useRenderPluginMessageInterpreter.tsx index 036a2357..ecf1c27c 100644 --- a/client/web/src/components/ChatBox/ChatMessageList/useRenderPluginMessageInterpreter.tsx +++ b/client/web/src/components/ChatBox/ChatMessageList/useRenderPluginMessageInterpreter.tsx @@ -1,5 +1,5 @@ import { messageInterpreter } from '@/plugin/common'; -import { Icon } from '@/components/Icon'; +import { Icon } from 'tailchat-design'; import { Popover } from 'antd'; import React from 'react'; import { useMemo } from 'react'; diff --git a/client/web/src/components/ChatBox/ChatReply.tsx b/client/web/src/components/ChatBox/ChatReply.tsx index 2af03400..ccca13bd 100644 --- a/client/web/src/components/ChatBox/ChatReply.tsx +++ b/client/web/src/components/ChatBox/ChatReply.tsx @@ -3,7 +3,7 @@ import { t, useChatBoxContext, useSharedEventHandler } from 'tailchat-shared'; import _isNil from 'lodash/isNil'; import { getMessageRender } from '@/plugin/common'; import { UserName } from '../UserName'; -import { Icon } from '@/components/Icon'; +import { Icon } from 'tailchat-design'; export const ChatReply: React.FC = React.memo(() => { const { replyMsg, setReplyMsg, clearReplyMsg } = useChatBoxContext(); diff --git a/client/web/src/components/GroupSection.tsx b/client/web/src/components/GroupSection.tsx index fa4828cd..9c9055fe 100644 --- a/client/web/src/components/GroupSection.tsx +++ b/client/web/src/components/GroupSection.tsx @@ -1,4 +1,4 @@ -import { Icon } from '@/components/Icon'; +import { Icon } from 'tailchat-design'; import React, { PropsWithChildren } from 'react'; import { useReducer } from 'react'; diff --git a/client/web/src/components/Icon.tsx b/client/web/src/components/Icon.tsx deleted file mode 100644 index 6c98cace..00000000 --- a/client/web/src/components/Icon.tsx +++ /dev/null @@ -1,6 +0,0 @@ -export { - /** - * @deprecated please import it from `tailchat-design` - */ - Icon, -} from 'tailchat-design'; diff --git a/client/web/src/components/IsDeveloping.tsx b/client/web/src/components/IsDeveloping.tsx index 16f8aa49..e5e2130d 100644 --- a/client/web/src/components/IsDeveloping.tsx +++ b/client/web/src/components/IsDeveloping.tsx @@ -1,4 +1,4 @@ -import { Icon } from '@/components/Icon'; +import { Icon } from 'tailchat-design'; import { t } from 'tailchat-shared'; import React from 'react'; diff --git a/client/web/src/components/Modal.tsx b/client/web/src/components/Modal.tsx index 5608a4e0..87a80e46 100644 --- a/client/web/src/components/Modal.tsx +++ b/client/web/src/components/Modal.tsx @@ -12,7 +12,7 @@ import _isString from 'lodash/isString'; import _noop from 'lodash/noop'; import { PortalAdd, PortalRemove } from './Portal'; import { Button, Typography } from 'antd'; -import { Icon } from '@/components/Icon'; +import { Icon } from 'tailchat-design'; import { CSSTransition } from 'react-transition-group'; import clsx from 'clsx'; import { useIsMobile } from '@/hooks/useIsMobile'; diff --git a/client/web/src/components/Panel/group/MembersPanel.tsx b/client/web/src/components/Panel/group/MembersPanel.tsx index 7e541d2e..318bf09d 100644 --- a/client/web/src/components/Panel/group/MembersPanel.tsx +++ b/client/web/src/components/Panel/group/MembersPanel.tsx @@ -1,4 +1,4 @@ -import { Icon } from '@/components/Icon'; +import { Icon } from 'tailchat-design'; import { openReconfirmModalP } from '@/components/Modal'; import { GroupUserPopover } from '@/components/popover/GroupUserPopover'; import { UserListItem } from '@/components/UserListItem'; diff --git a/client/web/src/components/Spinner.tsx b/client/web/src/components/Spinner.tsx index c1d2f5e1..42f7583d 100644 --- a/client/web/src/components/Spinner.tsx +++ b/client/web/src/components/Spinner.tsx @@ -1,4 +1,4 @@ -import { Icon } from '@/components/Icon'; +import { Icon } from 'tailchat-design'; import React from 'react'; export const Spinner: React.FC = React.memo(() => { diff --git a/client/web/src/components/TipIcon.tsx b/client/web/src/components/TipIcon.tsx index 23455e4f..ee201fbe 100644 --- a/client/web/src/components/TipIcon.tsx +++ b/client/web/src/components/TipIcon.tsx @@ -1,5 +1,5 @@ -import { Icon } from './Icon'; import React from 'react'; +import { Icon } from 'tailchat-design'; import { DelayTip } from './DelayTip'; export const TipIcon: React.FC<{ diff --git a/client/web/src/components/modals/CreateGroupInvite/index.tsx b/client/web/src/components/modals/CreateGroupInvite/index.tsx index 807a3d5e..a59c87ce 100644 --- a/client/web/src/components/modals/CreateGroupInvite/index.tsx +++ b/client/web/src/components/modals/CreateGroupInvite/index.tsx @@ -1,4 +1,4 @@ -import { Icon } from '@/components/Icon'; +import { Icon } from 'tailchat-design'; import React from 'react'; import { useGroupInfo, t } from 'tailchat-shared'; import { ModalWrapper } from '../../Modal'; diff --git a/client/web/src/components/modals/SettingsView/About.tsx b/client/web/src/components/modals/SettingsView/About.tsx index 9095afd0..738f75f5 100644 --- a/client/web/src/components/modals/SettingsView/About.tsx +++ b/client/web/src/components/modals/SettingsView/About.tsx @@ -2,7 +2,7 @@ import { Typography } from 'antd'; import React from 'react'; import { version } from 'tailchat-shared'; import logoUrl from '@assets/images/logo.svg'; -import { Icon } from '@/components/Icon'; +import { Icon } from 'tailchat-design'; const { Paragraph, Text, Link } = Typography; diff --git a/client/web/src/plugin/component/index.tsx b/client/web/src/plugin/component/index.tsx index 1a3beb63..93749ef8 100644 --- a/client/web/src/plugin/component/index.tsx +++ b/client/web/src/plugin/component/index.tsx @@ -13,10 +13,9 @@ export { notification, Empty, } from 'antd'; -export { Avatar, SensitiveText } from 'tailchat-design'; +export { Avatar, SensitiveText, Icon } from 'tailchat-design'; export const TextArea = Input.TextArea; export { Image } from '@/components/Image'; -export { Icon } from '@/components/Icon'; export { IconBtn } from '@/components/IconBtn'; export { PillTabs, PillTabPane } from '@/components/PillTabs'; export { LoadingSpinner } from '@/components/LoadingSpinner'; diff --git a/client/web/src/routes/Entry/ForgetPasswordView.tsx b/client/web/src/routes/Entry/ForgetPasswordView.tsx index 79d34377..41f65c06 100644 --- a/client/web/src/routes/Entry/ForgetPasswordView.tsx +++ b/client/web/src/routes/Entry/ForgetPasswordView.tsx @@ -1,4 +1,4 @@ -import { Icon } from '@/components/Icon'; +import { Icon } from 'tailchat-design'; import { forgetPassword, resetPassword, diff --git a/client/web/src/routes/Entry/GuestView.tsx b/client/web/src/routes/Entry/GuestView.tsx index 385a117d..dcde9bf0 100644 --- a/client/web/src/routes/Entry/GuestView.tsx +++ b/client/web/src/routes/Entry/GuestView.tsx @@ -2,7 +2,7 @@ import { Spinner } from '@/components/Spinner'; import { useSearchParam } from '@/hooks/useSearchParam'; import { setUserJWT } from '@/utils/jwt-helper'; import { setGlobalUserLoginInfo } from '@/utils/user-helper'; -import { Icon } from '@/components/Icon'; +import { Icon } from 'tailchat-design'; import React, { useState } from 'react'; import { useNavigate } from 'react-router'; import { diff --git a/client/web/src/routes/Entry/LoginView.tsx b/client/web/src/routes/Entry/LoginView.tsx index 5094dc9c..2e4d6e11 100644 --- a/client/web/src/routes/Entry/LoginView.tsx +++ b/client/web/src/routes/Entry/LoginView.tsx @@ -1,4 +1,4 @@ -import { Icon } from '@/components/Icon'; +import { Icon } from 'tailchat-design'; import { Divider } from 'antd'; import { isValidStr, loginWithEmail, t, useAsyncFn } from 'tailchat-shared'; import React, { useEffect, useState } from 'react'; diff --git a/client/web/src/routes/Entry/RegisterView.tsx b/client/web/src/routes/Entry/RegisterView.tsx index e9f7495c..c724b23f 100644 --- a/client/web/src/routes/Entry/RegisterView.tsx +++ b/client/web/src/routes/Entry/RegisterView.tsx @@ -2,7 +2,7 @@ import { isValidStr, registerWithEmail, t, useAsyncFn } from 'tailchat-shared'; import React, { useState } from 'react'; import { Spinner } from '../../components/Spinner'; import { string } from 'yup'; -import { Icon } from '@/components/Icon'; +import { Icon } from 'tailchat-design'; import { useNavigate } from 'react-router'; import { setUserJWT } from '../../utils/jwt-helper'; import { setGlobalUserLoginInfo } from '../../utils/user-helper'; diff --git a/client/web/src/routes/Main/Navbar/MobileMenuBtn.tsx b/client/web/src/routes/Main/Navbar/MobileMenuBtn.tsx index f80da750..6c4c97a1 100644 --- a/client/web/src/routes/Main/Navbar/MobileMenuBtn.tsx +++ b/client/web/src/routes/Main/Navbar/MobileMenuBtn.tsx @@ -1,5 +1,5 @@ import { useIsMobile } from '@/hooks/useIsMobile'; -import { Icon } from '@/components/Icon'; +import { Icon } from 'tailchat-design'; import React, { useCallback } from 'react'; import { useSidebarContext } from '../SidebarContext'; diff --git a/client/web/src/routes/Main/Navbar/SettingBtn.tsx b/client/web/src/routes/Main/Navbar/SettingBtn.tsx index ac255e19..adc97d39 100644 --- a/client/web/src/routes/Main/Navbar/SettingBtn.tsx +++ b/client/web/src/routes/Main/Navbar/SettingBtn.tsx @@ -1,6 +1,6 @@ import { closeModal, openModal } from '@/components/Modal'; import { SettingsView } from '@/components/modals/SettingsView'; -import { Icon } from '@/components/Icon'; +import { Icon } from 'tailchat-design'; import React, { useCallback } from 'react'; export const SettingBtn: React.FC = React.memo(() => {