@webinex/chatify 2.0.0-alpha13 → 2.0.0-alpha14

package/src/ui/Chat/ChatHeaderActions.tsx

@@ -1,19 +1,19 @@
-import { ChatMembersPreview } from './Members';
-import { ChatMembersButton } from './Members';
-import { customize } from '../customize';
-import { useConversation } from '../Conversation';
-
-export const ChatHeaderActions = customize('ChatHeaderActions', () => {
-  const { active } = useConversation();
-
-  if (!active) {
-    return null;
-  }
-
-  return (
-    <div className="wxchtf-chat-members">
-      <ChatMembersPreview />
-      <ChatMembersButton />
-    </div>
-  );
-});
+import { ChatMembersPreview } from './Members';
+import { ChatMembersButton } from './Members';
+import { customize } from '../customize';
+import { useConversation } from '../Conversation';
+
+export const ChatHeaderActions = customize('ChatHeaderActions', () => {
+  const { active, compact } = useConversation();
+
+  if (!active) {
+    return null;
+  }
+
+  return (
+    <div className="wxchtf-chat-members">
+      {!compact && <ChatMembersPreview />}
+      <ChatMembersButton />
+    </div>
+  );
+});

package/src/ui/Chat/ChatPanel.tsx

@@ -1,30 +1,46 @@
-import { CSSProperties } from 'react';
-import { Localizer, LocalizerContext, defaultLocalizer } from '../localizer';
-import { CustomizeContext } from '../customize';
-import { ChatView, ChatViewCustomizeValue } from './ChatView';
-import { chatifyApi } from '../../core';
-
-export interface ChatPanelCustomizeValue extends ChatViewCustomizeValue {}
-
-export interface ChatPanelProps {
-  id: string;
-  className?: string;
-  style?: CSSProperties;
-  localizer?: Localizer;
-  customize?: ChatPanelCustomizeValue;
-}
-
-export function ChatPanel(props: ChatPanelProps) {
-  const { id, className = '', customize, localizer = defaultLocalizer, style } = props;
-  const { data: chat } = chatifyApi.useGetChatQuery({ id });
-
-  return (
-    <div className={`wxchtf-chatify wxchtf-chat-panel ${className}`} style={style}>
-      <LocalizerContext.Provider value={localizer}>
-        <CustomizeContext.Provider value={customize as any}>
-          {chat && <ChatView value={chat} key={id} />}
-        </CustomizeContext.Provider>
-      </LocalizerContext.Provider>
-    </div>
-  );
-}
+import { CSSProperties } from 'react';
+import { Localizer, LocalizerContext, defaultLocalizer } from '../localizer';
+import { CustomizeContext } from '../customize';
+import { ChatView, ChatViewCustomizeValue } from './ChatView';
+import { chatifyApi } from '../../core';
+import { useCompact } from '../useCompact';
+
+export interface ChatPanelCustomizeValue extends ChatViewCustomizeValue {}
+
+export interface ChatPanelProps {
+  id: string;
+  className?: string;
+  style?: CSSProperties;
+  localizer?: Localizer;
+  customize?: ChatPanelCustomizeValue;
+
+  /**
+   * If true, the chat panel will be displayed in compact mode.
+   * If a number is provided, the chat panel will be displayed in compact mode if its width is less than the provided number of pixels.
+   *
+   * @default 768
+   */
+  compact?: boolean | number;
+}
+
+export function ChatPanel(props: ChatPanelProps) {
+  const { id, className = '', customize, localizer = defaultLocalizer, style, compact: compactProp } = props;
+  const { data: chat } = chatifyApi.useGetChatQuery({ id });
+  const [ref, compact] = useCompact(compactProp);
+
+  return (
+    <div
+      className={['wxchtf-chatify', 'wxchtf-chat-panel', compact && '--compact', className]
+        .filter(Boolean)
+        .join(' ')}
+      style={style}
+      ref={ref}
+    >
+      <LocalizerContext.Provider value={localizer}>
+        <CustomizeContext.Provider value={customize as any}>
+          {chat && <ChatView value={chat} key={id} compact={compact} />}
+        </CustomizeContext.Provider>
+      </LocalizerContext.Provider>
+    </div>
+  );
+}

package/src/ui/Chat/ChatView.tsx

