From 1c04874530e78552c6cf90cb1dcda64081222874 Mon Sep 17 00:00:00 2001 From: meganjohnson96 Date: Sun, 18 Jun 2023 14:57:49 +0800 Subject: [PATCH] =?UTF-8?q?:bug:=20fix(awareness):=20=E5=85=BC=E5=AE=B9?= =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E7=AB=AF=E6=B8=B2=E6=9F=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Awareness/Avatars/Avatar.tsx | 2 +- src/Awareness/Cursors/Cursor.tsx | 2 +- src/Awareness/index.ts | 15 --------------- src/Awareness/index.tsx | 22 ++++++++++++++++++++++ 4 files changed, 24 insertions(+), 17 deletions(-) delete mode 100644 src/Awareness/index.ts create mode 100644 src/Awareness/index.tsx diff --git a/src/Awareness/Avatars/Avatar.tsx b/src/Awareness/Avatars/Avatar.tsx index 8f5646fd..55b46617 100644 --- a/src/Awareness/Avatars/Avatar.tsx +++ b/src/Awareness/Avatars/Avatar.tsx @@ -2,7 +2,7 @@ import { Avatar as A, Badge, Tooltip } from 'antd'; import Color from 'color'; import { memo } from 'react'; -interface AvatarProps { +export interface AvatarProps { /** * 用户名 */ diff --git a/src/Awareness/Cursors/Cursor.tsx b/src/Awareness/Cursors/Cursor.tsx index 4eb6ec5e..fe026113 100644 --- a/src/Awareness/Cursors/Cursor.tsx +++ b/src/Awareness/Cursors/Cursor.tsx @@ -24,7 +24,7 @@ const useStyles = createStyles(({ css }) => ({ `, })); -interface CursorProps { +export interface CursorProps { position: { x: number; y: number }; color: string; name: string; diff --git a/src/Awareness/index.ts b/src/Awareness/index.ts deleted file mode 100644 index 760ed192..00000000 --- a/src/Awareness/index.ts +++ /dev/null @@ -1,15 +0,0 @@ -import Avatar from './Avatars/Avatar'; -import Basic from './Awareness'; -import Cursor from './Cursors/Cursor'; - -export type IAwareness = typeof Basic & { - Cursor: typeof Cursor; - Avatar: typeof Avatar; -}; - -const Awareness = Basic as IAwareness; - -Awareness.Cursor = Cursor; -Awareness.Avatar = Avatar; - -export default Awareness; diff --git a/src/Awareness/index.tsx b/src/Awareness/index.tsx new file mode 100644 index 00000000..7f455a66 --- /dev/null +++ b/src/Awareness/index.tsx @@ -0,0 +1,22 @@ +import Avatar from './Avatars/Avatar'; + +import { lazy, Suspense } from 'react'; +import { AwarenessProps } from './Awareness'; +import Cursor from './Cursors/Cursor'; + +export type { AwarenessProps } from './Awareness'; + +const Basic = lazy(() => import('./Awareness')); + +const Awareness = (props: AwarenessProps) => { + return ( + + + + ); +}; + +Awareness.Cursor = Cursor; +Awareness.Avatar = Avatar; + +export default Awareness;