@webinex/chatify 2.0.0-alpha1 → 2.0.0-alpha12

package/src/ui/common/ChatList/ChatList.tsx

@@ -0,0 +1,84 @@
+import { Menu, MenuProps } from 'antd';
+import { useMemo } from 'react';
+import { ChatListItemBox } from './ChatListItemBox';
+import { customize } from '../../customize';
+import { ChatListValue } from './ChatListValue';
+import { useLocalizer } from '../../localizer';
+import { messageSequencePart } from '../../../core';
+
+export interface ChatListProps {
+  className?: string;
+  items: ChatListValue[];
+  selected: string | null;
+  onSelect?: (id: string) => void;
+
+  /**
+   * If true, do not show read status.
+   */
+  noRead?: boolean;
+
+  /**
+   * If set, shows a message at the bottom indicating that only the top N chats are shown.
+   */
+  top?: number;
+}
+
+function useOnSelect(props: ChatListProps) {
+  const { onSelect } = props;
+
+  return useMemo(
+    () =>
+      onSelect
+        ? (info: Parameters<NonNullable<MenuProps['onSelect']>>[0]) => onSelect(info.key as string)
+        : undefined,
+    [onSelect],
+  );
+}
+
+function useMenuItems(props: ChatListProps) {
+  //28b2a1a6-c052-4761-ad2d-95ce36d59f06-000000001
+  const { items, noRead, top } = props;
+  const localizer = useLocalizer();
+
+  return useMemo<MenuProps['items']>(() => {
+    const result = items
+      ?.slice()
+      .sort(
+        (a, b) => -messageSequencePart(a.lastMessage.id).localeCompare(messageSequencePart(b.lastMessage.id)),
+      )
+      .map((x) => ({ key: x.id, label: <ChatListItemBox chat={x} noRead={noRead} /> }));
+
+    if (top != null) {
+      return [
+        ...result,
+        {
+          type: 'item',
+          key: 'top',
+          disabled: true,
+          label: (
+            <div style={{ textAlign: 'center', cursor: 'text', fontStyle: 'italic' }}>
+              {localizer.chatList.topShown(top)}
+            </div>
+          ),
+        },
+      ];
+    }
+
+    return result;
+  }, [items, noRead, top, localizer]);
+}
+
+export const ChatList = customize('ChatList', (props: ChatListProps) => {
+  const { selected: selectedChatId } = props;
+  const selected = useMemo(() => (selectedChatId ? [selectedChatId] : []), [selectedChatId]);
+  const onSelect = useOnSelect(props);
+  const items = useMenuItems(props);
+
+  return (
+    <>
+      {items && (
+        <Menu className="wxchtf-chat-list" selectedKeys={selected} onSelect={onSelect} items={items} />
+      )}
+    </>
+  );
+});

package/src/ui/{ChatGroup/List → common/ChatList}/ChatListItemAvatar.tsx

@@ -1,22 +1,22 @@
-import { color } from '../../color';
-import { Icon } from '../../common/Icon';
-import { customize } from '../../customize';
-import type { ChatListItemBoxProps } from './ChatListItemBox';
-
-export const ChatListItemAvatar = customize('ChatListItemAvatar', (props: ChatListItemBoxProps) => {
-  const { id } = props.chat;
-
-  return (
-    <div
-      className="wxchtf-chat-avatar"
-      style={
-        {
-          '--background-color': color(id, { lightness: 90 }),
-          '--color': color(id, { saturation: 60, lightness: 65 }),
-        } as any
-      }
-    >
-      <Icon type="chat" />
-    </div>
-  );
-});
+import { color } from '../../color';
+import { Icon } from '../../common/Icon';
+import { customize } from '../../customize';
+import type { ChatListItemBoxProps } from './ChatListItemBox';
+
+export const ChatListItemAvatar = customize('ChatListItemAvatar', (props: ChatListItemBoxProps) => {
+  const { id } = props.chat;
+
+  return (
+    <div
+      className="wxchtf-chat-avatar"
+      style={
+        {
+          '--background-color': color(id, { lightness: 90 }),
+          '--color': color(id, { saturation: 60, lightness: 65 }),
+        } as any
+      }
+    >
+      <Icon type="chat" />
+    </div>
+  );
+});

