@tencentcloud/chat-uikit-react 2.2.6 → 2.2.8

package/src/components/ConversationCreate/ConversationCreateUserSelectList.tsx

@@ -1,26 +1,25 @@
 import React, { useRef, useState } from 'react';
 import { useTranslation } from 'react-i18next';
-import { Conversation, Profile } from '@tencentcloud/chat';
-import {
-  TUIConversationService,
-} from '@tencentcloud/chat-uikit-engine';
+import { Profile } from '@tencentcloud/chat';
 import { Input } from '../Input';
 import { Icon, IconTypes } from '../Icon';
 import { ConversationCreateSelectView, ConversationCreateSelectViewProps } from './ConversationCreateSelectView';
 import { Avatar, defaultUserAvatar } from '../Avatar';
 import { useConversationCreate } from './hooks/useConversationCreate';
-import { useUIKit, useUIManager } from '../../context';
+import { createC2CConversation } from '../../hooks/useConversation';
+import { useUIKit } from '../../context';
 import { PageStateTypes } from './ConversationCreate';
-import { useConversation } from '../../hooks';
 import { Toast } from '../Toast';
+import { IConversationModel } from '@tencentcloud/chat-uikit-engine';
 
-export interface ConversationCreateUserSelectListProps extends ConversationCreateSelectViewProps{
-  isCreateGroup: boolean,
-  setIsCreateGroup: React.Dispatch<React.SetStateAction<boolean>>,
-  setConversationCreated: React.Dispatch<React.SetStateAction<boolean>>,
-  className: string,
-  conversationList: Array<Conversation>,
-  setPageState: React.Dispatch<React.SetStateAction<PageStateTypes>>,
+export interface ConversationCreateUserSelectListProps extends ConversationCreateSelectViewProps {
+  isCreateGroup: boolean;
+  setIsCreateGroup: React.Dispatch<React.SetStateAction<boolean>>;
+  className?: string;
+  conversationList: IConversationModel[];
+  setPageState: React.Dispatch<React.SetStateAction<PageStateTypes>>;
+  onBeforeCreateConversation?: (userID: string) => void;
+  onConversationCreated?: (conversation: IConversationModel) => void;
 }
 export function ConversationCreateUserSelectList(props: ConversationCreateUserSelectListProps) {
   const {
@@ -30,20 +29,19 @@ export function ConversationCreateUserSelectList(props: ConversationCreateUserSe
     className,
     conversationList,
     setIsCreateGroup,
-    setConversationCreated,
     setPageState,
+    onBeforeCreateConversation,
+    onConversationCreated,
   } = props;
   const { t } = useTranslation();
   const [searchValue, setSearchValue] = useState('');
   const { chat } = useUIKit();
-  const { setActiveConversation } = useUIManager();
   const [friendList, setFriendList] = useState<any>({});
   const {
     getFriendListSortSearchResult,
-  } = useConversationCreate(chat, conversationList, (newFriendListResult) => {
+  } = useConversationCreate(conversationList, (newFriendListResult) => {
     setFriendList(newFriendListResult);
   });
-  const { createConversation } = useConversation(chat);
   const userCheckedList = useRef(new Map());
   const searchValueChange = async (e: React.ChangeEvent<HTMLInputElement>) => {
     const { value } = e.target;
@@ -55,7 +53,7 @@ export function ConversationCreateUserSelectList(props: ConversationCreateUserSe
     userCheckedList.current.clear();
     setSelectList([]);
   };
-  const getUserChecked = (userID:string, dom: HTMLElement) => {
+  const getUserChecked = (userID: string, dom: HTMLElement) => {
     if (!dom) return;
     if (!userCheckedList.current.has(userID)) {
       userCheckedList.current.set(userID, []);
@@ -75,17 +73,21 @@ export function ConversationCreateUserSelectList(props: ConversationCreateUserSe
     if (checked) {
       selectList.push({ profile, domList });
     } else {
-      selectList.splice(selectList.findIndex((item) => item.profile.userID === userID), 1);
+      selectList.splice(selectList.findIndex(item => item.profile.userID === userID), 1);
     }
     setSelectList([...selectList]);
   };
-  const createC2CConversation = async (profile: Profile) => {
+
+  const _createConversation = async (profile: Profile) => {
     if (isCreateGroup) return;
     const { userID } = profile;
-    const conversation = await createConversation(`C2C${userID}`);
-    setConversationCreated(false);
-    setActiveConversation(conversation);
-    TUIConversationService.switchConversation(conversation?.conversationID);
+    const params = onBeforeCreateConversation?.(userID);
+    createC2CConversation(userID)
+      .then((conversation: IConversationModel) => {
+        onConversationCreated?.(conversation);
+      }).catch((error) => {
+        Toast({ text: error.message, type: 'error' });
+      });
   };
   const next = () => {
     if (selectList && selectList.length === 0) {
@@ -113,11 +115,11 @@ export function ConversationCreateUserSelectList(props: ConversationCreateUserSe
           <div className="tui-user-name active">{t('TUIConversation.New group chat')}</div>
         </div>
       )}
-      <div className={`tui-conversation-create ${className}`}>
-        <div className="tui-conversation-create-container">
+      <div className={`tui-conversation-create-select-list-container ${className}`}>
+        <div className="tui-conversation-create-select-list">
           <div className="tui-group-container">
             {Object.keys(friendList).map(
-              (key) => friendList[key].length !== 0 && (
+              key => friendList[key].length !== 0 && (
                 <div className="tui-group-box" key={key}>
                   <div className="title">{key}</div>
                   {friendList[key].map((profile: Profile, index: number) => {
@@ -128,8 +130,8 @@ export function ConversationCreateUserSelectList(props: ConversationCreateUserSe
                         className="tui-user tui-user-checkbox-label"
                         htmlFor={`userChecked-${key}-${userID}`}
                         key={userID}
-                        onClick={(e) => {
-                          createC2CConversation(profile);
+                        onClick={() => {
+                          _createConversation(profile);
                         }}
                       >
                         <Avatar size={30} image={avatar || defaultUserAvatar} />

package/src/components/ConversationCreate/ConversationGroupTypeInfo.tsx

@@ -1,40 +1,40 @@
 import React from 'react';
 import { useTranslation } from 'react-i18next';
+import { TUIChatEngine } from '@tencentcloud/chat-uikit-engine';
 import './styles/conversationGroupTypeInfo.scss';
-import TencentCloudChat from '@tencentcloud/chat';
 import { PageStateTypes } from './ConversationCreate';
 import { Icon, IconTypes } from '../Icon';
 
 export enum GroupType {
-  Work= TencentCloudChat.TYPES.GRP_WORK,
-  Public= TencentCloudChat.TYPES.GRP_PUBLIC,
-  Meeting= TencentCloudChat.TYPES.GRP_MEETING,
-  AVChatRoom= TencentCloudChat.TYPES.GRP_AVCHATROOM,
-  Community = TencentCloudChat.TYPES.GRP_COMMUNITY,
+  Work = TUIChatEngine.TYPES.GRP_WORK,
+  Public = TUIChatEngine.TYPES.GRP_PUBLIC,
+  Meeting = TUIChatEngine.TYPES.GRP_MEETING,
+  AVChatRoom = TUIChatEngine.TYPES.GRP_AVCHATROOM,
+  Community = TUIChatEngine.TYPES.GRP_COMMUNITY,
 }
 export interface ConversationGroupTypeInfoProps {
-  groupType: string,
-  setGroupType: React.Dispatch<React.SetStateAction<string>>,
-  setPageState: React.Dispatch<React.SetStateAction<PageStateTypes>>,
+  groupType: GroupType;
+  setGroupType: React.Dispatch<React.SetStateAction<GroupType>>;
+  setPageState: React.Dispatch<React.SetStateAction<PageStateTypes>>;
 }
-export const typeInfoList = [
-  { type: 'Work', des: 'Users can join the group only via invitation by existing members. The invitation does not need to be agreed by the invitee or approved by the group owner. See the documentation for details.' },
-  { type: 'Public', des: 'After a public group is created, the group owner can designate group admins. To join the group, a user needs to search the group ID and send a request, which needs to be approved by the group owner or an admin before the user can join the group. See the documentation for details.' },
-  { type: 'Meeting', des: 'After the group is created, a user can join and quit the group freely and can view the messages sent before joining the group. It is suitable for scenarios that integrate Tencent Real-Time Communication (TRTC), such as audio and video conferences and online education. See the documentation for details.' },
-  { type: 'AVChatRoom', des: 'After a group is created, a user can join and quit the group freely. The group can have an unlimited number of members, but it does not store message history. It can be combined with Live Video Broadcasting (LVB) to support on-screen comment scenarios. See the documentation for details.' },
-  { type: 'Community', des: 'After creation, you can enter and leave at will, support up to 100,000 people, support historical message storage, and after users search for group ID and initiate a group application, they can join the group without administrator approval. See product documentation for details.' },
+export const typeInfoList: Array<{ type: GroupType; name: string; des: string }> = [
+  { type: GroupType.Work, name: 'Work', des: 'Users can join the group only via invitation by existing members. The invitation does not need to be agreed by the invitee or approved by the group owner. See the documentation for details.' },
+  { type: GroupType.Public, name: 'Public', des: 'After a public group is created, the group owner can designate group admins. To join the group, a user needs to search the group ID and send a request, which needs to be approved by the group owner or an admin before the user can join the group. See the documentation for details.' },
+  { type: GroupType.Meeting, name: 'Meeting', des: 'After the group is created, a user can join and quit the group freely and can view the messages sent before joining the group. It is suitable for scenarios that integrate Tencent Real-Time Communication (TRTC), such as audio and video conferences and online education. See the documentation for details.' },
+  { type: GroupType.AVChatRoom, name: 'AVChatRoom', des: 'After a group is created, a user can join and quit the group freely. The group can have an unlimited number of members, but it does not store message history. It can be combined with Live Video Broadcasting (LVB) to support on-screen comment scenarios. See the documentation for details.' },
+  { type: GroupType.Community, name: 'Community', des: 'After creation, you can enter and leave at will, support up to 100,000 people, support historical message storage, and after users search for group ID and initiate a group application, they can join the group without administrator approval. See product documentation for details.' },
 ];
 export function ConversationGroupTypeInfo(props: ConversationGroupTypeInfoProps) {
   const { groupType, setGroupType, setPageState } = props;
 
   const { t } = useTranslation();
-  const selectGroupType = (type: string) => {
+  const selectGroupType = (type: GroupType) => {
     setGroupType(type);
     setPageState(PageStateTypes.CREATE_DETAIL);
   };
   return (
     <div className="tui-conversation-group-type-info">
-      {typeInfoList.map(({ type, des }) => (
+      {typeInfoList.map(({ type, name, des }) => (
         <div
           key={type}
           role="presentation"
@@ -43,12 +43,12 @@ export function ConversationGroupTypeInfo(props: ConversationGroupTypeInfoProps)
         >
           <div className="group-type-info-title">
             {type === groupType && <Icon className="box-active-icon" type={IconTypes.RIGHT} width={16} height={16} />}
-            {t(`TUIConversation.${type}`)}
+            {t(`TUIConversation.${name}`)}
           </div>
           <div className="group-type-info-description">{t(`TUIConversation.${des}`)}</div>
         </div>
       ))}
-      <a className="group-type-info-document" target="_blank" href="https://www.tencentcloud.com/document/product/1047/33515?lang=en&pg=#group-features" rel="bookmark noreferrer">{t('TUIConversation.Details')}</a>
+      <a className="group-type-info-document" target="_blank" href="https://trtc.io/document/33529?platform=web&product=chat&menulabel=uikit#group-types" rel="bookmark noreferrer">{t('TUIConversation.Details')}</a>
     </div>
   );
 }

package/src/components/ConversationCreate/hooks/useConversationCreate.tsx

@@ -1,14 +1,13 @@
 import React, { useState, useEffect } from 'react';
-import TencentCloudChat, { Conversation, Friend, Profile } from '@tencentcloud/chat';
+import { StoreName, TUIStore, TUIUserService, IConversationModel } from '@tencentcloud/chat-uikit-engine';
+import TencentCloudChat, { Friend, Profile } from '@tencentcloud/chat';
 import { strChineseFirstPy } from '../static/word';
-import { useProfile } from '../../../hooks';
 
 export const useConversationCreate = (
-  chat: any,
-  conversationList: Array<Conversation>,
-  setFriendListResultHandler?:(
+  conversationList: IConversationModel[],
+  setFriendListResultHandler?: (
     newFriendListResult: object,
-    setFriendListResult: React.Dispatch<React.SetStateAction<{string:Array<object>}>>
+    setFriendListResult: React.Dispatch<React.SetStateAction<{ string: object[] }>>
   ) => void,
 ) => {
   const [friendListSortResult, setFriendListSortResult] = useState<any>();
@@ -20,30 +19,27 @@ export const useConversationCreate = (
     }
     return strChineseFirstPy.charAt(uni - 19968);
   };
-  const queryFriendList = async () => {
+  const queryFriendList = async (friendList: Friend[]) => {
     const frequentlyConversationProfile = conversationList.filter(
-      (item: Conversation) => item?.type === TencentCloudChat.TYPES.CONV_C2C,
-    ).slice(0, 5).map((item: Conversation) => item?.userProfile);
-    const { code, data } = await chat.getFriendList();
-    if (code === 0) {
-      const sortResult = handleData(
-        data.map((item: Friend) => item.profile),
-        frequentlyConversationProfile,
-      );
-      setFriendListSortResult(sortResult);
-      if (setFriendListResultHandler) {
-        setFriendListResultHandler(sortResult, setFriendListSortResult);
-      }
+      (item: IConversationModel) => item?.type === TencentCloudChat.TYPES.CONV_C2C,
+    ).slice(0, 5).map((item: IConversationModel) => item?.userProfile);
+    const sortResult = handleData(
+      friendList?.map((item: Friend) => item.profile),
+      frequentlyConversationProfile,
+    );
+    setFriendListSortResult(sortResult);
+    if (setFriendListResultHandler) {
+      setFriendListResultHandler(sortResult, setFriendListSortResult);
     }
   };
-  const handleData = (profileList: Array<Profile>, frequentlyConversationProfile?: any) => {
+  function handleData(profileList: Profile[], frequentlyConversationProfile?: any) {
     const sortResult: any = {
       '#': [],
     };
     for (let i = 65; i <= 90; i += 1) {
       sortResult[String.fromCharCode(i)] = [];
     }
-    profileList.forEach((profile) => {
+    profileList?.forEach((profile) => {
       const { nick, userID } = profile;
       const first = getFirstLetter(nick || userID);
       if (first >= 'a' && first <= 'z') {
@@ -58,21 +54,20 @@ export const useConversationCreate = (
       sortResult[key].sort((a: any, b: any) => {
         const { nick: aNick, userID: aUserID } = a;
         const { nick: bNick, userID: bUserID } = b;
-        if (aNick || aUserID < bNick || bUserID) {
-          return 1;
-        } if (aNick || aUserID === bNick || bUserID) {
+        if (aNick || aUserID <= bNick || bUserID) {
           return 1;
         }
         return -1;
       });
     });
     return sortResult;
-  };
-  const { getUserProfile } = useProfile(chat);
+  }
+  // const { getUserProfile } = useProfile();
   const getFriendListSortSearchResult = async (searchValue: string) => {
     if (!searchValue) return friendListSortResult;
-    const { data: profileList } = await getUserProfile([searchValue]);
-
+    const { data } = await TUIUserService.getUserProfile({
+      userIDList: [searchValue],
+    });
     const result: any = {};
     let isIncludes = false;
     Object.keys(friendListSortResult).forEach((key) => {
@@ -97,11 +92,23 @@ export const useConversationCreate = (
     if (process.env?.REACT_APP_ONLINE === 'TencentCloudDemo') {
       return result;
     }
-    return !isIncludes ? handleData(profileList) : result;
+    return !isIncludes ? handleData(data) : result;
   };
+
+  function onFriendListUpdated(list: Friend[]) {
+    queryFriendList(list);
+  }
+
   useEffect(() => {
-    queryFriendList();
-  }, [chat]);
+    TUIStore.watch(StoreName.FRIEND, {
+      friendList: onFriendListUpdated,
+    });
+    return () => {
+      TUIStore.unwatch(StoreName.FRIEND, {
+        friendList: onFriendListUpdated,
+      });
+    };
+  }, []);
   return {
     getFirstLetter,
     queryFriendList,

package/src/components/ConversationCreate/index.ts

@@ -1,6 +1,7 @@
 export * from './ConversationCreate';
 export * from './ConversationCreateSelectView';
-export * from './ConversationCreatGroupDetail';
+export * from './ConversationCreateGroupDetail';
 export * from './ConversationCreateUserSelectList';
 export * from './hooks/useConversationCreate';
 export * from './ConversationGroupTypeInfo';
+export * from './ConversationCreateButton';

package/src/components/ConversationCreate/styles/{ConversationCreatGroupDetail.scss → ConversationCreateGroupDetail.scss}

@@ -1,39 +1,38 @@
+@use "../../../styles/colors/color-theme" as *;
+
 .tui-conversation-create-group-detail {
+  display: flex;
+  flex-direction: column;
+  padding: 0 10px;
+  overflow-y: scroll;
+
+  @include theme() {
+    color: get(text-color-primary);
+  }
+
   .create-group-box {
     padding: 10px 0;
   }
 
   .input-group-text {
-    font-weight: 400;
     font-size: 14px;
-    font-family: PingFangSC-Medium;
-    line-height: 22px;
-    color: #000;
   }
 
   .create-group-name {
     .input-group-name {
       font-weight: 700;
       font-size: 14px;
-      font-family: PingFangSC-Medium;
-      line-height: 19px;
-      color: #000;
     }
   }
 
   .input-group-title {
-    color: rgba(0, 0, 0, 40%);
     width: 106px;
     font-size: 14px;
   }
 
   .create-group-illustrate {
-    font-weight: 400;
     font-size: 12px;
-    font-family: PingFangSC-Medium;
-    line-height: 17px;
     text-align: justify;
-    color: rgba(0, 0, 0, 40%);
     padding-left: 8px;
   }
 
@@ -41,9 +40,6 @@
     .create-group-portrait-title {
       font-weight: 600;
       font-size: 14px;
-      font-family: PingFangSC-Medium;
-      line-height: 20px;
-      color: #000;
       padding: 20px 0 20px 8px;
     }
 
@@ -52,18 +48,18 @@
       flex-wrap: wrap;
       justify-content: flex-start;
       margin-bottom: 10px;
+      padding: 0 10px;
 
       .create-group-portrait-info {
         align-items: center;
         display: flex;
         flex-direction: column;
-        width: calc((100% - 10px) / 6);
+        // width: calc((100% - 10px) / 6);
         padding: 6px;
         box-sizing: border-box;
 
         &-nick {
           font-size: 12px;
-          font-family: PingFangSC-Medium;
           margin-top: 6px;
         }
       }

package/src/components/ConversationCreate/styles/conversationCreateButton.scss

@@ -0,0 +1,5 @@
+.tui-conversation-create-button {
+  display: flex;
+  align-items: center;
+  margin: 10px;
+}

package/src/components/ConversationCreate/styles/conversationCreateSelectView.scss

@@ -1,9 +1,16 @@
+@use "../../../styles/colors/color-theme" as *;
+
 .conversation-create-select-view {
   display: flex;
   flex-wrap: wrap;
   justify-content: flex-start;
   margin-bottom: 10px;
-  .select-view-info{
+
+  @include theme() {
+    color: get(text-color-primary);
+  }
+
+  .select-view-info {
     align-items: center;
     display: flex;
     flex-direction: column;
@@ -11,21 +18,19 @@
     padding: 6px;
     box-sizing: border-box;
     position: relative;
+
     .select-view-info-close {
       position: absolute;
       right: 15px;
       top: 6px;
       z-index: 2;
     }
+
     .select-view-info-nick {
-      font-family: PingFangSC-Medium;
-      font-weight: 400;
       font-size: 12px;
-      line-height: 17px;
-      font-style: normal;
-      overflow:hidden;
-      text-overflow:ellipsis;
-      white-space:nowrap;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
       width: 100%;
       text-align: center;
     }

package/src/components/ConversationCreate/styles/conversationGroupTypeInfo.scss

@@ -1,33 +1,41 @@
+@use "../../../styles/colors/color-theme" as *;
+
 .tui-conversation-group-type-info {
   display: flex;
   flex-direction: column;
   padding: 0 10px;
   overflow-y: scroll;
 
+  @include theme() {
+    color: get(text-color-primary);
+  }
+
   .group-type-info-box {
     display: flex;
     flex-direction: column;
-    background: #FFFFFF;
-    border: 1px solid #DDDDDD;
     border-radius: 16px;
     padding: 12px 16px;
     margin-top: 12px;
     cursor: pointer;
 
+    @include theme() {
+      background-color: get(bg-color-operate);
+      border: 1px solid get(stroke-color-primary);
+    }
+
     &:hover {
-      border: 1px solid #147AFF;
+      border: 1px solid #147aff;
     }
 
     &.group-type-info-box--active {
-      border: 1px solid #147AFF;
+      border: 1px solid #147aff;
     }
+
     .group-type-info-title {
       font-size: 16px;
-      font-family: PingFangSC-Medium;
-      line-height: 22px;
-      color: rgba(0, 0, 0, 0.8);
       display: flex;
       align-items: center;
+
       .box-active-icon {
         margin-right: 8px;
       }
@@ -35,31 +43,22 @@
 
     .group-type-info-description {
       font-size: 12px;
-      font-family: PingFangSC-Medium;
-      line-height: 17px;
       text-align: justify;
-      color: rgba(0, 0, 0, 0.4);
     }
   }
 
   .group-type-info-document {
     font-size: 16px;
-    font-family: PingFangSC-Medium;
-    line-height: 22px;
     text-align: justify;
     text-decoration: none;
     margin: 1rem auto;
 
-    &:link {
-      color: #104EF5;
-    }
-
-    &:active {
-      color: #104EF5;
-    }
-
+    &:link,
+    &:active,
     &:visited {
-      color: #104EF5;
+      @include theme() {
+        color: get(text-color-link);
+      }
     }
   }
 }