@webinex/chatify 1.0.3-rc3 → 2.0.0-alpha3

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

@@ -1,22 +1,26 @@
-import { ChatListItem as ChatListItemModel } from '../../core';
-import { customize } from '../customize';
-import { ChatListItemName } from './ChatListItemName';
-import { ChatListItemUnreadCount } from './ChatListItemUnreadCount';
-import { ChatListItemLastMessage } from './ChatListItemLastMessage';
-
-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' : '')}>
-      <ChatListItemName {...props} />
-      <ChatListItemUnreadCount {...props} />
-      <ChatListItemLastMessage {...props} />
-    </div>
-  );
-});
+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>
+  );
+});

package/src/ui/{ChatList → ChatGroup/List}/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/{ChatList → ChatGroup/List}/ChatListItemLastMessageAuthor.tsx

@@ -1,20 +1,15 @@
-import { Avatar } from '../Avatar';
-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">
-        <Avatar account={message.sentBy} /> {message.sentBy.name}
-      </div>
-    );
-  },
-);
+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>;
+  },
+);

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

@@ -1,21 +1,21 @@
-import { useLocalizer } from '../localizer';
-import { formatSystemMessage } from '../SystemMessage/SystemMessageRow';
-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 { message } = props.chat;
+    const localizer = useLocalizer();
+
+    return (
+      <div className="wxchtf-chat-last-message">
+        {message.sentBy.id === 'chatify::system'
+          ? message.text && formatSystemMessage(localizer, message.text)
+          : message.text}
+      </div>
+    );
+  },
+);

package/src/ui/{ChatList → ChatGroup/List}/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: {
+        message: { 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/ChatListItemName.tsx

@@ -0,0 +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>;
+});

package/src/ui/{ChatList → ChatGroup/List}/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 <= 0) {
+    return null;
+  }
+
+  return <div className="wxchtf-unread-count">{unreadCount}</div>;
+});

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,154 +1,9 @@
-import { CSSProperties, FC, useMemo } from 'react';
-import { useReadMonitor } from '../core';
-import { Localizer, LocalizerContext, defaultLocalizer } from './localizer';
-import { Avatar } from './Avatar';
-import { CustomizeProvider, CustomizeProviderValue } 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,
-  ChatListItemLastMessageSentAt,
-} 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;
-  ChatListItemLastMessageSentAt?: typeof ChatListItemLastMessageSentAt.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 DEFAULT_CUSTOMIZE: ChatifyCustomizeValue = {
-  Header: null,
-  Footer: null,
-};
-
-export const Chatify: FC<ChatifyProps> = (props) => {
-  const { localizer = defaultLocalizer, customize = DEFAULT_CUSTOMIZE } = props;
-  const customizeValue = useMemo(() => Object.assign({}, DEFAULT_CUSTOMIZE, customize), [customize]);
-
-  return (
-    <LocalizerContext.Provider value={localizer}>
-      <CustomizeProvider value={customizeValue as CustomizeProviderValue}>
-        <Content {...props} />
-      </CustomizeProvider>
-    </LocalizerContext.Provider>
-  );
-};
-
-Chatify.displayName = 'Chatify';
+import { ChatPanel } from './Chat';
+import { ChatGroupPanel } from './ChatGroup';
+import { ThreadPanel } from './Thread';
+
+export const Chatify = {
+  Thread: ThreadPanel,
+  ChatGroup: ChatGroupPanel,
+  Chat: ChatPanel,
+};

package/src/ui/Conversation/Conversation.tsx

@@ -0,0 +1,78 @@
+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';
+import type { Flippo } from '@webinex/flippo';
+
+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;
+  flippo?: Flippo;
+}
+
+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,29 @@
+import React from 'react';
+import { MessageBase, MessageBody } from '../../core';
+import type { Flippo } from '@webinex/flippo';
+
+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;
+  flippo?: Flippo;
+}
+
+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>;
+});