package/src/ui/{ChatGroup/List → common/ChatList}/ChatListItemBox.tsx

@@ -1,26 +1,32 @@
-import { ChatListItem as ChatListItemModel } from '../../../core';
-import { customize } from '../../customize';
-import { ChatListItemName } from './ChatListItemName';
-import { ChatListItemUnreadCount } from './ChatListItemUnreadCount';
-import { ChatListItemLastMessage } from './ChatListItemLastMessage';
-import { ChatListItemAvatar } from './ChatListItemAvatar';
-
-export interface ChatListItemBoxProps {
-  chat: ChatListItemModel;
-}
-
-export const ChatListItemBox = customize('ChatListItemBox', (props: ChatListItemBoxProps) => {
-  const { message, lastReadMessageId } = props.chat;
-  const read = lastReadMessageId != null && lastReadMessageId.localeCompare(message.id) >= 0;
-
-  return (
-    <div className={'wxchtf-chat' + (!read ? ' --unread' : '')}>
-      <ChatListItemAvatar {...props} />
-      <span className="wxchtf-chat-info">
-        <ChatListItemName {...props} />
-        <ChatListItemUnreadCount {...props} />
-        <ChatListItemLastMessage {...props} />
-      </span>
-    </div>
-  );
-});
+import { customize } from '../../customize';
+import { ChatListItemName } from './ChatListItemName';
+import { ChatListItemUnreadCount } from './ChatListItemUnreadCount';
+import { ChatListItemLastMessage } from './ChatListItemLastMessage';
+import { ChatListItemAvatar } from './ChatListItemAvatar';
+import { ChatListValue } from './ChatListValue';
+
+export interface ChatListItemBoxProps {
+  chat: ChatListValue;
+
+  /**
+   * If true, do not show read status.
+   */
+  noRead?: boolean;
+}
+
+export const ChatListItemBox = customize('ChatListItemBox', (props: ChatListItemBoxProps) => {
+  const { noRead = false } = props;
+  const { lastMessage, lastReadMessageId } = props.chat;
+  const read = lastReadMessageId != null && lastReadMessageId.localeCompare(lastMessage.id) >= 0;
+
+  return (
+    <div className={'wxchtf-chat' + (!read && !noRead ? ' --unread' : '')}>
+      <ChatListItemAvatar {...props} />
+      <span className="wxchtf-chat-info">
+        <ChatListItemName {...props} />
+        <ChatListItemUnreadCount {...props} />
+        <ChatListItemLastMessage {...props} />
+      </span>
+    </div>
+  );
+});

package/src/ui/{ChatGroup/List → common/ChatList}/ChatListItemLastMessage.tsx

@@ -1,15 +1,15 @@
-import { customize } from '../../customize';
-import type { ChatListItemBoxProps } from './ChatListItemBox';
-import { ChatListItemLastMessageContent } from './ChatListItemLastMessageContent';
-import { ChatListItemLastMessageAuthor } from './ChatListItemLastMessageAuthor';
-import { ChatListItemLastMessageSentAt } from './ChatListItemLastMessageSentAt';
-
-export const ChatListItemLastMessage = customize('ChatListItemLastMessage', (props: ChatListItemBoxProps) => {
-  return (
-    <div className="wxchtf-chat-last">
-      <ChatListItemLastMessageAuthor {...props} />
-      <ChatListItemLastMessageContent {...props} />
-      <ChatListItemLastMessageSentAt {...props} />
-    </div>
-  );
-});
+import { customize } from '../../customize';
+import type { ChatListItemBoxProps } from './ChatListItemBox';
+import { ChatListItemLastMessageContent } from './ChatListItemLastMessageContent';
+import { ChatListItemLastMessageAuthor } from './ChatListItemLastMessageAuthor';
+import { ChatListItemLastMessageSentAt } from './ChatListItemLastMessageSentAt';
+
+export const ChatListItemLastMessage = customize('ChatListItemLastMessage', (props: ChatListItemBoxProps) => {
+  return (
+    <div className="wxchtf-chat-last">
+      <ChatListItemLastMessageAuthor {...props} />
+      <ChatListItemLastMessageContent {...props} />
+      <ChatListItemLastMessageSentAt {...props} />
+    </div>
+  );
+});

