@webinex/chatify 2.0.0-alpha13 → 2.0.0-alpha14

package/src/ui/Conversation/index.ts

@@ -1,13 +1,13 @@
-export * from './InputBox';
-export * from './Message';
-export * from './NextObserver';
-export * from './ReadObserver';
-export * from './SendingMessage';
-export * from './SystemMessage';
-
-export * from './ConversationActions';
-export * from './ConversationBody';
-export * from './ConversationHeader';
-export * from './ConversationName';
-export * from './ConversationContext';
-export * from './Conversation';
+export * from './InputBox';
+export * from './Message';
+export * from './NextObserver';
+export * from './ReadObserver';
+export * from './SendingMessage';
+export * from './SystemMessage';
+
+export * from './ConversationActions';
+export * from './ConversationBody';
+export * from './ConversationHeader';
+export * from './ConversationName';
+export * from './ConversationContext';
+export * from './Conversation';

package/src/ui/Thread/ThreadActions.tsx

@@ -1,22 +1,22 @@
-import { Button, Tooltip } from 'antd';
-import { customize } from '../customize';
-import { useThreadContext } from './ThreadContext';
-import { Icon } from '../common/Icon';
-
-export const ThreadActions = customize('ThreadActions', () => {
-  const { watch, onWatch } = useThreadContext();
-
-  if (!watch) {
-    return (
-      <Tooltip title="Watch thread">
-        <Button type="link" icon={<Icon type="watch" />} onClick={() => onWatch(true)} />
-      </Tooltip>
-    );
-  }
-
-  return (
-    <Tooltip title="Unwatch thread">
-      <Button type="link" icon={<Icon type="unwatch" />} onClick={() => onWatch(false)} />
-    </Tooltip>
-  );
-});
+import { Button, Tooltip } from 'antd';
+import { customize } from '../customize';
+import { useThreadContext } from './ThreadContext';
+import { Icon } from '../common/Icon';
+
+export const ThreadActions = customize('ThreadActions', () => {
+  const { watch, onWatch } = useThreadContext();
+
+  if (!watch) {
+    return (
+      <Tooltip title="Watch thread">
+        <Button type="link" icon={<Icon type="watch" />} onClick={() => onWatch(true)} />
+      </Tooltip>
+    );
+  }
+
+  return (
+    <Tooltip title="Unwatch thread">
+      <Button type="link" icon={<Icon type="unwatch" />} onClick={() => onWatch(false)} />
+    </Tooltip>
+  );
+});

package/src/ui/Thread/ThreadContext.ts

@@ -1,13 +1,13 @@
-import React from 'react';
-
-export interface ThreadContextValue {
-  id: string;
-  watch: boolean;
-  onWatch: (value: boolean) => void;
-}
-
-export const ThreadContext = React.createContext<ThreadContextValue>(null!);
-
-export function useThreadContext() {
-  return React.useContext(ThreadContext);
-}
+import React from 'react';
+
+export interface ThreadContextValue {
+  id: string;
+  watch: boolean;
+  onWatch: (value: boolean) => void;
+}
+
+export const ThreadContext = React.createContext<ThreadContextValue>(null!);
+
+export function useThreadContext() {
+  return React.useContext(ThreadContext);
+}

package/src/ui/Thread/ThreadPanel.tsx

