diff --git a/src/containers/content/WorksContent/index.tsx b/src/containers/content/WorksContent/index.tsx index 969f315e9..422628ef2 100755 --- a/src/containers/content/WorksContent/index.tsx +++ b/src/containers/content/WorksContent/index.tsx @@ -12,7 +12,7 @@ import { buildLog } from '@/utils/logger' import { bond } from '@/utils/mobx' import Pagi from '@/widgets/Pagi' -// import AvatarsGroup from '@/widgets/AvatarsGroup' +// import Facepile from '@/widgets/Facepile' import type { TStore } from './store' @@ -64,7 +64,7 @@ const WorksContentContainer: FC = ({ {/* 活跃用户 - + */} {!isMobile && } diff --git a/src/containers/thread/KanbanThread/Actions.tsx b/src/containers/thread/KanbanThread/Actions.tsx index 18d3bebee..4df1fe380 100644 --- a/src/containers/thread/KanbanThread/Actions.tsx +++ b/src/containers/thread/KanbanThread/Actions.tsx @@ -4,7 +4,7 @@ import { ICON } from '@/config' import { mockUsers } from '@/utils/mock' import { IconSwitcher } from '@/widgets/Switcher' -import AvatarsGroup from '@/widgets/AvatarsGroup' +import Facepile from '@/widgets/Facepile' import { Space } from '@/widgets/Common' import { @@ -51,7 +51,7 @@ const Actions: FC = () => { 参与者 - + {/* */} {/* 新增 diff --git a/src/widgets/AvatarsGroup/MoreItem.tsx b/src/widgets/Facepile/MoreItem.tsx similarity index 100% rename from src/widgets/AvatarsGroup/MoreItem.tsx rename to src/widgets/Facepile/MoreItem.tsx diff --git a/src/widgets/AvatarsGroup/RealAvatar.tsx b/src/widgets/Facepile/RealAvatar.tsx similarity index 100% rename from src/widgets/AvatarsGroup/RealAvatar.tsx rename to src/widgets/Facepile/RealAvatar.tsx diff --git a/src/widgets/AvatarsGroup/RealNumber.tsx b/src/widgets/Facepile/RealNumber.tsx similarity index 100% rename from src/widgets/AvatarsGroup/RealNumber.tsx rename to src/widgets/Facepile/RealNumber.tsx diff --git a/src/widgets/AvatarsGroup/index.tsx b/src/widgets/Facepile/index.tsx similarity index 96% rename from src/widgets/AvatarsGroup/index.tsx rename to src/widgets/Facepile/index.tsx index 0bc392e8f..c4fde01ec 100644 --- a/src/widgets/AvatarsGroup/index.tsx +++ b/src/widgets/Facepile/index.tsx @@ -1,6 +1,6 @@ /* * - * AvatarsGroup + * Facepile * */ @@ -49,7 +49,7 @@ export const RealAvatar = dynamic(() => import('./RealAvatar'), { }) /* eslint-disable-next-line */ -const log = buildLog('c:AvatarsGroup:index') +const log = buildLog('c:Facepile:index') const validUser = compose(not, isNil) @@ -83,7 +83,7 @@ export type TProps = { onTotalSelect?: () => void } -const AvatarsGroup: FC = ({ +const Facepile: FC = ({ size = SIZE.SMALL, total = null, users = [], @@ -151,4 +151,4 @@ const AvatarsGroup: FC = ({ ) } -export default trackWindowScroll(AvatarsGroup) +export default trackWindowScroll(Facepile) diff --git a/src/widgets/AvatarsGroup/spec.d.ts b/src/widgets/Facepile/spec.d.ts similarity index 100% rename from src/widgets/AvatarsGroup/spec.d.ts rename to src/widgets/Facepile/spec.d.ts diff --git a/src/widgets/AvatarsGroup/styles/index.ts b/src/widgets/Facepile/styles/index.ts similarity index 100% rename from src/widgets/AvatarsGroup/styles/index.ts rename to src/widgets/Facepile/styles/index.ts diff --git a/src/widgets/AvatarsGroup/styles/metric.ts b/src/widgets/Facepile/styles/metric.ts similarity index 100% rename from src/widgets/AvatarsGroup/styles/metric.ts rename to src/widgets/Facepile/styles/metric.ts diff --git a/src/widgets/AvatarsGroup/styles/more_item.ts b/src/widgets/Facepile/styles/more_item.ts similarity index 100% rename from src/widgets/AvatarsGroup/styles/more_item.ts rename to src/widgets/Facepile/styles/more_item.ts diff --git a/src/widgets/AvatarsGroup/styles/real_avatar.ts b/src/widgets/Facepile/styles/real_avatar.ts similarity index 100% rename from src/widgets/AvatarsGroup/styles/real_avatar.ts rename to src/widgets/Facepile/styles/real_avatar.ts diff --git a/src/widgets/AvatarsGroup/styles/real_number.ts b/src/widgets/Facepile/styles/real_number.ts similarity index 100% rename from src/widgets/AvatarsGroup/styles/real_number.ts rename to src/widgets/Facepile/styles/real_number.ts diff --git a/src/widgets/AvatarsGroup/tests/index.test.ts b/src/widgets/Facepile/tests/index.test.ts similarity index 68% rename from src/widgets/AvatarsGroup/tests/index.test.ts rename to src/widgets/Facepile/tests/index.test.ts index a151f5ea2..90ab750d5 100644 --- a/src/widgets/AvatarsGroup/tests/index.test.ts +++ b/src/widgets/Facepile/tests/index.test.ts @@ -1,9 +1,9 @@ // import React from 'react' // import { shallow } from 'enzyme' -// import AvatarsGroup from '../index' +// import Facepile from '../index' -describe('', () => { +describe('', () => { it('TODO: Expect to have unit tests specified', () => { expect(true).toEqual(true) }) diff --git a/src/widgets/PostItem/DesktopView/Header.tsx b/src/widgets/PostItem/DesktopView/Header.tsx index f88835a82..1b561c75e 100644 --- a/src/widgets/PostItem/DesktopView/Header.tsx +++ b/src/widgets/PostItem/DesktopView/Header.tsx @@ -5,7 +5,7 @@ import type { TPost } from '@/spec' import { callWallpaperEditor } from '@/utils/helper' -import AvatarsGroup from '@/widgets/AvatarsGroup' +import Facepile from '@/widgets/Facepile' // import TagsList from '@/widgets/TagsList' import { @@ -37,7 +37,7 @@ const Header: FC = ({ item }) => { - diff --git a/src/widgets/Tooltip/index.tsx b/src/widgets/Tooltip/index.tsx index eae647579..aaa55fd7f 100755 --- a/src/widgets/Tooltip/index.tsx +++ b/src/widgets/Tooltip/index.tsx @@ -41,7 +41,7 @@ export type TProps = { noPadding?: boolean showArrow?: boolean behavior?: 'default' | 'confirm' | 'delete-confirm' | 'add' - // currently only for AvatarsGroup, it will collapse the height + // currently only for Facepile, it will collapse the height // for same reason, figure out later contentHeight?: string diff --git a/src/widgets/Upvote/DefaultLayout.tsx b/src/widgets/Upvote/DefaultLayout.tsx index a40c49783..f0815f781 100644 --- a/src/widgets/Upvote/DefaultLayout.tsx +++ b/src/widgets/Upvote/DefaultLayout.tsx @@ -11,7 +11,7 @@ import type { TUser } from '@/spec' import { buildLog } from '@/utils/logger' import { Space } from '@/widgets/Common' -import AvatarsGroup from '@/widgets/AvatarsGroup' +import Facepile from '@/widgets/Facepile' import UpvoteBtn from './UpvoteBtn' import Desc from './Desc' @@ -60,9 +60,7 @@ const Upvote: FC = ({ {count} {!noOne && } - {!noOne && !isMobile && ( - - )} + {!noOne && !isMobile && } {!noOne && ( = ({ {count} {!noOne && } - {!noOne && !isMobile && } + {!noOne && !isMobile && } ) } diff --git a/src/widgets/Upvote/StickerLayout.tsx b/src/widgets/Upvote/StickerLayout.tsx index ff9b8bac8..4b3fbcfee 100644 --- a/src/widgets/Upvote/StickerLayout.tsx +++ b/src/widgets/Upvote/StickerLayout.tsx @@ -11,7 +11,7 @@ import { buildLog } from '@/utils/logger' import { UPVOTE_LAYOUT } from '@/constant' import AnimatedCount from '@/widgets/AnimatedCount' -import AvatarsGroup from '@/widgets/AvatarsGroup' +import Facepile from '@/widgets/Facepile' import UpvoteBtn from './UpvoteBtn' import { @@ -54,7 +54,7 @@ const Upvote: FC = ({ - + ) diff --git a/src/widgets/Upvote/WorksArticleLayout.tsx b/src/widgets/Upvote/WorksArticleLayout.tsx index 2bb58ae31..4d6f4dcdd 100644 --- a/src/widgets/Upvote/WorksArticleLayout.tsx +++ b/src/widgets/Upvote/WorksArticleLayout.tsx @@ -10,7 +10,7 @@ import type { TUser } from '@/spec' import { buildLog } from '@/utils/logger' import { SIZE, UPVOTE_LAYOUT } from '@/constant' -import AvatarsGroup from '@/widgets/AvatarsGroup' +import Facepile from '@/widgets/Facepile' import AnimatedCount from '@/widgets/AnimatedCount' import Desc from './Desc' @@ -69,7 +69,7 @@ const Upvote: FC = ({ {!noOne && ( -