package/src/ui/{ChatGroup/List → common/ChatList}/ChatListItemLastMessageAuthor.tsx

@@ -1,15 +1,15 @@
-import { customize } from '../../customize';
-import type { ChatListItemBoxProps } from './ChatListItemBox';
-
-export const ChatListItemLastMessageAuthor = customize(
-  'ChatListItemLastMessageAuthor',
-  (props: ChatListItemBoxProps) => {
-    const { message } = props.chat;
-
-    if (message.sentBy.id === 'chatify::system') {
-      return null;
-    }
-
-    return <div className="wxchtf-chat-last-author">{message.sentBy.name}</div>;
-  },
-);
+import { customize } from '../../customize';
+import type { ChatListItemBoxProps } from './ChatListItemBox';
+
+export const ChatListItemLastMessageAuthor = customize(
+  'ChatListItemLastMessageAuthor',
+  (props: ChatListItemBoxProps) => {
+    const { lastMessage } = props.chat;
+
+    if (lastMessage.sentBy.id === 'chatify::system') {
+      return null;
+    }
+
+    return <div className="wxchtf-chat-last-author">{lastMessage.sentBy.name}</div>;
+  },
+);

package/src/ui/{ChatGroup/List → common/ChatList}/ChatListItemLastMessageContent.tsx

@@ -1,21 +1,21 @@
-import { useLocalizer } from '../../localizer';
-import { formatSystemMessage } from '../../Conversation/SystemMessage';
-import { FC } from 'react';
-import { customize } from '../../customize';
-import type { ChatListItemBoxProps } from './ChatListItemBox';
-
-export const ChatListItemLastMessageContent = customize<FC<ChatListItemBoxProps>>(
-  'ChatListItemLastMessageContent',
-  (props) => {
-    const { message } = props.chat;
-    const localizer = useLocalizer();
-
-    return (
-      <div className="wxchtf-chat-last-message">
-        {message.sentBy.id === 'chatify::system'
-          ? formatSystemMessage(localizer, message.text)
-          : message.text}
-      </div>
-    );
-  },
-);
+import { useLocalizer } from '../../localizer';
+import { formatSystemMessage } from '../../Conversation/SystemMessage';
+import { FC } from 'react';
+import { customize } from '../../customize';
+import type { ChatListItemBoxProps } from './ChatListItemBox';
+
+export const ChatListItemLastMessageContent = customize<FC<ChatListItemBoxProps>>(
+  'ChatListItemLastMessageContent',
+  (props) => {
+    const { lastMessage } = props.chat;
+    const localizer = useLocalizer();
+
+    return (
+      <div className="wxchtf-chat-last-message">
+        {lastMessage.sentBy.id === 'chatify::system'
+          ? lastMessage.text && formatSystemMessage(localizer, lastMessage.text)
+          : lastMessage.text}
+      </div>
+    );
+  },
+);

package/src/ui/{ChatGroup/List → common/ChatList}/ChatListItemLastMessageSentAt.tsx