@@ -1,127 +1,128 @@
-import { useCallback, useEffect, useMemo } from 'react';
-import { MessageBody, chatifyApi, parseThreadMessageId } from '../../core';
-import { Conversation, ConversationCustomizeValue, ConversationProps } from '../Conversation';
-import { ThreadContext, ThreadContextValue } from './ThreadContext';
-import { Localizer, LocalizerContext, defaultLocalizer } from '../localizer';
-import { CustomizeContext } from '../customize';
-import { ThreadActions } from './ThreadActions';
-import { CommonCustomizeValue } from '../common';
-
-export interface ThreadCustomizeValue extends ConversationCustomizeValue, CommonCustomizeValue {
-  ThreadActions?: typeof ThreadActions.Component | null;
-}
-
-export interface ThreadPanelProps {
-  threadId: string;
-  className?: string;
-  customize?: ThreadCustomizeValue;
-  localizer?: Localizer;
-}
-
-function usePanelState(props: ThreadPanelProps) {
-  const { threadId } = props;
-  const { data: thread } = chatifyApi.useGetThreadQuery({ id: threadId });
-  const { data: messageList } = chatifyApi.useGetThreadMessageListQuery({ threadId });
-  const { id, name, archive, lastReadMessageId, watch } = thread ?? {};
-  const { messages, hasMore } = messageList ?? {};
-
-  const [read] = chatifyApi.useReadThreadMessageMutation();
-  const onRead = useCallback((id: string) => read({ id }), [read]);
-
-  const [fetchNext, { isLoading: isFetchNextLoading }] = chatifyApi.useFetchNextThreadMessageListMutation();
-  const onNext = useCallback(() => fetchNext({ threadId }), [fetchNext, threadId]);
-
-  const [send] = chatifyApi.useSendThreadMessageMutation();
-  const onSend = useCallback(
-    (message: MessageBody) => send({ body: message, threadId }).unwrap(),
-    [threadId, send],
-  );
-
-  const { data: readQueue } = chatifyApi.useGetThreadMessageReadQueueQuery();
-
-  const conversation = useMemo(() => {
-    if (!id) {
-      return null;
-    }
-
-    const result: ConversationProps = {
-      value: { id: id!, name: name!, active: !archive, lastReadMessageId: lastReadMessageId ?? null },
-      messages,
-      hasMore,
-      onNext,
-      nextLoading: isFetchNextLoading,
-      onRead,
-      onSend,
-      noReadTracking: !watch,
-      isReading: (id: string) =>
-        readQueue!.some(
-          (unit) => parseThreadMessageId(unit.value)[0] === parseThreadMessageId(id)[0] && id <= unit.value,
-        ),
-    };
-
-    return result;
-  }, [
-    onNext,
-    onRead,
-    onSend,
-    isFetchNextLoading,
-    id,
-    name,
-    archive,
-    messages,
-    hasMore,
-    lastReadMessageId,
-    readQueue,
-    watch,
-  ]);
-
-  const [watchThread] = chatifyApi.useWatchThreadMutation();
-
-  const threadContext = useMemo<ThreadContextValue | null>(
-    () =>
-      thread
-        ? {
-            id: thread.id,
-            watch: thread.watch,
-            onWatch: (value) => watchThread({ id: thread.id, watch: value }).unwrap(),
-          }
-        : null,
-    [thread, watchThread],
-  );
-
-  return [conversation, threadContext] as const;
-}
-
-const DEFAULT_CUSTOMIZE: ThreadCustomizeValue = {
-  ConversationActions: () => <ThreadActions />,
-};
-
-export function ThreadPanel(props: ThreadPanelProps) {
-  const { threadId, customize, localizer = defaultLocalizer, className = '' } = props;
-  const [conversation, threadContext] = usePanelState(props);
-  const customizeMergeValue = useMemo(() => ({ ...DEFAULT_CUSTOMIZE, ...customize }), [customize]);
-
-  useEffect(() => {
-    chatifyApi.settings.client.connectToThread(threadId);
-
-    return () => {
-      chatifyApi.settings.client.disconnectFromThread(threadId);
-    };
-  }, [threadId]);
-
-  if (!conversation || !threadContext) {
-    return null;
-  }
-
-  return (
-    <LocalizerContext.Provider value={localizer}>
-      <ThreadContext.Provider value={threadContext}>
-        <CustomizeContext.Provider value={customizeMergeValue as any}>
-          <div className={`wxchtf-chatify wxchtf-thread ${className}`}>
-            {conversation && <Conversation {...conversation} />}
-          </div>
-        </CustomizeContext.Provider>
-      </ThreadContext.Provider>
-    </LocalizerContext.Provider>
-  );
-}
+import { useCallback, useEffect, useMemo } from 'react';
+import { MessageBody, chatifyApi, parseThreadMessageId } from '../../core';
+import { Conversation, ConversationCustomizeValue, ConversationProps } from '../Conversation';
+import { ThreadContext, ThreadContextValue } from './ThreadContext';
+import { Localizer, LocalizerContext, defaultLocalizer } from '../localizer';
+import { CustomizeContext } from '../customize';
+import { ThreadActions } from './ThreadActions';
+import { CommonCustomizeValue } from '../common';
+
+export interface ThreadCustomizeValue extends ConversationCustomizeValue, CommonCustomizeValue {
+  ThreadActions?: typeof ThreadActions.Component | null;
+}
+
+export interface ThreadPanelProps {
+  threadId: string;
+  className?: string;
+  customize?: ThreadCustomizeValue;
+  localizer?: Localizer;
+}
+
+function usePanelState(props: ThreadPanelProps) {
+  const { threadId } = props;
+  const { data: thread } = chatifyApi.useGetThreadQuery({ id: threadId });
+  const { data: messageList } = chatifyApi.useGetThreadMessageListQuery({ threadId });
+  const { id, name, archive, lastReadMessageId, watch } = thread ?? {};
+  const { messages, hasMore } = messageList ?? {};
+
+  const [read] = chatifyApi.useReadThreadMessageMutation();
+  const onRead = useCallback((id: string) => read({ id }), [read]);
+
+  const [fetchNext, { isLoading: isFetchNextLoading }] = chatifyApi.useFetchNextThreadMessageListMutation();
+  const onNext = useCallback(() => fetchNext({ threadId }), [fetchNext, threadId]);
+
+  const [send] = chatifyApi.useSendThreadMessageMutation();
+  const onSend = useCallback(
+    (message: MessageBody) => send({ body: message, threadId }).unwrap(),
+    [threadId, send],
+  );
+
+  const { data: readQueue } = chatifyApi.useGetThreadMessageReadQueueQuery();
+
+  const conversation = useMemo(() => {
+    if (!id) {
+      return null;
+    }
+
+    const result: ConversationProps = {
+      value: { id: id!, name: name!, active: !archive, lastReadMessageId: lastReadMessageId ?? null },
+      messages,
+      hasMore,
+      onNext,
+      nextLoading: isFetchNextLoading,
+      onRead,
+      onSend,
+      noReadTracking: !watch,
+      compact: false,
+      isReading: (id: string) =>
+        readQueue!.some(
+          (unit) => parseThreadMessageId(unit.value)[0] === parseThreadMessageId(id)[0] && id <= unit.value,
+        ),
+    };
+
+    return result;
+  }, [
+    onNext,
+    onRead,
+    onSend,
+    isFetchNextLoading,
+    id,
+    name,
+    archive,
+    messages,
+    hasMore,
+    lastReadMessageId,
+    readQueue,
+    watch,
+  ]);
+
+  const [watchThread] = chatifyApi.useWatchThreadMutation();
+
+  const threadContext = useMemo<ThreadContextValue | null>(
+    () =>
+      thread
+        ? {
+            id: thread.id,
+            watch: thread.watch,
+            onWatch: (value) => watchThread({ id: thread.id, watch: value }).unwrap(),
+          }
+        : null,
+    [thread, watchThread],
+  );
+
+  return [conversation, threadContext] as const;
+}
+
+const DEFAULT_CUSTOMIZE: ThreadCustomizeValue = {
+  ConversationActions: () => <ThreadActions />,
+};
+
+export function ThreadPanel(props: ThreadPanelProps) {
+  const { threadId, customize, localizer = defaultLocalizer, className = '' } = props;
+  const [conversation, threadContext] = usePanelState(props);
+  const customizeMergeValue = useMemo(() => ({ ...DEFAULT_CUSTOMIZE, ...customize }), [customize]);
+
+  useEffect(() => {
+    chatifyApi.settings.client.connectToThread(threadId);
+
+    return () => {
+      chatifyApi.settings.client.disconnectFromThread(threadId);
+    };
+  }, [threadId]);
+
+  if (!conversation || !threadContext) {
+    return null;
+  }
+
+  return (
+    <LocalizerContext.Provider value={localizer}>
+      <ThreadContext.Provider value={threadContext}>
+        <CustomizeContext.Provider value={customizeMergeValue as any}>
+          <div className={`wxchtf-chatify wxchtf-thread ${className}`}>
+            {conversation && <Conversation {...conversation} />}
+          </div>
+        </CustomizeContext.Provider>
+      </ThreadContext.Provider>
+    </LocalizerContext.Provider>
+  );
+}

