@webinex/chatify 1.0.3-rc3 → 2.0.0-alpha1

package/src/core/types.tsx

@@ -0,0 +1,152 @@
+export interface File {
+  name: string;
+  bytes: number;
+  ref: string;
+}
+
+export interface Account {
+  id: string;
+  name: string;
+  avatar: string;
+}
+
+export interface MessageBase {
+  id: string;
+  text: string;
+  files: File[];
+  sentAt: string;
+  sentBy: Account;
+}
+
+export interface ChatMessage extends MessageBase {
+  chatId: string;
+  requestId?: string;
+}
+
+export interface Chat {
+  id: string;
+  name: string;
+  members: Account[];
+  active: boolean;
+  lastReadMessageId: string | null;
+}
+
+export interface ChatListItem {
+  id: string;
+  name: string;
+  message: ChatMessage;
+  totalUnreadCount: number;
+  active: boolean;
+  lastReadMessageId: string | null;
+}
+
+export interface SendChatMessageRequest {
+  chatId: string;
+  text: string;
+  files: File[];
+  requestId: string;
+}
+
+export interface MessageBody {
+  text: string;
+  files: File[];
+}
+
+export interface AddChatRequest {
+  requestId: string;
+  name: string;
+  message?: MessageBody;
+  members: string[];
+}
+
+export interface ReadChatMessageRequest {
+  id: string;
+}
+
+export interface ReadChatMessageEvent {
+  chatId: string;
+  newLastReadMessageId: string;
+  readCount: number;
+}
+
+export interface RemoveChatMemberRequest {
+  chatId: string;
+  accountId: string;
+  deleteHistory: boolean;
+}
+
+export interface AddChatMemberRequest {
+  chatId: string;
+  accountId: string;
+  withHistory: boolean;
+}
+
+export interface UpdateChatNameRequest {
+  id: string;
+  name: string;
+}
+
+export function chatId(messageId: string) {
+  return messageId.slice(0, 36);
+}
+
+export interface ThreadWatchListItem {
+  id: string;
+  name: string;
+  createdById: string;
+  createdAt: string;
+  archive: boolean;
+  lastMessage: ThreadMessage | null;
+  lastReadMessageId: string | null;
+}
+
+export interface Thread {
+  id: string;
+  name: string;
+  createdBy: Account;
+  createdAt: string;
+  archive: boolean;
+  lastMessageId: string | null;
+  lastReadMessageId: string | null;
+  watch: boolean;
+}
+
+export interface ThreadMessage extends MessageBase {
+  threadId: string;
+}
+
+export interface SendThreadMessageRequest {
+  threadId: string;
+  body: MessageBody;
+}
+
+export type SystemMessageText =
+  | 'chatify://chat-created'
+  | 'chatify://member-added'
+  | 'chatify://member-removed'
+  | `chatify://chat-name-changed`;
+
+export function parseThreadMessageId(messageId: string) {
+  const [threadId, index] = messageId.split('::', 2);
+  return [threadId, parseInt(index, 10)] as const;
+}
+
+export function calcThreadUnreadCount(
+  thread: Pick<ThreadWatchListItem, 'lastMessage' | 'lastReadMessageId'>,
+) {
+  const lastReadMessageIndex =
+    thread.lastReadMessageId != null ? parseThreadMessageId(thread.lastReadMessageId)[1] : -1;
+
+  const lastThreadMessageIndex =
+    thread.lastMessage?.id != null ? parseThreadMessageId(thread.lastMessage?.id)[1] : -1;
+
+  return lastThreadMessageIndex - lastReadMessageIndex;
+}
+
+export function calcThreadListUnreadCount(
+  threads: Pick<ThreadWatchListItem, 'lastMessage' | 'lastReadMessageId'>[],
+) {
+  return threads.reduce((prev, thread) => {
+    return prev + calcThreadUnreadCount(thread);
+  }, 0);
+}

package/src/index.ts

@@ -1,3 +1,2 @@
 export * from './ui';
 export * from './core';
-export * from './ChatifyContext';

package/src/styles/aside.scss