@@ -1,22 +1,22 @@
-import { customize } from '../../customize';
-import { useLocalizer } from '../../localizer';
-import { ChatListItemBoxProps } from './ChatListItemBox';
-
-export const ChatListItemLastMessageSentAt = customize(
-  'ChatListItemLastMessageSentAt',
-  (props: ChatListItemBoxProps) => {
-    const {
-      chat: {
-        message: { sentAt },
-      },
-    } = props;
-
-    const localizer = useLocalizer();
-
-    return (
-      <div className="wxchtf-chat-last-sent-at">
-        {localizer.isToday(sentAt) ? localizer.timestamp(sentAt) : localizer.dateTime(sentAt)}
-      </div>
-    );
-  },
-);
+import { customize } from '../../customize';
+import { useLocalizer } from '../../localizer';
+import { ChatListItemBoxProps } from './ChatListItemBox';
+
+export const ChatListItemLastMessageSentAt = customize(
+  'ChatListItemLastMessageSentAt',
+  (props: ChatListItemBoxProps) => {
+    const {
+      chat: {
+        lastMessage: { sentAt },
+      },
+    } = props;
+
+    const localizer = useLocalizer();
+
+    return (
+      <div className="wxchtf-chat-last-sent-at">
+        {localizer.isToday(sentAt) ? localizer.timestamp(sentAt) : localizer.dateTime(sentAt)}
+      </div>
+    );
+  },
+);

package/src/ui/{ChatGroup/List → common/ChatList}/ChatListItemName.tsx

@@ -1,8 +1,8 @@
-import { customize } from '../../customize';
-import type { ChatListItemBoxProps } from './ChatListItemBox';
-
-export const ChatListItemName = customize('ChatListItemName', (props: ChatListItemBoxProps) => {
-  const { chat } = props;
-
-  return <div className="wxchtf-chat-name">{chat.name}</div>;
-});
+import { customize } from '../../customize';
+import type { ChatListItemBoxProps } from './ChatListItemBox';
+
+export const ChatListItemName = customize('ChatListItemName', (props: ChatListItemBoxProps) => {
+  const { chat } = props;
+
+  return <div className="wxchtf-chat-name">{chat.name}</div>;
+});

package/src/ui/{ChatGroup/List → common/ChatList}/ChatListItemUnreadCount.tsx

@@ -1,12 +1,12 @@
-import { customize } from '../../customize';
-import { ChatListItemBoxProps } from './ChatListItemBox';
-
-export const ChatListItemUnreadCount = customize('ChatListItemUnreadCount', (props: ChatListItemBoxProps) => {
-  const { totalUnreadCount: unreadCount } = props.chat;
-
-  if (unreadCount <= 0) {
-    return null;
-  }
-
-  return <div className="wxchtf-unread-count">{unreadCount}</div>;
-});
+import { customize } from '../../customize';
+import { ChatListItemBoxProps } from './ChatListItemBox';
+
+export const ChatListItemUnreadCount = customize('ChatListItemUnreadCount', (props: ChatListItemBoxProps) => {
+  const { totalUnreadCount: unreadCount } = props.chat;
+
+  if (unreadCount == null || unreadCount <= 0) {
+    return null;
+  }
+
+  return <div className="wxchtf-unread-count">{unreadCount}</div>;
+});

package/src/ui/common/ChatList/ChatListValue.ts

@@ -0,0 +1,9 @@
+import { MessageBase } from '../../../core';
+
+export interface ChatListValue {
+  id: string;
+  name: string;
+  lastMessage: MessageBase;
+  totalUnreadCount?: number;
+  lastReadMessageId?: string | null;
+}

package/{dist/esm/types/ui/ChatGroup/List/index.d.ts → src/ui/common/ChatList/index.ts}

@@ -7,6 +7,7 @@ import { ChatListItemLastMessageContent } from './ChatListItemLastMessageContent
 import { ChatListItemLastMessageSentAt } from './ChatListItemLastMessageSentAt';
 import { ChatListItemName } from './ChatListItemName';
 import { ChatListItemUnreadCount } from './ChatListItemUnreadCount';
+
 export * from './ChatList';
 export * from './ChatListItemAvatar';
 export * from './ChatListItemBox';