package/src/ui/Thread/index.tsx

@@ -1,3 +1,3 @@
-export * from './ThreadActions';
-export * from './ThreadPanel';
-export * from './ThreadContext';
+export * from './ThreadActions';
+export * from './ThreadPanel';
+export * from './ThreadContext';

package/src/ui/color.ts

@@ -1,20 +1,20 @@
-interface ColorOptions {
-  saturation?: number;
-  lightness?: number;
-}
-
-const DEFAULT_COLOR_OPTIONS: ColorOptions = {
-  saturation: 100,
-  lightness: 75,
-};
-
-export function color(value: string, options: ColorOptions = {}) {
-  options = Object.assign({}, DEFAULT_COLOR_OPTIONS, options);
-
-  let hash = 0;
-  for (let i = 0; i < value.length; i++) {
-    hash = value.charCodeAt(i) + ((hash << 5) - hash);
-    hash = hash & hash;
-  }
-  return `hsl(${hash % 360}, ${options.saturation}%, ${options.lightness}%)`;
-}
+interface ColorOptions {
+  saturation?: number;
+  lightness?: number;
+}
+
+const DEFAULT_COLOR_OPTIONS: ColorOptions = {
+  saturation: 100,
+  lightness: 75,
+};
+
+export function color(value: string, options: ColorOptions = {}) {
+  options = Object.assign({}, DEFAULT_COLOR_OPTIONS, options);
+
+  let hash = 0;
+  for (let i = 0; i < value.length; i++) {
+    hash = value.charCodeAt(i) + ((hash << 5) - hash);
+    hash = hash & hash;
+  }
+  return `hsl(${hash % 360}, ${options.saturation}%, ${options.lightness}%)`;
+}

