@webinex/chatify 1.0.2-rc3 → 1.0.3-rc3

package/src/styles/chat.scss

@@ -10,57 +10,85 @@
       flex-flow: column nowrap;
 
       .wxchtf-chat-header {
-        border-bottom: $border;
-        padding: 0.5rem 1rem;
+        padding: 15px 20px;
+        line-height: 24px;
+        z-index: 1;
+        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 {
           font-weight: 600;
+          font-size: 16px;
           flex: none;
 
           &.--editable {
             cursor: pointer;
           }
         }
+
+        .wxchtf-chat-members {
+          display: inline-flex;
+          gap: 6px;
+        }
       }
 
       .wxchtf-chat-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: $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;
+
+          &: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;
             }
+
+            .wxchtf-message-info-box {
+              text-align: right;
+            }
           }
 
           .wxchtf-message-author {
@@ -68,42 +96,45 @@
 
             .ant-avatar {
               @include avatarSize($avatarSize);
-              box-shadow: rgba(0, 0, 0, 0.16) 0px 1px 4px;
+            }
+          }
+
+          .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;
             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 +143,31 @@
           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;
+            padding-left: 10px;
           }
-        }
-
-        .wxchtf-message,
-        .wxchtf-sending-message,
-        .wxchtf-system-message,
-        .wxchtf-message-skeleton {
-          margin-bottom: 2rem;
 
-          &:first-child {
-            margin-bottom: 0;
+          &::after {
+            content: '';
+            position: absolute;
+            height: 1px;
+            width: 100%;
+            left: 0;
+            top: 50%;
+            z-index: 0;
+            background-color: #0000000f;
           }
         }
 
@@ -159,62 +194,16 @@
           }
         }
       }
-
-      .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;
+      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

@@ -2,11 +2,10 @@
 @import './mixins.scss';
 @import './keyframes.scss';
 @import './aside.scss';
-@import './settings.scss';
 @import './chat.scss';
