chore: re-organize ui components files

src/components/ModalDislike/index.tsx

@@ -1,8 +1,8 @@
 import { APP_CLS_ROOT, OPERATION_FAIL_MSG } from '$common'
 import { colorPrimaryValue } from '$components/ModalSettings/theme.shared'
+import { BaseModal, BaseModalStyle, ModalClose } from '$components/_base/BaseModal'
 import type { AppRecItem, AppRecItemExtend } from '$define'
 import { DislikeIcon } from '$modules/icon'
-import { BaseModal, BaseModalStyle, ModalClose } from '$ui-components/BaseModal'
 import { AntdMessage } from '$utility'
 import { toastRequestFail } from '$utility/toast'
 import { Info } from '@icon-park/react'

src/components/ModalFeed/index.tsx

@@ -6,10 +6,10 @@ import type { OnRefresh } from '$components/RecGrid/useRefresh'
 import { OnRefreshContext } from '$components/RecGrid/useRefresh'
 import { RefreshButton } from '$components/RecHeader/RefreshButton'
 import { VideoSourceTab } from '$components/RecHeader/tab'
+import { BaseModal, BaseModalStyle, ModalClose } from '$components/_base/BaseModal'
+import { CollapseBtn } from '$components/_base/CollapseBtn'
 import { useIsDarkMode } from '$modules/dark-mode'
 import { useSettingsSnapshot } from '$modules/settings'
