@webinex/chatify 1.0.2-rc3 → 2.0.0-alpha1

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

@@ -1,4 +1,4 @@
-import { customize } from '../customize';
+import { customize } from '../../customize';
 import { ChatListItemBoxProps } from './ChatListItemBox';
 
 export const ChatListItemUnreadCount = customize('ChatListItemUnreadCount', (props: ChatListItemBoxProps) => {

package/src/ui/ChatGroup/List/index.ts

@@ -0,0 +1,31 @@
+import { ChatList } from './ChatList';
+import { ChatListItemAvatar } from './ChatListItemAvatar';
+import { ChatListItemBox } from './ChatListItemBox';
+import { ChatListItemLastMessage } from './ChatListItemLastMessage';
+import { ChatListItemLastMessageAuthor } from './ChatListItemLastMessageAuthor';
+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';
+export * from './ChatListItemLastMessage';
+export * from './ChatListItemLastMessageAuthor';
+export * from './ChatListItemLastMessageContent';
+export * from './ChatListItemLastMessageSentAt';
+export * from './ChatListItemName';
+export * from './ChatListItemUnreadCount';
+
+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;
+}

package/src/ui/ChatGroup/index.ts

@@ -0,0 +1,5 @@
+export * from './Create';
+export * from './Layout';
+export * from './List';
+export * from './ChatGroupContext';
+export * from './ChatGroupPanel';

package/src/ui/Chatify.tsx

@@ -1,148 +1,9 @@
-import { CSSProperties, FC } from 'react';
-import { useReadMonitor } from '../core';
-import { Localizer, LocalizerContext, defaultLocalizer } from './localizer';
-import { Avatar } from './Avatar';
-import { CustomizeProvider } from './customize';
-import { ChatHeaderMembers } from './ChatPanel/ChatHeaderMembers';
-import { ChatMembersButton } from './ChatPanel/ChatMembersButton';
-import { AddChatButton } from './AddChatButton';
-import { ChatName } from './ChatName';
-
-import { Aside, Main, Body, Footer, Header } from './Layout';
-
-import {
-  ChatListItemBox,
-  ChatListItemLastMessageContent,
-  ChatListItemLastMessageAuthor,
-  ChatListItemLastMessage,
-  ChatListItemUnreadCount,
-  ChatListItemName,
-} from './ChatList';
-
-import {
-  SendingMessageBox,
-  SendingMessageContent,
-  SendingMessageInfoBox,
-  SendingMessageText,
-} from './SendingMessage';
-
-import {
-  MessageBox,
-  MessageRow,
-  MessageContent,
-  MessageText,
-  MessageAuthor,
-  MessageInfoBox,
-} from './Message';
-
-import { MessageReadObserver } from './MessageReadObserver';
-import { Icon } from './Icon';
-import { SystemMessageRow } from './SystemMessage/SystemMessageRow';
-import { ChatList } from './ChatList';
-import { ChatBody, ChatHeader, ChatHeaderName, ChatPanel } from './ChatPanel';
-import { InputBox, InputFilesBox, InputSubmitButtonBox, InputTextBox } from './InputBox';
-import { SystemMessageBox } from './SystemMessage';
-import {
-  CreateChatForm,
-  CreateChatMemberInput,
-  CreateChatNameInput,
-  CreateChatPanel,
-} from './CreateChatPanel';
-
-export interface ChatifyCustomizeValue {
-  // ./ChatList
-  ChatList?: typeof ChatList.Component | null;
-  ChatListItemBox?: typeof ChatListItemBox.Component | null;
-  ChatListItemName?: typeof ChatListItemName.Component | null;
-  ChatListItemUnreadCount?: typeof ChatListItemUnreadCount.Component | null;
-  ChatListItemLastMessage?: typeof ChatListItemLastMessage.Component | null;
-  ChatListItemLastMessageAuthor?: typeof ChatListItemLastMessageAuthor.Component | null;
-  ChatListItemLastMessageContent?: typeof ChatListItemLastMessageContent.Component | null;
-
-  // ./Layout
-  Header?: typeof Header.Component | null;
-  Footer?: typeof Footer.Component | null;
-  Body?: typeof Body.Component | null;
-  Main?: typeof Main.Component | null;
-  Aside?: typeof Aside.Component | null;
-
-  // ./Message
-  MessageAuthor?: typeof MessageAuthor.Component | null;
-  MessageBox?: typeof MessageBox.Component | null;
-  MessageContent?: typeof MessageContent.Component | null;
-  MessageInfoBox?: typeof MessageInfoBox.Component | null;
-  MessageRow?: typeof MessageRow.Component | null;
-  MessageText?: typeof MessageText.Component | null;
-
-  // ./SendingMessage
-  SendingMessageBox?: typeof SendingMessageBox.Component | null;
-  SendingMessageContent?: typeof SendingMessageContent.Component | null;
-  SendingMessageInfoBox?: typeof SendingMessageInfoBox.Component | null;
-  SendingMessageText?: typeof SendingMessageText.Component | null;
-
-  // ./ChatPanel
-  ChatBody?: typeof ChatBody.Component | null;
-  ChatHeader?: typeof ChatHeader.Component | null;
-  ChatHeaderMembers?: typeof ChatHeaderMembers.Component | null;
-  ChatHeaderName?: typeof ChatHeaderName.Component | null;
-  ChatPanel?: typeof ChatPanel.Component | null;
-  ChatMembersButton?: typeof ChatMembersButton.Component | null;
-
-  // ./InputBox
-  InputBox?: typeof InputBox.Component | null;
-  InputFilesBox?: typeof InputFilesBox.Component | null;
-  InputSubmitButtonBox?: typeof InputSubmitButtonBox.Component | null;
-  InputTextBox?: typeof InputTextBox.Component | null;
-
-  // ./SystemMessage
-  SystemMessageBox?: typeof SystemMessageBox.Component | null;
-  SystemMessageRow?: typeof SystemMessageRow.Component | null;
-
-  // ./CreateChatPanel
-  CreateChatForm?: typeof CreateChatForm.Component | null;
-  CreateChatMemberInput?: typeof CreateChatMemberInput.Component | null;
-  CreateChatNameInput?: typeof CreateChatNameInput.Component | null;
-  CreateChatPanel?: typeof CreateChatPanel.Component | null;
-
-  MessageReadObserver?: typeof MessageReadObserver.Component | null;
-  Avatar?: typeof Avatar.Component | null;
-  AddChatButton?: typeof AddChatButton.Component | null;
-  ChatName?: typeof ChatName.Component | null;
-  Icon?: typeof Icon.Component | null;
-}
-
-export interface ChatifyProps {
-  className?: string;
-  style?: CSSProperties;
-  localizer?: Localizer;
-  customize?: ChatifyCustomizeValue;
-}
-
-function Content(props: Pick<ChatifyProps, 'className' | 'style'>) {
-  const { className = '', style } = props;
-  useReadMonitor();
-
-  return (
-    <div className={className + ' wxchtf-chatify'} style={style}>
-      <Header />
-      <Body />
-      <Footer />
-    </div>
-  );
-}
-
-const EMPTY_CUSTOMIZE = {};
-
-export const Chatify: FC<ChatifyProps> = (props) => {
-  const { localizer = defaultLocalizer, customize = EMPTY_CUSTOMIZE } = props;
-
-  return (
-    <LocalizerContext.Provider value={localizer}>
-      <CustomizeProvider value={customize}>
-        <Content {...props} />
-      </CustomizeProvider>
-    </LocalizerContext.Provider>
-  );
+import { ChatPanel } from './Chat';
+import { ChatGroupPanel } from './ChatGroup';
+import { ThreadPanel } from './Thread';
+
+export const Chatify = {
+  Thread: ThreadPanel,
+  ChatGroup: ChatGroupPanel,
+  Chat: ChatPanel,
 };
-
-Chatify.displayName = 'Chatify';

package/src/ui/Conversation/Conversation.tsx

@@ -0,0 +1,76 @@
+import { ConversationHeader } from './ConversationHeader';
+import { ConversationBody } from './ConversationBody';
+import { customize } from '../customize';
+import { ConversationName } from './ConversationName';
+import { ConversationContext, ConversationContextValue, ConversationValue } from './ConversationContext';
+import { useMemo } from 'react';
+import { InputBox, InputBoxCustomizeValue } from './InputBox';
+import { ConversationActions } from './ConversationActions';
+import { MessageCustomizeValue } from './Message';
+import { SendingMessageCustomizeValue } from './SendingMessage';
+import { SystemMessageCustomizeValue } from './SystemMessage';
+import { CommonCustomizeValue } from '../common';
+
+export interface ConversationProps extends Omit<ConversationContextValue, keyof ConversationValue> {
+  value: ConversationValue;
+}
+
+export interface ConversationCustomizeValue
+  extends InputBoxCustomizeValue,
+    MessageCustomizeValue,
+    SendingMessageCustomizeValue,
+    SystemMessageCustomizeValue,
+    CommonCustomizeValue {
+  ConversationActions?: typeof ConversationActions.Component | null;
+  ConversationBody?: typeof ConversationBody.Component | null;
+  ConversationHeader?: typeof ConversationHeader.Component | null;
+  ConversationName?: typeof ConversationName.Component | null;
+}
+
+export const Conversation = customize('Conversation', (props: ConversationProps) => {
+  const { value, hasMore, messages, nextLoading, onNext, onRead, onSend, isReading, noReadTracking } = props;
+  const { id, active, name, lastReadMessageId } = value;
+
+  const context = useMemo<ConversationContextValue>(
+    () => ({
+      id,
+      name,
+      active,
+      lastReadMessageId,
+      hasMore,
+      messages,
+      nextLoading,
+      onNext,
+      onRead,
+      onSend,
+      isReading,
+      noReadTracking,
+    }),
+    [
+      id,
+      name,
+      active,
+      onNext,
+      onRead,
+      onSend,
+      hasMore,
+      messages,
+      nextLoading,
+      lastReadMessageId,
+      isReading,
+      noReadTracking,
+    ],
+  );
+
+  return (
+    <ConversationContext.Provider value={context}>
+      <div className="wxchtf-conversation">
+        <div className="wxchtf-conversation-main">
+          <ConversationHeader />
+          <ConversationBody />
+          {active && <InputBox />}
+        </div>
+      </div>
+    </ConversationContext.Provider>
+  );
+});

package/src/ui/Conversation/ConversationActions.tsx

@@ -0,0 +1,5 @@
+import { customize } from '../customize';
+
+export const ConversationActions = customize('ConversationActions', () => {
+  return null;
+});

package/src/ui/Conversation/ConversationBody.tsx

@@ -0,0 +1,28 @@
+import { MessageBox } from './Message';
+import { NextMessagesObserver } from './NextObserver';
+import { SystemMessageBox } from './SystemMessage';
+import { MessageSkeleton } from '../common/MessageSkeleton';
+import { customize } from '../customize';
+import { SYSTEM_ID } from '../../core';
+import { useConversation } from './ConversationContext';
+
+// TODO: Add sending message box
+export const ConversationBody = customize('ConversationBody', () => {
+  const { id, messages = [], hasMore, onNext, nextLoading } = useConversation();
+
+  return (
+    <div className="wxchtf-conversation-body">
+      {!messages && <MessageSkeleton count={5} />}
+
+      {messages?.map((x) => {
+        if (x.sentBy.id === SYSTEM_ID) {
+          return <SystemMessageBox key={x.id} message={x} />;
+        }
+
+        return <MessageBox message={x} key={x.id} />;
+      })}
+
+      {hasMore && <NextMessagesObserver key={messages.length + id} onLoad={onNext} loading={nextLoading} />}
+    </div>
+  );
+});

package/src/ui/Conversation/ConversationContext.ts

@@ -0,0 +1,27 @@
+import React from 'react';
+import { MessageBase, MessageBody } from '../../core';
+
+export interface ConversationValue {
+  id: string;
+  name: string;
+  active: boolean;
+  lastReadMessageId: string | null;
+}
+
+export interface ConversationContextValue extends ConversationValue {
+  messages?: MessageBase[];
+  hasMore?: boolean;
+  nextLoading: boolean;
+  noReadTracking?: boolean;
+
+  isReading: (id: string) => boolean;
+  onNext: () => void;
+  onSend: (message: MessageBody) => void;
+  onRead: (id: string) => void;
+}
+
+export const ConversationContext = React.createContext<ConversationContextValue>(undefined!);
+
+export function useConversation() {
+  return React.useContext(ConversationContext);
+}

package/src/ui/Conversation/ConversationHeader.tsx

@@ -0,0 +1,23 @@
+import { Col, Row } from 'antd';
+import { customize, useCustomize } from '../customize';
+import { ConversationName } from './ConversationName';
+import { ConversationActions } from './ConversationActions';
+
+export const ConversationHeader = customize('ConversationHeader', () => {
+  const Actions = useCustomize(ConversationActions);
+
+  return (
+    <div className="wxchtf-conversation-header">
+      <Row justify="space-between" align="middle">
+        <Col>
+          <ConversationName />
+        </Col>
+        {Actions && (
+          <Col className="wxchtf-conversation-actions">
+            <Actions />
+          </Col>
+        )}
+      </Row>
+    </div>
+  );
+});

package/src/ui/Conversation/ConversationName.tsx

@@ -0,0 +1,7 @@
+import { customize } from '../customize';
+import { useConversation } from './ConversationContext';
+
+export const ConversationName = customize('ConversationName', () => {
+  const { name } = useConversation();
+  return <span className="wxchtf-conversation-name">{name}</span>;
+});

package/src/ui/Conversation/InputBox/InputBox.tsx

@@ -0,0 +1,40 @@
+import { useCallback, useLayoutEffect, useRef, useState } from 'react';
+import { InputFilesBox } from './InputFilesBox';
+import { InputTextBox } from './InputTextBox';
+import { customize } from '../../customize';
+import { InputSubmitButtonBox } from './InputSubmitButtonBox';
+import { useConversation } from '../ConversationContext';
+
+function useFormState() {
+  const { onSend } = useConversation();
+  const [text, setText] = useState('');
+
+  const onSubmit = useCallback(() => {
+    if (text.length === 0) {
+      return;
+    }
+
+    setText('');
+    Promise.resolve(onSend({ text, files: [] })).catch(() => setText(text));
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [text, onSend]);
+
+  return [onSubmit, { text, setText }] as const;
+}
+
+export const InputBox = customize('InputBox', () => {
+  const [onSend, { text, setText }] = useFormState();
+  const inputRef = useRef<HTMLTextAreaElement>(null);
+
+  useLayoutEffect(() => inputRef.current?.focus(), []);
+
+  return (
+    <div className="wxchtf-input-form">
+      <div className="wxchtf-input-box">
+        <InputFilesBox />
+        <InputTextBox value={text} onSend={onSend} onChange={setText} inputRef={inputRef} />
+        <InputSubmitButtonBox onSubmit={onSend} />
+      </div>
+    </div>
+  );
+});

package/src/ui/{InputBox → Conversation/InputBox}/InputFilesBox.tsx

@@ -1,6 +1,6 @@
 import { Button } from 'antd';
-import { customize } from '../customize';
-import { Icon } from '../Icon';
+import { customize } from '../../customize';
+import { Icon } from '../../common/Icon';
 
 export const InputFilesBox = customize('InputFilesBox', () => (
   <div className="wxchtf-add-files-box">

package/src/ui/{InputBox → Conversation/InputBox}/InputSubmitButtonBox.tsx

@@ -1,6 +1,6 @@
 import { Button } from 'antd';
-import { customize } from '../customize';
-import { Icon } from '../Icon';
+import { customize } from '../../customize';
+import { Icon } from '../../common/Icon';
 
 export interface InputSubmitButtonBoxProps {
   onSubmit: () => void;

package/src/ui/{InputBox → Conversation/InputBox}/InputTextBox.tsx

@@ -1,23 +1,25 @@
 import { Input } from 'antd';
-import { customize } from '../customize';
+import { customize } from '../../customize';
 import isHotkey from 'is-hotkey';
-import { memo, useCallback } from 'react';
-import { useLocalizer } from '../localizer';
+import { RefObject, memo, useCallback } from 'react';
+import { useLocalizer } from '../../localizer';
+import { TextAreaProps } from 'antd/es/input';
 
 export interface TextInputBoxProps {
   value: string;
   onChange: (value: string) => void;
   onSend: (value: string) => void;
+  inputRef?: RefObject<HTMLTextAreaElement>;
 }
 
 const isSend = isHotkey('ctrl+enter');
 
-const AUTO_SIZE = { maxRows: 5 };
+const AUTO_SIZE: TextAreaProps['autoSize'] = { maxRows: 5, minRows: 1 };
 
 export const InputTextBox = customize(
   'InputTextBox',
   memo((props: TextInputBoxProps) => {
-    const { value, onChange, onSend } = props;
+    const { value, onChange, onSend, inputRef } = props;
     const localizer = useLocalizer();
 
     const onInputChange = useCallback(
@@ -37,6 +39,7 @@ export const InputTextBox = customize(
     return (
       <div className="wxchtf-text-input-box">
         <Input.TextArea
+          ref={inputRef}
           value={value}
           onChange={onInputChange}
           autoSize={AUTO_SIZE}

package/src/ui/Conversation/InputBox/index.ts

@@ -0,0 +1,16 @@
+import { InputBox } from './InputBox';
+import { InputFilesBox } from './InputFilesBox';
+import { InputSubmitButtonBox } from './InputSubmitButtonBox';
+import { InputTextBox } from './InputTextBox';
+
+export * from './InputBox';
+export * from './InputFilesBox';
+export * from './InputSubmitButtonBox';
+export * from './InputTextBox';
+
+export interface InputBoxCustomizeValue {
+  InputBox?: typeof InputBox.Component | null;
+  InputTextBox?: typeof InputTextBox.Component | null;
+  InputFilesBox?: typeof InputFilesBox.Component | null;
+  InputSubmitButtonBox?: typeof InputSubmitButtonBox.Component | null;
+}

package/src/ui/{Message → Conversation/Message}/MessageAuthor.tsx

@@ -1,5 +1,5 @@
-import { customize } from '../customize';
-import { Avatar } from '../Avatar';
+import { customize } from '../../customize';
+import { Avatar } from '../../common/Avatar';
 import type { MessageBoxProps } from './MessageBox';
 
 export const MessageAuthor = customize('MessageAuthor', (props: MessageBoxProps) => {

package/src/ui/{Message → Conversation/Message}/MessageBox.tsx

@@ -1,11 +1,11 @@
 import { useRef } from 'react';
-import { Message } from '../../core';
-import { customize } from '../customize';
-import { MessageReadObserver } from '../MessageReadObserver';
+import { customize } from '../../customize';
+import { MessageReadObserver } from '../ReadObserver';
 import { MessageRow } from './MessageRow';
+import { MessageBase } from '../../../core';
 
 export interface MessageBoxProps {
-  message: Message;
+  message: MessageBase;
 }
 
 export const MessageBox = customize('MessageBox', (props: MessageBoxProps) => {

package/src/ui/{Message → Conversation/Message}/MessageContent.tsx

@@ -1,13 +1,11 @@
-import { customize } from '../customize';
+import { customize } from '../../customize';
 import { MessageText } from './MessageText';
-import { MessageInfoBox } from './MessageInfoBox';
 import type { MessageBoxProps } from './MessageBox';
 
 export const MessageContent = customize('MessageContent', (props: MessageBoxProps) => {
   return (
     <div className="wxchtf-message-content">
       <MessageText {...props} />
-      <MessageInfoBox {...props} />
     </div>
   );
 });

package/src/ui/{Message → Conversation/Message}/MessageInfoBox.tsx

@@ -1,21 +1,24 @@
-import { useMe } from '../../ChatifyContext';
-import { useSelect } from '../../core';
-import { customize } from '../customize';
-import { useLocalizer } from '../localizer';
+import { chatifyApi } from '../../../core';
+import { customize } from '../../customize';
+import { useLocalizer } from '../../localizer';
+import { useConversation } from '../ConversationContext';
 import type { MessageBoxProps } from './MessageBox';
 
 export const MessageInfoBox = customize('MessageInfoBox', (props: MessageBoxProps) => {
   const { message } = props;
   const { id, sentBy, sentAt } = message;
-  const me = useMe();
+  const { lastReadMessageId, isReading, noReadTracking } = useConversation();
+  const me = chatifyApi.settings.me();
   const my = sentBy.id === me;
   const localizer = useLocalizer();
-  const reading = useSelect((x) => x.queue.read.queued.includes(id), []);
+  const isRead = lastReadMessageId != null && id.localeCompare(lastReadMessageId) <= 0;
+  const reading = !isRead && isReading(id);
 
   return (
     <div className="wxchtf-message-info-box">
+      {!my && <div className="wxchtf-message-author-name">{sentBy.name},</div>}
       <div className="wxchtf-message-sent-at">{localizer.timestamp(sentAt)}</div>
-      {!my && (
+      {!my && !noReadTracking && (
         <div className="wxchtf-message-read-box">
           {reading ? localizer.message.reading() : localizer.message.read()}
         </div>

package/src/ui/{Message → Conversation/Message}/MessageRow.tsx

@@ -1,9 +1,10 @@
-import { useMe } from '../../ChatifyContext';
 import { Ref } from 'react';
-import { customize } from '../customize';
+import { customize } from '../../customize';
 import { MessageAuthor } from './MessageAuthor';
 import { MessageContent } from './MessageContent';
 import { MessageBoxProps } from './MessageBox';
+import { MessageInfoBox } from './MessageInfoBox';
+import { chatifyApi } from '../../../core';
 
 export interface MessageRowProps extends MessageBoxProps {
   containerRef?: Ref<HTMLDivElement>;
@@ -12,13 +13,16 @@ export interface MessageRowProps extends MessageBoxProps {
 export const MessageRow = customize('MessageRow', (props: MessageRowProps) => {
   const { message, containerRef } = props;
   const { sentBy } = message;
-  const me = useMe();
+  const me = chatifyApi.settings.me();
   const my = sentBy.id === me;
 
   return (
     <div ref={containerRef} className={'wxchtf-message' + (my ? ' --my' : '')}>
       <MessageAuthor {...props} />
-      <MessageContent {...props} />
+      <div>
+        <MessageInfoBox {...props} />
+        <MessageContent {...props} />
+      </div>
     </div>
   );
 });

package/src/ui/{Message → Conversation/Message}/MessageText.tsx

@@ -1,4 +1,4 @@
-import { customize } from '../customize';
+import { customize } from '../../customize';
 import { MessageBoxProps } from './MessageBox';
 
 export const MessageText = customize('MessageText', (props: MessageBoxProps) => {

package/src/ui/Conversation/Message/index.ts

@@ -0,0 +1,22 @@
+import { MessageAuthor } from './MessageAuthor';
+import { MessageBox } from './MessageBox';
+import { MessageContent } from './MessageContent';
+import { MessageInfoBox } from './MessageInfoBox';
+import { MessageRow } from './MessageRow';
+import { MessageText } from './MessageText';
+
+export * from './MessageAuthor';
+export * from './MessageBox';
+export * from './MessageContent';
+export * from './MessageInfoBox';
+export * from './MessageRow';
+export * from './MessageText';
+
+export interface MessageCustomizeValue {
+  MessageAuthor?: typeof MessageAuthor.Component | null;
+  MessageBox?: typeof MessageBox.Component | null;
+  MessageContent?: typeof MessageContent.Component | null;
+  MessageInfoBox?: typeof MessageInfoBox.Component | null;
+  MessageRow?: typeof MessageRow.Component | null;
+  MessageText?: typeof MessageText.Component | null;
+}