fcr-ui-scene 3.5.1 → 3.6.1

package/lib/modules/control-bar/store.js

@@ -22,7 +22,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = exports.StoreContext = void 0;
-var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 require("core-js/modules/es.array.for-each.js");
 require("core-js/modules/es.array.iterator.js");
 require("core-js/modules/es.date.to-string.js");
@@ -52,13 +51,11 @@ require("core-js/modules/esnext.weak-map.emplace.js");
 require("core-js/modules/web.dom-collections.for-each.js");
 require("core-js/modules/web.dom-collections.iterator.js");
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
-var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 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 _mobx = require("mobx");
 var _type = require("agora-rte-sdk/lib/core/rtc/type");
-var _shareAudio = require("agora-ui-foundation/lib/components/room-screen-share-state-bar/share-audio");
 var _decorator = require("agora-foundation/lib/decorator");
 var _type2 = require("fcr-core/lib/room-control/type");
 var _fcrCore = require("fcr-core");
@@ -73,7 +70,7 @@ var _i18n = require("agora-ui-foundation/lib/i18n");
 var _logger = require("../../utilities/logger");
 var _jsxRuntime = require("react/jsx-runtime");
 var _ControlBarStore;
-var _initProto, _leaveConfirmRefDecs, _init_leaveConfirmRef, _init_shareWithAudio, _init_shareAudioProcessingChannel, _init_currentShareId, _init_currentShareType, _init_currentShareBounds, _init_recordShareBounds, _init_cloudRecordingState, _init_isHost, _init_roomDuration, _init_startTime, _init_playUrl, _init_liveStreamingState, _init_allApplicationWindows, _init_roomInfo, _init_isShowMeetingDetailPortal, _init_hiddenShareActionNav, _init_boardOwnerUser, _init_currentShareDisplayId, _setCheckedStateMapDecs, _initControlBarDecs, _updateCurrentShareContentDecs, _setShareWithAudioStateDecs, _showLockedRoomToastDecs, _createNewShareDecs, _handlerStopShareDecs, _setShareAudioProcessingChannelDecs, _handleMoreClickDecs, _pauseCloudRecordingDecs, _resumeCloudRecordingDecs, _stopCloudRecordingDecs, _showToastDecs, _setShowMeetingDetailPortalDecs, _setEnableWaitingRoomDecs, _handleLeaveRoomDecs, _resetMessageCountDecs, _ref;
+var _initProto, _leaveConfirmRefDecs, _init_leaveConfirmRef, _init_shareWithAudio, _init_currentShareId, _init_currentShareType, _init_currentShareBounds, _init_recordShareBounds, _init_cloudRecordingState, _init_isHost, _init_roomDuration, _init_startTime, _init_playUrl, _init_liveStreamingState, _init_allApplicationWindows, _init_roomInfo, _init_isShowMeetingDetailPortal, _init_hiddenShareActionNav, _init_boardOwnerUser, _init_currentShareDisplayId, _setCheckedStateMapDecs, _initControlBarDecs, _updateCurrentShareContentDecs, _setShareWithAudioStateDecs, _showLockedRoomToastDecs, _createNewShareDecs, _handlerStopShareDecs, _setShareAudioProcessingChannelDecs, _handleMoreClickDecs, _pauseCloudRecordingDecs, _resumeCloudRecordingDecs, _stopCloudRecordingDecs, _showToastDecs, _setShowMeetingDetailPortalDecs, _setEnableWaitingRoomDecs, _handleLeaveRoomDecs, _resetMessageCountDecs, _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; }
@@ -102,7 +99,6 @@ var _O = /*#__PURE__*/new WeakMap();
 var _P = /*#__PURE__*/new WeakMap();
 var _Q = /*#__PURE__*/new WeakMap();
 var _R = /*#__PURE__*/new WeakMap();