-import { BaseModal, BaseModalStyle, ModalClose } from '$ui-components/BaseModal'
-import { CollapseBtn } from '$ui-components/CollapseBtn'
 import { AntdMessage } from '$utility'
 
 const S = {

src/components/ModalSettings/index.tsx

@@ -1,8 +1,8 @@
 import { __PROD__ } from '$common'
+import { BaseModal, BaseModalStyle, ModalClose } from '$components/_base/BaseModal'
 import { ConfigIcon } from '$modules/icon'
 import type { BooleanSettingsKey } from '$modules/settings'
 import { settings } from '$modules/settings'
-import { BaseModal, BaseModalStyle, ModalClose } from '$ui-components/BaseModal'
 import { AntdMessage, shouldDisableShortcut } from '$utility'
 import { Tabs } from 'antd'
 import styles from './index.module.scss'

src/components/ModalSettings/setting-item.tsx

@@ -1,6 +1,6 @@
+import { AntdTooltip } from '$components/_base/antd-custom'
 import type { BooleanSettingsKey } from '$modules/settings'
 import { updateSettings, useSettingsSnapshot } from '$modules/settings'
-import { AntdTooltip } from '$ui-components/antd-custom'
 import { Checkbox, Switch } from 'antd'
 import type { CheckboxChangeEvent } from 'antd/es/checkbox'
 import type { ComponentProps, ReactNode } from 'react'

src/components/ModalSettings/tab-panes/pane-advance.tsx

@@ -1,6 +1,7 @@
 import { APP_NAME } from '$common'
 import { C, flexVerticalCenterStyle } from '$common/emotion-css'
 import { CheckboxSettingItem } from '$components/ModalSettings/setting-item'
+import { AntdTooltip } from '$components/_base/antd-custom'
 import { OpenExternalLinkIcon } from '$modules/icon'
 import {
   allowedSettingsKeys,
@@ -11,7 +12,6 @@ import {
 } from '$modules/settings'
 import { exportSettings, importSettings } from '$modules/settings/file-backup'
 import { articleDraft, restoreOmitKeys } from '$modules/settings/index.shared'
-import { AntdTooltip } from '$ui-components/antd-custom'
 import { AntdMessage } from '$utility'
 import { Button, Popconfirm, Slider, Space } from 'antd'
 import { omit, pick } from 'lodash'

src/components/ModalSettings/tab-panes/pane-basic.tsx

@@ -4,9 +4,9 @@ import { CheckboxSettingItem } from '$components/ModalSettings/setting-item'
 import { TabIcon } from '$components/RecHeader/tab-config'
 import { ETab } from '$components/RecHeader/tab-enum'
 import { VideoLinkOpenMode, VideoLinkOpenModeConfig } from '$components/VideoCard/index.shared'
+import { HelpInfo } from '$components/_base/HelpInfo'
 import { IconPark } from '$modules/icon/icon-park'
 import { updateSettings, useSettingsSnapshot } from '$modules/settings'
-import { HelpInfo } from '$ui-components/HelpInfo'
 import { AntdMessage } from '$utility'
 import { Button, Select, Space, Tag } from 'antd'
 import styles from '../index.module.scss'

src/components/ModalSettings/tab-panes/pane-filter.tsx

@@ -1,7 +1,7 @@
 import { C } from '$common/emotion-css'
 import { CheckboxSettingItem, SwitchSettingItem } from '$components/ModalSettings/setting-item'
+import { HelpInfo } from '$components/_base/HelpInfo'
 import { updateSettings, useSettingsSnapshot } from '$modules/settings'
-import { HelpInfo } from '$ui-components/HelpInfo'
 import { InputNumber, Tag } from 'antd'
 import type { ComponentProps } from 'react'
 import { EditableListSettingItem } from '../EditableListSettingItem'

src/components/ModalSettings/tab-panes/pane-video-source-tab-config.tsx

@@ -2,12 +2,12 @@ import { CheckboxSettingItem } from '$components/ModalSettings/setting-item'
 import { useSortedTabKeys } from '$components/RecHeader/tab'
 import { TabConfig, TabIcon } from '$components/RecHeader/tab-config'
 import { ETab, TabKeys } from '$components/RecHeader/tab-enum'
+import { HelpInfo } from '$components/_base/HelpInfo'
+import { AntdTooltip } from '$components/_base/antd-custom'
 import { EAppApiDevice } from '$define/index.shared'
 import { useIsDarkMode } from '$modules/dark-mode'
 import { IconPark } from '$modules/icon/icon-park'
 import { updateSettings, useSettingsSnapshot } from '$modules/settings'
-import { HelpInfo } from '$ui-components/HelpInfo'
-import { AntdTooltip } from '$ui-components/antd-custom'
 import { AntdMessage } from '$utility'
 import type { DragEndEvent } from '@dnd-kit/core'
 import { DndContext, PointerSensor, closestCenter, useSensor, useSensors } from '@dnd-kit/core'

src/components/ModalSettings/theme.tsx

@@ -7,11 +7,11 @@
  */
 
 import { flexCenterStyle } from '$common/emotion-css'
+import { HelpInfo } from '$components/_base/HelpInfo'
+import { AntdTooltip } from '$components/_base/antd-custom'
 import { $evolvedThemeColor } from '$header'
 import { IconAnimatedChecked } from '$modules/icon/animated-checked'
 import { updateSettings, useSettingsSnapshot } from '$modules/settings'
-import { HelpInfo } from '$ui-components/HelpInfo'
-import { AntdTooltip } from '$ui-components/antd-custom'
 import { usePrevious } from 'ahooks'
 import { ColorPicker } from 'antd'
 import type { Color } from 'antd/es/color-picker'

src/components/RecGrid/index.tsx

@@ -13,6 +13,7 @@ import { getActiveCardBorderCss, useCardBorderCss } from '$components/VideoCard/
 import { type VideoCardEmitter, type VideoCardEvents } from '$components/VideoCard/index.shared'
 import { filterRecItems } from '$components/VideoCard/process/filter'
 import type { IVideoCardData } from '$components/VideoCard/process/normalize'
+import { AntdTooltip } from '$components/_base/antd-custom'
 import { type RecItemType, type RecItemTypeOrSeparator } from '$define'
 import { EApiType } from '$define/index.shared'
 import { $headerHeight } from '$header'
@@ -22,7 +23,6 @@ import { concatThenUniq, refreshForGrid } from '$modules/rec-services'
 import { hotStore } from '$modules/rec-services/hot'
 import { useSettingsSnapshot } from '$modules/settings'
 import { isSafari } from '$ua'
-import { AntdTooltip } from '$ui-components/antd-custom'
 import { AntdMessage } from '$utility'
 import { useEventListener, useLatest } from 'ahooks'
 import { Divider } from 'antd'

src/components/RecHeader/tab.tsx

@@ -1,8 +1,8 @@
 import { flexVerticalCenterStyle } from '$common/emotion-css'
 import { type OnRefresh } from '$components/RecGrid/useRefresh'
+import { HelpInfo } from '$components/_base/HelpInfo'
 import { QUERY_DYNAMIC_UP_MID } from '$modules/rec-services/dynamic-feed/store'
 import { useSettingsSnapshot } from '$modules/settings'
-import { HelpInfo } from '$ui-components/HelpInfo'
 import { checkLoginStatus, useHasLogined } from '$utility'
 import { proxyWithGmStorage } from '$utility/valtio'
 import { Radio } from 'antd'

src/components/VideoCard/index.tsx

@@ -8,6 +8,7 @@ import { colorPrimaryValue } from '$components/ModalSettings/theme.shared'
 import type { OnRefresh } from '$components/RecGrid/useRefresh'
 import { useCurrentUsingTab, videoSourceTabState } from '$components/RecHeader/tab'
 import { ETab } from '$components/RecHeader/tab-enum'
+import { Picture } from '$components/_base/Picture'
 import { isRanking, type AppRecItemExtend, type PvideoJson, type RecItemType } from '$define'
 import { EApiType } from '$define/index.shared'
 import { openNewTab } from '$modules/gm'
@@ -22,7 +23,6 @@ import { UserBlacklistService, useInBlacklist } from '$modules/user/relations/bl
 import { UserfollowService } from '$modules/user/relations/follow'
 import { isWebApiSuccess } from '$request'
 import { isFirefox } from '$ua'
-import { Picture } from '$ui-components/Picture'
 import { AntdMessage, AntdNotification, toast } from '$utility'
 import type { TheCssType } from '$utility/type'
 import { useLockFn } from 'ahooks'

src/components/VideoCard/process/normalize.tsx

@@ -1,6 +1,7 @@
 import { APP_NAME } from '$common'
 import { C } from '$common/emotion-css'
 import { borderColorValue, colorPrimaryValue } from '$components/ModalSettings/theme.shared'
+import { AntdTooltip } from '$components/_base/antd-custom'
 import {
   isApp,
   isDynamic,
@@ -32,7 +33,6 @@ import {
   isCinemaRankingItem,
 } from '$modules/rec-services/hot/ranking/category'
 import { ELiveStatus } from '$modules/rec-services/live/live-enum'
-import { AntdTooltip } from '$ui-components/antd-custom'
 import { toHttps } from '$utility'
 import {
   formatDuration,

src/ui-components/HelpInfo.tsx → src/components/_base/HelpInfo.tsx

@@ -1,7 +1,7 @@
 import { IconPark } from '$modules/icon/icon-park'
-import { AntdTooltip } from '$ui-components/antd-custom'
 import type { ReactNode } from 'react'
 import type { SetOptional } from 'type-fest'
+import { AntdTooltip } from './antd-custom'
 
 export function HelpInfo({
   children,

src/modules/access-key/tv-qrcode/TvQrCodeAuth.tsx

@@ -1,7 +1,7 @@
 import { APP_CLS_ROOT } from '$common'
 import { AntdApp } from '$components/AntdApp'
+import { BaseModal, BaseModalStyle, ModalClose } from '$components/_base/BaseModal'
 import { useIsDarkMode } from '$modules/dark-mode'
-import { BaseModal, BaseModalStyle, ModalClose } from '$ui-components/BaseModal'
 import { QRCode } from 'antd'
 import { once } from 'lodash'
 import mitt from 'mitt'

src/modules/rec-services/dynamic-feed/usage-info.tsx

@@ -2,10 +2,10 @@ import { antdCustomCss, flexVerticalCenterStyle, iconOnlyRoundButtonCss } from '
 import { colorPrimaryValue } from '$components/ModalSettings/theme.shared'
 import { useOnRefreshContext } from '$components/RecGrid/useRefresh'
 import { CHARGE_ONLY_TEXT } from '$components/VideoCard/top-marks'
+import { HelpInfo } from '$components/_base/HelpInfo'
+import { AntdTooltip } from '$components/_base/antd-custom'
 import { IconPark } from '$modules/icon/icon-park'
 import { useSettingsSnapshot } from '$modules/settings'
-import { HelpInfo } from '$ui-components/HelpInfo'
-import { AntdTooltip } from '$ui-components/antd-custom'
 import { getAvatarSrc } from '$utility/image'
 import type { AntdMenuItemType } from '$utility/type'
 import { Avatar, Badge, Button, Checkbox, Dropdown, Input, Popover, Radio, Space } from 'antd'

src/modules/rec-services/hot/index.tsx

@@ -2,10 +2,10 @@ import { C, antdCustomCss } from '$common/emotion-css'
 import { colorPrimaryValue } from '$components/ModalSettings/theme.shared'
 import { useOnRefreshContext } from '$components/RecGrid/useRefresh'
 import { EHotSubTab } from '$components/RecHeader/tab-enum'
+import { AntdTooltip } from '$components/_base/antd-custom'
 import type { RecItemTypeOrSeparator } from '$define'
 import { styled } from '$libs'
 import { settings } from '$modules/settings'
-import { AntdTooltip } from '$ui-components/antd-custom'
 import type { AntdMenuItemType } from '$utility/type'
 import { proxyWithGmStorage } from '$utility/valtio'
 import { Button, Dropdown } from 'antd'

src/modules/rec-services/hot/ranking/index.tsx

@@ -2,11 +2,11 @@ import { REQUEST_FAIL_MSG } from '$common'
 import { antdCustomCss, flexVerticalCenterStyle } from '$common/emotion-css'
 import { colorPrimaryValue } from '$components/ModalSettings/theme.shared'
 import { useOnRefreshContext } from '$components/RecGrid/useRefresh'
+import { HelpInfo } from '$components/_base/HelpInfo'
 import type { RankingItemExtend } from '$define'
 import { EApiType } from '$define/index.shared'
 import { usePopupContainer } from '$modules/rec-services/_base'
 import { isWebApiSuccess, request } from '$request'
-import { HelpInfo } from '$ui-components/HelpInfo'
 import { toast } from '$utility'
 import { proxyWithGmStorage } from '$utility/valtio'
 import { Button, Popover } from 'antd'