fcr-ui-scene 3.2.0 → 3.3.1

package/lib/modules/chat/index.css

@@ -15,3 +15,52 @@
 .fcr-message-label .fcr-avatar {
   cursor: pointer;
 }
+
+.chat-tabs-container {
+  width: 100%;
+  display: flex;
+  justify-content: center;
+}
+
+.fcr-no-data-chat {
+  width: 100%;
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+}
+
+.fcr-no-data-chat span {
+  font-weight: 400;
+  font-size: 13px;
+  line-height: 14px;
+  font-family: PingFang HK;
+  color: var(--fcr_ui_scene_icontext2);
+}
+
+.fcr-no-data-chat img {
+  width: 50%;
+  object-fit: contain;
+  margin-bottom: 20px;
+}
+
+.chat-container-icon {
+  position: relative;
+}
+
+.chat-container-red {
+  width: 8px;
+  height: 8px;
+  border-radius: 50%;
+  background: var(--fcr_ui_scene_ramp_red6);
+  position: absolute;
+  right: -5px;
+  top: -5px;
+}
+
+.chat-tabs-container .fcr-action-bar-chat-unread-count {
+  top: -16px;
+  right: -16px;
+  left: auto;
+}

package/lib/modules/chat/index.d.ts

@@ -4,7 +4,7 @@ import { FcrUIEventStore } from '../../common/event-store';
 import { FcrSecurityStore } from '../../common/security-store';
 import { CHAT_WRAPPER_CLASS } from 'agora-ui-foundation/lib/components/chat-wrapper';
 import { FcrChatRoomFile, FcrChatRoomMessageType } from 'agora-edu-core/lib/room-control/chatroom-control/type';
-import { FcrBaseRoomControl } from 'agora-edu-core';
+import { FcrMainRoomControl, FcrWaitingRoomControl } from 'agora-edu-core/lib/room-control/type';
 export { CHAT_WRAPPER_CLASS };
 export declare class ChatUIModule extends UIModule {
     private _store;
@@ -12,7 +12,7 @@ export declare class ChatUIModule extends UIModule {
     private _uiEventStore;
     private _uid;
     constructor({ roomControl, uiEventStore, securityStore, }: {
-        roomControl: FcrBaseRoomControl;
+        roomControl: FcrMainRoomControl | FcrWaitingRoomControl;
         uiEventStore: FcrUIEventStore;
         securityStore: FcrSecurityStore;
     });

package/lib/modules/chat/index.dev.js

@@ -23,7 +23,7 @@ window.__DEV_ENGINE_IS_READY__.then(/*#__PURE__*/(0, _asyncToGenerator2["default
         engine = window.__DEV_ENGINE__;
         roomId = window.__DEV_ROOM_ID__; // TODO: dev 环境需要 login
         // await engine.login();
-        roomControl = engine.createRoomControl(roomId);
+        roomControl = engine.createMainRoomControl(roomId);
         uiEventStore = new _eventStore.FcrUIEventStore();
         securityStore = new _securityStore.FcrSecurityStore(roomControl.getPrivilegeControl(), roomControl.getUserControl(), roomControl.getStreamControl(), roomControl.getRoomSessionControl(), uiEventStore); // TODO: dev 环境需要 join
         // await roomControl.join({

package/lib/modules/chat/index.js

@@ -62,13 +62,13 @@ var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _base = require("../../base");
 require("./index.css");
-var _store = _interopRequireDefault(require("./store"));
 var _chat = require("./chat");
 var _decorator = require("agora-foundation/lib/decorator");
 var _contex = require("./contex");
 var _messageTextarea = require("agora-ui-foundation/lib/components/message-textarea");
 var _chatWrapper = require("agora-ui-foundation/lib/components/chat-wrapper");
 var _type = require("agora-edu-core/lib/room-control/chatroom-control/type");
+var _store = _interopRequireDefault(require("./store"));
 var _jsxRuntime = require("react/jsx-runtime");
 var _ChatUIModule;
 var _initProto;
@@ -95,7 +95,8 @@ var ChatUIModule = exports.ChatUIModule = /*#__PURE__*/function (_UIModule) {
       chatRoomControl: _this._chatRoomControl,
       userControl: roomControl.getUserControl(),
       uiEventStore: uiEventStore,
-      securityStore: securityStore
+      securityStore: securityStore,
+      roomControl: roomControl
     });
     _this.sendMessage = _this.sendMessage.bind(_this);
     _this.updateReadMsgIndex = _this.updateReadMsgIndex.bind(_this);
@@ -123,8 +124,9 @@ var ChatUIModule = exports.ChatUIModule = /*#__PURE__*/function (_UIModule) {
               _this2.sendMessage(imgData, _type.FcrChatRoomMessageType.Image);
             });
           },
-          userId: this._uid,
-          isHost: this._store.isHost,
+          userId: this._uid
+          // isHost={this._store.isHost}
+          ,
           singling: singling
         })
       });