@@ -16,14 +17,16 @@ export * from './ChatListItemLastMessageContent';
 export * from './ChatListItemLastMessageSentAt';
 export * from './ChatListItemName';
 export * from './ChatListItemUnreadCount';
+export * from './ChatListValue';
+
 export interface ChatListCustomizeValue {
-    ChatList?: typeof ChatList.Component | null;
-    ChatListItemAvatar?: typeof ChatListItemAvatar.Component | null;
-    ChatListItemBox?: typeof ChatListItemBox.Component | null;
-    ChatListItemLastMessage?: typeof ChatListItemLastMessage.Component | null;
-    ChatListItemLastMessageAuthor?: typeof ChatListItemLastMessageAuthor.Component | null;
-    ChatListItemLastMessageContent?: typeof ChatListItemLastMessageContent.Component | null;
-    ChatListItemLastMessageSentAt?: typeof ChatListItemLastMessageSentAt.Component | null;
-    ChatListItemName?: typeof ChatListItemName.Component | null;
-    ChatListItemUnreadCount?: typeof ChatListItemUnreadCount.Component | null;
+  ChatList?: typeof ChatList.Component | null;
+  ChatListItemAvatar?: typeof ChatListItemAvatar.Component | null;
+  ChatListItemBox?: typeof ChatListItemBox.Component | null;
+  ChatListItemLastMessage?: typeof ChatListItemLastMessage.Component | null;
+  ChatListItemLastMessageAuthor?: typeof ChatListItemLastMessageAuthor.Component | null;
+  ChatListItemLastMessageContent?: typeof ChatListItemLastMessageContent.Component | null;
+  ChatListItemLastMessageSentAt?: typeof ChatListItemLastMessageSentAt.Component | null;
+  ChatListItemName?: typeof ChatListItemName.Component | null;
+  ChatListItemUnreadCount?: typeof ChatListItemUnreadCount.Component | null;
 }

package/src/ui/common/Icon.tsx

@@ -1,40 +1,48 @@
-import { FC } from 'react';
-import { customize } from '../customize';
-import SendOutlined from '@ant-design/icons/SendOutlined';
-import PaperClipOutlined from '@ant-design/icons/PaperClipOutlined';
-import UserAddOutlined from '@ant-design/icons/UserAddOutlined';
-import UsergroupAddOutlined from '@ant-design/icons/UsergroupAddOutlined';
-import UserDeleteOutlined from '@ant-design/icons/UserDeleteOutlined';
-import UsergroupDeleteOutlined from '@ant-design/icons/UsergroupDeleteOutlined';
-import TeamOutlined from '@ant-design/icons/TeamOutlined';
-import EditOutlined from '@ant-design/icons/EditOutlined';
-import CloseOutlined from '@ant-design/icons/CloseOutlined';
-import EyeInvisibleOutlined from '@ant-design/icons/EyeInvisibleOutlined';
-import EyeOutlined from '@ant-design/icons/EyeOutlined';
-
-export type IconType = keyof typeof ICONS;
-
-export interface IconProps {
-  type: IconType;
-}
-
-export const ICONS = {
-  attach: PaperClipOutlined,
-  send: SendOutlined,
-  'remove-member': UserDeleteOutlined,
-  'remove-member-delete-history': UsergroupDeleteOutlined,
-  'add-member': UserAddOutlined,
-  'add-member-with-history': UsergroupAddOutlined,
-  members: TeamOutlined,
-  edit: EditOutlined,
-  close: CloseOutlined,
-  chat: TeamOutlined,
-  watch: EyeOutlined,
-  unwatch: EyeInvisibleOutlined,
-};
-
-export const Icon = customize<FC<IconProps>>('Icon', (props) => {
-  const { type } = props;
-  const IconComponent = ICONS[type];
-  return IconComponent ? <IconComponent /> : null;
-});
+import { FC } from 'react';
+import { customize } from '../customize';
+import {
+  SendOutlined,
+  PaperClipOutlined,
+  UserAddOutlined,
+  UsergroupAddOutlined,
+  UserDeleteOutlined,
+  UsergroupDeleteOutlined,
+  TeamOutlined,
+  EditOutlined,
+  CloseOutlined,
+  EyeInvisibleOutlined,
+  EyeOutlined,
+  DeleteOutlined,
+  DownloadOutlined,
+  SettingOutlined,
+} from '@ant-design/icons';
+
+export type IconType = keyof typeof ICONS;
+
+export interface IconProps {
+  type: IconType;
+}
+
+export const ICONS = {
+  attach: PaperClipOutlined,
+  send: SendOutlined,
+  'remove-member': UserDeleteOutlined,
+  'remove-member-delete-history': UsergroupDeleteOutlined,
+  'add-member': UserAddOutlined,
+  'add-member-with-history': UsergroupAddOutlined,
+  members: TeamOutlined,
+  edit: EditOutlined,
+  close: CloseOutlined,
+  chat: TeamOutlined,
+  watch: EyeOutlined,
+  unwatch: EyeInvisibleOutlined,
+  'delete-file': DeleteOutlined,
+  'open-file': DownloadOutlined,
+  settings: SettingOutlined,
+};
+
+export const Icon = customize<FC<IconProps>>('Icon', (props) => {
+  const { type } = props;
+  const IconComponent = ICONS[type];
+  return IconComponent ? <IconComponent /> : null;
+});

