fcr-ui-scene 3.4.4 → 3.5.0

package/lib/modules/chat/chat-room-store.js

@@ -41,10 +41,6 @@ require("core-js/modules/es.object.entries.js");
 require("core-js/modules/es.object.to-string.js");
 require("core-js/modules/es.string.iterator.js");
 require("core-js/modules/es.weak-map.js");
-require("core-js/modules/esnext.async-iterator.filter.js");
-require("core-js/modules/esnext.async-iterator.find.js");
-require("core-js/modules/esnext.async-iterator.for-each.js");
-require("core-js/modules/esnext.async-iterator.some.js");
 require("core-js/modules/esnext.iterator.constructor.js");
 require("core-js/modules/esnext.iterator.filter.js");
 require("core-js/modules/esnext.iterator.find.js");
@@ -75,20 +71,19 @@ var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-var _logger = require("agora-foundation/lib/logger");
 var _reactVirtualized = require("react-virtualized");
 var _fcrCore = require("fcr-core");
 var _type = require("fcr-core/lib/room-control/chatroom-control/type");
 var _imports = require("fcr-core/lib/imports");
 var _types = require("./types");
 var _mobx = require("mobx");
-var _type2 = require("fcr-core/lib/room-control/type");
-var _type3 = require("fcr-core/lib/type");
+var _type2 = require("fcr-core/lib/type");
 var _i18n = require("agora-ui-foundation/lib/i18n");
-var _constant = require("../../utilities/constant");
 var _helper = require("agora-ui-foundation/lib/components/avatar/helper");
+var _type3 = require("../../type");
+var _logger = require("../../utilities/logger");
 var _ChatRoomStore;
