@webinex/chatify 1.0.2-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,67 +1,127 @@
+@use './variables.scss' as vars;
+
 .wxchtf-aside {
   flex: none;
-  width: 300px;
-  border-right: $border;
   display: flex;
   flex-flow: column nowrap;
+  background: #ffffff;
+  border-top-left-radius: vars.$radius;
+  border-bottom-left-radius: vars.$radius;
+  padding-top: 15px;
+  width: 320px;
+  position: relative;
+  overflow: hidden;
+
+  &::before {
+    position: absolute;
+    content: '';
+    left: 0;
+    bottom: 0;
+    width: calc(100% - 10px);
+    height: 20px;
+    z-index: 1;
+    background: linear-gradient(180deg, rgba(255, 255, 255, 0) 0%, #ffffff 100%);
+  }
 
   .wxchtf-chat-list.ant-menu {
     flex: 1 1 auto;
     height: 100px;
     overflow-y: auto;
+    border-inline-end: none;
+    padding-bottom: 2rem;
 
     @include scrollbar();
 
+    .ant-menu-item + .ant-menu-item {
+      margin-top: 8px;
+    }
+
     .ant-menu-item {
       padding: 0;
       height: unset;
       margin: 0;
-      width: 100%;
-      border-radius: 0;
+      margin-left: 8px;
+      width: calc(100% - 16px);
+      border-radius: 8px;
       line-height: 1.5;
-      border-top: $border;
 
-      &:first-child {
-        border-top: none;
-      }
+      &.ant-menu-item-selected {
+        background-color: #e4f7f7;
 
-      &.ant-menu-item-selected .wxchtf-chat-name {
-        font-weight: 600;
+        .wxchtf-chat-name {
+          font-weight: 600;
+          color: inherit;
+        }
       }
 
       .wxchtf-chat {
-        padding: 0.5rem 1rem;
+        padding-inline: 10px;
+        padding-block: 8.5px;
         position: relative;
+        display: flex;
+        flex-flow: row nowrap;
+        align-items: center;
 
         &.--unread {
           .wxchtf-chat-last {
             font-weight: bold;
           }
+
+          .wxchtf-chat-name {
+            font-weight: bold;
+            max-width: 100%;
+          }
+        }
+
+        .wxchtf-chat-info {
+          min-width: 1;
         }
 
         .wxchtf-chat-name {
-          font-weight: bold;
           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 {
-          display: inline-block;
-          padding: 0.2rem;
-          min-width: 1rem;
-          height: 1.2rem;
-          line-height: 0.7rem;
-          margin-left: 0.5rem;
+          background-color: #ff4d4f;
           border-radius: 50%;
+          width: 16px;
+          height: 16px;
+          padding: 0;
+          font-size: 10px;
+          position: absolute;
+          top: 32px;
+          right: 13px;
+          color: white;
+          line-height: 16px;
+          font-weight: bold;
           text-align: center;
-          font-size: 0.7rem;
-          background: $unreadCountBackground;
         }
 
         .wxchtf-chat-last {
           $size: 25px;
+          color: #0e0f1799;
 
           font-style: italic;
-          opacity: 0.75;
           overflow: hidden;
           text-overflow: ellipsis;
           white-space: nowrap;
@@ -87,6 +147,13 @@
           .wxchtf-chat-last-message {
             display: inline;
           }
+
+          .wxchtf-chat-last-sent-at {
+            position: absolute;
+            top: 7px;
+            right: 13px;
+            font-size: 0.8em;
+          }
         }
       }
     }

package/src/styles/chat.scss

@@ -1,109 +1,160 @@
+@use './variables.scss' as vars;
+
 .wxchtf-chatify {
-  .wxchtf-chat-panel {
+  .wxchtf-chat {
+    flex: auto;
+    display: flex;
+    flex-flow: row nowrap;
+    min-width: 1;
+  }
+
+  .wxchtf-conversation {
     flex: auto;
     display: flex;
     flex-flow: row nowrap;
+    min-width: 1;
 
-    .wxchtf-chat-main {
+    .wxchtf-conversation-main {
       flex: 1;
       display: flex;
       flex-flow: column nowrap;
+      min-width: 0;
 
-      .wxchtf-chat-header {
-        border-bottom: $border;
-        padding: 0.5rem 1rem;
+      .wxchtf-conversation-header {
+        padding: 15px 20px;
+        line-height: 24px;
+        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;
 
           &.--editable {
             cursor: pointer;
           }
         }
+
+        .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;
-        background: $chatBodyBackground;
+        background: white;
         padding: 2rem 1rem;
+        padding-right: 1rem;
         display: flex;
         flex-flow: column-reverse nowrap;
+        align-items: center;
 
         @include scrollbar();
 
-        @media only screen and (min-width: 1120px) {
-          padding-right: 30%;
+        .wxchtf-message,
+        .wxchtf-sending-message,
+        .wxchtf-system-message,
+        .wxchtf-message-skeleton {
+          margin-bottom: 8px;
+          max-width: vars.$messageBoxWidth;
+          width: 100%;
+
+          &:first-child {
+            margin-bottom: 0;
+          }
         }
 
         .wxchtf-message,
         .wxchtf-sending-message {
           display: flex;
           flex-flow: row nowrap;
-          width: 100%;
-          align-items: flex-end;
+          align-items: flex-start;
+
+          & > div {
+            min-width: 0;
+          }
+
+          &:not(.--my) {
+            .wxchtf-message-content,
+            .wxchtf-sending-message-content {
+              border-bottom-left-radius: 0;
+            }
+          }
 
           &.--my {
             direction: rtl;
             justify-content: flex-start;
 
             .wxchtf-message-author {
-              margin-right: 0;
-              margin-left: 15px;
+              display: none;
             }
 
             .wxchtf-message-content,
             .wxchtf-sending-message-content {
               direction: ltr;
-              border-bottom-left-radius: 10px;
               border-bottom-right-radius: 0;
-              background-color: $myMessageBackground;
+              background-color: vars.$myMessageBackground;
+            }
+
+            .wxchtf-message-info-box {
+              text-align: right;
             }
           }
 
           .wxchtf-message-author {
             margin-right: 15px;
+            flex: none;
 
             .ant-avatar {
-              @include avatarSize($avatarSize);
-              box-shadow: rgba(0, 0, 0, 0.16) 0px 1px 4px;
+              @include avatarSize(vars.$avatarSize);
+            }
+          }
+
+          .wxchtf-message-info-box,
+          .wxchtf-sending-message-info-box {
+            text-align: left;
+            margin-bottom: 3px;
+
+            .wxchtf-message-author-name,
+            .wxchtf-message-sent-at,
+            .wxchtf-message-read-box,
+            .wxchtf-sending-message-sending-box {
+              display: inline-block;
+              font-size: 0.85em;
+              opacity: 0.5;
+            }
+
+            .wxchtf-message-sent-at,
+            .wxchtf-message-read-box,
+            .wxchtf-sending-message-sending-box {
+              margin-left: 5px;
             }
           }
 
           .wxchtf-message-content,
           .wxchtf-sending-message-content {
+            width: fit-content;
             min-width: 300px;
             max-width: 70%;
-            border-radius: $messageBorderRadius;
-            padding: 0.75rem 1rem;
+            padding: 12px 19px;
             background: white;
-            border-bottom-left-radius: 0;
-            background-color: $messageBackground;
-            box-shadow: rgba(0, 0, 0, 0.16) 0px 1px 4px;
+            background-color: vars.$messageBackground;
             display: block;
             white-space: pre-wrap;
             overflow-wrap: break-word;
+            border-radius: 24px;
 
-            .wxchtf-message-info-box,
-            .wxchtf-sending-message-info-box {
-              text-align: right;
-
-              .wxchtf-message-sent-at,
-              .wxchtf-message-read-box,
-              .wxchtf-sending-message-sending-box {
-                display: inline-block;
-                font-style: italic;
-                font-size: 0.75em;
-                margin-top: 0.5rem;
-                opacity: 0.5;
-              }
-
-              .wxchtf-message-read-box,
-              .wxchtf-sending-message-sending-box {
-                margin-left: 5px;
-              }
+            .wxchtf-message-text {
+              line-height: 21px;
             }
           }
         }
@@ -112,27 +163,20 @@
           font-style: italic;
           position: relative;
           text-align: center;
+          color: #0e0f1799;
 
           .wxchtf-text,
           .wxchtf-timestamp {
+            position: relative;
+            z-index: 1;
+            padding-inline: 8px;
             display: inline-block;
-            opacity: 0.9;
             font-size: 0.85em;
+            background-color: white;
           }
 
           .wxchtf-timestamp {
-            margin-left: 1rem;
-          }
-        }
-
-        .wxchtf-message,
-        .wxchtf-sending-message,
-        .wxchtf-system-message,
-        .wxchtf-message-skeleton {
-          margin-bottom: 2rem;
-
-          &:first-child {
-            margin-bottom: 0;
+            padding-left: 10px;
           }
         }
 
@@ -146,77 +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-input-form {
-        flex: none;
-        max-height: 300px;
-        display: flex;
-        flex-flow: column nowrap;
-
-        .wxchtf-input-box {
-          flex: none;
-          display: flex;
-          flex-flow: row nowrap;
-          padding: 1rem 0;
-          border-top: $border;
-
-          @mixin iconBtn {
-            flex: none;
-            display: flex;
-            padding: 0 1rem;
-            align-items: flex-end;
-
-            .ant-btn.ant-btn-icon-only .anticon {
-              font-size: 1.5rem;
-            }
-          }
-
-          .wxchtf-add-files-box {
-            @include iconBtn();
-          }
-
-          .wxchtf-text-input-box {
-            flex: auto;
-
-            textarea {
-              resize: none;
-              border: none;
-              outline: none;
-              box-shadow: none;
-
-              @include scrollbar();
-            }
-          }
-
-          .wxchtf-submit-btn-box {
-            @include iconBtn();
-          }
-        }
-      }
-    }
-
-    .wxchtf-chat-members-panel {
-      min-width: 300px;
-      border-left: $border;
-
-      .wxchtf-chat-members-list {
-        .wxchtf-chat-members-list-item {
-          padding-inline: 1rem;
-        }
-      }
     }
   }
 }