+@import './input.scss';
 
 .wxchtf-chatify {
-  border: $border;
   display: flex;
   flex-flow: column nowrap;
   background: $background;
@@ -14,7 +13,6 @@
 
   .wxchtf-header {
     min-height: 2rem;
-    border-bottom: $border;
   }
 
   .wxchtf-body {
@@ -25,7 +23,26 @@
 
   .wxchtf-footer {
     min-height: 2rem;
-    border-top: $border;
+  }
+
+  .wxchtf-add-btn-wrapper {
+    width: 100%;
+    text-align: right;
+    padding-inline: 0.5rem;
+    margin-bottom: 1rem;
+
+    .wxchtf-add-btn {
+      border: none;
+      background-color: #e4f7f7;
+      height: 50px;
+      padding: 0;
+      line-height: 50px;
+      min-width: 150px;
+      border-radius: 50px;
+      font-weight: 600;
+      opacity: 0.9;
+      box-shadow: none;
+    }
   }
 }
 
@@ -33,13 +50,24 @@
   flex: auto;
   display: flex;
   flex-flow: column nowrap;
+  border-top-right-radius: $radius;
+  border-bottom-right-radius: $radius;
+  box-shadow: 0px 6px 30px 0px #0cd9e214, 0px 1px 12px 0px #006e720f;
+  z-index: 2;
 
-  .wxchtf-create-chat {
+  .wxchtf-create-chat-panel {
     display: flex;
     flex-flow: column nowrap;
     justify-content: center;
     align-items: center;
     height: 100%;
+    position: relative;
+
+    .wxchtf-create-chat-panel-close {
+      position: absolute;
+      right: 25px;
+      top: 25px;
+    }
 
     form {
       padding: 2rem;
@@ -49,6 +77,7 @@
       .wxchtf-create-chat-member-input-list {
         max-height: 15rem;
         overflow-y: auto;
+        @include scrollbar();
 
         .ant-list-item {
           padding-inline: 0.5rem;

package/src/styles/input.scss

@@ -0,0 +1,72 @@
+.wxchtf-input-form {
+  flex: none;
+  max-height: 300px;
+  display: flex;
+  flex-flow: column nowrap;
+  padding: 12px 20px 20px 20px;
+
+  .wxchtf-input-box {
+    flex: none;
+    display: flex;
+    flex-flow: row nowrap;
+    padding: 8px;
+    max-width: $messageBoxWidth;
+    width: 100%;
+    margin: auto;
+    background: rgba(245, 245, 245, 1);
+    border-radius: 40px;
+
+    @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,
+    .wxchtf-submit-btn-box {
+      align-items: center;
+
+      button {
+        width: unset;
+      }
+
+      svg {
+        font-size: 18px;
+        color: rgba(14, 15, 23, 0.25);
+      }
+    }
+
+    .wxchtf-add-files-box {
+      @include iconBtn();
+    }
+
+    .wxchtf-text-input-box {
+      flex: auto;
+      margin-left: 16px;
+      margin-right: 16px;
+
+      textarea {
+        resize: none;
+        border: none;
+        outline: none;
+        box-shadow: none;
+        background: transparent;
+        padding-inline: 0;
+        font-size: 13px;
+        line-height: 26px;
+
+        @include scrollbar();
+      }
+    }
+
+    .wxchtf-submit-btn-box {
+      @include iconBtn();
+      margin-left: 1rem;
+    }
+  }
+}

package/src/styles/variables.scss

@@ -1,10 +1,10 @@
 $borderColor: #ddd;
 $border: 1px solid #ddd;
 $background: white;
-$radius: 4px;
-$chatBodyBackground: #f5f5f5;
-$messageBackground: #e1f5fe;
-$myMessageBackground: #b9f6ca;
+$radius: 24px;
+$messageBackground: #f5f5f5;
+$myMessageBackground: #e4f7f7;
 $unreadCountBackground: #ffa726;
 $avatarSize: 40px;
 $messageBorderRadius: 10px;
+$messageBoxWidth: 1110px;

package/src/ui/AddChatButton.tsx

@@ -8,8 +8,10 @@ export const AddChatButton = customize('AddChatButton', () => {
   const onAddChat = useCallback(() => dispatch({ type: 'new_chat_open', data: undefined }), [dispatch]);
 
   return (
-    <Button onClick={onAddChat} icon={'+'} type="link">
-      Add chat
-    </Button>
+    <span className="wxchtf-add-btn-wrapper">
+      <Button className="wxchtf-add-btn" onClick={onAddChat} icon="+">
+        Add chat
+      </Button>
+    </span>
   );
 });

package/src/ui/ChatList/ChatListItemLastMessage.tsx

@@ -2,12 +2,14 @@ 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/ChatListItemLastMessageSentAt.tsx

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

package/src/ui/ChatList/index.ts

@@ -5,3 +5,4 @@ export * from './ChatListItemLastMessageAuthor';
 export * from './ChatListItemLastMessageContent';
 export * from './ChatListItemName';
 export * from './ChatListItemUnreadCount';
+export * from './ChatListItemLastMessageSentAt';

package/src/ui/ChatPanel/ChatHeader.tsx

@@ -1,4 +1,4 @@
-import { Col, Row, Space } from 'antd';
+import { Col, Row } from 'antd';
 import { ChatHeaderMembers } from './ChatHeaderMembers';
 import { ChatMembersButton } from './ChatMembersButton';
 import { customize } from '../customize';
@@ -21,10 +21,8 @@ export const ChatHeader = customize('ChatHeader', (props: ChatHeaderProps) => {
         </Col>
         {chat.active && (
           <Col className="wxchtf-chat-members">
-            <Space align="center">
-              <ChatHeaderMembers id={id} />
-              <ChatMembersButton id={id} />
-            </Space>
+            <ChatHeaderMembers id={id} />
+            <ChatMembersButton id={id} />
           </Col>
         )}
       </Row>

package/src/ui/ChatPanel/ChatHeaderMembers.tsx

@@ -1,6 +1,8 @@
 import { useGetChatQuery } from '../../core';
-import { Avatar, Tooltip } from 'antd';
+import { Tooltip } from 'antd';
 import { customize } from '../customize';
+import { Avatar as AntdAvatar } from 'antd';
+import { Avatar } from '../Avatar';
 
 export interface ChatHeaderMembersProps {
   id: string;
@@ -15,12 +17,12 @@ export const ChatHeaderMembers = customize('ChatHeaderMembers', (props: ChatHead
   }
 
   return (
-    <Avatar.Group maxCount={5}>
+    <AntdAvatar.Group maxCount={5}>
       {chat.members.map((x) => (
         <Tooltip key={x.id} title={x.name}>
-          <Avatar src={x.avatar}>{x.name}</Avatar>
+          <Avatar account={x} />
         </Tooltip>
       ))}
-    </Avatar.Group>
+    </AntdAvatar.Group>
   );
 });

package/src/ui/ChatPanel/ChatHeaderName.tsx

@@ -37,23 +37,25 @@ export const ChatHeaderName = customize('ChatHeaderName', (props: ChatHeaderName
 
   if (edit) {
     return (
-      <Input
-        value={editNameValue}
-        onChange={(e) => setEditNameValue(e.target.value)}
-        onBlur={() => setEdit(false)}
-        onKeyDown={(e) => {
-          if (isEscape(e)) {
-            setEdit(false);
-          } else if (isEnter(e)) {
-            setEdit(false);
+      <Tooltip defaultOpen title="Press Enter to save new chat name or Escape to cancel editing">
+        <Input
+          value={editNameValue}
+          onChange={(e) => setEditNameValue(e.target.value)}
+          onBlur={() => setEdit(false)}
+          onKeyDown={(e) => {
+            if (isEscape(e)) {
+              setEdit(false);
+            } else if (isEnter(e)) {
+              setEdit(false);
 
-            if (editNameValue !== name) {
-              updateChatName();
+              if (editNameValue !== name && editNameValue.trim() !== '') {
+                updateChatName();
+              }
             }
-          }
-        }}
-        autoFocus
-      />
+          }}
+          autoFocus
+        />
+      </Tooltip>
     );
   }
 

package/src/ui/ChatPanel/ChatMembersButton.tsx

@@ -17,5 +17,5 @@ export const ChatMembersButton = customize('ChatMembersButton', (_: ChatMembersB
     [dispatch],
   );
 
-  return <Button onClick={onSettingsClick} type="link" icon={<Icon type="team" />} />;
+  return <Button onClick={onSettingsClick} type="link" icon={<Icon type="members" />} />;
 });

package/src/ui/ChatPanel/ChatMembersPanel.tsx

@@ -55,22 +55,26 @@ const ChatMemberListItem = customize('ChatMemberListItem', (props: ChatMemberLis
         isMember
           ? [
               <Tooltip key="remove" title="Remove (keep history)">
-                <Button onClick={onRemoveKeepHistory} type="link" icon={<Icon type="remove" />} />
+                <Button onClick={onRemoveKeepHistory} type="link" icon={<Icon type="remove-member" />} />
               </Tooltip>,
               <Tooltip key="remove_delete_history" title="Remove (delete history)">
                 <Button
                   onClick={onRemoveDeleteHistory}
                   type="link"
-                  icon={<Icon type="remove_delete_history" />}
+                  icon={<Icon type="remove-member-delete-history" />}
                 />
               </Tooltip>,
             ]
           : [
               <Tooltip key="add_no_history" title="Add (no history)">
-                <Button onClick={onAddWithoutHistory} type="link" icon={<Icon type="add" />} />
+                <Button onClick={onAddWithoutHistory} type="link" icon={<Icon type="add-member" />} />
               </Tooltip>,
               <Tooltip key="add" title="Add (share history)">
-                <Button onClick={onAddWithHistory} type="link" icon={<Icon type="add_with_history" />} />
+                <Button
+                  onClick={onAddWithHistory}
+                  type="link"
+                  icon={<Icon type="add-member-with-history" />}
+                />
               </Tooltip>,
             ]
       }

package/src/ui/Chatify.tsx

@@ -1,8 +1,8 @@
-import { CSSProperties, FC } from 'react';
+import { CSSProperties, FC, useMemo } from 'react';
 import { useReadMonitor } from '../core';
 import { Localizer, LocalizerContext, defaultLocalizer } from './localizer';
 import { Avatar } from './Avatar';
-import { CustomizeProvider } from './customize';
+import { CustomizeProvider, CustomizeProviderValue } from './customize';
 import { ChatHeaderMembers } from './ChatPanel/ChatHeaderMembers';
 import { ChatMembersButton } from './ChatPanel/ChatMembersButton';
 import { AddChatButton } from './AddChatButton';
@@ -17,6 +17,7 @@ import {
   ChatListItemLastMessage,
   ChatListItemUnreadCount,
   ChatListItemName,
+  ChatListItemLastMessageSentAt,
 } from './ChatList';
 
 import {
@@ -58,6 +59,7 @@ export interface ChatifyCustomizeValue {
   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;
@@ -131,14 +133,18 @@ function Content(props: Pick<ChatifyProps, 'className' | 'style'>) {
   );
 }
 
-const EMPTY_CUSTOMIZE = {};
+const DEFAULT_CUSTOMIZE: ChatifyCustomizeValue = {
+  Header: null,
+  Footer: null,
+};
 
 export const Chatify: FC<ChatifyProps> = (props) => {
-  const { localizer = defaultLocalizer, customize = EMPTY_CUSTOMIZE } = props;
+  const { localizer = defaultLocalizer, customize = DEFAULT_CUSTOMIZE } = props;
+  const customizeValue = useMemo(() => Object.assign({}, DEFAULT_CUSTOMIZE, customize), [customize]);
 
   return (
     <LocalizerContext.Provider value={localizer}>
-      <CustomizeProvider value={customize}>
+      <CustomizeProvider value={customizeValue as CustomizeProviderValue}>
         <Content {...props} />
       </CustomizeProvider>
     </LocalizerContext.Provider>