-var _initProto, _init__userInfo, _init_needRecomputeRowIdMap, _init_messageList, _init_readMsgIndex, _init_readIdx, _init_viewIdx, _init_historyUnreadCount, _init_hasHistoryMsg, _init_newMsgsUnReadCnt, _init_privateTargetUser, _init_chatLevel, _init_currentUserMap, _init_textMsg, _init_privateTargetList, _init_chatRoomState, _init_hasNewMsg, _init_userCount, _init_unReadMsgCount, _setLastScrollTopDecs, _setMessageListDecs, _sendMessageDecs, _setUnReadMsgCountDecs, _setHasNewMsgDecs, _handleTextMessageReceivedDecs, _getUserCountDecs, _onRemoteUserUpdateDecs, _refreshUserListDecs, _handleNewMsgDecs, _updateReadMsgIndexDecs, _initReadInfoDecs, _updateHistoryUnreadCntDecs, _updateHasHistoryMsgDecs, _updateScrollInfoDecs, _updateViewIdxDecs, _updateReadIdxDecs, _updateFirstMsgIdDecs, _updateHistoryUnReadCountDecs, _updateListDecs, _updateMostRecentHeightDecs, _updateMostRecentWidthDecs, _patchHandleMsgDecs, _forceNotifyMsgsDecs, _resetComponentCacheDecs, _resetTargetUserDecs, _initChatLevelDecs, _setTargetUserDecs, _updateChatLevelDecs, _updateChatTextMsgDecs, _filterChatMemberDecs, _hasSendMessagePermissionDecs, _permitPrivateChatDecs, _handleToastDecs, _handleConnectionUpdatedDecs, _initChatRoomConnectionStateDecs, _ref;
+var _initProto, _init__userInfo, _init_needRecomputeRowIdMap, _init_messageList, _init_readMsgIndex, _init_readIdx, _init_viewIdx, _init_historyUnreadCount, _init_hasHistoryMsg, _init_newMsgsUnReadCnt, _init_privateTargetUser, _init_chatLevel, _init_currentUserMap, _init_textMsg, _init_privateTargetList, _init_chatRoomState, _init_userCount, _init_unReadMsgCount, _setLastScrollTopDecs, _setMessageListDecs, _sendMessageDecs, _setUnReadMsgCountDecs, _handleTextMessageReceivedDecs, _getUserCountDecs, _onRemoteUserUpdateDecs, _refreshUserListDecs, _handleNewMsgDecs, _updateReadMsgIndexDecs, _initReadInfoDecs, _updateHistoryUnreadCntDecs, _updateHasHistoryMsgDecs, _updateScrollInfoDecs, _updateViewIdxDecs, _updateReadIdxDecs, _updateFirstMsgIdDecs, _updateHistoryUnReadCountDecs, _updateListDecs, _updateMostRecentHeightDecs, _updateMostRecentWidthDecs, _patchHandleMsgDecs, _forceNotifyMsgsDecs, _resetComponentCacheDecs, _resetTargetUserDecs, _initChatLevelDecs, _setTargetUserDecs, _updateChatLevelDecs, _updateChatTextMsgDecs, _filterChatMemberDecs, _permitPrivateChatDecs, _handleToastDecs, _handleConnectionUpdatedDecs, _initChatRoomConnectionStateDecs, _ref;
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2["default"])(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _classPrivateFieldInitSpec(e, t, a) { _checkPrivateRedeclaration(e, t), t.set(e, a); }
@@ -118,8 +113,7 @@ var _N = /*#__PURE__*/new WeakMap();
 var _O = /*#__PURE__*/new WeakMap();
 var _P = /*#__PURE__*/new WeakMap();
 var _Q = /*#__PURE__*/new WeakMap();
-var _R = /*#__PURE__*/new WeakMap();
-_ref = (_setLastScrollTopDecs = [_mobx.action, _mobx.action.bound], _setMessageListDecs = [_mobx.action, _mobx.action.bound], _sendMessageDecs = [_mobx.action, _mobx.action.bound], _setUnReadMsgCountDecs = [_mobx.action, _mobx.action.bound], _setHasNewMsgDecs = [_mobx.action, _mobx.action.bound], _handleTextMessageReceivedDecs = [_mobx.action, _mobx.action.bound], _getUserCountDecs = [_mobx.action, _mobx.action.bound], _onRemoteUserUpdateDecs = [_mobx.action, _mobx.action.bound], _refreshUserListDecs = [_mobx.action, _mobx.action.bound], _handleNewMsgDecs = [_mobx.action, _mobx.action.bound], _updateReadMsgIndexDecs = [_mobx.action, _mobx.action.bound], _initReadInfoDecs = [_mobx.action, _mobx.action.bound], _updateHistoryUnreadCntDecs = [_mobx.action, _mobx.action.bound], _updateHasHistoryMsgDecs = [_mobx.action, _mobx.action.bound], _updateScrollInfoDecs = [_mobx.action, _mobx.action.bound], _updateViewIdxDecs = [_mobx.action, _mobx.action.bound], _updateReadIdxDecs = [_mobx.action, _mobx.action.bound], _updateFirstMsgIdDecs = [_mobx.action, _mobx.action.bound], _updateHistoryUnReadCountDecs = [_mobx.action, _mobx.action.bound], _updateListDecs = [_mobx.action, _mobx.action.bound], _updateMostRecentHeightDecs = [_mobx.action, _mobx.action.bound], _updateMostRecentWidthDecs = [_mobx.action, _mobx.action.bound], _patchHandleMsgDecs = [_mobx.action, _mobx.action.bound], _forceNotifyMsgsDecs = [_mobx.action, _mobx.action.bound], _resetComponentCacheDecs = [_mobx.action, _mobx.action.bound], _resetTargetUserDecs = [_mobx.action, _mobx.action.bound], _initChatLevelDecs = [_mobx.action, _mobx.action.bound], _setTargetUserDecs = [_mobx.action, _mobx.action.bound], _updateChatLevelDecs = [_mobx.action, _mobx.action.bound], _updateChatTextMsgDecs = [_mobx.action, _mobx.action.bound], _filterChatMemberDecs = [_mobx.action, _mobx.action.bound], _hasSendMessagePermissionDecs = [_mobx.action, _mobx.action.bound], _permitPrivateChatDecs = [_mobx.action, _mobx.action.bound], _handleToastDecs = [_mobx.action, _mobx.action.bound], _handleConnectionUpdatedDecs = [_mobx.action, _mobx.action.bound], _initChatRoomConnectionStateDecs = [_mobx.action, _mobx.action.bound], "needCbBottomCount");
+_ref = (_setLastScrollTopDecs = [_mobx.action, _mobx.action.bound], _setMessageListDecs = [_mobx.action, _mobx.action.bound], _sendMessageDecs = [_mobx.action, _mobx.action.bound], _setUnReadMsgCountDecs = [_mobx.action, _mobx.action.bound], _handleTextMessageReceivedDecs = [_mobx.action, _mobx.action.bound], _getUserCountDecs = [_mobx.action, _mobx.action.bound], _onRemoteUserUpdateDecs = [_mobx.action, _mobx.action.bound], _refreshUserListDecs = [_mobx.action, _mobx.action.bound], _handleNewMsgDecs = [_mobx.action, _mobx.action.bound], _updateReadMsgIndexDecs = [_mobx.action, _mobx.action.bound], _initReadInfoDecs = [_mobx.action, _mobx.action.bound], _updateHistoryUnreadCntDecs = [_mobx.action, _mobx.action.bound], _updateHasHistoryMsgDecs = [_mobx.action, _mobx.action.bound], _updateScrollInfoDecs = [_mobx.action, _mobx.action.bound], _updateViewIdxDecs = [_mobx.action, _mobx.action.bound], _updateReadIdxDecs = [_mobx.action, _mobx.action.bound], _updateFirstMsgIdDecs = [_mobx.action, _mobx.action.bound], _updateHistoryUnReadCountDecs = [_mobx.action, _mobx.action.bound], _updateListDecs = [_mobx.action, _mobx.action.bound], _updateMostRecentHeightDecs = [_mobx.action, _mobx.action.bound], _updateMostRecentWidthDecs = [_mobx.action, _mobx.action.bound], _patchHandleMsgDecs = [_mobx.action, _mobx.action.bound], _forceNotifyMsgsDecs = [_mobx.action, _mobx.action.bound], _resetComponentCacheDecs = [_mobx.action, _mobx.action.bound], _resetTargetUserDecs = [_mobx.action, _mobx.action.bound], _initChatLevelDecs = [_mobx.action, _mobx.action.bound], _setTargetUserDecs = [_mobx.action, _mobx.action.bound], _updateChatLevelDecs = [_mobx.action, _mobx.action.bound], _updateChatTextMsgDecs = [_mobx.action, _mobx.action.bound], _filterChatMemberDecs = [_mobx.action, _mobx.action.bound], _permitPrivateChatDecs = [_mobx.action, _mobx.action.bound], _handleToastDecs = [_mobx.action, _mobx.action.bound], _handleConnectionUpdatedDecs = [_mobx.action, _mobx.action.bound], _initChatRoomConnectionStateDecs = [_mobx.action, _mobx.action.bound], "needCbBottomCount");
 var ChatRoomStore = exports.ChatRoomStore = /*#__PURE__*/function () {
   function ChatRoomStore(_ref2) {
     var _this = this;
@@ -144,15 +138,18 @@ var ChatRoomStore = exports.ChatRoomStore = /*#__PURE__*/function () {
       msgId: ''
     });
     (0, _defineProperty2["default"])(this, "lastScrollTop", undefined);
-    (0, _defineProperty2["default"])(this, "logger", (0, _logger.getLogger)());
+    (0, _defineProperty2["default"])(this, "logger", (0, _logger.createLogger)({
+      prefix: 'ChatRoomStore'
+    }));
     (0, _defineProperty2["default"])(this, "_maxMsgCount", 500);
     (0, _defineProperty2["default"])(this, "_originalMessages", []);
     (0, _defineProperty2["default"])(this, "_disposers", []);
     (0, _defineProperty2["default"])(this, "_noUser", {
       userId: _types.USER_NONE,
       userName: (0, _i18n.transI18n)('fmt_chat_tips_selecthost'),
-      userRole: _type3.FcrUserRole.ROBOT,
-      connectorType: _fcrCore.FcrRoomConnectorType.NONE
+      userRole: _type2.FcrUserRole.ROBOT,
+      connectorType: _fcrCore.FcrRoomConnectorType.NONE,
+      platform: _type2.FcrPlatform.UNSUPPORTED
     });
     _classPrivateFieldInitSpec(this, _A, _init__userInfo(this));
     _classPrivateFieldInitSpec(this, _B, _init_needRecomputeRowIdMap(this, new Map()));
@@ -174,9 +171,8 @@ var ChatRoomStore = exports.ChatRoomStore = /*#__PURE__*/function () {
     _classPrivateFieldInitSpec(this, _M, _init_textMsg(this, ''));
     _classPrivateFieldInitSpec(this, _N, _init_privateTargetList(this, []));
     _classPrivateFieldInitSpec(this, _O, _init_chatRoomState(this, _type.FcrChatRoomConnectionState.Disconnected));
-    _classPrivateFieldInitSpec(this, _P, _init_hasNewMsg(this, false));
-    _classPrivateFieldInitSpec(this, _Q, _init_userCount(this, 0));
-    _classPrivateFieldInitSpec(this, _R, _init_unReadMsgCount(this, 0));
+    _classPrivateFieldInitSpec(this, _P, _init_userCount(this, 0));
+    _classPrivateFieldInitSpec(this, _Q, _init_unReadMsgCount(this, 0));
     (0, _defineProperty2["default"])(this, "_userObserver", {
       onRemoteUsersJoined: this._onRemoteUserUpdate.bind(this),
       onRemoteUsersLeft: this._onRemoteUserUpdate.bind(this),
@@ -335,7 +331,7 @@ var ChatRoomStore = exports.ChatRoomStore = /*#__PURE__*/function () {
       _classPrivateFieldSet(_O, this, v);
     }
   }, {
-    key: "hasNewMsg",
+    key: "userCount",
     get: function get() {
       return _classPrivateFieldGet(_P, this);
     },
@@ -343,21 +339,13 @@ var ChatRoomStore = exports.ChatRoomStore = /*#__PURE__*/function () {
       _classPrivateFieldSet(_P, this, v);
     }
   }, {
-    key: "userCount",
+    key: "unReadMsgCount",
     get: function get() {
       return _classPrivateFieldGet(_Q, this);
     },
     set: function set(v) {
       _classPrivateFieldSet(_Q, this, v);
     }
-  }, {
-    key: "unReadMsgCount",
-    get: function get() {
-      return _classPrivateFieldGet(_R, this);
-    },
-    set: function set(v) {
-      _classPrivateFieldSet(_R, this, v);
-    }
   }, {
     key: "release",
     value: function release() {
@@ -430,7 +418,6 @@ var ChatRoomStore = exports.ChatRoomStore = /*#__PURE__*/function () {
     value: function _messageReceived(_roomId, msg, roomType) {
       if (roomType === this._type) {
         this._originalMessages.push(msg);
-        this._uiEventStore.sendEvent(_constant.FcrUIAction.RECEIVE_NEW_CHAT_MESSAGES_FOR_RED, this._type);
       }
     }
   }, {
@@ -438,11 +425,6 @@ var ChatRoomStore = exports.ChatRoomStore = /*#__PURE__*/function () {
     value: function setUnReadMsgCount(count) {
       this.unReadMsgCount = count;
     }
-  }, {
-    key: "setHasNewMsg",
-    value: function setHasNewMsg(value) {
-      this.hasNewMsg = value;
-    }
   }, {
     key: "_handleTextMessageReceived",
     value: function _handleTextMessageReceived(message, target) {
@@ -460,13 +442,13 @@ var ChatRoomStore = exports.ChatRoomStore = /*#__PURE__*/function () {
       var color = (0, _helper.getNameColor)(userName);
       var msgPublisherRole = 'participant';
       switch (userRole) {
-        case _type3.FcrUserRole.HOST:
+        case _type2.FcrUserRole.HOST:
           msgPublisherRole = 'host';
           break;
-        case _type3.FcrUserRole.COHOST:
+        case _type2.FcrUserRole.COHOST:
           msgPublisherRole = 'union-host';
           break;
-        case _type3.FcrUserRole.PARTICIPANT:
+        case _type2.FcrUserRole.PARTICIPANT:
           msgPublisherRole = 'participant';
           break;
       }
@@ -482,24 +464,21 @@ var ChatRoomStore = exports.ChatRoomStore = /*#__PURE__*/function () {
       }, type === _type.FcrChatRoomMessageType.Text ? {
         msg: message.content
       } : {
-        img: message.file
+        img: message.url
       }));
     }
   }, {
     key: "getUserCount",
     value: function getUserCount() {
       return this._userControl.getUserList().filter(function (user) {
-        return user.userRole === _type3.FcrUserRole.PARTICIPANT;
+        return user.userRole === _type2.FcrUserRole.PARTICIPANT;
       }).length;
     }
   }, {
     key: "_onRemoteUserUpdate",
     value: function _onRemoteUserUpdate(roomId, events) {
-      if (this._type === _type2.FcrRoomType.Waitingroom) {
+      if (this._type === _type3.FcrUIRoomType.WAITING_ROOM) {
         this.userCount = this.getUserCount();
-        if (this.userCount === 0) {
-          this._uiEventStore.sendEvent(_constant.FcrUIAction.CHAT_ROOM_CLOSED, this._type);
-        }
       }
       this._refreshUserList();
     }
@@ -585,34 +564,34 @@ var ChatRoomStore = exports.ChatRoomStore = /*#__PURE__*/function () {
       return this._securityStore.disallowedAllChat();
     }
   }, {
-    key: "hasChatPermission",
+    key: "hasSendMessagePermission",
     get: function get() {
-      return this._securityStore.hasChatSendPublicPermission();
+      return this.hasChatSendPrivatePermission || this._securityStore.hasChatSendPublicPermission();
     }
   }, {
-    key: "hasChatSendPrivatePermission",
+    key: "hasChatSendPublicPermission",
     get: function get() {
-      return this._securityStore.hasPermissionToSendPrivateMessage(_type3.FcrUserRole.HOST) || this._securityStore.hasPermissionToSendPrivateMessage(_type3.FcrUserRole.COHOST);
+      return this._securityStore.hasChatSendPublicPermission();
     }
   }, {
-    key: "hasSendAllPermission",
+    key: "hasChatSendPrivatePermission",
     get: function get() {
-      return this._securityStore.hasSendAllChatPermission();
+      return this._securityStore.hasPermissionToSendPrivateMessage(_type2.FcrUserRole.HOST) || this._securityStore.hasPermissionToSendPrivateMessage(_type2.FcrUserRole.COHOST) || this._securityStore.hasPermissionToSendPrivateMessage(_type2.FcrUserRole.PARTICIPANT);
     }
   }, {
     key: "isHost",
     get: function get() {
-      return this._userInfo.userRole === _type3.FcrUserRole.HOST;
+      return this._userInfo.userRole === _type2.FcrUserRole.HOST;
     }
   }, {
     key: "isCohost",
     get: function get() {
-      return this._userInfo.userRole === _type3.FcrUserRole.COHOST;
+      return this._userInfo.userRole === _type2.FcrUserRole.COHOST;
     }
   }, {
     key: "localIsManager",
     get: function get() {
-      return this._userInfo.userRole === _type3.FcrUserRole.HOST || this._userInfo.userRole === _type3.FcrUserRole.COHOST;
+      return this._userInfo.userRole === _type2.FcrUserRole.HOST || this._userInfo.userRole === _type2.FcrUserRole.COHOST;
     }
 
     // 本地添加系统消息
@@ -658,7 +637,7 @@ var ChatRoomStore = exports.ChatRoomStore = /*#__PURE__*/function () {
           _this2.updateChatLevel('everyone');
         }
       }), (0, _mobx.reaction)(function () {
-        return _this2.hasChatPermission;
+        return _this2.hasChatSendPublicPermission;
       }, function (state) {
         if (state) {
           _this2.setTargetUser(_types.ALL_TO_USER);
@@ -826,7 +805,7 @@ var ChatRoomStore = exports.ChatRoomStore = /*#__PURE__*/function () {
         userRole = _ref3.userRole;
       var msg = {
         id: String(new Date().getTime()),
-        role: userRole === _type3.FcrUserRole.PARTICIPANT ? 'participant' : userRole === _type3.FcrUserRole.COHOST ? 'union-host' : 'host',
+        role: userRole === _type2.FcrUserRole.PARTICIPANT ? 'participant' : userRole === _type2.FcrUserRole.COHOST ? 'union-host' : 'host',
         time: Date.now(),
         msg: '',
         color: '',
@@ -862,16 +841,11 @@ var ChatRoomStore = exports.ChatRoomStore = /*#__PURE__*/function () {
       var res = list.filter(function (user) {
         return _this6._securityStore.hasPermissionToSendPrivateMessage(user.userRole) || user.userId === _types.USER_ALL;
       });
-      if (res.length && _type2.FcrRoomType.Waitingroom === this._type && !this.localIsManager) {
+      if (res.length && _type3.FcrUIRoomType.WAITING_ROOM === this._type && !this.localIsManager) {
         this.setTargetUser(res[0]);
       }
       return res;
     }
-  }, {
-    key: "hasSendMessagePermission",
-    value: function hasSendMessagePermission() {
-      return this._securityStore.hasPermissionToSendPrivateMessage(_type3.FcrUserRole.HOST) || this._securityStore.hasPermissionToSendPrivateMessage(_type3.FcrUserRole.COHOST) || this._securityStore.hasChatSendPublicPermissionByTargetRole(_type3.FcrUserRole.PARTICIPANT) || this._securityStore.hasChatSendPublicPermissionByTargetRole(_type3.FcrUserRole.HOST) || this._securityStore.hasChatSendPublicPermissionByTargetRole(_type3.FcrUserRole.COHOST);
-    }
   }, {
     key: "permitPrivateChat",
     value: function permitPrivateChat(userId) {
@@ -898,7 +872,7 @@ var ChatRoomStore = exports.ChatRoomStore = /*#__PURE__*/function () {
   }, {
     key: "isHostOrCoHost",
     get: function get() {
-      return this._userInfo.userRole === _type3.FcrUserRole.HOST || this._userInfo.userRole === _type3.FcrUserRole.COHOST;
+      return this._userInfo.userRole === _type2.FcrUserRole.HOST || this._userInfo.userRole === _type2.FcrUserRole.COHOST;
     }
   }, {
     key: "setAllowChat",
@@ -930,8 +904,8 @@ var ChatRoomStore = exports.ChatRoomStore = /*#__PURE__*/function () {
   }]);
 }();
 _ChatRoomStore = ChatRoomStore;
-var _applyDecs$e = _applyDecs(_ChatRoomStore, [[_mobx.observable, 1, "_userInfo"], [_mobx.observable, 1, "needRecomputeRowIdMap"], [_mobx.observable, 1, "messageList"], [_mobx.observable, 1, "readMsgIndex"], [_mobx.observable, 1, "readIdx"], [_mobx.observable, 1, "viewIdx"], [_mobx.observable, 1, "historyUnreadCount"], [_mobx.observable, 1, "hasHistoryMsg"], [_mobx.observable, 1, "newMsgsUnReadCnt"], [_mobx.observable, 1, "privateTargetUser"], [_mobx.observable, 1, "chatLevel"], [_mobx.observable, 1, "currentUserMap"], [_mobx.observable, 1, "textMsg"], [_mobx.observable, 1, "privateTargetList"], [_mobx.observable, 1, "chatRoomState"], [_mobx.observable, 1, "hasNewMsg"], [_mobx.observable, 1, "userCount"], [_mobx.observable, 1, "unReadMsgCount"], [_setLastScrollTopDecs, 18, "setLastScrollTop"], [_setMessageListDecs, 18, "setMessageList"], [_sendMessageDecs, 18, "sendMessage"], [_setUnReadMsgCountDecs, 18, "setUnReadMsgCount"], [_setHasNewMsgDecs, 18, "setHasNewMsg"], [_handleTextMessageReceivedDecs, 18, "_handleTextMessageReceived"], [_getUserCountDecs, 18, "getUserCount"], [_onRemoteUserUpdateDecs, 18, "_onRemoteUserUpdate"], [_refreshUserListDecs, 18, "_refreshUserList"], [_handleNewMsgDecs, 18, "handleNewMsg"], [_updateReadMsgIndexDecs, 18, "updateReadMsgIndex"], [_mobx.computed, 3, "hasSendAllPermission"], [_mobx.computed, 3, "isHost"], [_mobx.computed, 3, "isCohost"], [_mobx.computed, 3, "localIsManager"], [_initReadInfoDecs, 18, "initReadInfo"], [_updateHistoryUnreadCntDecs, 18, "updateHistoryUnreadCnt"], [_updateHasHistoryMsgDecs, 18, "updateHasHistoryMsg"], [_updateScrollInfoDecs, 18, "updateScrollInfo"], [_updateViewIdxDecs, 18, "updateViewIdx"], [_updateReadIdxDecs, 18, "updateReadIdx"], [_updateFirstMsgIdDecs, 18, "updateFirstMsgId"], [_updateHistoryUnReadCountDecs, 18, "updateHistoryUnReadCount"], [_updateListDecs, 18, "updateList"], [_updateMostRecentHeightDecs, 18, "updateMostRecentHeight"], [_updateMostRecentWidthDecs, 18, "updateMostRecentWidth"], [_patchHandleMsgDecs, 18, "patchHandleMsg"], [_forceNotifyMsgsDecs, 18, "forceNotifyMsgs"], [_resetComponentCacheDecs, 18, "resetComponentCache"], [_resetTargetUserDecs, 18, "resetTargetUser"], [_initChatLevelDecs, 18, "initChatLevel"], [_setTargetUserDecs, 18, "setTargetUser"], [_mobx.computed, 3, "targetUserIsOnline"], [_mobx.computed, 3, "remoteUsers"], [_imports.bound, 2, "handleChatPermissionUpdate"], [_updateChatLevelDecs, 18, "updateChatLevel"], [_updateChatTextMsgDecs, 18, "updateChatTextMsg"], [_filterChatMemberDecs, 18, "filterChatMember"], [_hasSendMessagePermissionDecs, 18, "hasSendMessagePermission"], [_permitPrivateChatDecs, 18, "permitPrivateChat"], [_handleToastDecs, 18, "handleToast"], [_mobx.computed, 3, "isHostOrCoHost"], [_imports.bound, 2, "setAllowChat"], [_imports.bound, 2, "setAllowChatWithPayload"], [_handleConnectionUpdatedDecs, 18, "_handleConnectionUpdated"], [_initChatRoomConnectionStateDecs, 18, "_initChatRoomConnectionState"]], []).e;
-var _applyDecs$e2 = (0, _slicedToArray2["default"])(_applyDecs$e, 19);
+var _applyDecs$e = _applyDecs(_ChatRoomStore, [[_mobx.observable, 1, "_userInfo"], [_mobx.observable, 1, "needRecomputeRowIdMap"], [_mobx.observable, 1, "messageList"], [_mobx.observable, 1, "readMsgIndex"], [_mobx.observable, 1, "readIdx"], [_mobx.observable, 1, "viewIdx"], [_mobx.observable, 1, "historyUnreadCount"], [_mobx.observable, 1, "hasHistoryMsg"], [_mobx.observable, 1, "newMsgsUnReadCnt"], [_mobx.observable, 1, "privateTargetUser"], [_mobx.observable, 1, "chatLevel"], [_mobx.observable, 1, "currentUserMap"], [_mobx.observable, 1, "textMsg"], [_mobx.observable, 1, "privateTargetList"], [_mobx.observable, 1, "chatRoomState"], [_mobx.observable, 1, "userCount"], [_mobx.observable, 1, "unReadMsgCount"], [_setLastScrollTopDecs, 18, "setLastScrollTop"], [_setMessageListDecs, 18, "setMessageList"], [_sendMessageDecs, 18, "sendMessage"], [_setUnReadMsgCountDecs, 18, "setUnReadMsgCount"], [_handleTextMessageReceivedDecs, 18, "_handleTextMessageReceived"], [_getUserCountDecs, 18, "getUserCount"], [_onRemoteUserUpdateDecs, 18, "_onRemoteUserUpdate"], [_refreshUserListDecs, 18, "_refreshUserList"], [_handleNewMsgDecs, 18, "handleNewMsg"], [_updateReadMsgIndexDecs, 18, "updateReadMsgIndex"], [_mobx.computed, 3, "isHost"], [_mobx.computed, 3, "isCohost"], [_mobx.computed, 3, "localIsManager"], [_initReadInfoDecs, 18, "initReadInfo"], [_updateHistoryUnreadCntDecs, 18, "updateHistoryUnreadCnt"], [_updateHasHistoryMsgDecs, 18, "updateHasHistoryMsg"], [_updateScrollInfoDecs, 18, "updateScrollInfo"], [_updateViewIdxDecs, 18, "updateViewIdx"], [_updateReadIdxDecs, 18, "updateReadIdx"], [_updateFirstMsgIdDecs, 18, "updateFirstMsgId"], [_updateHistoryUnReadCountDecs, 18, "updateHistoryUnReadCount"], [_updateListDecs, 18, "updateList"], [_updateMostRecentHeightDecs, 18, "updateMostRecentHeight"], [_updateMostRecentWidthDecs, 18, "updateMostRecentWidth"], [_patchHandleMsgDecs, 18, "patchHandleMsg"], [_forceNotifyMsgsDecs, 18, "forceNotifyMsgs"], [_resetComponentCacheDecs, 18, "resetComponentCache"], [_resetTargetUserDecs, 18, "resetTargetUser"], [_initChatLevelDecs, 18, "initChatLevel"], [_setTargetUserDecs, 18, "setTargetUser"], [_mobx.computed, 3, "targetUserIsOnline"], [_mobx.computed, 3, "remoteUsers"], [_imports.bound, 2, "handleChatPermissionUpdate"], [_updateChatLevelDecs, 18, "updateChatLevel"], [_updateChatTextMsgDecs, 18, "updateChatTextMsg"], [_filterChatMemberDecs, 18, "filterChatMember"], [_permitPrivateChatDecs, 18, "permitPrivateChat"], [_handleToastDecs, 18, "handleToast"], [_mobx.computed, 3, "isHostOrCoHost"], [_imports.bound, 2, "setAllowChat"], [_imports.bound, 2, "setAllowChatWithPayload"], [_handleConnectionUpdatedDecs, 18, "_handleConnectionUpdated"], [_initChatRoomConnectionStateDecs, 18, "_initChatRoomConnectionState"]], []).e;
+var _applyDecs$e2 = (0, _slicedToArray2["default"])(_applyDecs$e, 18);
 _init__userInfo = _applyDecs$e2[0];
 _init_needRecomputeRowIdMap = _applyDecs$e2[1];
 _init_messageList = _applyDecs$e2[2];
@@ -947,8 +921,7 @@ _init_currentUserMap = _applyDecs$e2[11];
 _init_textMsg = _applyDecs$e2[12];
 _init_privateTargetList = _applyDecs$e2[13];
 _init_chatRoomState = _applyDecs$e2[14];
-_init_hasNewMsg = _applyDecs$e2[15];
-_init_userCount = _applyDecs$e2[16];
-_init_unReadMsgCount = _applyDecs$e2[17];
-_initProto = _applyDecs$e2[18];
+_init_userCount = _applyDecs$e2[15];
+_init_unReadMsgCount = _applyDecs$e2[16];
+_initProto = _applyDecs$e2[17];
 _applyDecs$e;

package/lib/modules/chat/chat-select/index.css

@@ -57,7 +57,6 @@
   align-items: center;
   cursor: pointer;
   width: 215px !important;
-  border-radius: var(--fcr_cornerradius_l);
 }
 
 .candidate-container-selected {
@@ -73,20 +72,20 @@
 }
 
 .candidate-avatar {
-  width: 32px;
-  height: 32px;
+  width: 26px;
+  height: 26px;
   border-radius: var(--fcr_cornerradius_s);
   background: var(--for_head5);
   display: flex;
   justify-content: center;
   align-items: center;
+  margin: 0 5px;
   /* text */
   color: var(--fcr_ui_scene_white10);
   font-family: Verdana;
   font-size: 14px;
   font-weight: 700;
   line-height: 14px;
-  margin-right: 5px;
 }
 .candidate-avatar .fcr-avatar {
   border-radius: var(--fcr_cornerradius_m);
@@ -94,8 +93,6 @@
 
 .candidate-avatar-all {
   background: var(--for_head1);
-  width: 32px;
-  height: 32px;
 }
 
 .candidate {

package/lib/modules/chat/chat-select/index.js

@@ -1,21 +1,11 @@
 "use strict";
 
-require("core-js/modules/es.symbol.js");
-require("core-js/modules/es.array.for-each.js");
-require("core-js/modules/es.object.define-properties.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/es.object.get-own-property-descriptors.js");
-require("core-js/modules/es.object.keys.js");
-require("core-js/modules/esnext.async-iterator.for-each.js");
-require("core-js/modules/esnext.iterator.for-each.js");
-require("core-js/modules/web.dom-collections.for-each.js");
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.ChatSelect = void 0;
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 require("core-js/modules/es.array.filter.js");
 require("core-js/modules/es.array.includes.js");
@@ -46,8 +36,6 @@ var _i18n = require("agora-ui-foundation/lib/i18n");
 var _fcr_defaultpage = _interopRequireDefault(require("../../../../public/assets/fcr_defaultpage.png"));
 var _helper = require("agora-ui-foundation/lib/components/avatar/helper");
 var _jsxRuntime = require("react/jsx-runtime");
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2["default"])(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function highlightMatches(str, matchStr) {
   var result = [];
   var matchLen = matchStr.length;
@@ -116,9 +104,7 @@ var ChatSelect = exports.ChatSelect = (0, _mobxReact.observer)(function (_ref) {
     }
     return /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
       className: selectedUid === users[index].userId ? 'candidate-container-selected' : 'candidate-container',
-      style: _objectSpread(_objectSpread({}, style), {}, {
-        pointerEvents: 'all'
-      }),
+      style: style,
       onClick: function onClick(_) {
         var user = filterUsers[index];
         onSelect(user);

package/lib/modules/chat/chat.js

@@ -72,22 +72,21 @@ var Chat = exports.Chat = (0, _mobxReact.observer)(function (_ref) {
     singling = _ref.singling,
     handleClickUploadImage = _ref.handleClickUploadImage;
   var t = (0, _i18n.useI18n)();
-  var _useContext = (0, _react.useContext)(_store.StoreContext),
-    chatRoomStores = _useContext.chatRoomStores,
-    hasWaitingRoomPermission = _useContext.hasWaitingRoomPermission,
-    activeTabIndex = _useContext.activeTabIndex,
-    handlerActiveTab = _useContext.handlerActiveTab;
   var defaultProps = {
     errorMsg: t('fmt_chat_tips_exceedlimit'),
     forbiddenTxt: t('fmt_chat_button_muteall'),
     styles: {
-      display: 'flex',
-      height: chatRoomStores[_constant.RoomType.WAITING_ROOM] && chatRoomStores[_constant.RoomType.WAITING_ROOM].userCount > 0 ? 'calc(100% - 28px)' : '100%'
+      display: 'flex'
     }
   };
   var styles = defaultProps.styles,
     forbiddenTxt = defaultProps.forbiddenTxt,
     errorMsg = defaultProps.errorMsg;
+  var _useContext = (0, _react.useContext)(_store.StoreContext),
+    chatRoomStores = _useContext.chatRoomStores,
+    hasWaitingRoomPermission = _useContext.hasWaitingRoomPermission,
+    activeTabIndex = _useContext.activeTabIndex,
+    handlerActiveTab = _useContext.handlerActiveTab;
   var _ref2 = chatRoomStores[activeTabIndex],
     setTargetUser = _ref2.setTargetUser,
     privateTargetUser = _ref2.privateTargetUser,

package/lib/modules/chat/components/chat-action/index.js

@@ -8,13 +8,13 @@ exports.ChatAction = void 0;
 var _mobxReact = require("mobx-react");
 var _react = require("react");
 var _store = require("../../store");
-var _type = require("fcr-core/lib/room-control/type");
 var _chatManager = require("agora-ui-foundation/lib/components/chat-manager");
+var _type = require("../../../../type");
 var _jsxRuntime = require("react/jsx-runtime");
 var ChatAction = exports.ChatAction = (0, _mobxReact.observer)(function () {
   var _useContext = (0, _react.useContext)(_store.StoreContext),
     chatRoomStores = _useContext.chatRoomStores;
-  var _ref = chatRoomStores[_type.FcrRoomType.Mainroom],
+  var _ref = chatRoomStores[_type.FcrUIRoomType.MAIN_ROOM],
     isHostOrCoHost = _ref.isHostOrCoHost,
     setAllowChat = _ref.setAllowChat,
     setAllowChatWithPayload = _ref.setAllowChatWithPayload,

package/lib/modules/chat/components/chat-bar/index.css

@@ -83,3 +83,7 @@
 .fcr-message-bar .fcr-text-bubble {
   font-weight: 300;
 }
+
+.fcr-chat-select-popover .fcr-tooltip-inner {
+  transform: translateX(-13px);
+}

package/lib/modules/chat/components/chat-bar/index.d.ts

@@ -1,3 +1,3 @@
 import './index.css';
 import { MessageBarProps } from '../../types';
-export declare const MessageBar: ({ styles, users, selectedUser, onTargetChange, title, }: React.PropsWithChildren<MessageBarProps>) => import("react/jsx-runtime").JSX.Element;
+export declare const MessageBar: ({ styles, users }: React.PropsWithChildren<MessageBarProps>) => import("react/jsx-runtime").JSX.Element;

package/lib/modules/chat/components/chat-bar/index.js

@@ -8,7 +8,6 @@ require("core-js/modules/es.object.define-property.js");
 require("core-js/modules/es.object.get-own-property-descriptor.js");
 require("core-js/modules/es.object.get-own-property-descriptors.js");
 require("core-js/modules/es.object.keys.js");
-require("core-js/modules/esnext.async-iterator.for-each.js");
 require("core-js/modules/esnext.iterator.for-each.js");
 require("core-js/modules/web.dom-collections.for-each.js");
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
@@ -18,7 +17,6 @@ Object.defineProperty(exports, "__esModule", {
 exports.MessageBar = void 0;
 require("core-js/modules/es.array.filter.js");
 require("core-js/modules/es.object.to-string.js");
-require("core-js/modules/esnext.async-iterator.filter.js");
 require("core-js/modules/esnext.iterator.constructor.js");
 require("core-js/modules/esnext.iterator.filter.js");
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
@@ -39,13 +37,10 @@ var _jsxRuntime = require("react/jsx-runtime");
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2["default"])(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var MessageBar = exports.MessageBar = (0, _mobxReact.observer)(function (_ref) {
-  var _users$filter, _selectedUser$userId, _selectedUser$userNam;
+  var _users$filter, _privateTargetUser$us, _privateTargetUser$us2;
   var styles = _ref.styles,
     _ref$users = _ref.users,
-    users = _ref$users === void 0 ? [] : _ref$users,
-    selectedUser = _ref.selectedUser,
-    onTargetChange = _ref.onTargetChange,
-    title = _ref.title;
+    users = _ref$users === void 0 ? [] : _ref$users;
   var t = (0, _i18n.useI18n)();
   var cls = (0, _classnames["default"])('fcr-message-bar', {});
   // 每次打开聊天窗, 默认 All
@@ -66,22 +61,27 @@ var MessageBar = exports.MessageBar = (0, _mobxReact.observer)(function (_ref) {
     }
     setPopoverOpened(visible);
   };
-  var selectedUserId = (_selectedUser$userId = selectedUser === null || selectedUser === void 0 ? void 0 : selectedUser.userId) !== null && _selectedUser$userId !== void 0 ? _selectedUser$userId : _types.USER_ALL;
   var handleSelected = function handleSelected(user) {
     setPopoverOpened(false);
-    onTargetChange && onTargetChange(user);
+    setTargetUser(user);
   };
-  (0, _react.useEffect)(function () {
-    setTips(selectedUserId === _types.USER_ALL ? t('fmt_chat_labels_sendto') : t('fmt_chats_label_privatechat'));
-  }, [selectedUserId]);
   var _useContext = (0, _react.useContext)(_store.StoreContext),
     chatRoomStores = _useContext.chatRoomStores,
-    activeTabIndex = _useContext.activeTabIndex,
-    roomType = _useContext.roomType;
+    activeTabIndex = _useContext.activeTabIndex;
   var _ref2 = chatRoomStores[activeTabIndex],
-    chatLevel = _ref2.chatLevel,
     privateTargetUser = _ref2.privateTargetUser,
-    localIsManager = _ref2.localIsManager;
+    localIsManager = _ref2.localIsManager,
+    setTargetUser = _ref2.setTargetUser,
+    chatLevel = _ref2.chatLevel;
+  var selectedUserId = (_privateTargetUser$us = privateTargetUser === null || privateTargetUser === void 0 ? void 0 : privateTargetUser.userId) !== null && _privateTargetUser$us !== void 0 ? _privateTargetUser$us : _types.USER_ALL;
+  var chatSelectNoTitle = localIsManager || chatLevel === 'everyone' || chatLevel === 'no_one';
+  var 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')
+  });
+  (0, _react.useEffect)(function () {
+    setTips(selectedUserId === _types.USER_ALL ? t('fmt_chat_labels_sendto') : t('fmt_chats_label_privatechat'));
+  }, [selectedUserId]);
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
     className: cls,
     style: _objectSpread({}, styles),
@@ -95,7 +95,7 @@ var MessageBar = exports.MessageBar = (0, _mobxReact.observer)(function (_ref) {
         width: 280
       },
       placement: "bottomLeft",
-      overlayClassName: "fcr-action-bar--device-popover",
+      overlayClassName: "fcr-action-bar--device-popover fcr-chat-select-popover",
       visible: popoverOpened,
       onVisibleChange: onPopoverChanged,
       trigger: "click",
@@ -120,7 +120,7 @@ var MessageBar = exports.MessageBar = (0, _mobxReact.observer)(function (_ref) {
             }
             // TODO: 当选中的 uid 为 None 时，需要提示选择管理员
             ,
-            txt: privateTargetUser.userId === _types.USER_NONE && !localIsManager ? t('fmt_chat_tips_selecthost') : (_selectedUser$userNam = selectedUser === null || selectedUser === void 0 ? void 0 : selectedUser.userName) !== null && _selectedUser$userNam !== void 0 ? _selectedUser$userNam : _types.USER_ALL,
+            txt: privateTargetUser.userId === _types.USER_NONE && !localIsManager ? t('fmt_chat_tips_selecthost') : (_privateTargetUser$us2 = privateTargetUser === null || privateTargetUser === void 0 ? void 0 : privateTargetUser.userName) !== null && _privateTargetUser$us2 !== void 0 ? _privateTargetUser$us2 : _types.USER_ALL,
             icon: _type.FcrIconType.FCR_DROPDOWN,
             colors: {
               iconPrimary: 'var(--fcr_web_ui_scene_mainicon1)',