@@ -1,10 +1,12 @@
+@use './variables.scss' as vars;
+
 .wxchtf-aside {
   flex: none;
   display: flex;
   flex-flow: column nowrap;
   background: #ffffff;
-  border-top-left-radius: $radius;
-  border-bottom-left-radius: $radius;
+  border-top-left-radius: vars.$radius;
+  border-bottom-left-radius: vars.$radius;
   padding-top: 15px;
   width: 320px;
   position: relative;
@@ -48,6 +50,7 @@
 
         .wxchtf-chat-name {
           font-weight: 600;
+          color: inherit;
         }
       }
 
@@ -55,6 +58,9 @@
         padding-inline: 10px;
         padding-block: 8.5px;
         position: relative;
+        display: flex;
+        flex-flow: row nowrap;
+        align-items: center;
 
         &.--unread {
           .wxchtf-chat-last {
@@ -67,9 +73,32 @@
           }
         }
 
+        .wxchtf-chat-info {
+          min-width: 1;
+        }
+
         .wxchtf-chat-name {
           display: inline-block;
           font-weight: 500;
+          color: rgba(0, 0, 0, 0.88);
+        }
+
+        .wxchtf-chat-avatar {
+          background-color: var(--background-color);
+          width: 42px;
+          height: 42px;
+          line-height: 40px;
+          text-align: center;
+          color: var(--color);
+          border-radius: 50%;
+          margin-right: 11px;
+          flex: none;
+
+          .anticon {
+            font-size: 20px;
+            line-height: 42px;
+            height: 42px;
+          }
         }
 
         .wxchtf-unread-count {

package/src/styles/chat.scss

@@ -1,22 +1,33 @@
+@use './variables.scss' as vars;
+
 .wxchtf-chatify {
-  .wxchtf-chat-panel {
+  .wxchtf-chat {
     flex: auto;
     display: flex;
     flex-flow: row nowrap;
+    min-width: 1;
+  }
 
-    .wxchtf-chat-main {
+  .wxchtf-conversation {
+    flex: auto;
+    display: flex;
+    flex-flow: row nowrap;
+    min-width: 1;
+
+    .wxchtf-conversation-main {
       flex: 1;
       display: flex;
       flex-flow: column nowrap;
+      min-width: 0;
 
-      .wxchtf-chat-header {
+      .wxchtf-conversation-header {
         padding: 15px 20px;
         line-height: 24px;
-        z-index: 1;
+        z-index: 2;
         box-shadow: 0px 2px 4px 0px rgba(88, 99, 107, 0.04), 0px 1px 9px -1px rgba(88, 99, 107, 0.04),
           0px 1px 2px 0px rgba(88, 99, 107, 0.06);
 
-        .wxchtf-chat-name {
+        .wxchtf-conversation-name {
           font-weight: 600;
           font-size: 16px;
           flex: none;
@@ -26,13 +37,17 @@
           }
         }
 
+        .wxchtf-conversation-actions {
+          display: inline-flex;
+        }
+
         .wxchtf-chat-members {
           display: inline-flex;
           gap: 6px;
         }
       }
 
-      .wxchtf-chat-body {
+      .wxchtf-conversation-body {
         flex: 1 1 auto;
         height: 100px;
         overflow-y: auto;
@@ -50,7 +65,7 @@
         .wxchtf-system-message,
         .wxchtf-message-skeleton {
           margin-bottom: 8px;
-          max-width: $messageBoxWidth;
+          max-width: vars.$messageBoxWidth;
           width: 100%;
 
           &:first-child {
@@ -64,6 +79,10 @@
           flex-flow: row nowrap;
           align-items: flex-start;
 
+          & > div {
+            min-width: 0;
+          }
+
           &:not(.--my) {
             .wxchtf-message-content,
             .wxchtf-sending-message-content {
@@ -83,7 +102,7 @@
             .wxchtf-sending-message-content {
               direction: ltr;
               border-bottom-right-radius: 0;
-              background-color: $myMessageBackground;
+              background-color: vars.$myMessageBackground;
             }
 
             .wxchtf-message-info-box {
@@ -93,9 +112,10 @@
 
           .wxchtf-message-author {
             margin-right: 15px;
+            flex: none;
 
             .ant-avatar {
-              @include avatarSize($avatarSize);
+              @include avatarSize(vars.$avatarSize);
             }
           }
 
@@ -127,7 +147,7 @@
             max-width: 70%;
             padding: 12px 19px;
             background: white;
-            background-color: $messageBackground;
+            background-color: vars.$messageBackground;
             display: block;
             white-space: pre-wrap;
             overflow-wrap: break-word;
@@ -158,17 +178,6 @@
           .wxchtf-timestamp {
             padding-left: 10px;
           }
-
-          &::after {
-            content: '';
-            position: absolute;
-            height: 1px;
-            width: 100%;
-            left: 0;
-            top: 50%;
-            z-index: 0;
-            background-color: #0000000f;
-          }
         }
 
         .wxchtf-message-skeleton {
@@ -181,31 +190,19 @@
           }
 
           .wxchtf-avatar .ant-skeleton-avatar {
-            width: $avatarSize;
-            height: $avatarSize;
-            line-height: $avatarSize;
+            width: vars.$avatarSize;
+            height: vars.$avatarSize;
+            line-height: vars.$avatarSize;
           }
 
           .wxchtf-content {
             width: 300px;
             height: 100px;
-            border-radius: $messageBorderRadius;
+            border-radius: vars.$messageBorderRadius;
             border-bottom-left-radius: 0;
           }
         }
       }
     }
-
-    .wxchtf-chat-members-panel {
-      min-width: 300px;
-      box-shadow: -4px 0px 20px -5px #0cd9e214, -2px 1px 12px #006e720f;
-
-      .wxchtf-chat-members-list {
-        .wxchtf-chat-members-list-item {
-          padding-inline: 1rem;
-          border-block-end: none;
-        }
-      }
-    }
   }
 }

package/src/styles/index.scss

@@ -1,15 +1,16 @@
-@import './variables.scss';
+@use './variables.scss' as vars;
 @import './mixins.scss';
 @import './keyframes.scss';
 @import './aside.scss';
 @import './chat.scss';
 @import './input.scss';
+@import './members.scss';
 
 .wxchtf-chatify {
   display: flex;
   flex-flow: column nowrap;
-  background: $background;
-  border-radius: $radius;
+  background: vars.$background;
+  border-radius: vars.$radius;
 
   .wxchtf-header {
     min-height: 2rem;
@@ -50,10 +51,11 @@
   flex: auto;
   display: flex;
   flex-flow: column nowrap;
-  border-top-right-radius: $radius;
-  border-bottom-right-radius: $radius;
+  border-top-right-radius: vars.$radius;
+  border-bottom-right-radius: vars.$radius;
   box-shadow: 0px 6px 30px 0px #0cd9e214, 0px 1px 12px 0px #006e720f;
   z-index: 2;
+  min-width: 0;
 
   .wxchtf-create-chat-panel {
     display: flex;

package/src/styles/input.scss

@@ -1,3 +1,5 @@
+@use './variables.scss' as vars;
+
 .wxchtf-input-form {
   flex: none;
   max-height: 300px;
@@ -10,7 +12,7 @@
     display: flex;
     flex-flow: row nowrap;
     padding: 8px;
-    max-width: $messageBoxWidth;
+    max-width: vars.$messageBoxWidth;
     width: 100%;
     margin: auto;
     background: rgba(245, 245, 245, 1);

package/src/styles/members.scss

@@ -0,0 +1,13 @@
+.wxchtf-chatify {
+  .wxchtf-chat-members-panel {
+    min-width: 300px;
+    box-shadow: -4px 0px 20px -5px #0cd9e214, -2px 1px 12px #006e720f;
+
+    .wxchtf-chat-members-list {
+      .wxchtf-chat-members-list-item {
+        padding-inline: 1rem;
+        border-block-end: none;
+      }
+    }
+  }
+}

package/src/types/core/api/accountApi.d.ts

@@ -0,0 +1,5 @@
+import { BaseApiEndpointBuilder } from './baseApi';
+import { Account } from '../types';
+export declare function accountEndpoints(builder: BaseApiEndpointBuilder): {
+    getAccountList: import("@reduxjs/toolkit/query").QueryDefinition<void, import("@reduxjs/toolkit/query").BaseQueryFn, "chat" | "account" | "message" | "thread" | "thread-message", Account[], "chatify">;
+};