@@ -141,19 +143,20 @@ var ChatUIModule = exports.ChatUIModule = /*#__PURE__*/function (_UIModule) {
     key: "sendMessage",
     value: function () {
       var _sendMessage = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee(msg, type) {
+        var _this$_store$chatRoom, _this$_store$chatRoom2;
         return _regenerator["default"].wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
               _context.prev = 0;
               _context.next = 3;
-              return this._store.sendMessage(msg, type);
+              return (_this$_store$chatRoom = this._store.chatRoomStores[this._store.activeTabIndex]) === null || _this$_store$chatRoom === void 0 ? void 0 : _this$_store$chatRoom.sendMessage(msg, type);
             case 3:
               _context.next = 8;
               break;
             case 5:
               _context.prev = 5;
               _context.t0 = _context["catch"](0);
-              this._store.handleToast({
+              (_this$_store$chatRoom2 = this._store.chatRoomStores[this._store.activeTabIndex]) === null || _this$_store$chatRoom2 === void 0 || _this$_store$chatRoom2.handleToast({
                 id: 'send-msg',
                 toastProps: {
                   content: _context.t0.reason,
@@ -176,10 +179,11 @@ var ChatUIModule = exports.ChatUIModule = /*#__PURE__*/function (_UIModule) {
     key: "updateReadMsgIndex",
     value: function () {
       var _updateReadMsgIndex = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee2(data) {
+        var _this$_store$chatRoom3;
         return _regenerator["default"].wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
-              this._store.updateReadMsgIndex(data);
+              (_this$_store$chatRoom3 = this._store.chatRoomStores[this._store.activeTabIndex]) === null || _this$_store$chatRoom3 === void 0 || _this$_store$chatRoom3.updateReadMsgIndex(data);
             case 1:
             case "end":
               return _context2.stop();
@@ -194,7 +198,8 @@ var ChatUIModule = exports.ChatUIModule = /*#__PURE__*/function (_UIModule) {
   }, {
     key: "onUnload",
     value: function onUnload() {
-      this._store.release();
+      var _this$_store$chatRoom4;
+      (_this$_store$chatRoom4 = this._store.chatRoomStores[this._store.activeTabIndex]) === null || _this$_store$chatRoom4 === void 0 || _this$_store$chatRoom4.release();
     }
   }]);
 }(_base.UIModule);

package/lib/modules/chat/message-list.js

@@ -70,6 +70,7 @@ var _classnames = _interopRequireDefault(require("classnames"));
 var _copyText = require("../../utilities/copyText");
 var _platform = require("../../utilities/platform");
 var _env = require("agora-foundation/lib/utilities/env");
+var _fcr_defaultpage = _interopRequireDefault(require("../../../public/assets/fcr_defaultpage.png"));
 var _jsxRuntime = require("react/jsx-runtime");
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { "default": e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n["default"] = e, t && t.set(e, n), n; }
@@ -95,39 +96,42 @@ var MessageList = exports.MessageList = (0, _mobxReact.observer)(function (_ref)
     copyTips = _ref.copyTips;
   var t = (0, _i18n.useI18n)();
   var _useContext = (0, _react.useContext)(_contex.StoreContext),
-    storeMsgs = _useContext.messageList,
-    readMsgIndex = _useContext.readMsgIndex,
-    needCbBottomCount = _useContext.needCbBottomCount,
-    list = _useContext.list,
-    mostRecentHeight = _useContext.mostRecentHeight,
-    mostRecentWidth = _useContext.mostRecentWidth,
-    cache = _useContext.cache,
-    scrollHeight = _useContext.scrollHeight,
-    scrollTop = _useContext.scrollTop,
-    clientHeight = _useContext.clientHeight,
-    firstMsgId = _useContext.firstMsgId,
-    readIdx = _useContext.readIdx,
-    viewIdx = _useContext.viewIdx,
-    historyUnReadCount = _useContext.historyUnreadCount,
-    hasHistoryMsg = _useContext.hasHistoryMsg,
-    newMsgsUnReadCnt = _useContext.newMsgsUnReadCnt,
-    isHost = _useContext.isHost,
-    isCohost = _useContext.isCohost,
-    initReadInfo = _useContext.initReadInfo,
-    updateScrollInfo = _useContext.updateScrollInfo,
-    updateHasHistoryMsg = _useContext.updateHasHistoryMsg,
-    updateHistoryCnt = _useContext.updateHistoryUnreadCnt,
-    updateViewIdx = _useContext.updateViewIdx,
-    updateReadIdx = _useContext.updateReadIdx,
-    updateFirstMsgId = _useContext.updateFirstMsgId,
-    updateHistoryUnReadCount = _useContext.updateHistoryUnReadCount,
-    updateList = _useContext.updateList,
-    updateMostRecentHeight = _useContext.updateMostRecentHeight,
-    updateMostRecentWidth = _useContext.updateMostRecentWidth,
-    forceNotifyMsgs = _useContext.forceNotifyMsgs,
-    permitPrivateChat = _useContext.permitPrivateChat,
-    lastScrollTop = _useContext.lastScrollTop,
-    setLastScrollTop = _useContext.setLastScrollTop;
+    chatRoomStores = _useContext.chatRoomStores,
+    activeTabIndex = _useContext.activeTabIndex;
+  var _ref2 = chatRoomStores[activeTabIndex],
+    storeMsgs = _ref2.messageList,
+    readMsgIndex = _ref2.readMsgIndex,
+    needCbBottomCount = _ref2.needCbBottomCount,
+    list = _ref2.list,
+    mostRecentHeight = _ref2.mostRecentHeight,
+    mostRecentWidth = _ref2.mostRecentWidth,
+    cache = _ref2.cache,
+    scrollHeight = _ref2.scrollHeight,
+    scrollTop = _ref2.scrollTop,
+    clientHeight = _ref2.clientHeight,
+    firstMsgId = _ref2.firstMsgId,
+    readIdx = _ref2.readIdx,
+    viewIdx = _ref2.viewIdx,
+    historyUnReadCount = _ref2.historyUnreadCount,
+    hasHistoryMsg = _ref2.hasHistoryMsg,
+    newMsgsUnReadCnt = _ref2.newMsgsUnReadCnt,
+    isHost = _ref2.isHost,
+    isCohost = _ref2.isCohost,
+    initReadInfo = _ref2.initReadInfo,
+    updateScrollInfo = _ref2.updateScrollInfo,
+    updateHasHistoryMsg = _ref2.updateHasHistoryMsg,
+    updateHistoryCnt = _ref2.updateHistoryUnreadCnt,
+    updateViewIdx = _ref2.updateViewIdx,
+    updateReadIdx = _ref2.updateReadIdx,
+    updateFirstMsgId = _ref2.updateFirstMsgId,
+    updateHistoryUnReadCount = _ref2.updateHistoryUnReadCount,
+    updateList = _ref2.updateList,
+    updateMostRecentHeight = _ref2.updateMostRecentHeight,
+    updateMostRecentWidth = _ref2.updateMostRecentWidth,
+    forceNotifyMsgs = _ref2.forceNotifyMsgs,
+    permitPrivateChat = _ref2.permitPrivateChat,
+    lastScrollTop = _ref2.lastScrollTop,
+    setLastScrollTop = _ref2.setLastScrollTop;
   var _useState = (0, _react.useState)(storeMsgs !== null && storeMsgs !== void 0 ? storeMsgs : []),
     _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
     messageList = _useState2[0],
@@ -207,7 +211,7 @@ var MessageList = exports.MessageList = (0, _mobxReact.observer)(function (_ref)
     scrollToIdx(viewIdx);
   }, [newMsgsUnReadCnt]);
   var handleCopyMsg = /*#__PURE__*/function () {
-    var _ref2 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee(msg, time, publisherNickName, targetNickname) {
+    var _ref3 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee(msg, time, publisherNickName, targetNickname) {
       var msgHandled;
       return _regenerator["default"].wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
@@ -224,7 +228,7 @@ var MessageList = exports.MessageList = (0, _mobxReact.observer)(function (_ref)
       }, _callee);
     }));
     return function handleCopyMsg(_x, _x2, _x3, _x4) {
-      return _ref2.apply(this, arguments);
+      return _ref3.apply(this, arguments);
     };
   }();
   var handleSelectMsg = function handleSelectMsg(idx, checked) {
@@ -245,12 +249,12 @@ var MessageList = exports.MessageList = (0, _mobxReact.observer)(function (_ref)
     // list?.scrollToPosition(_scrollTop);
   };
   var rowRenderer = function rowRenderer(messageList) {
-    return function (_ref3) {
+    return function (_ref4) {
       var _arr, _arr2, _arr3, _arr4, _datum$img;
-      var index = _ref3.index,
-        key = _ref3.key,
-        parent = _ref3.parent,
-        style = _ref3.style;
+      var index = _ref4.index,
+        key = _ref4.key,
+        parent = _ref4.parent,
+        style = _ref4.style;
       var datum = messageList[index % messageList.length];
       var publisherRole = datum.role,
         time = datum.time,
@@ -379,7 +383,7 @@ var MessageList = exports.MessageList = (0, _mobxReact.observer)(function (_ref)
                       width: 'auto'
                     },
                     onCopy: (/*#__PURE__*/function () {
-                      var _ref4 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee2(type) {
+                      var _ref5 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee2(type) {
                         var currentScrollTop;
                         return _regenerator["default"].wrap(function _callee2$(_context2) {
                           while (1) switch (_context2.prev = _context2.next) {
@@ -410,7 +414,7 @@ var MessageList = exports.MessageList = (0, _mobxReact.observer)(function (_ref)
                         }, _callee2);
                       }));
                       return function (_x5) {
-                        return _ref4.apply(this, arguments);
+                        return _ref5.apply(this, arguments);
                       };
                     }()),
                     onPrivate: function onPrivate() {
@@ -576,13 +580,20 @@ var MessageList = exports.MessageList = (0, _mobxReact.observer)(function (_ref)
       styles: {
         zIndex: 999
       }
-    }) : null, /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactVirtualized.AutoSizer, {
+    }) : null, messageList.length === 0 ? /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
+      className: "fcr-no-data-chat",
+      children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("img", {
+        src: _fcr_defaultpage["default"]
+      }), /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+        children: t('fmt_chat_tips_nodata')
+      })]
+    }) : /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactVirtualized.AutoSizer, {
       style: {
         alignSelf: 'stretch'
       },
-      children: function children(_ref5) {
-        var height = _ref5.height,
-          width = _ref5.width;
+      children: function children(_ref6) {
+        var height = _ref6.height,
+          width = _ref6.width;
         if (height !== mostRecentHeight || width !== mostRecentWidth) {
           cache.clearAll();
           if (list) {
@@ -592,8 +603,8 @@ var MessageList = exports.MessageList = (0, _mobxReact.observer)(function (_ref)
         updateMostRecentHeight(height);
         updateMostRecentWidth(width);
         return /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactVirtualized.List, {
-          ref: function ref(_ref6) {
-            updateList(_ref6);
+          ref: function ref(_ref7) {
+            updateList(_ref7);
           },
           style: {
             padding: 'inherit',

package/lib/modules/chat/store.d.ts

@@ -4,9 +4,13 @@ import { FcrUserRole, FcrUserInfo } from 'agora-edu-core/lib/type';
 import { FcrUIEventStore } from '../../common/event-store';
 import { FcrSecurityStore } from '../../common/security-store';
 import { CellMeasurerCache, List } from 'react-virtualized';
+import { RoomType } from '../../utilities/constant';
 import { AllowChatLevelType } from 'agora-ui-foundation/lib/components/chat-manager';
 import { ToastConfig } from 'agora-ui-foundation/lib/components/toast';
-import { FcrChatRoomConnectionState, FcrChatRoomControl, FcrChatRoomFile, FcrChatRoomMessageType } from 'agora-edu-core/lib/room-control/chatroom-control/type';
+import { FcrChatRoomConnectionState, FcrChatRoomControl, FcrChatRoomFile, FcrChatRoomMessageType, FcrChatRoomReceiveImageMessage, FcrChatRoomReceiveTextMessage } from 'agora-edu-core/lib/room-control/chatroom-control/type';
+import { FcrMainRoomControl, FcrWaitingRoomControl } from 'agora-edu-core/lib/room-control/type';
+import { AgoraObservable } from 'agora-foundation/lib/utilities/observable';
+type FcrChatRoomReceiveMessage = FcrChatRoomReceiveTextMessage | FcrChatRoomReceiveImageMessage;
 export interface MsgListType {
     id: string;
     nickName: string;
@@ -25,7 +29,35 @@ export declare const USER_ALL = "All";
 export declare const USER_NONE = "NONE";
 export declare const allToUser: FcrUserInfo;
 export declare const noUser: FcrUserInfo;
+type FcrChatStoreObserver = {
+    onReceiveMessage: (msgs: FcrChatRoomReceiveMessage[], type: RoomType) => void;
+};
+type ChatRoomStoreMap = {
+    [K in RoomType]?: ChatRoomStore;
+};
+type RoomTypeKeys = keyof typeof RoomType;
 export default class ChatStore {
+    private _observable;
+    private _securityStore;
+    private _uiEventStore;
+    private _chatVisible;
+    private _eventObserver;
+    private _chatStoreObserver;
+    accessor chatRoomStores: ChatRoomStoreMap;
+    accessor activeTabIndex: RoomTypeKeys;
+    constructor({ chatRoomControl, userControl, uiEventStore, securityStore, roomControl, }: {
+        chatRoomControl: FcrChatRoomControl;
+        userControl: FcrUserControl;
+        uiEventStore: FcrUIEventStore;
+        securityStore: FcrSecurityStore;
+        roomControl: FcrWaitingRoomControl | FcrMainRoomControl;
+    });
+    hasWaitingRoomPermission(): boolean;
+    private _handleReceiveMessage;
+    handlerActiveTab(key: RoomType): void;
+    private _handleEvent;
+}
+export declare class ChatRoomStore {
     needCbBottomCount: number;
     list: List | undefined;
     mostRecentHeight: number;
@@ -45,9 +77,11 @@ export default class ChatStore {
     private _userControl;
     private _chatRoomControl;
     private _securityStore;
+    private _chatStoreObservable;
     private _maxMsgCount;
     private _originalMessages;
     private _disposers;
+    private _type;
     private accessor _userInfo;
     accessor messageList: MsgListType[];
     accessor readMsgIndex: {
@@ -65,20 +99,28 @@ export default class ChatStore {
     accessor textMsg: string;
     accessor privateTargetList: FcrUserInfo[];
     accessor chatRoomState: FcrChatRoomConnectionState;
+    accessor hasNewMsg: boolean;
+    accessor userCount: number;
+    accessor unReadMsgCount: number;
     private _chatRoomObserver;
     private _userObserver;
-    constructor({ chatRoomControl, userControl, uiEventStore, securityStore, }: {
+    constructor({ chatRoomControl, userControl, uiEventStore, securityStore, type, chatStoreObservable, }: {
         chatRoomControl: FcrChatRoomControl;
         userControl: FcrUserControl;
         uiEventStore: FcrUIEventStore;
         securityStore: FcrSecurityStore;
+        type: RoomType;
+        chatStoreObservable: AgoraObservable<FcrChatStoreObserver>;
     });
     release(): void;
     setLastScrollTop(value: number | undefined): void;
     setMessageList(messages: MsgListType[]): void;
     sendMessage(msg: string | FcrChatRoomFile, type: FcrChatRoomMessageType): Promise<void>;
     private messageReceived;
+    setUnReadMsgCount(count: number): void;
+    setHasNewMsg(value: boolean): void;
     private _handleTextMessageReceived;
+    getUserCount(): number;
     private _onRemoteUserUpdate;
     private _onUserPropertiesUpdated;
     private _onUserInfoUpdated;
@@ -94,6 +136,7 @@ export default class ChatStore {
     get disallowedPublicChatAndDisallowedPrivateChatToParticipant(): boolean | undefined;
     get disallowedAllChat(): boolean | undefined;
     get hasChatPermission(): boolean;
+    get hasChatSendPrivatePermission(): boolean;
     get isHost(): boolean;
     get isCohost(): boolean;
     get localIsManager(): boolean;
@@ -121,6 +164,8 @@ export default class ChatStore {
     updateChatLevel(chatLevel: AllowChatLevelType): void;
     get privilegeOperator(): FcrUserInfo | undefined;
     updateChatTextMsg(txt: string): void;
+    filterChatMember(list: FcrUserInfo[]): FcrUserInfo[];
+    hasSendMessagePermission(): boolean;
     permitPrivateChat(userId: string): void;
     handleToast(params: ToastConfig): void;
     get isHostOrCoHost(): boolean;
@@ -130,3 +175,4 @@ export default class ChatStore {
 }
 export declare function isManager(role: FcrUserRole): role is FcrUserRole.HOST | FcrUserRole.COHOST;
 export declare function sortUsers(users: FcrUserInfo[]): FcrUserInfo[];
+export {};