@@ -1,115 +1,122 @@
-import { CustomizeContext, customize, useCustomizeContext } from '../customize';
-import { MessageBody, chatId, chatifyApi } from '../../core';
-import {
-  Conversation,
-  ConversationCustomizeValue,
-  ConversationProps,
-  ConversationValue,
-} from '../Conversation';
-import { useCallback, useMemo } from 'react';
-import { ChatEditableHeaderName } from './ChatEditableHeaderName';
-import { ChatHeaderActions } from './ChatHeaderActions';
-import { ChatMembersCustomizeValue, ChatMembersPanel } from './Members';
-import { ChatContext, useChatContext } from './ChatContext';
-
-export interface ChatProps {
-  value: ChatValue;
-}
-
-export interface ChatValue extends ConversationValue {}
-
-export interface ChatViewCustomizeValue extends ConversationCustomizeValue, ChatMembersCustomizeValue {
-  ChatEditableHeaderName?: typeof ChatEditableHeaderName.Component | null;
-  ChatHeaderActions?: typeof ChatHeaderActions.Component | null;
-  ChatView?: typeof ChatView.Component | null;
-}
-
-export const DEFAULT_CHAT_VIEW_CUSTOMIZE_VALUE: ConversationCustomizeValue = {
-  ConversationName: () => <ChatEditableHeaderName />,
-  ConversationActions: () => <ChatHeaderActions />,
-};
-
-function useConversation(props: ChatProps) {
-  const { value: chat } = props;
-  const { id, name, active, lastReadMessageId } = chat;
-
-  const { data: messageList } = chatifyApi.useGetChatMessageListQuery({ chatId: id });
-  const { messages, hasMore } = messageList ?? {};
-
-  const [fetchNext, { isLoading: isFetchNextLoading }] = chatifyApi.useFetchNextChatMessageListMutation();
-  const onNext = useCallback(() => fetchNext({ chatId: id }), [fetchNext, id]);
-
-  const [read] = chatifyApi.useReadChatMessageMutation();
-  const onRead = useCallback((id: string) => read({ id }), [read]);
-
-  const [send] = chatifyApi.useSendChatMessageMutation();
-  const onSend = useCallback((message: MessageBody) => send({ ...message, chatId: id }).unwrap(), [id, send]);
-
-  const { data: readQueue } = chatifyApi.useGetChatMessageReadQueueQuery();
-
-  const conversation = useMemo(() => {
-    if (!id) {
-      return null;
-    }
-
-    const result: ConversationProps = {
-      value: { id: id!, name: name!, active: active!, lastReadMessageId: lastReadMessageId! },
-      messages,
-      hasMore,
-      onNext,
-      nextLoading: isFetchNextLoading,
-      onRead,
-      onSend,
-      isReading: (id: string) => readQueue!.some((x) => chatId(x.value) === chatId(id) && id <= x.value),
-    };
-
-    return result;
-  }, [
-    onNext,
-    onRead,
-    onSend,
-    isFetchNextLoading,
-    id,
-    name,
-    active,
-    messages,
-    hasMore,
-    lastReadMessageId,
-    readQueue,
-  ]);
-
-  return conversation;
-}
-
-function Content(props: ChatProps) {
-  const conversation = useConversation(props);
-  const { showMembers } = useChatContext();
-
-  if (!conversation) {
-    return null;
-  }
-
-  return (
-    <div className="wxchtf-chat">
-      <Conversation {...conversation} />
-      {showMembers && <ChatMembersPanel />}
-    </div>
-  );
-}
-
-export const ChatView = customize('ChatView', (props: ChatProps) => {
-  const { value } = props;
-  const customized = useCustomizeContext();
-  const customize: ChatViewCustomizeValue = useMemo(
-    () => ({ ...(customized ?? {}), ...DEFAULT_CHAT_VIEW_CUSTOMIZE_VALUE }),
-    [customized],
-  );
-
-  return (
-    <CustomizeContext.Provider value={customize}>
-      <ChatContext id={value.id}>
-        <Content value={value} />
-      </ChatContext>
-    </CustomizeContext.Provider>
-  );
-});
+import { CustomizeContext, customize, useCustomizeContext } from '../customize';
+import { MessageBody, chatId, chatifyApi } from '../../core';
+import {
+  Conversation,
+  ConversationCustomizeValue,
+  ConversationProps,
+  ConversationValue,
+} from '../Conversation';
+import { useCallback, useMemo } from 'react';
+import { ChatEditableHeaderName } from './ChatEditableHeaderName';
+import { ChatHeaderActions } from './ChatHeaderActions';
+import { ChatMembersCustomizeValue, ChatMembersPanel } from './Members';
+import { ChatContext, useChatContext } from './ChatContext';
+
+export interface ChatViewProps {
+  value: ChatValue;
+  compact?: boolean;
+  onBackClick?: () => void;
+}
+
+export interface ChatValue extends ConversationValue {}
+
+export interface ChatViewCustomizeValue extends ConversationCustomizeValue, ChatMembersCustomizeValue {
+  ChatEditableHeaderName?: typeof ChatEditableHeaderName.Component | null;
+  ChatHeaderActions?: typeof ChatHeaderActions.Component | null;
+  ChatView?: typeof ChatView.Component | null;
+}
+
+export const DEFAULT_CHAT_VIEW_CUSTOMIZE_VALUE: ConversationCustomizeValue = {
+  ConversationName: () => <ChatEditableHeaderName />,
+  ConversationActions: () => <ChatHeaderActions />,
+};
+
+function useConversation(props: Pick<ChatViewProps, 'value' | 'onBackClick'>) {
+  const { value: chat, onBackClick } = props;
+  const { compact } = useChatContext();
+  const { id, name, active, lastReadMessageId } = chat;
+
+  const { data: messageList } = chatifyApi.useGetChatMessageListQuery({ chatId: id });
+  const { messages, hasMore } = messageList ?? {};
+
+  const [fetchNext, { isLoading: isFetchNextLoading }] = chatifyApi.useFetchNextChatMessageListMutation();
+  const onNext = useCallback(() => fetchNext({ chatId: id }), [fetchNext, id]);
+
+  const [read] = chatifyApi.useReadChatMessageMutation();
+  const onRead = useCallback((id: string) => read({ id }), [read]);
+
+  const [send] = chatifyApi.useSendChatMessageMutation();
+  const onSend = useCallback((message: MessageBody) => send({ ...message, chatId: id }).unwrap(), [id, send]);
+
+  const { data: readQueue } = chatifyApi.useGetChatMessageReadQueueQuery();
+
+  const conversation = useMemo(() => {
+    if (!id) {
+      return null;
+    }
+
+    const result: ConversationProps = {
+      value: { id: id!, name: name!, active: active!, lastReadMessageId: lastReadMessageId! },
+      messages,
+      hasMore,
+      onNext,
+      nextLoading: isFetchNextLoading,
+      onRead,
+      onSend,
+      isReading: (id: string) => readQueue!.some((x) => chatId(x.value) === chatId(id) && id <= x.value),
+      compact: compact ?? false,
+      onBackClick,
+    };
+
+    return result;
+  }, [
+    onNext,
+    onRead,
+    onSend,
+    isFetchNextLoading,
+    id,
+    name,
+    active,
+    messages,
+    hasMore,
+    lastReadMessageId,
+    readQueue,
+    compact,
+    onBackClick,
+  ]);
+
+  return conversation;
+}
+
+function Content(props: Pick<ChatViewProps, 'value' | 'onBackClick'>) {
+  const conversation = useConversation(props);
+  const { compact, showMembers } = useChatContext();
+
+  if (!conversation) {
+    return null;
+  }
+
+  return (
+    <div className="wxchtf-chat">
+      {(!compact || !showMembers) && <Conversation {...conversation} />}
+      {showMembers && <ChatMembersPanel />}
+    </div>
+  );
+}
+
+export const ChatView = customize('ChatView', (props: ChatViewProps) => {
+  const { value, compact, onBackClick } = props;
+  const customized = useCustomizeContext();
+  const customize: ChatViewCustomizeValue = useMemo(
+    () => ({ ...(customized ?? {}), ...DEFAULT_CHAT_VIEW_CUSTOMIZE_VALUE }),
+    [customized],
+  );
+
+  return (
+    <CustomizeContext.Provider value={customize}>
+      <ChatContext id={value.id} compact={compact ?? false}>
+        <Content value={value} onBackClick={onBackClick} />
+      </ChatContext>
+    </CustomizeContext.Provider>
+  );
+});

