@tencentcloud/chat-uikit-react 2.2.3 → 2.2.5

package/src/components/TUIMessage/styles/layout.scss

@@ -1,3 +1,5 @@
+@use "../../../styles/colors/color-theme" as *;
+
 .message-default {
   width: 100%;
   flex: 1;
@@ -24,6 +26,10 @@
       display: inline-block;
       padding-bottom: 3px;
       max-width: 60%;
+
+      @include theme() {
+        color: get(text-primary);
+      }
     }
   }
 }
@@ -80,7 +86,10 @@
     font-family: PingFangSC-Medium;
     line-height: 14px;
     text-align: right;
-    color: #7A7A7A;
+
+    @include theme() {
+      color: get(text-secondary);
+    }
   }
 }
 
@@ -91,7 +100,9 @@
     bottom: 10px;
     right: 10px;
     .time {
-      color: #FFFFFF;
+      @include theme() {
+        color: get(text-primary);
+      }
     }
   }
 }
@@ -110,6 +121,10 @@
       white-space: pre-wrap;
       display: inline;
       vertical-align: middle;
+
+      @include theme() {
+        color: get(text-primary);
+      }
     }
     .message-status {
       display: inline-flex;
@@ -232,46 +247,64 @@
 }
 
 .meesage-bubble-reply {
-  background: #ECEBEB;
   padding: 8px 16px;
+
+  @include theme() {
+    background-color: get(bg-secondary);
+  }
+
   &-in {
     border-radius: 16px 16px 16px 0;
   }
+
   &-out {
     border-radius: 16px 16px 0px 16px;
   }
+
   .message-text {
-    border-radius: none;
-    border: none;
+    border: none !important;
   }
+
   .bubble {
     padding: 0;
+
     &-in {
       border-radius: 0;
     }
   }
+
   &-main {
     position: relative;
     padding: 10px 14px;
     margin-bottom: 10px;
-    background: #FFFFFF;
+
+    @include theme() {
+      background-color: get(bg-primary);
+    }
+
     &::before {
       content: "";
       position: absolute;
       width: 6px;
       height: 100%;
-      background: #D9D9D9;
       top: 0;
       left: 0;
+
+      @include theme() {
+        background-color: get(bg-5);
+      }
     }
+
     .title {
-      font-family: PingFangSC-Medium;
-      font-style: normal;
       font-weight: 500;
       font-size: 14px;
-      line-height: 17px;
       padding-bottom: 10px;
+
+      @include theme() {
+        color: get(text-primary);
+      }
     }
+
     .message-context {
       opacity: 0.6;
     }
@@ -504,4 +537,4 @@
 
 .website {
   color: #147aff !important;
-}
+}

package/src/components/TUIMessage/utils/emojiMap.ts

@@ -468,7 +468,7 @@ export function formatEmojiString(data: string, type = 0, language?: string) {
   };
   Object.entries(emojiEnKey).map((item) => {
     if (text.includes(item[replace.key])) {
-      if (language && language === 'zh') {
+      if (language && language === 'zh-CN') {
         text = item[replace.key];
       } else {
         text = transText(text, item[replace.key], item[replace.value]);

package/src/components/TUIMessageInput/TUIMessageInputDefault.tsx

@@ -34,7 +34,9 @@ export function TUIMessageInputDefault():React.ReactElement {
   useEffect(() => {
     if (focus && textareaRef && textareaRef.current) {
       textareaRef.current.autofocus = true;
-      isPC && textareaRef?.current?.focus();
+      isPC && textareaRef?.current?.focus({
+        preventScroll: true,
+      });
       // eslint-disable-next-line
       // @ts-ignore
       textareaRef?.current?.addEventListener('paste', handlePasete);

package/src/components/TUIMessageInput/hooks/useEmojiPicker.tsx

@@ -27,7 +27,7 @@ export function useEmojiPicker<T extends useEmojiPickerProps>(props:PropsWithChi
   const { i18n } = useTranslation();
 
   const onSelectEmoji = (emoji:EmojiData) => {
-    if (i18n.language === 'zh') {
+    if (i18n.language === 'zh-CN') {
       insertText && insertText(emoji.data);
     } else {
       insertText && insertText(emojiEnKey[emoji.data]);

package/src/components/TUIMessageInput/hooks/useMessageInputText.tsx

@@ -147,7 +147,9 @@ export const useMessageInputText = (props:useMessageInputTextProps) => {
           end: state?.cursorPos?.end && state.cursorPos.end + textToInsert.length,
         },
       });
-      textareaRef?.current?.focus();
+      textareaRef?.current?.focus({
+        preventScroll: true,
+      });
     },
     [textareaRef, state],
   );

package/src/components/TUIMessageInput/styles/color.scss

@@ -1,17 +1,36 @@
+@use "../../../styles/colors/color-theme" as *;
+
 .tui-message-input {
+  @include theme() {
+    background-color: get(bg-primary);
+  }
+
   .tui-kit-input-box--focus {
-    outline: 1px solid #147AFF;
+    @include theme() {
+      outline: 1px solid get(status-info);
+    }
   }
+
   .input-box {
-    border: 1px solid #D3DAF3;
-    background: #FFFFFF;
+    @include theme() {
+      background-color: get(bg-primary);
+      border: 1px solid get(border-5);
+    }
   }
 }
 
 .input-plugin-popup {
   &-box {
-    background: #FFFFFF;
-    box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.25);
     border-radius: 16px;
+
+    [data-chat-theme="light"] & {
+      background-color: var(--chat-theme-light-bg-primary);
+      box-shadow: var(--chat-theme-light-box-shadow-1);
+    }
+
+    [data-chat-theme="dark"] & {
+      background-color: var(--chat-theme-dark-bg-3);
+      box-shadow: var(--chat-theme-dark-box-shadow-1);
+    }
   }
-}
+}

package/src/components/TUIMessageInput/styles/layout.scss

@@ -1,24 +1,29 @@
+@use "../../../styles/colors/color-theme" as *;
+
 // message input styles
 .tui-message-input {
   display: flex;
   flex-direction: column;
+
   &-main {
     flex: 1;
     display: flex;
     align-items: center;
     padding: 14px 12px;
     gap: 12px;
+
     .input-box {
       flex: 1;
       display: flex;
-      padding: 0 8px;
       position: relative;
       min-height: 20px;
       max-height: 200px;
       border-radius: 15px;
       overflow: hidden;
       padding: 10px;
+
       .input-visibility-content {
+        min-height: 20px;
         word-break: break-all;
         visibility: hidden;
         max-width: -webkit-fill-available;
@@ -29,6 +34,7 @@
         line-height: 17px;
         padding: 1px 2px;
       }
+
       textarea {
         position: absolute;
         top: 0;
@@ -45,17 +51,24 @@
         resize: none;
         border: none;
         background: none;
-        &:focus, &:active{
+
+        @include theme() {
+          color: get(text-primary);
+        }
+
+        &:focus,
+        &:active {
           border: none;
           outline: none;
         }
       }
     }
-  
+
     .disabled {
       display: none;
     }
   }
+
   &-box {
     flex: 1;
     display: flex;
@@ -69,12 +82,14 @@ ul li {
 
 .input-plugin-popup {
   position: relative;
+
   &-box {
     position: absolute;
     z-index: 2;
     bottom: 30px;
   }
 }
+
 .input-plugin-item {
   font-style: normal;
   font-weight: 500;
@@ -82,12 +97,12 @@ ul li {
   font-family: PingFangSC-Medium;
   line-height: 19px;
   display: flex;
+
   span {
     padding: 0 17px;
   }
 }
 
-
 // emoji picker styles
 .emoji-picker {
   .face-list {
@@ -97,44 +112,53 @@ ul li {
     display: flex;
     flex-wrap: wrap;
     overflow-y: auto;
+
     &-item {
       padding: 5px;
       cursor: pointer;
+      user-select: none;
+
       img {
         width: 20px;
       }
+
       .face-img {
         width: 38px;
       }
     }
   }
+
   .face-tab {
     display: flex;
     align-items: center;
     min-width: 265px;
+
     &-item {
       cursor: pointer;
       width: 24px;
       padding: 10px;
+
       img {
         width: 100%;
       }
     }
   }
+
   .emoji-plugin-right {
     right: 0;
   }
 }
 
-
 // upload styles
 .upload-picker {
   position: relative;
   padding: 10px 16px;
   min-width: 180px;
+
   &:hover {
     color: #147aff;
   }
+
   input {
     position: absolute;
     cursor: pointer;
@@ -148,12 +172,13 @@ ul li {
 
 .input-quote {
   padding: 7px 16px;
-  background: #F9F9F9;
+  background: #f9f9f9;
   display: flex;
   align-items: center;
+
   &-content {
     flex: 1;
-    background: #FFFFFF;
+    background: #fff;
     padding: 2px 14px;
     position: relative;
     display: flex;
@@ -162,21 +187,24 @@ ul li {
     font-size: 14px;
     font-family: PingFangSC-Medium;
     line-height: 17px;
-    color: #000000;
+    color: #000;
+
     &::before {
       content: "";
       position: absolute;
       width: 6px;
       height: 100%;
-      background: #999999;
+      background: #999;
       top: 0;
       left: 0;
     }
+
     span {
       padding-top: 8px;
       opacity: 0.6;
     }
   }
+
   .icon {
     margin: 0 5px 0 16px;
   }
@@ -184,18 +212,20 @@ ul li {
 
 // TUIForward
 .tui-forward {
-  background: #FFFFFF;
+  background: #fff;
   border-radius: 16px;
   display: flex;
   flex-direction: column;
   overflow: hidden;
   width: 300px;
   max-height: 90%;
+
   &-header {
     display: flex;
     align-items: center;
     padding: 24px 20px;
   }
+
   &-title {
     padding: 0 16px;
     font-family: PingFangSC-Medium;
@@ -204,10 +234,12 @@ ul li {
     font-size: 14px;
     line-height: 17px;
   }
+
   &-main {
     padding: 0 20px;
     max-height: calc(100vh - 200px);
     overflow-y: auto;
+
     .no-result {
       font-family: PingFangSC-Medium;
       font-size: 14px;
@@ -215,14 +247,17 @@ ul li {
       line-height: 20px;
       padding: 10px;
       text-align: center;
-      color: #999999;
+      color: #999;
     }
   }
+
   &-search {
     padding: 10px 15px;
   }
+
   &-list {
     padding: 13px 0;
+
     &-title {
       font-family: PingFangSC-Medium;
       font-style: normal;
@@ -230,6 +265,7 @@ ul li {
       font-size: 14px;
       line-height: 20px;
     }
+
     &-item {
       padding: 6px 0;
       font-family: PingFangSC-Medium;
@@ -241,11 +277,13 @@ ul li {
       justify-content: space-between;
       align-items: center;
       width: 100%;
+
       .info {
         display: flex;
         align-items: center;
         flex-shrink: 0;
         width: 100%;
+
         &-nick {
           padding: 0 13px;
           font-family: PingFangSC-Medium;
@@ -263,15 +301,17 @@ ul li {
       }
     }
   }
+
   &-footer {
-    background: rgba(249, 249, 249, 0.94);
+    background: rgba(249, 249, 249, 94%);
     padding: 13px 10px;
     display: flex;
     justify-content: space-between;
     align-items: center;
+
     .button {
       cursor: pointer;
-      background: #0365F9;
+      background: #0365f9;
       border-radius: 31px;
       padding: 10px 21px;
       font-family: PingFangSC-Medium;
@@ -279,12 +319,13 @@ ul li {
       font-weight: 400;
       font-size: 14px;
       line-height: 20px;
-      color: #FFFFFF;
+      color: #fff;
       border: none;
     }
+
     &-name {
       flex: 1;
-      overflow : hidden;
+      overflow: hidden;
       word-break: break-all;
       text-overflow: ellipsis;
       display: -webkit-box;
@@ -296,7 +337,8 @@ ul li {
 
 .transmitter {
   padding: 0 10px;
+
   .icon-send {
     transform: rotate(90deg);
   }
-}
+}

package/src/components/TUIMessageList/TUIMessageList.tsx

@@ -20,9 +20,9 @@ export interface MessageListProps extends InfiniteScrollProps {
   highlightedMessageId?: string,
   intervalsTimer?: number,
 }
-function TUIMessageListWithContext <T extends MessageListProps>(
+function TUIMessageListWithContext<T extends MessageListProps>(
   props: PropsWithChildren<T>,
-):React.ReactElement {
+): React.ReactElement {
   const {
     highlightedMessageId: propsHighlightedMessageId,
     loadMore: propsLoadMore,
@@ -46,8 +46,8 @@ function TUIMessageListWithContext <T extends MessageListProps>(
   const { TUIMessage, EmptyStateIndicator = DefaultEmptyStateIndicator } = useComponentContext('TUIMessageList');
 
   const highlightedMessageId = propsHighlightedMessageId
-  || TUIMessageListConfig?.highlightedMessageId
-  || contextHighlightedMessageId;
+    || TUIMessageListConfig?.highlightedMessageId
+    || contextHighlightedMessageId;
 
   const intervalsTimer = (propsIntervalsTimer || TUIMessageListConfig?.intervalsTimer || 30) * 60;
 
@@ -71,7 +71,9 @@ function TUIMessageListWithContext <T extends MessageListProps>(
         const HTMLCollection = ulElement?.children || [];
         const element = HTMLCollection[HTMLCollection.length - 1];
         const timer = setTimeout(() => {
-          element?.scrollIntoView();
+          if (messageListRef?.current) {
+            messageListRef.current.scrollTop = messageListRef.current.scrollHeight;
+          }
           setFirstRender(true);
           clearTimeout(timer);
         }, 100);
@@ -87,7 +89,12 @@ function TUIMessageListWithContext <T extends MessageListProps>(
       }
       const { children } = element;
       children[children.length - 1].classList.add('high-lighted');
-      element?.scrollIntoView({ block: 'center' });
+      if (messageListRef?.current) {
+        const highlightedMessageRect = element.getBoundingClientRect();
+        const messageListRect = messageListRef.current.getBoundingClientRect();
+        const finalScrollTop = highlightedMessageRect.top - messageListRect.top + messageListRef.current.scrollTop;
+        messageListRef.current.scrollTop = finalScrollTop;
+      }
       const timer = setTimeout(() => {
         children[children.length - 1].classList.remove('high-lighted');
         clearTimeout(timer);
@@ -108,8 +115,8 @@ function TUIMessageListWithContext <T extends MessageListProps>(
       >
         <ul ref={setUlElement}>
           {
-              elements?.length && elements.length > 0 ? elements : <EmptyStateIndicator listType="message" />
-            }
+            elements?.length && elements.length > 0 ? elements : <EmptyStateIndicator listType="message" />
+          }
         </ul>
       </InfiniteScroll>
     </div>
@@ -117,9 +124,9 @@ function TUIMessageListWithContext <T extends MessageListProps>(
 }
 
 const MemoizedTUIMessageListContext = React.memo(TUIMessageListWithContext) as
-typeof TUIMessageListWithContext;
+  typeof TUIMessageListWithContext;
 
-export function TUIMessageList(props:MessageListProps):React.ReactElement {
+export function TUIMessageList(props: MessageListProps): React.ReactElement {
   return (
     <MemoizedTUIMessageListContext {...props} />
   );

package/src/components/TUIMessageList/styles/layout.scss

@@ -1,3 +1,5 @@
+@use "../../../styles/colors/color-theme" as *;
+
 ul,li,div,p,label,span {
   margin: 0;
   padding: 0;
@@ -12,6 +14,11 @@ ul li {
   overflow-y: auto;
   position: relative;
   padding: 0 20px;
+
+  @include theme() {
+    background-color: get(bg-primary);
+  }
+
   &.hide {
     opacity: 0;
   }
@@ -26,15 +33,22 @@ ul li {
     font-style: normal;
     font-weight: 500;
     line-height: 17px;
-    color: #999999;
+
+    @include theme() {
+      color: get(text-secondary);
+    }
+
   }
   &-time {
-    color: #7a7a7a;
     font-family: PingFangSC-Medium;
     font-size: 12px;
     font-weight: 400;
     line-height: 14px;
     padding: 10px;
     text-align: center;
+
+    @include theme() {
+      color: get(text-secondary);
+    }
   }
 }