fcr-ui-scene 3.4.5 → 3.5.1

package/lib/modules/chat/store.js

@@ -9,26 +9,11 @@ require("core-js/modules/es.array.is-array.js");
 require("core-js/modules/es.date.to-primitive.js");
 require("core-js/modules/es.function.bind.js");
 require("core-js/modules/es.function.name.js");
-require("core-js/modules/es.map.js");
 require("core-js/modules/es.number.constructor.js");
 require("core-js/modules/es.object.create.js");
 require("core-js/modules/es.object.define-property.js");
 require("core-js/modules/es.object.get-own-property-descriptor.js");
 require("core-js/modules/esnext.function.metadata.js");
-require("core-js/modules/esnext.map.delete-all.js");
-require("core-js/modules/esnext.map.emplace.js");
-require("core-js/modules/esnext.map.every.js");
-require("core-js/modules/esnext.map.filter.js");
-require("core-js/modules/esnext.map.find.js");
-require("core-js/modules/esnext.map.find-key.js");
-require("core-js/modules/esnext.map.includes.js");
-require("core-js/modules/esnext.map.key-of.js");
-require("core-js/modules/esnext.map.map-keys.js");
-require("core-js/modules/esnext.map.map-values.js");
-require("core-js/modules/esnext.map.merge.js");
-require("core-js/modules/esnext.map.reduce.js");
-require("core-js/modules/esnext.map.some.js");
-require("core-js/modules/esnext.map.update.js");
 require("core-js/modules/esnext.symbol.metadata.js");
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 var _typeof = require("@babel/runtime/helpers/typeof");
@@ -42,6 +27,7 @@ require("core-js/modules/es.array.for-each.js");
 require("core-js/modules/es.array.iterator.js");
 require("core-js/modules/es.array.push.js");
 require("core-js/modules/es.array.sort.js");
+require("core-js/modules/es.map.js");
 require("core-js/modules/es.object.to-string.js");
 require("core-js/modules/es.object.values.js");
 require("core-js/modules/es.string.iterator.js");
@@ -49,6 +35,20 @@ require("core-js/modules/es.weak-map.js");
 require("core-js/modules/esnext.async-iterator.for-each.js");
 require("core-js/modules/esnext.iterator.constructor.js");
 require("core-js/modules/esnext.iterator.for-each.js");
+require("core-js/modules/esnext.map.delete-all.js");
+require("core-js/modules/esnext.map.emplace.js");
+require("core-js/modules/esnext.map.every.js");
+require("core-js/modules/esnext.map.filter.js");
+require("core-js/modules/esnext.map.find.js");
+require("core-js/modules/esnext.map.find-key.js");
+require("core-js/modules/esnext.map.includes.js");
+require("core-js/modules/esnext.map.key-of.js");
+require("core-js/modules/esnext.map.map-keys.js");
+require("core-js/modules/esnext.map.map-values.js");
+require("core-js/modules/esnext.map.merge.js");
+require("core-js/modules/esnext.map.reduce.js");
+require("core-js/modules/esnext.map.some.js");
+require("core-js/modules/esnext.map.update.js");
 require("core-js/modules/esnext.weak-map.delete-all.js");
 require("core-js/modules/esnext.weak-map.emplace.js");
 require("core-js/modules/web.dom-collections.for-each.js");
@@ -66,8 +66,9 @@ var _observable = require("agora-foundation/lib/utilities/observable");
 var _react = require("react");
 var _types = require("./types");
 var _chatRoomStore = require("./chat-room-store");
+var _type3 = require("../../type");
 var _ChatStore;
-var _initProto, _init_chatRoomStores, _init_activeTabIndex, _init_roomType, _handleReceiveMessageDecs, _handlerActiveTabDecs, _handleEventDecs, _releaseDecs, _ref;
+var _initProto, _init_chatRoomStores, _init_activeTabIndex, _init_copyMap, _handleReceiveMessageDecs, _handlerActiveTabDecs, _handleSelectMsgDecs, _clearCopyMapDecs, _releaseDecs, _ref;
 function _classPrivateFieldInitSpec(e, t, a) { _checkPrivateRedeclaration(e, t), t.set(e, a); }
 function _checkPrivateRedeclaration(e, t) { if (t.has(e)) throw new TypeError("Cannot initialize the same private elements twice on an object"); }
 function _classPrivateFieldSet(s, a, r) { return s.set(_assertClassBrand(s, a), r), r; }