package/src/ui/Chat/Members/ChatMembersButton.tsx

@@ -1,9 +1,9 @@
-import { Button } from 'antd';
-import { customize } from '../../customize';
-import { Icon } from '../../common/Icon';
-import { useChatContext } from '../ChatContext';
-
-export const ChatMembersButton = customize('ChatMembersButton', () => {
-  const { showMembers, onShowMembers } = useChatContext();
-  return <Button onClick={() => onShowMembers(!showMembers)} type="link" icon={<Icon type="members" />} />;
-});
+import { Button } from 'antd';
+import { customize } from '../../customize';
+import { Icon } from '../../common/Icon';
+import { useChatContext } from '../ChatContext';
+
+export const ChatMembersButton = customize('ChatMembersButton', () => {
+  const { showMembers, onShowMembers } = useChatContext();
+  return <Button onClick={() => onShowMembers(!showMembers)} type="link" icon={<Icon type="members" />} />;
+});

package/src/ui/Chat/Members/ChatMembersPanel.tsx

@@ -1,112 +1,128 @@
-import { Button, List, Space, Tooltip } from 'antd';
-import { chatifyApi } from '../../../core';
-import { customize } from '../../customize';
-import { useCallback, useMemo } from 'react';
-import { Icon } from '../../common/Icon';
-import { Avatar } from '../../common/Avatar';
-import { useChatContext } from '../ChatContext';
-
-interface ChatMemberListItemProps {
-  id: string;
-  chatId: string;
-}
-
-function useAdd(chatId: string, accountId: string, withHistory: boolean) {
-  const [add, state] = chatifyApi.useAddChatMemberMutation();
-  const onAdd = useCallback(
-    () => add({ chatId, accountId, withHistory }),
-    [add, chatId, accountId, withHistory],
-  );
-  return [onAdd, state] as const;
-}
-
-function useRemove(chatId: string, accountId: string, deleteHistory: boolean) {
-  const [remove, state] = chatifyApi.useRemoveChatMemberMutation();
-  const onRemove = useCallback(
-    () => remove({ chatId, accountId, deleteHistory }),
-    [remove, chatId, accountId, deleteHistory],
-  );
-  return [onRemove, state] as const;
-}
-
-const ChatMemberListItem = customize('ChatMemberListItem', (props: ChatMemberListItemProps) => {
-  const { chatId } = props;
-  const { data: chat } = chatifyApi.useGetChatQuery({ id: chatId });
-  const { data: accounts } = chatifyApi.useGetAccountListQuery({});
-  const account = accounts!.find((x) => x.id === props.id)!;
-  const isMember = chat!.members.some((x) => x.id === account.id);
-  const [onAddWithoutHistory] = useAdd(chatId, account.id, false);
-  const [onAddWithHistory] = useAdd(chatId, account.id, true);
-  const [onRemoveKeepHistory] = useRemove(chatId, account.id, false);
-  const [onRemoveDeleteHistory] = useRemove(chatId, account.id, true);
-
-  return (
-    <List.Item
-      className="wxchtf-chat-members-list-item"
-      actions={
-        isMember
-          ? [
-              <Tooltip key="remove" title="Remove (keep history)">
-                <Button onClick={onRemoveKeepHistory} type="link" icon={<Icon type="remove-member" />} />
-              </Tooltip>,
-              <Tooltip key="remove_delete_history" title="Remove (delete history)">
-                <Button
-                  onClick={onRemoveDeleteHistory}
-                  type="link"
-                  icon={<Icon type="remove-member-delete-history" />}
-                />
-              </Tooltip>,
-            ]
-          : [
-              <Tooltip key="add_no_history" title="Add (no history)">
-                <Button onClick={onAddWithoutHistory} type="link" icon={<Icon type="add-member" />} />
-              </Tooltip>,
-              <Tooltip key="add" title="Add (share history)">
-                <Button
-                  onClick={onAddWithHistory}
-                  type="link"
-                  icon={<Icon type="add-member-with-history" />}
-                />
-              </Tooltip>,
-            ]
-      }
-    >
-      <Space>
-        <Avatar account={account} />
-        <span>{account.name}</span>
-      </Space>
-    </List.Item>
-  );
-});
-
-export const ChatMembersPanel = customize('ChatMembersPanel', () => {
-  const { id } = useChatContext();
-  const { data: chat } = chatifyApi.useGetChatQuery({ id });
-  const { data: accounts } = chatifyApi.useGetAccountListQuery({});
-  const ordered = useMemo(
-    () =>
-      accounts
-        ?.slice()
-        .sort(
-          (a, b) =>
-            (chat?.members.some((m) => m.id === a.id) ? -100 : 0) -
-            (chat?.members.some((m) => m.id === b.id) ? -100 : 0) +
-            a.name.localeCompare(b.name),
-        ),
-    [accounts, chat],
-  );
-
-  if (!chat?.members || !accounts) {
-    return null;
-  }
-
-  return (
-    <div className="wxchtf-chat-members-panel">
-      <List
-        className="wxchtf-chat-members-list"
-        dataSource={ordered}
-        renderItem={(item) => <ChatMemberListItem id={item.id} chatId={id} />}
-      />
-    </div>
-  );
-});
+import { Button, Col, List, Row, Space, Tooltip } from 'antd';
+import { chatifyApi } from '../../../core';
+import { customize } from '../../customize';
+import { useCallback, useMemo } from 'react';
+import { Icon } from '../../common/Icon';
+import { Avatar } from '../../common/Avatar';
+import { useChatContext } from '../ChatContext';
+import { LeftOutlined } from '@ant-design/icons';
+import { useLocalizer } from '@/ui/localizer';
+
+interface ChatMemberListItemProps {
+  id: string;
+  chatId: string;
+}
+
+function useAdd(chatId: string, accountId: string, withHistory: boolean) {
+  const [add, state] = chatifyApi.useAddChatMemberMutation();
+  const onAdd = useCallback(
+    () => add({ chatId, accountId, withHistory }),
+    [add, chatId, accountId, withHistory],
+  );
+  return [onAdd, state] as const;
+}
+
+function useRemove(chatId: string, accountId: string, deleteHistory: boolean) {
+  const [remove, state] = chatifyApi.useRemoveChatMemberMutation();
+  const onRemove = useCallback(
+    () => remove({ chatId, accountId, deleteHistory }),
+    [remove, chatId, accountId, deleteHistory],
+  );
+  return [onRemove, state] as const;
+}
+
+const ChatMemberListItem = customize('ChatMemberListItem', (props: ChatMemberListItemProps) => {
+  const { chatId } = props;
+  const { data: chat } = chatifyApi.useGetChatQuery({ id: chatId });
+  const { data: accounts } = chatifyApi.useGetAccountListQuery({});
+  const account = accounts!.find((x) => x.id === props.id)!;
+  const isMember = chat!.members.some((x) => x.id === account.id);
+  const [onAddWithoutHistory] = useAdd(chatId, account.id, false);
+  const [onAddWithHistory] = useAdd(chatId, account.id, true);
+  const [onRemoveKeepHistory] = useRemove(chatId, account.id, false);
+  const [onRemoveDeleteHistory] = useRemove(chatId, account.id, true);
+
+  return (
+    <List.Item
+      className="wxchtf-chat-members-list-item"
+      actions={
+        isMember
+          ? [
+              <Tooltip key="remove" title="Remove (keep history)">
+                <Button onClick={onRemoveKeepHistory} type="link" icon={<Icon type="remove-member" />} />
+              </Tooltip>,
+              <Tooltip key="remove_delete_history" title="Remove (delete history)">
+                <Button
+                  onClick={onRemoveDeleteHistory}
+                  type="link"
+                  icon={<Icon type="remove-member-delete-history" />}
+                />
+              </Tooltip>,
+            ]
+          : [
+              <Tooltip key="add_no_history" title="Add (no history)">
+                <Button onClick={onAddWithoutHistory} type="link" icon={<Icon type="add-member" />} />
+              </Tooltip>,
+              <Tooltip key="add" title="Add (share history)">
+                <Button
+                  onClick={onAddWithHistory}
+                  type="link"
+                  icon={<Icon type="add-member-with-history" />}
+                />
+              </Tooltip>,
+            ]
+      }
+    >
+      <Space>
+        <Avatar account={account} />
+        <span>{account.name}</span>
+      </Space>
+    </List.Item>
+  );
+});
+
+export const ChatMembersPanel = customize('ChatMembersPanel', () => {
+  const { id, compact, onShowMembers } = useChatContext();
+  const localizer = useLocalizer();
+  const { data: chat } = chatifyApi.useGetChatQuery({ id });
+  const { data: accounts } = chatifyApi.useGetAccountListQuery({});
+
+  const ordered = useMemo(
+    () =>
+      accounts
+        ?.slice()
+        .sort(
+          (a, b) =>
+            (chat?.members.some((m) => m.id === a.id) ? -100 : 0) -
+            (chat?.members.some((m) => m.id === b.id) ? -100 : 0) +
+            a.name.localeCompare(b.name),
+        ),
+    [accounts, chat],
+  );
+
+  if (!chat?.members || !accounts) {
+    return null;
+  }
+
+  return (
+    <div className="wxchtf-chat-members-panel">
+      {compact && (
+        <div className="wxchtf-chat-members-panel-header">
+          <Row wrap={false} align="middle" gutter={10}>
+            <Col flex="none">
+              <Button type="text" icon={<LeftOutlined />} onClick={() => onShowMembers(false)} />
+            </Col>
+            <Col>
+              <span className="wxchtf-chat-members-panel-title">{localizer.members.title(chat.name)}</span>
+            </Col>
+          </Row>
+        </div>
+      )}
+      <List
+        className="wxchtf-chat-members-list"
+        dataSource={ordered}
+        renderItem={(item) => <ChatMemberListItem id={item.id} chatId={id} />}
+      />
+    </div>
+  );
+});