package/src/ui/common/MessageSkeleton.tsx

@@ -1,20 +1,20 @@
-import { Skeleton } from 'antd';
-import { customize } from '../customize';
-
-export interface MessageSkeletonProps {
-  count?: number;
-}
-
-export const MessageSkeleton = customize('MessageSkeleton', (props: MessageSkeletonProps) => {
-  const { count = 1 } = props;
-  return (
-    <>
-      {Array.from(Array(count)).map((_, index) => (
-        <div className="wxchtf-message-skeleton" key={index}>
-          <Skeleton.Avatar className="wxchtf-avatar" active />
-          <Skeleton.Button active className="wxchtf-content" />
-        </div>
-      ))}
-    </>
-  );
-});
+import { Skeleton } from 'antd';
+import { customize } from '../customize';
+
+export interface MessageSkeletonProps {
+  count?: number;
+}
+
+export const MessageSkeleton = customize('MessageSkeleton', (props: MessageSkeletonProps) => {
+  const { count = 1 } = props;
+  return (
+    <>
+      {Array.from(Array(count)).map((_, index) => (
+        <div className="wxchtf-message-skeleton" key={index}>
+          <Skeleton.Avatar className="wxchtf-avatar" active />
+          <Skeleton.Button active className="wxchtf-content" />
+        </div>
+      ))}
+    </>
+  );
+});

package/src/ui/common/index.ts

@@ -1,13 +1,14 @@
-import { Avatar } from './Avatar';
-import { Icon } from './Icon';
-import { MessageSkeleton } from './MessageSkeleton';
-
-export * from './Avatar';
-export * from './Icon';
-export * from './MessageSkeleton';
-
-export interface CommonCustomizeValue {
-  Avatar?: typeof Avatar.Component | null;
-  Icon?: typeof Icon.Component | null;
-  MessageSkeleton?: typeof MessageSkeleton.Component | null;
-}
+import { Avatar } from './Avatar';
+import { Icon } from './Icon';
+import { MessageSkeleton } from './MessageSkeleton';
+
+export * from './Avatar';
+export * from './Icon';
+export * from './MessageSkeleton';
+export * from './ChatList';
+
+export interface CommonCustomizeValue {
+  Avatar?: typeof Avatar.Component | null;
+  Icon?: typeof Icon.Component | null;
+  MessageSkeleton?: typeof MessageSkeleton.Component | null;
+}