package/src/ui/common/Avatar.tsx

@@ -1,20 +1,20 @@
-import { FC, ForwardedRef, forwardRef } from 'react';
-import { Account } from '../../core';
-import { Avatar as AntdAvatar } from 'antd';
-import { customize } from '../customize';
-
-export interface AvatarProps {
-  account: Account;
-}
-
-const _Avatar: FC<AvatarProps> = forwardRef(
-  (props: AvatarProps, forwardRef: ForwardedRef<HTMLSpanElement>) => {
-    const { account } = props;
-
-    return <AntdAvatar ref={forwardRef} src={account.avatar} />;
-  },
-);
-
-_Avatar.displayName = 'Avatar';
-
-export const Avatar = customize('Avatar', _Avatar);
+import { FC, ForwardedRef, forwardRef } from 'react';
+import { Account } from '../../core';
+import { Avatar as AntdAvatar } from 'antd';
+import { customize } from '../customize';
+
+export interface AvatarProps {
+  account: Account;
+}
+
+const _Avatar: FC<AvatarProps> = forwardRef(
+  (props: AvatarProps, forwardRef: ForwardedRef<HTMLSpanElement>) => {
+    const { account } = props;
+
+    return <AntdAvatar ref={forwardRef} src={account.avatar} />;
+  },
+);
+
+_Avatar.displayName = 'Avatar';
+
+export const Avatar = customize('Avatar', _Avatar);

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

@@ -1,84 +1,83 @@
-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} />
-      )}
-    </>
-  );
-});
+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) {
+  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/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>
+  );
+});