@@ -81,13 +82,12 @@ function _checkInRHS(e) { if (Object(e) !== e) throw TypeError("right-hand side
 var _A = /*#__PURE__*/new WeakMap();
 var _B = /*#__PURE__*/new WeakMap();
 var _C = /*#__PURE__*/new WeakMap();
-_ref = (_handleReceiveMessageDecs = [_mobx.action, _mobx.action.bound], _handlerActiveTabDecs = [_mobx.action, _mobx.action.bound], _handleEventDecs = [_mobx.action, _mobx.action.bound], _releaseDecs = [_mobx.action, _mobx.action.bound], "_disposers");
+_ref = (_handleReceiveMessageDecs = [_mobx.action, _mobx.action.bound], _handlerActiveTabDecs = [_mobx.action, _mobx.action.bound], _handleSelectMsgDecs = [_mobx.action, _mobx.action.bound], _clearCopyMapDecs = [_mobx.action, _mobx.action.bound], _releaseDecs = [_mobx.action, _mobx.action.bound], "_disposers");
 var ChatStore = exports["default"] = /*#__PURE__*/function () {
   function ChatStore(_ref2) {
     var _this = this,
       _roomControl$getRoomI,
-      _roomControl$getRoomI2,
-      _roomControl$getRoomI3;
+      _roomControl$getRoomI2;
     var chatRoomControl = _ref2.chatRoomControl,
       userControl = _ref2.userControl,
       uiEventStore = _ref2.uiEventStore,
@@ -95,46 +95,53 @@ var ChatStore = exports["default"] = /*#__PURE__*/function () {
       roomControl = _ref2.roomControl,
       waitingRoomControlProvider = _ref2.waitingRoomControlProvider,
       roomProvider = _ref2.roomProvider,
-      chatProvider = _ref2.chatProvider;
+      chatProvider = _ref2.chatProvider,
+      sharedLayoutDataSource = _ref2.sharedLayoutDataSource,
+      sharedWaitingRoomDataSource = _ref2.sharedWaitingRoomDataSource,
+      sharedChatDataSource = _ref2.sharedChatDataSource;
     (0, _classCallCheck2["default"])(this, ChatStore);
     (0, _defineProperty2["default"])(this, _ref, (_initProto(this), []));
     (0, _defineProperty2["default"])(this, "_observable", new _observable.AgoraObservable());
-    (0, _defineProperty2["default"])(this, "_chatVisible", false);
     _classPrivateFieldInitSpec(this, _A, _init_chatRoomStores(this, {}));
-    _classPrivateFieldInitSpec(this, _B, _init_activeTabIndex(this, _type2.FcrRoomType.Mainroom));
-    _classPrivateFieldInitSpec(this, _C, _init_roomType(this, _type2.FcrRoomType.Mainroom));
+    _classPrivateFieldInitSpec(this, _B, _init_activeTabIndex(this, _type3.FcrUIRoomType.MAIN_ROOM));
+    _classPrivateFieldInitSpec(this, _C, _init_copyMap(this, new Map()));
     this._securityStore = securityStore;
     this._uiEventStore = uiEventStore;
     this._chatProvider = chatProvider;
+    this._sharedLayoutDataSource = sharedLayoutDataSource;
+    this._sharedWaitingRoomDataSource = sharedWaitingRoomDataSource;
+    this._sharedChatDataSource = sharedChatDataSource;
     var roomObserver = {
       onJoinWaitingRoom: function onJoinWaitingRoom(room) {
         var userControl = room.getUserControl();
         var chatRoomControl = room.getChatRoomControl();
-        _this.chatRoomStores[_type2.FcrRoomType.Waitingroom] = new _chatRoomStore.ChatRoomStore({
+        _this.chatRoomStores[_type3.FcrUIRoomType.WAITING_ROOM] = new _chatRoomStore.ChatRoomStore({
           chatRoomControl: chatRoomControl,
           userControl: userControl,
           uiEventStore: _this._uiEventStore,
           securityStore: waitingRoomControlProvider.privilegeProvider,
-          type: _type2.FcrRoomType.Waitingroom,
+          type: _type3.FcrUIRoomType.WAITING_ROOM,
           chatStoreObservable: _this._observable,
           chatProvider: _this._chatProvider
         });
+      },
+      onWaitingRoomManageCanceled: function onWaitingRoomManageCanceled() {
+        var _this$chatRoomStores$;
+        _this.handlerActiveTab(_type3.FcrUIRoomType.MAIN_ROOM);
+        (_this$chatRoomStores$ = _this.chatRoomStores[_type3.FcrUIRoomType.WAITING_ROOM]) === null || _this$chatRoomStores$ === void 0 || _this$chatRoomStores$.release();
+        delete _this.chatRoomStores[_type3.FcrUIRoomType.WAITING_ROOM];
       }
     };
-    var eventObserver = {
-      onEvent: this._handleEvent
-    };
     var chatStoreObserver = {
       onReceiveMessage: this._handleReceiveMessage
     };
     if (((_roomControl$getRoomI = roomControl.getRoomInfo()) === null || _roomControl$getRoomI === void 0 ? void 0 : _roomControl$getRoomI.roomType) === _type2.FcrRoomType.Mainroom) {
       roomProvider.addObserver(roomObserver);
     }
-    uiEventStore.addObserver(eventObserver);
     this._observable.addObserver(chatStoreObserver);
     var isMainroom = ((_roomControl$getRoomI2 = roomControl.getRoomInfo()) === null || _roomControl$getRoomI2 === void 0 ? void 0 : _roomControl$getRoomI2.roomType) === _type2.FcrRoomType.Mainroom;
-    var type = isMainroom ? _type2.FcrRoomType.Mainroom : _type2.FcrRoomType.Waitingroom;
-    this.activeTabIndex = isMainroom ? _type2.FcrRoomType.Mainroom : _type2.FcrRoomType.Waitingroom;
+    var type = isMainroom ? _type3.FcrUIRoomType.MAIN_ROOM : _type3.FcrUIRoomType.WAITING_ROOM;
+    this.activeTabIndex = isMainroom ? _type3.FcrUIRoomType.MAIN_ROOM : _type3.FcrUIRoomType.WAITING_ROOM;
     this.chatRoomStores[type] = new _chatRoomStore.ChatRoomStore({
       chatRoomControl: chatRoomControl,
       userControl: userControl,
@@ -144,10 +151,25 @@ var ChatStore = exports["default"] = /*#__PURE__*/function () {
       chatStoreObservable: this._observable,
       chatProvider: this._chatProvider
     });
-    this.roomType = (_roomControl$getRoomI3 = roomControl.getRoomInfo()) === null || _roomControl$getRoomI3 === void 0 ? void 0 : _roomControl$getRoomI3.roomType;
-    this._disposers.push(function () {
+    this._disposers.push((0, _mobx.reaction)(function () {
+      return sharedWaitingRoomDataSource.totalWaitingRoomUser;
+    }, function (count) {
+      if (count === 0) {
+        _this.handlerActiveTab(_type3.FcrUIRoomType.MAIN_ROOM);
+      }
+    }), (0, _mobx.reaction)(function () {
+      return _this._sharedLayoutDataSource.asideLayout.chat;
+    }, function (visible) {
+      if (visible === true) {
+        var _this$chatRoomStores$2;
+        (_this$chatRoomStores$2 = _this.chatRoomStores[_this.activeTabIndex]) === null || _this$chatRoomStores$2 === void 0 || _this$chatRoomStores$2.setUnReadMsgCount(0);
+      }
+    }), (0, _mobx.reaction)(function () {
+      return _this._sharedChatDataSource.activeTab;
+    }, function (tab) {
+      _this.activeTabIndex = tab;
+    }), function () {
       roomProvider.removeObserver(roomObserver);
-      uiEventStore.removeObserver(eventObserver);
       _this._observable.removeObserver(chatStoreObserver);
     });
   }
@@ -168,7 +190,7 @@ var ChatStore = exports["default"] = /*#__PURE__*/function () {
       _classPrivateFieldSet(_B, this, v);
     }
   }, {
-    key: "roomType",
+    key: "copyMap",
     get: function get() {
       return _classPrivateFieldGet(_C, this);
     },
@@ -183,9 +205,9 @@ var ChatStore = exports["default"] = /*#__PURE__*/function () {
   }, {
     key: "_handleReceiveMessage",
     value: function _handleReceiveMessage(notifyMsgs, type) {
-      if (this.activeTabIndex !== type || !this._chatVisible) {
-        var _this$chatRoomStores$, _this$chatRoomStores$2;
-        (_this$chatRoomStores$ = this.chatRoomStores[type]) === null || _this$chatRoomStores$ === void 0 || _this$chatRoomStores$.setUnReadMsgCount(notifyMsgs.length + ((_this$chatRoomStores$2 = this.chatRoomStores[type]) === null || _this$chatRoomStores$2 === void 0 ? void 0 : _this$chatRoomStores$2.unReadMsgCount));
+      if (this.activeTabIndex !== type || !this._sharedLayoutDataSource.asideLayout.chat) {
+        var _this$chatRoomStores$3, _this$chatRoomStores$4;
+        (_this$chatRoomStores$3 = this.chatRoomStores[type]) === null || _this$chatRoomStores$3 === void 0 || _this$chatRoomStores$3.setUnReadMsgCount(notifyMsgs.length + ((_this$chatRoomStores$4 = this.chatRoomStores[type]) === null || _this$chatRoomStores$4 === void 0 ? void 0 : _this$chatRoomStores$4.unReadMsgCount));
         this._chatProvider.latestsMessageInfo = {
           notifyMsgs: notifyMsgs,
           currentRoomType: type
@@ -195,44 +217,25 @@ var ChatStore = exports["default"] = /*#__PURE__*/function () {
   }, {
     key: "handlerActiveTab",
     value: function handlerActiveTab(key) {
-      var _this$chatRoomStores$3, _this$chatRoomStores$4;
+      var _this$chatRoomStores$5;
       this.activeTabIndex = key;
-      (_this$chatRoomStores$3 = this.chatRoomStores[key]) === null || _this$chatRoomStores$3 === void 0 || _this$chatRoomStores$3.setUnReadMsgCount(0);
-      (_this$chatRoomStores$4 = this.chatRoomStores[_type2.FcrRoomType.Waitingroom]) === null || _this$chatRoomStores$4 === void 0 || _this$chatRoomStores$4.setHasNewMsg(false);
+      (_this$chatRoomStores$5 = this.chatRoomStores[key]) === null || _this$chatRoomStores$5 === void 0 || _this$chatRoomStores$5.setUnReadMsgCount(0);
       this._uiEventStore.sendEvent(_constant.FcrUIAction.CHAT_ROOM_TAB_CHANGE, key);
     }
   }, {
-    key: "_handleEvent",
-    value: function _handleEvent(action, payload) {
-      if (action === _constant.FcrUIAction.RECEIVE_NEW_CHAT_MESSAGES_FOR_RED) {
-        if (this.activeTabIndex !== payload) {
-          var _this$chatRoomStores;
-          (_this$chatRoomStores = this.chatRoomStores[payload]) === null || _this$chatRoomStores === void 0 || _this$chatRoomStores.setHasNewMsg(true);
-        } else {
-          var _this$chatRoomStores2;
-          (_this$chatRoomStores2 = this.chatRoomStores[payload]) === null || _this$chatRoomStores2 === void 0 || _this$chatRoomStores2.setHasNewMsg(false);
-        }
-      }
-      if (action === _constant.FcrUIAction.CHAT_ROOM_CLOSED) {
-        this.handlerActiveTab(_type2.FcrRoomType.Mainroom);
-      }
-      if (action === _constant.FcrUIAction.CHAT_VISIBLE) {
-        if (payload === true) {
-          var _this$chatRoomStores$5;
-          (_this$chatRoomStores$5 = this.chatRoomStores[this.activeTabIndex]) === null || _this$chatRoomStores$5 === void 0 || _this$chatRoomStores$5.setUnReadMsgCount(0);
-        }
-        this._chatVisible = payload;
-      }
-      if (action === _constant.FcrUIAction.WAITING_ROOM_DESTROYED) {
-        var _this$chatRoomStores$6;
-        (_this$chatRoomStores$6 = this.chatRoomStores[_type2.FcrRoomType.Waitingroom]) === null || _this$chatRoomStores$6 === void 0 || _this$chatRoomStores$6.release();
-        delete this.chatRoomStores[_type2.FcrRoomType.Waitingroom];
-        this.handlerActiveTab(_type2.FcrRoomType.Mainroom);
-      }
-      if (action === _constant.FcrUIAction.TOGGLE_CHAT_ROOM_TAB) {
-        this.handlerActiveTab(payload);
+    key: "handleSelectMsg",
+    value: function handleSelectMsg(idx, checked) {
+      if (checked) {
+        this.copyMap.set(idx, checked);
+      } else {
+        this.copyMap["delete"](idx);
       }
     }
+  }, {
+    key: "clearCopyMap",
+    value: function clearCopyMap() {
+      this.copyMap.clear();
+    }
   }, {
     key: "release",
     value: function release() {
@@ -248,10 +251,10 @@ var ChatStore = exports["default"] = /*#__PURE__*/function () {
   }]);
 }();
 _ChatStore = ChatStore;
-var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_ChatStore, [[_mobx.observable, 1, "chatRoomStores"], [_mobx.observable, 1, "activeTabIndex"], [_mobx.observable, 1, "roomType"], [_decorator.bound, 2, "hasWaitingRoomPermission"], [_handleReceiveMessageDecs, 18, "_handleReceiveMessage"], [_handlerActiveTabDecs, 18, "handlerActiveTab"], [_handleEventDecs, 18, "_handleEvent"], [_releaseDecs, 18, "release"]], []).e, 4);
+var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_ChatStore, [[_mobx.observable, 1, "chatRoomStores"], [_mobx.observable, 1, "activeTabIndex"], [_mobx.observable, 1, "copyMap"], [_decorator.bound, 2, "hasWaitingRoomPermission"], [_handleReceiveMessageDecs, 18, "_handleReceiveMessage"], [_handlerActiveTabDecs, 18, "handlerActiveTab"], [_handleSelectMsgDecs, 18, "handleSelectMsg"], [_clearCopyMapDecs, 18, "clearCopyMap"], [_releaseDecs, 18, "release"]], []).e, 4);
 _init_chatRoomStores = _applyDecs$e[0];
 _init_activeTabIndex = _applyDecs$e[1];
-_init_roomType = _applyDecs$e[2];
+_init_copyMap = _applyDecs$e[2];
 _initProto = _applyDecs$e[3];
 function isManager(role) {
   return role === _type.FcrUserRole.HOST || role === _type.FcrUserRole.COHOST;

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

@@ -1,10 +1,10 @@
 import { AllowChatLevelType } from 'agora-ui-foundation/lib/components/chat-manager';
 import { RoleType } from 'agora-ui-foundation/lib/components/message-bubble';
-import { FcrChatRoomFile, FcrChatRoomReceiveImageMessage, FcrChatRoomReceiveTextMessage } from 'fcr-core/lib/room-control/chatroom-control/type';
-import { FcrRoomType } from 'fcr-core/lib/room-control/type';
+import { FcrChatRoomReceivedImageMessage, FcrChatRoomReceivedTextMessage } from 'fcr-core/lib/room-control/chatroom-control/type';
 import { FcrUserInfo } from 'fcr-core/lib/type';
 import { CSSProperties } from 'react';
 import { ChatRoomStore } from './chat-room-store';
+import { FcrUIRoomType } from '../../type';
 export interface MessageBarProps {
     styles?: CSSProperties;
     users?: FcrUserInfo[];
@@ -43,7 +43,7 @@ export interface MessageListProps {
     selectCnt?: number;
     copyTips?: () => void;
 }
-export type FcrChatRoomReceiveMessage = FcrChatRoomReceiveTextMessage | FcrChatRoomReceiveImageMessage;
+export type FcrChatRoomReceiveMessage = FcrChatRoomReceivedTextMessage | FcrChatRoomReceivedImageMessage;
 export interface MsgListType {
     id: string;
     nickName: string;
@@ -51,7 +51,7 @@ export interface MsgListType {
     role: RoleType;
     time: number | string;
     msg?: string;
-    img?: FcrChatRoomFile;
+    img?: string;
     color: string;
     systemMsg?: boolean;
     chatLevel?: AllowChatLevelType;
@@ -62,9 +62,9 @@ export declare const USER_ALL = "All";
 export declare const USER_NONE = "NONE";
 export declare const ALL_TO_USER: FcrUserInfo;
 export type FcrChatStoreObserver = {
-    onReceiveMessage: (msgs: FcrChatRoomReceiveMessage[], type: FcrRoomType) => void;
+    onReceiveMessage: (msgs: FcrChatRoomReceiveMessage[], type: FcrUIRoomType) => void;
 };
 export type ChatRoomStoreMap = {
-    [K in FcrRoomType]?: ChatRoomStore;
+    [K in FcrUIRoomType]?: ChatRoomStore;
 };
-export type RoomTypeKeys = keyof typeof FcrRoomType;
+export type RoomTypeKeys = keyof typeof FcrUIRoomType;

package/lib/modules/chat/types.js

@@ -13,5 +13,6 @@ var ALL_TO_USER = exports.ALL_TO_USER = {
   userId: USER_ALL,
   userName: USER_ALL,
   userRole: _type.FcrUserRole.ROBOT,
-  connectorType: _fcrCore.FcrRoomConnectorType.NONE
+  connectorType: _fcrCore.FcrRoomConnectorType.NONE,
+  platform: _type.FcrPlatform.WEB_DESKTOP
 };

package/lib/modules/chat/view.js

@@ -16,7 +16,6 @@ require("core-js/modules/es.array.iterator.js");
 require("core-js/modules/es.array.map.js");
 require("core-js/modules/es.array.sort.js");
 require("core-js/modules/es.array.unshift.js");
-require("core-js/modules/es.map.js");
 require("core-js/modules/es.object.to-string.js");
 require("core-js/modules/es.string.iterator.js");
 require("core-js/modules/esnext.async-iterator.filter.js");
@@ -28,20 +27,6 @@ require("core-js/modules/esnext.iterator.filter.js");
 require("core-js/modules/esnext.iterator.find.js");
 require("core-js/modules/esnext.iterator.for-each.js");
 require("core-js/modules/esnext.iterator.map.js");
-require("core-js/modules/esnext.map.delete-all.js");
-require("core-js/modules/esnext.map.emplace.js");
-require("core-js/modules/esnext.map.every.js");
-require("core-js/modules/esnext.map.filter.js");
-require("core-js/modules/esnext.map.find.js");
-require("core-js/modules/esnext.map.find-key.js");
-require("core-js/modules/esnext.map.includes.js");
-require("core-js/modules/esnext.map.key-of.js");
-require("core-js/modules/esnext.map.map-keys.js");
-require("core-js/modules/esnext.map.map-values.js");
-require("core-js/modules/esnext.map.merge.js");
-require("core-js/modules/esnext.map.reduce.js");
-require("core-js/modules/esnext.map.some.js");
-require("core-js/modules/esnext.map.update.js");
 require("core-js/modules/web.dom-collections.for-each.js");
 require("core-js/modules/web.dom-collections.iterator.js");
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
@@ -55,17 +40,16 @@ var _i18n = require("agora-ui-foundation/lib/i18n");
 var _react = require("react");
 var _chatBar = require("./components/chat-bar");
 var _type = require("../../type");
+var _type2 = require("fcr-core/lib/type");
 var _util = require("./util");
 var _copyText = require("../../utilities/copyText");
-var _type2 = require("fcr-core/lib/room-control/chatroom-control/type");
+var _type3 = require("fcr-core/lib/room-control/chatroom-control/type");
 var _fcrCore = require("fcr-core");
-var _tabs = require("agora-ui-foundation/lib/components/tabs");
-var _fcr_chat_reddot = _interopRequireDefault(require("../../../public/assets/fcr_chat_reddot.svg"));
-var _type3 = require("fcr-core/lib/room-control/type");
 var _types = require("./types");
+var _chatTabs = _interopRequireDefault(require("./components/chat-tabs"));
 var _jsxRuntime = require("react/jsx-runtime");
 var Chat = exports.Chat = (0, _mobxReact.observer)(function (_ref) {
-  var _chatRoomStores$FcrRo, _chatRoomStores$FcrRo2, _chatRoomStores$FcrRo3, _chatRoomStores$FcrRo4, _chatRoomStores$FcrRo5, _chatRoomStores$FcrRo6, _chatRoomStores$FcrRo7;
+  var _chatRoomStores$FcrUI;
   var updateReadIndex = _ref.updateReadIndex,
     sendMsg = _ref.sendMsg,
     localUserId = _ref.userId,
@@ -74,22 +58,21 @@ var Chat = exports.Chat = (0, _mobxReact.observer)(function (_ref) {
   var t = (0, _i18n.useI18n)();
   var _useContext = (0, _react.useContext)(_store.StoreContext),
     chatRoomStores = _useContext.chatRoomStores,
-    hasWaitingRoomPermission = _useContext.hasWaitingRoomPermission,
     activeTabIndex = _useContext.activeTabIndex,
-    handlerActiveTab = _useContext.handlerActiveTab;
+    copyMap = _useContext.copyMap,
+    clearCopyMap = _useContext.clearCopyMap;
   var defaultProps = {
     errorMsg: t('fmt_chat_tips_exceedlimit'),
     forbiddenTxt: t('fmt_chat_button_muteall'),
     styles: {
       display: 'flex',
-      height: (_chatRoomStores$FcrRo = chatRoomStores[_type3.FcrRoomType.Waitingroom]) !== null && _chatRoomStores$FcrRo !== void 0 && _chatRoomStores$FcrRo.userCount || 0 > 0 ? 'calc(100% - 28px)' : '100%'
+      height: (_chatRoomStores$FcrUI = chatRoomStores[_type.FcrUIRoomType.WAITING_ROOM]) !== null && _chatRoomStores$FcrUI !== void 0 && _chatRoomStores$FcrUI.userCount || 0 > 0 ? 'calc(100% - 28px)' : '100%'
     }
   };
   var styles = defaultProps.styles,
     forbiddenTxt = defaultProps.forbiddenTxt,
     errorMsg = defaultProps.errorMsg;
   var _ref2 = chatRoomStores[activeTabIndex],
-    setTargetUser = _ref2.setTargetUser,
     privateTargetUser = _ref2.privateTargetUser,
     remoteUsers = _ref2.remoteUsers,
     targetUserIsOnline = _ref2.targetUserIsOnline,
@@ -98,44 +81,32 @@ var Chat = exports.Chat = (0, _mobxReact.observer)(function (_ref) {
     messageList = _ref2.messageList,
     textMsg = _ref2.textMsg,
     updateChatTextMsg = _ref2.updateChatTextMsg,
-    privateTargetList = _ref2.privateTargetList,
     resetTargetUser = _ref2.resetTargetUser,
     handleToast = _ref2.handleToast,
     chatRoomState = _ref2.chatRoomState,
     isHost = _ref2.isHost,
-    hasChatPermission = _ref2.hasChatPermission,
+    hasChatSendPublicPermission = _ref2.hasChatSendPublicPermission,
     hasChatSendPrivatePermission = _ref2.hasChatSendPrivatePermission,
     filterChatMember = _ref2.filterChatMember,
-    hasSendMessagePermission = _ref2.hasSendMessagePermission,
-    hasSendAllPermission = _ref2.hasSendAllPermission;
-  var handleTargetChange = function handleTargetChange(user) {
-    setTargetUser(user);
-  };
+    hasSendMessagePermission = _ref2.hasSendMessagePermission;
   var _useState = (0, _react.useState)(false),
     _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
     multiSelectActive = _useState2[0],
     setMultiSelectActive = _useState2[1];
-  var _useState3 = (0, _react.useState)(new Map()),
-    _useState4 = (0, _slicedToArray2["default"])(_useState3, 2),
-    copyMap = _useState4[0],
-    setCopyMap = _useState4[1];
-  var _useState5 = (0, _react.useState)(0),
-    _useState6 = (0, _slicedToArray2["default"])(_useState5, 2),
-    selectCnt = _useState6[0],
-    setSelectCnt = _useState6[1];
   var targetList = (0, _react.useMemo)(function () {
     var _users$;
     var users = (0, _toConsumableArray2["default"])(remoteUsers);
     if (((_users$ = users[0]) === null || _users$ === void 0 ? void 0 : _users$.userId) === _types.USER_ALL) {
-      if (!hasSendAllPermission) {
+      if (!hasChatSendPublicPermission) {
         users.shift();
       }
-    } else if (hasSendAllPermission) {
+    } else if (hasChatSendPublicPermission) {
       users.unshift({
         userId: _types.USER_ALL,
         userName: t('fmt_chat_option_all'),
         userRole: _type.FcrUserRole.ROBOT,
-        connectorType: _fcrCore.FcrRoomConnectorType.NONE
+        connectorType: _fcrCore.FcrRoomConnectorType.NONE,
+        platform: _type2.FcrPlatform.WEB_DESKTOP
       });
     }
     users = users.filter(function (user) {
@@ -151,7 +122,7 @@ var Chat = exports.Chat = (0, _mobxReact.observer)(function (_ref) {
     });
     users = filterChatMember(users);
     return users;
-  }, [chatLevel, remoteUsers, activeTabIndex, hasChatPermission, hasChatSendPrivatePermission]);
+  }, [chatLevel, remoteUsers, activeTabIndex, hasChatSendPublicPermission, hasChatSendPrivatePermission]);
   var handleMultiCopyMsg = /*#__PURE__*/function () {
     var _ref3 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee() {
       var msgHandled, msgIndex;
@@ -191,16 +162,10 @@ var Chat = exports.Chat = (0, _mobxReact.observer)(function (_ref) {
       return _ref3.apply(this, arguments);
     };
   }();
-  (0, _react.useEffect)(function () {
-    setSelectCnt(copyMap.size);
-  }, [copyMap.size]);
   var resetMultiSelectStates = function resetMultiSelectStates() {
     setMultiSelectActive(false);
-    copyMap.clear();
-    setCopyMap(copyMap);
-    setSelectCnt(0);
+    clearCopyMap();
   };
-  var chatSelectNoTitle = localIsManager || chatLevel === 'everyone' || chatLevel === 'no_one';
   var copyTips = function copyTips() {
     handleToast({
       id: 'copy-multi-msg',
@@ -212,50 +177,15 @@ var Chat = exports.Chat = (0, _mobxReact.observer)(function (_ref) {
     });
   };
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
-    children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
-      className: "chat-tabs-container",
-      children: chatRoomStores[_type3.FcrRoomType.Waitingroom] && chatRoomStores[_type3.FcrRoomType.Mainroom] && chatRoomStores[_type3.FcrRoomType.Waitingroom].userCount > 0 ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_tabs.FcrTabs, {
-        items: [{
-          label: /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
-            className: "chat-container-icon",
-            children: [((_chatRoomStores$FcrRo2 = chatRoomStores[_type3.FcrRoomType.Mainroom]) === null || _chatRoomStores$FcrRo2 === void 0 ? void 0 : _chatRoomStores$FcrRo2.unReadMsgCount) > 0 && /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
-              className: "fcr-action-bar-chat-unread-count",
-              children: ((_chatRoomStores$FcrRo3 = chatRoomStores[_type3.FcrRoomType.Mainroom]) === null || _chatRoomStores$FcrRo3 === void 0 ? void 0 : _chatRoomStores$FcrRo3.unReadMsgCount) > 99 ? /*#__PURE__*/(0, _jsxRuntime.jsx)("img", {
-                src: _fcr_chat_reddot["default"]
-              }) : (_chatRoomStores$FcrRo4 = chatRoomStores[_type3.FcrRoomType.Mainroom]) === null || _chatRoomStores$FcrRo4 === void 0 ? void 0 : _chatRoomStores$FcrRo4.unReadMsgCount
-            }), t('fmt_waitingroom_sidebar_chat_label_meeting', {
-              reason1: chatRoomStores[_type3.FcrRoomType.Mainroom].userCount
-            })]
-          }),
-          key: "".concat(_type3.FcrRoomType.Mainroom)
-        }, {
-          label: /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
-            className: "chat-container-icon",
-            children: [((_chatRoomStores$FcrRo5 = chatRoomStores[_type3.FcrRoomType.Waitingroom]) === null || _chatRoomStores$FcrRo5 === void 0 ? void 0 : _chatRoomStores$FcrRo5.unReadMsgCount) > 0 && /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
-              className: "fcr-action-bar-chat-unread-count",
-              children: ((_chatRoomStores$FcrRo6 = chatRoomStores[_type3.FcrRoomType.Waitingroom]) === null || _chatRoomStores$FcrRo6 === void 0 ? void 0 : _chatRoomStores$FcrRo6.unReadMsgCount) > 99 ? /*#__PURE__*/(0, _jsxRuntime.jsx)("img", {
-                src: _fcr_chat_reddot["default"]
-              }) : (_chatRoomStores$FcrRo7 = chatRoomStores[_type3.FcrRoomType.Waitingroom]) === null || _chatRoomStores$FcrRo7 === void 0 ? void 0 : _chatRoomStores$FcrRo7.unReadMsgCount
-            }), t('fmt_waitingroom_sidebar_label_waiting', {
-              reason1: chatRoomStores[_type3.FcrRoomType.Waitingroom].userCount
-            })]
-          }),
-          key: "".concat(_type3.FcrRoomType.Waitingroom)
-        }],
-        activeKey: "".concat(activeTabIndex),
-        onChange: function onChange(key) {
-          handlerActiveTab(key);
-        }
-      }) : null
-    }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_chatWrapper.ChatWrapper, {
+    children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_chatTabs["default"], {}), /*#__PURE__*/(0, _jsxRuntime.jsx)(_chatWrapper.ChatWrapper, {
       styles: styles,
       errorMsg: errorMsg,
       forbiddenTxt: forbiddenTxt,
       singling: singling,
-      forbidden: !localIsManager && !hasChatPermission && !hasChatSendPrivatePermission,
+      forbidden: !localIsManager && !hasChatSendPublicPermission && !hasChatSendPrivatePermission,
       isHost: isHost,
       handMsg: function handMsg(msg) {
-        if (chatRoomState !== _type2.FcrChatRoomConnectionState.Connected) {
+        if (chatRoomState !== _type3.FcrChatRoomConnectionState.Connected) {
           handleToast({
             id: 'send-msg-offline',
             toastProps: {
@@ -297,7 +227,7 @@ var Chat = exports.Chat = (0, _mobxReact.observer)(function (_ref) {
           //   return;
           // }
 
-          if (privateTargetUser.userId === _types.USER_ALL && !hasSendMessagePermission()) {
+          if (privateTargetUser.userId === _types.USER_ALL && !hasSendMessagePermission) {
             handleToast({
               id: 'send-msg-to-none',
               toastProps: {
@@ -324,19 +254,13 @@ var Chat = exports.Chat = (0, _mobxReact.observer)(function (_ref) {
       },
       handleClickUploadImage: handleClickUploadImage,
       msgBarElement: /*#__PURE__*/(0, _jsxRuntime.jsx)(_chatBar.MessageBar, {
-        selectedUser: privateTargetUser,
-        users: targetList,
-        onTargetChange: handleTargetChange,
-        title: chatSelectNoTitle ? undefined : /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
-          className: "assign-host-title",
-          children: chatLevel === 'public' ? t('fmt_chat_option_onlypublic') : t('fmt_chat_option_onlyprivate')
-        })
+        users: targetList
       }),
       targetUserIsOnline: targetUserIsOnline,
       privateTarget: privateTargetUser.userId,
       selectTargetNickname: privateTargetUser.userName,
       multiSelectActive: multiSelectActive,
-      selectCnt: selectCnt,
+      selectCnt: copyMap.size,
       onSelectCancel: function onSelectCancel() {
         resetMultiSelectStates();
       },
@@ -361,11 +285,7 @@ var Chat = exports.Chat = (0, _mobxReact.observer)(function (_ref) {
         updateReadMsgIndex: updateReadIndex,
         userId: localUserId,
         setMultiSelectActive: setMultiSelectActive,
-        multiSelectActive: multiSelectActive,
-        copyMap: copyMap,
-        setCopyMap: setCopyMap,
-        selectCnt: selectCnt,
-        copyTips: copyTips
+        multiSelectActive: multiSelectActive
       })
     })]
   });

package/lib/modules/components/device-control/store.d.ts

@@ -1,17 +1,18 @@
 import { DeviceSettingDialogConfig } from '../../setting/store';
 import { FcrMainRoomControl, FcrWaitingRoomControl } from 'fcr-core/lib/room-control/type';
 import { ConnectionTabType } from '../../video-window/type';
-import { FcrUIEventProvider } from '../../../providers/event-provider';
 import { FcrUIDeviceProvider } from '../../../providers/device-provider';
 import { FcrUISharedDevicePrivilegeDataSource } from '../../../shared-data-source/device-privilege-data';
 import { FcrUIDeviceStreamProvider } from '../../../providers/device-stream-provider';
+import { FcrUIDialogProvider } from '../../../providers/dialog-provider';
 export declare class DeviceControlStore {
     private _roomControl;
     private _deviceProvider;
-    private _eventProvider;
+    private _dialogProvider;
     private _deviceStreamProvider;
     private _sharedDevicePrivilegeDataSource;
     private _connectionWindowId;
+    private _streamControlObserver;
     accessor isPstnUser: boolean;
     accessor phoneMicEnabled: boolean;
     get microphoneId(): string;
@@ -24,7 +25,7 @@ export declare class DeviceControlStore {
     get microphoneList(): import("agora-rte-sdk").AgoraRtcDeviceInfo[];
     get cameraList(): import("agora-rte-sdk").AgoraRtcDeviceInfo[];
     get connectType(): import("../../../type").FcrUIConnectType;
-    constructor(_roomControl: FcrMainRoomControl | FcrWaitingRoomControl, _deviceProvider: FcrUIDeviceProvider, _eventProvider: FcrUIEventProvider, _deviceStreamProvider: FcrUIDeviceStreamProvider, _sharedDevicePrivilegeDataSource: FcrUISharedDevicePrivilegeDataSource);
+    constructor(_roomControl: FcrMainRoomControl | FcrWaitingRoomControl, _deviceProvider: FcrUIDeviceProvider, _dialogProvider: FcrUIDialogProvider, _deviceStreamProvider: FcrUIDeviceStreamProvider, _sharedDevicePrivilegeDataSource: FcrUISharedDevicePrivilegeDataSource);
     openDeviceSettingDialog(arg: Partial<DeviceSettingDialogConfig>): void;
     openConnection(type: ConnectionTabType): void;
     closeConnection(): void;