-var _S = /*#__PURE__*/new WeakMap();
 _ref = (_leaveConfirmRefDecs = [_mobx.observable, _mobx.observable.ref], _setCheckedStateMapDecs = [_mobx.action, _mobx.action.bound], _initControlBarDecs = [_mobx.action, _mobx.action.bound], _updateCurrentShareContentDecs = [_mobx.action, _mobx.action.bound], _setShareWithAudioStateDecs = [_mobx.action, _mobx.action.bound], _showLockedRoomToastDecs = [_mobx.action, _mobx.action.bound], _createNewShareDecs = [_mobx.action, _mobx.action.bound], _handlerStopShareDecs = [_mobx.action, _mobx.action.bound], _setShareAudioProcessingChannelDecs = [_mobx.action, _mobx.action.bound], _handleMoreClickDecs = [_mobx.action, _mobx.action.bound], _pauseCloudRecordingDecs = [_decorator.bound, (0, _decorator.debounced)(500, {
   leading: true
 })], _resumeCloudRecordingDecs = [_decorator.bound, (0, _decorator.debounced)(500, {
@@ -112,11 +108,11 @@ _ref = (_leaveConfirmRefDecs = [_mobx.observable, _mobx.observable.ref], _setChe
 })], _showToastDecs = [_mobx.action, _mobx.action.bound], _setShowMeetingDetailPortalDecs = [_mobx.action, _mobx.action.bound], _setEnableWaitingRoomDecs = [_mobx.action, _mobx.action.bound], _handleLeaveRoomDecs = [_mobx.action, _mobx.action.bound], _resetMessageCountDecs = [_mobx.action, _mobx.action.bound], "logger");
 var ControlBarStore = exports["default"] = /*#__PURE__*/function () {
   function ControlBarStore(_ref2) {
-    var _roomControl$getRoomS,
+    var _this = this,
+      _roomControl$getRoomS,
       _roomControl$getRoomS2,
       _roomControl$getRoomS3,
-      _roomControl$getRoomS4,
-      _this = this;
+      _roomControl$getRoomS4;
     var uiEventStore = _ref2.uiEventStore,
       securityStore = _ref2.securityStore,
       roomControl = _ref2.roomControl,
@@ -129,7 +125,9 @@ var ControlBarStore = exports["default"] = /*#__PURE__*/function () {
       abilityProvider = _ref2.abilityProvider,
       sharedMeetingTimeDataSource = _ref2.sharedMeetingTimeDataSource,
       messageProvider = _ref2.messageProvider,
-      sharedSecuritySharedDataSource = _ref2.sharedSecuritySharedDataSource;
+      sharedSecuritySharedDataSource = _ref2.sharedSecuritySharedDataSource,
+      dialogProvider = _ref2.dialogProvider,
+      screenShareDataSource = _ref2.screenShareDataSource;
     (0, _classCallCheck2["default"])(this, ControlBarStore);
     (0, _defineProperty2["default"])(this, _ref, (_initProto(this), (0, _logger.createLogger)({
       prefix: 'ControlBarStore'
@@ -143,36 +141,48 @@ var ControlBarStore = exports["default"] = /*#__PURE__*/function () {
     });
     (0, _defineProperty2["default"])(this, "_disposers", []);
     (0, _defineProperty2["default"])(this, "_liveStreamingDialogKey", null);
+    (0, _defineProperty2["default"])(this, "_dialogObsever", {
+      onDialogOpened: function onDialogOpened(dialogKey, dialogId) {
+        if (dialogKey === _constant.FcrUIDialogKey.PARTICIPANT) {
+          _this._participantDialogId = dialogId;
+        }
+      },
+      onDialogClosed: function onDialogClosed(dialogId) {
+        if (dialogId === _this._participantDialogId) {
+          _this._participantDialogId = '';
+        }
+      }
+    });
+    (0, _defineProperty2["default"])(this, "_participantDialogId", '');
     _classPrivateFieldInitSpec(this, _A, _init_leaveConfirmRef(this, undefined));
     _classPrivateFieldInitSpec(this, _B, _init_shareWithAudio(this, false));
-    _classPrivateFieldInitSpec(this, _C, _init_shareAudioProcessingChannel(this, _shareAudio.AudioProcessingChannel.MONO));
-    _classPrivateFieldInitSpec(this, _D, _init_currentShareId(this, ''));
-    _classPrivateFieldInitSpec(this, _E, _init_currentShareType(this, _type.AgoraRtcScreenCaptureType.SCREEN));
-    _classPrivateFieldInitSpec(this, _F, _init_currentShareBounds(this, {
+    _classPrivateFieldInitSpec(this, _C, _init_currentShareId(this, ''));
+    _classPrivateFieldInitSpec(this, _D, _init_currentShareType(this, _type.AgoraRtcScreenCaptureType.SCREEN));
+    _classPrivateFieldInitSpec(this, _E, _init_currentShareBounds(this, {
       width: 0,
       height: 0,
       x: 0,
       y: 0
     }));
-    _classPrivateFieldInitSpec(this, _G, _init_recordShareBounds(this, new Map()));
-    _classPrivateFieldInitSpec(this, _H, _init_cloudRecordingState(this, _type3.FcrRecordingState.Stopped));
-    _classPrivateFieldInitSpec(this, _I, _init_isHost(this, false));
-    _classPrivateFieldInitSpec(this, _J, _init_roomDuration(this, 0));
-    _classPrivateFieldInitSpec(this, _K, _init_startTime(this, new Date().getTime()));
-    _classPrivateFieldInitSpec(this, _L, _init_playUrl(this, ''));
-    _classPrivateFieldInitSpec(this, _M, _init_liveStreamingState(this, _type3.FcrLiveStreamingState.STOPPED));
-    _classPrivateFieldInitSpec(this, _N, _init_allApplicationWindows(this, []));
-    _classPrivateFieldInitSpec(this, _O, _init_roomInfo(this, {
+    _classPrivateFieldInitSpec(this, _F, _init_recordShareBounds(this, new Map()));
+    _classPrivateFieldInitSpec(this, _G, _init_cloudRecordingState(this, _type3.FcrRecordingState.Stopped));
+    _classPrivateFieldInitSpec(this, _H, _init_isHost(this, false));
+    _classPrivateFieldInitSpec(this, _I, _init_roomDuration(this, 0));
+    _classPrivateFieldInitSpec(this, _J, _init_startTime(this, new Date().getTime()));
+    _classPrivateFieldInitSpec(this, _K, _init_playUrl(this, ''));
+    _classPrivateFieldInitSpec(this, _L, _init_liveStreamingState(this, _type3.FcrLiveStreamingState.STOPPED));
+    _classPrivateFieldInitSpec(this, _M, _init_allApplicationWindows(this, []));
+    _classPrivateFieldInitSpec(this, _N, _init_roomInfo(this, {
       roomId: '',
       roomName: '',
       roomType: _type2.FcrRoomType.Mainroom,
       password: '',
       inviteLink: ''
     }));
-    _classPrivateFieldInitSpec(this, _P, _init_isShowMeetingDetailPortal(this, false));
-    _classPrivateFieldInitSpec(this, _Q, _init_hiddenShareActionNav(this, false));
-    _classPrivateFieldInitSpec(this, _R, _init_boardOwnerUser(this, ''));
-    _classPrivateFieldInitSpec(this, _S, _init_currentShareDisplayId(this, 0));
+    _classPrivateFieldInitSpec(this, _O, _init_isShowMeetingDetailPortal(this, false));
+    _classPrivateFieldInitSpec(this, _P, _init_hiddenShareActionNav(this, false));
+    _classPrivateFieldInitSpec(this, _Q, _init_boardOwnerUser(this, ''));
+    _classPrivateFieldInitSpec(this, _R, _init_currentShareDisplayId(this, 0));
     this._uiEventStore = uiEventStore;
     this._roomControl = roomControl;
     this._securityStore = securityStore;
@@ -184,18 +194,21 @@ var ControlBarStore = exports["default"] = /*#__PURE__*/function () {
     this._sharedMeetingTimeDataSource = sharedMeetingTimeDataSource;
     this._messageProvider = messageProvider;
     this._sharedSecuritySharedDataSource = sharedSecuritySharedDataSource;
+    this._screenShareDataSource = screenShareDataSource;
     this.startTime = (_roomControl$getRoomS = (_roomControl$getRoomS2 = roomControl.getRoomSchedule()) === null || _roomControl$getRoomS2 === void 0 ? void 0 : _roomControl$getRoomS2.startTime) !== null && _roomControl$getRoomS !== void 0 ? _roomControl$getRoomS : new Date().getTime();
     this.roomInfo = roomControl.getRoomInfo();
     this.roomDuration = (_roomControl$getRoomS3 = (_roomControl$getRoomS4 = roomControl.getRoomSchedule()) === null || _roomControl$getRoomS4 === void 0 ? void 0 : _roomControl$getRoomS4.duration) !== null && _roomControl$getRoomS3 !== void 0 ? _roomControl$getRoomS3 : 0;
     this.liveStreamingState = roomControl.getLiveStreamingState();
     this._deviceProvider = deviceProvider;
     this._abilityProvider = abilityProvider;
+    this._dialogProvider = dialogProvider;
+    this._dialogProvider.addObserver(this._dialogObsever);
     this._roomObserver = {
-      onLiveStreamingStateUpdated: function onLiveStreamingStateUpdated(roomId, state, url) {
+      onLiveStreamingStateUpdated: function onLiveStreamingStateUpdated(_roomId, state, url) {
         _this.liveStreamingState = state;
         _this.playUrl = url;
       },
-      onCloudRecordingStateUpdated: function onCloudRecordingStateUpdated(roomId, state) {
+      onCloudRecordingStateUpdated: function onCloudRecordingStateUpdated(_roomId, state) {
         return _this.cloudRecordingState = state;
       }
     };
@@ -207,20 +220,6 @@ var ControlBarStore = exports["default"] = /*#__PURE__*/function () {
         _this.boardOwnerUser = '';
       }
     };
-    (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee() {
-      return _regenerator["default"].wrap(function _callee$(_context) {
-        while (1) switch (_context.prev = _context.next) {
-          case 0:
-            _context.next = 2;
-            return deviceProvider === null || deviceProvider === void 0 ? void 0 : deviceProvider.getWindowList();
-          case 2:
-            _this.allApplicationWindows = _context.sent;
-          case 3:
-          case "end":
-            return _context.stop();
-        }
-      }, _callee);
-    }))();
     roomControl.addObserver(this._roomObserver);
     roomControl.getBoardControl().addObserver(this._boardObserver);
   }
@@ -241,7 +240,7 @@ var ControlBarStore = exports["default"] = /*#__PURE__*/function () {
       _classPrivateFieldSet(_B, this, v);
     }
   }, {
-    key: "shareAudioProcessingChannel",
+    key: "currentShareId",
     get: function get() {
       return _classPrivateFieldGet(_C, this);
     },
@@ -249,7 +248,7 @@ var ControlBarStore = exports["default"] = /*#__PURE__*/function () {
       _classPrivateFieldSet(_C, this, v);
     }
   }, {
-    key: "currentShareId",
+    key: "currentShareType",
     get: function get() {
       return _classPrivateFieldGet(_D, this);
     },
@@ -257,7 +256,7 @@ var ControlBarStore = exports["default"] = /*#__PURE__*/function () {
       _classPrivateFieldSet(_D, this, v);
     }
   }, {
-    key: "currentShareType",
+    key: "currentShareBounds",
     get: function get() {
       return _classPrivateFieldGet(_E, this);
     },
@@ -265,7 +264,7 @@ var ControlBarStore = exports["default"] = /*#__PURE__*/function () {
       _classPrivateFieldSet(_E, this, v);
     }
   }, {
-    key: "currentShareBounds",
+    key: "recordShareBounds",
     get: function get() {
       return _classPrivateFieldGet(_F, this);
     },
@@ -273,7 +272,7 @@ var ControlBarStore = exports["default"] = /*#__PURE__*/function () {
       _classPrivateFieldSet(_F, this, v);
     }
   }, {
-    key: "recordShareBounds",
+    key: "cloudRecordingState",
     get: function get() {
       return _classPrivateFieldGet(_G, this);
     },
@@ -281,7 +280,7 @@ var ControlBarStore = exports["default"] = /*#__PURE__*/function () {
       _classPrivateFieldSet(_G, this, v);
     }
   }, {
-    key: "cloudRecordingState",
+    key: "isHost",
     get: function get() {
       return _classPrivateFieldGet(_H, this);
     },
@@ -289,7 +288,7 @@ var ControlBarStore = exports["default"] = /*#__PURE__*/function () {
       _classPrivateFieldSet(_H, this, v);
     }
   }, {
-    key: "isHost",
+    key: "roomDuration",
     get: function get() {
       return _classPrivateFieldGet(_I, this);
     },
@@ -297,7 +296,7 @@ var ControlBarStore = exports["default"] = /*#__PURE__*/function () {
       _classPrivateFieldSet(_I, this, v);
     }
   }, {
-    key: "roomDuration",
+    key: "startTime",
     get: function get() {
       return _classPrivateFieldGet(_J, this);
     },
@@ -305,7 +304,7 @@ var ControlBarStore = exports["default"] = /*#__PURE__*/function () {
       _classPrivateFieldSet(_J, this, v);
     }
   }, {
-    key: "startTime",
+    key: "playUrl",
     get: function get() {
       return _classPrivateFieldGet(_K, this);
     },
@@ -313,7 +312,7 @@ var ControlBarStore = exports["default"] = /*#__PURE__*/function () {
       _classPrivateFieldSet(_K, this, v);
     }
   }, {
-    key: "playUrl",
+    key: "liveStreamingState",
     get: function get() {
       return _classPrivateFieldGet(_L, this);
     },
@@ -321,7 +320,7 @@ var ControlBarStore = exports["default"] = /*#__PURE__*/function () {
       _classPrivateFieldSet(_L, this, v);
     }
   }, {
-    key: "liveStreamingState",
+    key: "allApplicationWindows",
     get: function get() {
       return _classPrivateFieldGet(_M, this);
     },
@@ -329,7 +328,7 @@ var ControlBarStore = exports["default"] = /*#__PURE__*/function () {
       _classPrivateFieldSet(_M, this, v);
     }
   }, {
-    key: "allApplicationWindows",
+    key: "roomInfo",
     get: function get() {
       return _classPrivateFieldGet(_N, this);
     },
@@ -337,7 +336,7 @@ var ControlBarStore = exports["default"] = /*#__PURE__*/function () {
       _classPrivateFieldSet(_N, this, v);
     }
   }, {
-    key: "roomInfo",
+    key: "isShowMeetingDetailPortal",
     get: function get() {
       return _classPrivateFieldGet(_O, this);
     },
@@ -345,7 +344,7 @@ var ControlBarStore = exports["default"] = /*#__PURE__*/function () {
       _classPrivateFieldSet(_O, this, v);
     }
   }, {
-    key: "isShowMeetingDetailPortal",
+    key: "hiddenShareActionNav",
     get: function get() {
       return _classPrivateFieldGet(_P, this);
     },
@@ -353,7 +352,7 @@ var ControlBarStore = exports["default"] = /*#__PURE__*/function () {
       _classPrivateFieldSet(_P, this, v);
     }
   }, {
-    key: "hiddenShareActionNav",
+    key: "boardOwnerUser",
     get: function get() {
       return _classPrivateFieldGet(_Q, this);
     },
@@ -361,7 +360,7 @@ var ControlBarStore = exports["default"] = /*#__PURE__*/function () {
       _classPrivateFieldSet(_Q, this, v);
     }
   }, {
-    key: "boardOwnerUser",
+    key: "currentShareDisplayId",
     get: function get() {
       return _classPrivateFieldGet(_R, this);
     },
@@ -369,12 +368,9 @@ var ControlBarStore = exports["default"] = /*#__PURE__*/function () {
       _classPrivateFieldSet(_R, this, v);
     }
   }, {
-    key: "currentShareDisplayId",
+    key: "shareAudioProcessingChannel",
     get: function get() {
-      return _classPrivateFieldGet(_S, this);
-    },
-    set: function set(v) {
-      _classPrivateFieldSet(_S, this, v);
+      return this._screenShareDataSource.currentShareAudioProcessingChannel;
     }
   }, {
     key: "privilegeProvider",
@@ -483,9 +479,9 @@ var ControlBarStore = exports["default"] = /*#__PURE__*/function () {
   }, {
     key: "meetingId",
     get: function get() {
-      var _ref4;
+      var _ref3;
       var mainRoomControl = this._roomProvider.currentRoomControl;
-      return (_ref4 = mainRoomControl === null || mainRoomControl === void 0 ? void 0 : mainRoomControl.getRoomPropertiesByKeyPath('meetingId')) !== null && _ref4 !== void 0 ? _ref4 : this.roomId;
+      return (_ref3 = mainRoomControl === null || mainRoomControl === void 0 ? void 0 : mainRoomControl.getRoomPropertiesByKeyPath('meetingId')) !== null && _ref3 !== void 0 ? _ref3 : this.roomId;
     }
   }, {
     key: "scheduleInfo",
@@ -519,8 +515,10 @@ var ControlBarStore = exports["default"] = /*#__PURE__*/function () {
     }
   }, {
     key: "initControlBar",
-    value: function initControlBar(payload, browserWindow) {
-      this.shareAudioProcessingChannel = payload.currentShareAudioProcessingChannel;
+    value: function initControlBar(payload, _browserWindow) {
+      // this._screenShareDataSource.setCurrentShareAudioProcessingChannel(
+      //   payload.currentShareAudioProcessingChannel,
+      // );
       this.currentShareId = payload.currentShareId;
       this.currentShareType = payload.currentShareType;
       this.currentShareBounds = payload.currentShareBounds;
@@ -566,7 +564,7 @@ var ControlBarStore = exports["default"] = /*#__PURE__*/function () {
   }, {
     key: "setShareAudioProcessingChannel",
     value: function setShareAudioProcessingChannel(target) {
-      this.shareAudioProcessingChannel = target;
+      this._screenShareDataSource.setCurrentShareAudioProcessingChannel(target);
     }
 
     // more
@@ -576,23 +574,27 @@ var ControlBarStore = exports["default"] = /*#__PURE__*/function () {
       var _this2 = this;
       switch (actionKey) {
         case _enums.MoreAction.OPEN_PARTICIPANTS:
-          this._uiEventStore.openDialog(_constant.FcrUIDialogKey.PARTICIPANT);
+          if (this._participantDialogId === '') {
+            this._dialogProvider.openDialog(_constant.FcrUIDialogKey.PARTICIPANT);
+          } else {
+            this._dialogProvider.closeDialog(this._participantDialogId);
+          }
           this._sharedLayoutDataSource.setAsideLayout({
             participant: false
           });
           break;
         case _enums.MoreAction.OPEN_CHAT:
-          this._uiEventStore.openDialog(_constant.FcrUIDialogKey.CHAT);
+          this._dialogProvider.openDialog(_constant.FcrUIDialogKey.CHAT);
           this._sharedLayoutDataSource.setAsideLayout({
             chat: false
           });
           this._resetMessageCount();
           break;
         case _enums.MoreAction.OPEN_LIVE_STEAMING_DIALOG:
-          this._uiEventStore.openDialog(_constant.FcrUIDialogKey.LIVE_STREAMING);
+          this._dialogProvider.openDialog(_constant.FcrUIDialogKey.LIVE_STREAMING);
           break;
         case _enums.MoreAction.OPEN_SETTING:
-          this._uiEventStore.openDialog(_constant.FcrUIDialogKey.DEVICE_SETTINGS);
+          this._dialogProvider.openDeviceSettingDialog({});
           break;
         case _enums.MoreAction.CLOUD_RECORDING_START:
           this.startCloudRecording();
@@ -619,15 +621,15 @@ var ControlBarStore = exports["default"] = /*#__PURE__*/function () {
     key: "openLiveStreamingDialog",
     value: function openLiveStreamingDialog() {
       var _this3 = this;
-      var dialogKey = this._uiEventStore.openConfirmDialog({
+      var dialogKey = this._dialogProvider.openConfirmDialog({
         width: 256,
         content: /*#__PURE__*/(0, _jsxRuntime.jsx)(_stopButton["default"], {
           onCancel: function onCancel() {
-            _this3._uiEventStore.closeConfirm(dialogKey);
+            _this3._dialogProvider.closeConfirm(dialogKey);
           },
           handleMoreClick: function handleMoreClick(type) {
             _this3.handleMoreClick(type);
-            _this3._uiEventStore.closeConfirm(dialogKey);
+            _this3._dialogProvider.closeConfirm(dialogKey);
           }
         }),
         showCancel: false,
@@ -669,12 +671,17 @@ var ControlBarStore = exports["default"] = /*#__PURE__*/function () {
   }, {
     key: "showToast",
     value: function showToast(params) {
-      this._uiEventStore.openDialog(_constant.FcrUIDialogKey.SHOW_TOAST, _constant.FcrUIDialogKey.SHOW_TOAST, {
+      this._dialogProvider.openDialog(_constant.FcrUIDialogKey.SHOW_TOAST, _constant.FcrUIDialogKey.SHOW_TOAST, {
         type: params.type,
         message: params.content,
         duration: params.duration
       });
     }
+  }, {
+    key: "roomDetailCopyText",
+    get: function get() {
+      return this._roomProvider.getRoomDetailCopyText();
+    }
   }, {
     key: "setShowMeetingDetailPortal",
     value: function setShowMeetingDetailPortal(show) {
@@ -689,17 +696,18 @@ var ControlBarStore = exports["default"] = /*#__PURE__*/function () {
     key: "handleLeaveRoom",
     value: function handleLeaveRoom() {
       var _this4 = this;
-      var dailogKey = this._uiEventStore.openConfirmDialog({
+      var dailogKey = this._dialogProvider.openConfirmDialog({
+        className: 'leave-meeting-dialog',
         width: 300,
         content: /*#__PURE__*/(0, _jsxRuntime.jsx)(_leaveMeeting.LeaveMeeting, {
           setPopoverOpened: function setPopoverOpened(value) {
             if (!value) {
-              _this4._uiEventStore.closeConfirm(dailogKey);
+              _this4._dialogProvider.closeConfirm(dailogKey);
             }
           }
         }),
         onCancel: function onCancel() {
-          _this4._uiEventStore.closeConfirm(dailogKey);
+          _this4._dialogProvider.closeConfirm(dailogKey);
         },
         showCancel: false,
         showOk: false
@@ -719,6 +727,7 @@ var ControlBarStore = exports["default"] = /*#__PURE__*/function () {
       });
       this._disposers = [];
       this._roomControl.getBoardControl().removeObserver(this._boardObserver);
+      this._dialogProvider.removeObserver(this._dialogObsever);
       this._roomControl.removeObserver(this._roomObserver);
       this.recordShareBounds.clear();
     }
@@ -730,25 +739,24 @@ var ControlBarStore = exports["default"] = /*#__PURE__*/function () {
   }]);
 }();
 _ControlBarStore = ControlBarStore;
-var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_ControlBarStore, [[_leaveConfirmRefDecs, 17, "leaveConfirmRef"], [_mobx.observable, 1, "shareWithAudio"], [_mobx.observable, 1, "shareAudioProcessingChannel"], [_mobx.observable, 1, "currentShareId"], [_mobx.observable, 1, "currentShareType"], [_mobx.observable, 1, "currentShareBounds"], [_mobx.observable, 1, "recordShareBounds"], [_mobx.observable, 1, "cloudRecordingState"], [_mobx.observable, 1, "isHost"], [_mobx.observable, 1, "roomDuration"], [_mobx.observable, 1, "startTime"], [_mobx.observable, 1, "playUrl"], [_mobx.observable, 1, "liveStreamingState"], [_mobx.observable, 1, "allApplicationWindows"], [_mobx.observable, 1, "roomInfo"], [_mobx.observable, 1, "isShowMeetingDetailPortal"], [_mobx.observable, 1, "hiddenShareActionNav"], [_mobx.observable, 1, "boardOwnerUser"], [_mobx.observable, 1, "currentShareDisplayId"], [_mobx.computed, 3, "hasSecurityPermission"], [_mobx.computed, 3, "hasStartCloudRecordingPermission"], [_mobx.computed, 3, "hasStopLiveStreamingPermission"], [_mobx.computed, 3, "hasGetLiveStreamingUrlPermission"], [_mobx.computed, 3, "hasStartLiveStreamingPermission"], [_mobx.computed, 3, "hasAssignHostBeforeLeavingPermission"], [_mobx.computed, 3, "hasEndRoomPermission"], [_mobx.computed, 3, "totalHourText"], [_mobx.computed, 3, "totalMinuteText"], [_mobx.computed, 3, "meetingTimeStatus"], [_mobx.computed, 3, "meetingTime"], [_mobx.computed, 3, "meetingTimeKey"], [_mobx.computed, 3, "roomId"], [_mobx.computed, 3, "meetingId"], [_mobx.computed, 3, "scheduleInfo"], [_mobx.computed, 3, "checkedStateMap"], [_setCheckedStateMapDecs, 18, "setCheckedStateMap"], [_initControlBarDecs, 18, "initControlBar"], [_updateCurrentShareContentDecs, 18, "updateCurrentShareContent"], [_setShareWithAudioStateDecs, 18, "setShareWithAudioState"], [_showLockedRoomToastDecs, 18, "showLockedRoomToast"], [_createNewShareDecs, 18, "createNewShare"], [_handlerStopShareDecs, 18, "handlerStopShare"], [_setShareAudioProcessingChannelDecs, 18, "setShareAudioProcessingChannel"], [_handleMoreClickDecs, 18, "handleMoreClick"], [_decorator.bound, 2, "openLiveStreamingDialog"], [_pauseCloudRecordingDecs, 2, "pauseCloudRecording"], [_resumeCloudRecordingDecs, 2, "resumeCloudRecording"], [_stopCloudRecordingDecs, 2, "stopCloudRecording"], [_decorator.bound, 2, "startCloudRecording"], [_showToastDecs, 18, "showToast"], [_setShowMeetingDetailPortalDecs, 18, "setShowMeetingDetailPortal"], [_setEnableWaitingRoomDecs, 18, "setEnableWaitingRoom"], [_handleLeaveRoomDecs, 18, "handleLeaveRoom"], [_decorator.bound, 2, "getLocalMeetingTime"], [_resetMessageCountDecs, 18, "_resetMessageCount"]], []).e, 20);
+var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_ControlBarStore, [[_leaveConfirmRefDecs, 17, "leaveConfirmRef"], [_mobx.observable, 1, "shareWithAudio"], [_mobx.observable, 1, "currentShareId"], [_mobx.observable, 1, "currentShareType"], [_mobx.observable, 1, "currentShareBounds"], [_mobx.observable, 1, "recordShareBounds"], [_mobx.observable, 1, "cloudRecordingState"], [_mobx.observable, 1, "isHost"], [_mobx.observable, 1, "roomDuration"], [_mobx.observable, 1, "startTime"], [_mobx.observable, 1, "playUrl"], [_mobx.observable, 1, "liveStreamingState"], [_mobx.observable, 1, "allApplicationWindows"], [_mobx.observable, 1, "roomInfo"], [_mobx.observable, 1, "isShowMeetingDetailPortal"], [_mobx.observable, 1, "hiddenShareActionNav"], [_mobx.observable, 1, "boardOwnerUser"], [_mobx.observable, 1, "currentShareDisplayId"], [_mobx.computed, 3, "hasSecurityPermission"], [_mobx.computed, 3, "hasStartCloudRecordingPermission"], [_mobx.computed, 3, "hasStopLiveStreamingPermission"], [_mobx.computed, 3, "hasGetLiveStreamingUrlPermission"], [_mobx.computed, 3, "hasStartLiveStreamingPermission"], [_mobx.computed, 3, "hasAssignHostBeforeLeavingPermission"], [_mobx.computed, 3, "hasEndRoomPermission"], [_mobx.computed, 3, "totalHourText"], [_mobx.computed, 3, "totalMinuteText"], [_mobx.computed, 3, "meetingTimeStatus"], [_mobx.computed, 3, "meetingTime"], [_mobx.computed, 3, "meetingTimeKey"], [_mobx.computed, 3, "roomId"], [_mobx.computed, 3, "meetingId"], [_mobx.computed, 3, "checkedStateMap"], [_setCheckedStateMapDecs, 18, "setCheckedStateMap"], [_initControlBarDecs, 18, "initControlBar"], [_updateCurrentShareContentDecs, 18, "updateCurrentShareContent"], [_setShareWithAudioStateDecs, 18, "setShareWithAudioState"], [_showLockedRoomToastDecs, 18, "showLockedRoomToast"], [_createNewShareDecs, 18, "createNewShare"], [_handlerStopShareDecs, 18, "handlerStopShare"], [_setShareAudioProcessingChannelDecs, 18, "setShareAudioProcessingChannel"], [_handleMoreClickDecs, 18, "handleMoreClick"], [_decorator.bound, 2, "openLiveStreamingDialog"], [_pauseCloudRecordingDecs, 2, "pauseCloudRecording"], [_resumeCloudRecordingDecs, 2, "resumeCloudRecording"], [_stopCloudRecordingDecs, 2, "stopCloudRecording"], [_decorator.bound, 2, "startCloudRecording"], [_showToastDecs, 18, "showToast"], [_setShowMeetingDetailPortalDecs, 18, "setShowMeetingDetailPortal"], [_setEnableWaitingRoomDecs, 18, "setEnableWaitingRoom"], [_handleLeaveRoomDecs, 18, "handleLeaveRoom"], [_decorator.bound, 2, "getLocalMeetingTime"], [_resetMessageCountDecs, 18, "_resetMessageCount"]], []).e, 19);
 _init_leaveConfirmRef = _applyDecs$e[0];
 _init_shareWithAudio = _applyDecs$e[1];
-_init_shareAudioProcessingChannel = _applyDecs$e[2];
-_init_currentShareId = _applyDecs$e[3];
-_init_currentShareType = _applyDecs$e[4];
-_init_currentShareBounds = _applyDecs$e[5];
-_init_recordShareBounds = _applyDecs$e[6];
-_init_cloudRecordingState = _applyDecs$e[7];
-_init_isHost = _applyDecs$e[8];
-_init_roomDuration = _applyDecs$e[9];
-_init_startTime = _applyDecs$e[10];
-_init_playUrl = _applyDecs$e[11];
-_init_liveStreamingState = _applyDecs$e[12];
-_init_allApplicationWindows = _applyDecs$e[13];
-_init_roomInfo = _applyDecs$e[14];
-_init_isShowMeetingDetailPortal = _applyDecs$e[15];
-_init_hiddenShareActionNav = _applyDecs$e[16];
-_init_boardOwnerUser = _applyDecs$e[17];
-_init_currentShareDisplayId = _applyDecs$e[18];
-_initProto = _applyDecs$e[19];
+_init_currentShareId = _applyDecs$e[2];
+_init_currentShareType = _applyDecs$e[3];
+_init_currentShareBounds = _applyDecs$e[4];
+_init_recordShareBounds = _applyDecs$e[5];
+_init_cloudRecordingState = _applyDecs$e[6];
+_init_isHost = _applyDecs$e[7];
+_init_roomDuration = _applyDecs$e[8];
+_init_startTime = _applyDecs$e[9];
+_init_playUrl = _applyDecs$e[10];
+_init_liveStreamingState = _applyDecs$e[11];
+_init_allApplicationWindows = _applyDecs$e[12];
+_init_roomInfo = _applyDecs$e[13];
+_init_isShowMeetingDetailPortal = _applyDecs$e[14];
+_init_hiddenShareActionNav = _applyDecs$e[15];
+_init_boardOwnerUser = _applyDecs$e[16];
+_init_currentShareDisplayId = _applyDecs$e[17];
+_initProto = _applyDecs$e[18];
 var StoreContext = exports.StoreContext = /*#__PURE__*/(0, _react.createContext)(null);

package/lib/modules/control-bar/view.js

@@ -97,9 +97,6 @@ var ControlBarView = exports.ControlBarView = (0, _mobxReact.observer)(function
   var HIDDEN_TIMEOUT = 3000;
   // 系统顶部的状态栏
   var _getCurrentSharingWor = (0, _tools.getCurrentSharingWorkArea)({
-      currentShareId: currentShareId,
-      currentShareType: currentShareType,
-      allApplicationWindows: allApplicationWindows,
       currentShareBounds: currentShareBounds
     }),
     browserWidth = _getCurrentSharingWor.width,
@@ -285,9 +282,6 @@ var ControlBarView = exports.ControlBarView = (0, _mobxReact.observer)(function
     } else {
       recordShareBounds.clear();
       screenBounds = (0, _tools.getCurrentSharingWorkArea)({
-        currentShareId: currentShareId,
-        currentShareType: currentShareType,
-        allApplicationWindows: allApplicationWindows,
         currentShareBounds: currentShareBounds
       });
       recordShareBounds.set(currentShareBounds, screenBounds);
@@ -360,6 +354,7 @@ var ControlBarView = exports.ControlBarView = (0, _mobxReact.observer)(function
         }), /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
           className: "share-action-nav__meeting-control-group",
           children: [hasSecurityPermission && /*#__PURE__*/(0, _jsxRuntime.jsx)(_popover.FcrPopover, {
+            showArrow: false,
             mouseEnterDelay: 0,
             overlayInnerStyle: {
               width: '300px',

package/lib/modules/device-pretest/audio-preview/speaker-detection.js

@@ -55,7 +55,7 @@ var SpeakerDetection = exports.SpeakerDetection = (0, _mobxReact.observer)(funct
       styleType: "white"
     }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_tooltip.FcrToolTip, {
       trigger: "hover",
-      placement: "top",
+      placement: "rightTop",
       mouseEnterDelay: 0.2,
       content: t(disabled ? 'fmt_settings_popup_disable_while_microphone_detected' : isDetecting ? 'fmt_setting_tips_speaker_unwork' : 'fmt_setting_tips_speaker'),
       children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_button.FcrButton, {

package/lib/modules/dialog/components/chat/electron.d.ts

@@ -1,4 +1,2 @@
 import { PropsWithChildren } from 'react';
-export declare const ChatElectronDialog: ({ children, }: PropsWithChildren<{
-    chatAction: React.ReactNode;
-}>) => import("react/jsx-runtime").JSX.Element;
+export declare const ChatElectronDialog: ({ children }: PropsWithChildren<{}>) => import("react/jsx-runtime").JSX.Element;

package/lib/modules/dialog/components/chat/index.js

@@ -17,26 +17,21 @@ var _constant = require("../../../../utilities/constant");
 var _tooltip = require("agora-ui-foundation/lib/components/tooltip");
 var _iconButton = require("agora-ui-foundation/lib/components/icon-button");
 var _type2 = require("agora-ui-foundation/lib/components/icon/type");
+var _mobxReact = require("mobx-react");
 var _jsxRuntime = require("react/jsx-runtime");
-var ChatDialog = exports.ChatDialog = function ChatDialog(_ref) {
-  var children = _ref.children,
-    chatAction = _ref.chatAction;
-  var _useContext = (0, _react.useContext)(_store.StoreContext),
-    closeChatFromDialog = _useContext.closeChatFromDialog,
-    moveChatFromDialogToAside = _useContext.moveChatFromDialogToAside,
-    chatRoomState = _useContext.chatRoomState,
-    waitingRoomState = _useContext.waitingRoomState;
+var Container = (0, _mobxReact.observer)(function (props) {
+  var store = (0, _react.useContext)(_store.StoreContext);
   var transI18n = (0, _i18n.useI18n)();
-  var container = /*#__PURE__*/(0, _jsxRuntime.jsx)(_dialogContainer["default"], {
-    title: chatRoomState === _type.FcrChatRoomConnectionState.Connected ? transI18n('fmt_chat_label_chat') : transI18n('fmt_aside_status_connecting'),
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_dialogContainer["default"], {
+    title: store.chatRoomState === _type.FcrChatRoomConnectionState.Connected ? transI18n('fmt_chat_label_chat') : transI18n('fmt_aside_status_connecting'),
     actions: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
-      children: [chatAction, /*#__PURE__*/(0, _jsxRuntime.jsx)(_tooltip.FcrToolTip, {
+      children: [props.chatAction, store.isSharingScreen ? null : /*#__PURE__*/(0, _jsxRuntime.jsx)(_tooltip.FcrToolTip, {
         content: transI18n('fmt_uimanager_option_mergeview'),
         mouseEnterDelay: 0,
         trigger: "hover",
         children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_iconButton.FcrIconButton, {
           icon: _type2.FcrIconType.FCR_WINDOWPAGE_BIGGER,
-          onClick: moveChatFromDialogToAside,
+          onClick: store.moveChatFromDialogToAside,
           className: "frc-window-header__icon fcr-no-drag",
           iconColors: {
             iconPrimary: 'var(--fcr_ui_scene_icontext1)'
@@ -44,15 +39,27 @@ var ChatDialog = exports.ChatDialog = function ChatDialog(_ref) {
         })
       })]
     }),
-    width: 800,
-    height: waitingRoomState ? 630 : 600,
+    width: (0, _env.isElectron)() ? 800 : 520 // APAAS-10264 聊天在 web 下宽度改成520
+    ,
+    height: store.waitingRoomState ? 630 : 600,
     dialogKey: _constant.FcrUIDialogKey.CHAT,
-    onClose: closeChatFromDialog,
-    children: children
+    onClose: store.closeChatFromDialog,
+    children: props.children
+  });
+});
+var ChatDialog = exports.ChatDialog = function ChatDialog(_ref) {
+  var children = _ref.children,
+    chatAction = _ref.chatAction;
+  var store = (0, _react.useContext)(_store.StoreContext);
+  var container = /*#__PURE__*/(0, _jsxRuntime.jsx)(_store.StoreContext.Provider, {
+    value: store,
+    children: /*#__PURE__*/(0, _jsxRuntime.jsx)(Container, {
+      chatAction: chatAction,
+      children: children
+    })
   });
   if ((0, _env.isElectron)()) {
     return /*#__PURE__*/(0, _jsxRuntime.jsx)(_electron.ChatElectronDialog, {
-      chatAction: chatAction,
       children: container
     });
   }

package/lib/modules/dialog/components/confirm-leave-meeting/index.d.ts

@@ -0,0 +1,6 @@
+import { FC, PropsWithChildren } from 'react';
+export declare const ConfirmLeaveMeetingDialog: FC<PropsWithChildren<{
+    title: string;
+    onOk: () => void;
+    onCancel: () => void;
+}>>;