fcr-ui-scene 3.5.1 → 3.6.0

package/lib/modules/share-screen/store.js

@@ -92,7 +92,7 @@ var _constant = require("../../utilities/constant");
 var _logger = require("../../utilities/logger");
 var _parameters = require("../../utilities/parameters");
 var _ShareScreenStore;
-var _initProto, _init_screenSharingState, _init_applicationCaptureSources, _init_screenCaptureSources, _init_currentShareAudioProcessingChannel, _init_currentSelection, _init_currentSelectionType, _init_shareWithAudio, _init_boardOwnerUser, _init_currentSelectionBounds, _handleChooseScreenDecs, _init_handleChooseScreen, _setShareWithAudioStateDecs, _hasLoopbackDeviceDecs, _setShareAudioProcessingChannelDecs, _openRelaunchTipsDialogDecs, _startPreviewDecs, _handleStopShareDecs, _handleStartShareDecs, _startLoopbackDecs, _handleShareStartWithAudioDecs, _handleShareStopWithAudioDecs, _openShareScreenSelectionDecs, _closeShareScreenSelectionDecs, _setControlBarWindowIdDecs, _openVideoWindowDialogDecs, _closeControlBarDecs, _closeVideoWindowDialogDecs, _setWithAudioStateDecs, _handleReplaceScreenDecs, _handleScreenCaptureStateUpdatedDecs, _setShareLockDecs, _handleStreamUpdateDecs, _initControlbarDecs, _ref;
+var _initProto, _init_screenSharingState, _init_applicationCaptureSources, _init_screenCaptureSources, _init_currentSelection, _init_currentSelectionType, _init_shareWithAudio, _init_boardOwnerUser, _init_currentSelectionBounds, _init_connectionState, _handleChooseScreenDecs, _init_handleChooseScreen, _setShareWithAudioStateDecs, _hasLoopbackDeviceDecs, _setShareAudioProcessingChannelDecs, _openRelaunchTipsDialogDecs, _startPreviewDecs, _handleStopShareDecs, _handleStartShareDecs, _startLoopbackDecs, _handleShareStartWithAudioDecs, _handleShareStopWithAudioDecs, _openShareScreenSelectionDecs, _closeShareScreenSelectionDecs, _setControlBarWindowIdDecs, _openVideoWindowDialogDecs, _closeControlBarDecs, _closeVideoWindowDialogDecs, _setWithAudioStateDecs, _handleReplaceScreenDecs, _handleScreenCaptureStateUpdatedDecs, _setShareLockDecs, _handleStreamUpdateDecs, _initControlbarDecs, _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; }
@@ -124,7 +124,9 @@ var ShareScreenStore = exports["default"] = /*#__PURE__*/function () {
       eventProvider = _ref2.eventProvider,
       sharedMemberDataSource = _ref2.sharedMemberDataSource,
       roomProvider = _ref2.roomProvider,
-      sharedConfigDataSource = _ref2.sharedConfigDataSource;
+      sharedConfigDataSource = _ref2.sharedConfigDataSource,
+      connectionProvider = _ref2.connectionProvider,
+      screenShareDataSource = _ref2.screenShareDataSource;
     (0, _classCallCheck2["default"])(this, ShareScreenStore);
     (0, _defineProperty2["default"])(this, _ref, (_initProto(this), (0, _logger.createLogger)({
       prefix: 'ShareScreenStore'
@@ -135,8 +137,14 @@ var ShareScreenStore = exports["default"] = /*#__PURE__*/function () {
     (0, _defineProperty2["default"])(this, "_removeScreenStreamFailed", false);
     (0, _defineProperty2["default"])(this, "_isReplaceScreen", false);
     (0, _defineProperty2["default"])(this, "_previewDom", null);
+    (0, _defineProperty2["default"])(this, "_connectionObserver", {
+      onConnectionStateUpdated: function onConnectionStateUpdated(state) {
+        _this.connectionState = state;
+      }
+    });
     (0, _defineProperty2["default"])(this, "_roomObserver", {
-      onRoomClosed: this.handleStopShare
+      onRoomClosed: this.handleStopShare,
+      onLeaveMainRoom: this.handleStopShare
     });
     (0, _defineProperty2["default"])(this, "_observer", {
       onScreenCaptureStateUpdated: (0, _env.isElectron)() ? this._handleScreenCaptureStateUpdated : this._handleWebScreenCaptureStateUpdated
@@ -175,21 +183,22 @@ var ShareScreenStore = exports["default"] = /*#__PURE__*/function () {
     (0, _defineProperty2["default"])(this, "_shareAudioTrack", null);
     (0, _defineProperty2["default"])(this, "_currentShareId", '');
     (0, _defineProperty2["default"])(this, "_currentShareType", _type.AgoraRtcScreenCaptureType.SCREEN);
+    (0, _defineProperty2["default"])(this, "_isOnline", true);
     _classPrivateFieldInitSpec(this, _A, _init_screenSharingState(this, _fcrCore.FcrMediaSourceState.CLOSE));
     _classPrivateFieldInitSpec(this, _B, _init_applicationCaptureSources(this, []));
     _classPrivateFieldInitSpec(this, _C, _init_screenCaptureSources(this, []));
-    _classPrivateFieldInitSpec(this, _D, _init_currentShareAudioProcessingChannel(this, _shareAudio.AudioProcessingChannel.MONO));
-    _classPrivateFieldInitSpec(this, _E, _init_currentSelection(this, (0, _env.isElectron)() ? '' : 'default'));
-    _classPrivateFieldInitSpec(this, _F, _init_currentSelectionType(this, _type.AgoraRtcScreenCaptureType.WINDOW));
-    _classPrivateFieldInitSpec(this, _G, _init_shareWithAudio(this, !(0, _env.isElectron)()));
+    _classPrivateFieldInitSpec(this, _D, _init_currentSelection(this, (0, _env.isElectron)() ? '' : 'default'));
+    _classPrivateFieldInitSpec(this, _E, _init_currentSelectionType(this, _type.AgoraRtcScreenCaptureType.WINDOW));
+    _classPrivateFieldInitSpec(this, _F, _init_shareWithAudio(this, !(0, _env.isElectron)()));
     // electron 默认 false，web 默认 true
-    _classPrivateFieldInitSpec(this, _H, _init_boardOwnerUser(this, undefined));
-    _classPrivateFieldInitSpec(this, _I, _init_currentSelectionBounds(this, {
+    _classPrivateFieldInitSpec(this, _G, _init_boardOwnerUser(this, undefined));
+    _classPrivateFieldInitSpec(this, _H, _init_currentSelectionBounds(this, {
       x: 0,
       y: 0,
       width: 0,
       height: 0
     }));
+    _classPrivateFieldInitSpec(this, _I, _init_connectionState(this, _fcrCore.FcrConnectionState.CONNECTED));
     (0, _defineProperty2["default"])(this, "handleChooseScreen", _init_handleChooseScreen(this, function (id) {
       var type = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : _type.AgoraRtcScreenCaptureType.WINDOW;
       var bounds = arguments.length > 2 ? arguments[2] : undefined;
@@ -204,6 +213,8 @@ var ShareScreenStore = exports["default"] = /*#__PURE__*/function () {
     this._securityStore = privilegeProvider;
     this._roomProvider = roomProvider;
     this._sharedMemberDataSource = sharedMemberDataSource;
+    this._connectionProvider = connectionProvider;
+    this._screenShareDataSource = screenShareDataSource;
     this._streamControl = roomControl.getStreamControl();
     this._userControl = roomControl.getUserControl();
     this._boardControl = roomControl.getBoardControl();
@@ -211,6 +222,7 @@ var ShareScreenStore = exports["default"] = /*#__PURE__*/function () {
     this._eventProvider.addObserver(this._uiEventObserver);
     this._streamControl.addObserver(this._streamObserver);
     this._boardControl.addObserver(this._boardObserver);
+    this._connectionProvider.addObserver(this._connectionObserver);
     this._addEventListeners();
     this._syncShareStreamState();
     if ((0, _parameters.getStartScreenSharing)(sharedConfigDataSource.creatorConfig.parameters)) {
@@ -255,7 +267,7 @@ var ShareScreenStore = exports["default"] = /*#__PURE__*/function () {
       _classPrivateFieldSet(_C, this, v);
     }
   }, {
-    key: "currentShareAudioProcessingChannel",
+    key: "currentSelection",
     get: function get() {
       return _classPrivateFieldGet(_D, this);
     },
@@ -263,7 +275,7 @@ var ShareScreenStore = exports["default"] = /*#__PURE__*/function () {
       _classPrivateFieldSet(_D, this, v);
     }
   }, {
-    key: "currentSelection",
+    key: "currentSelectionType",
     get: function get() {
       return _classPrivateFieldGet(_E, this);
     },
@@ -271,7 +283,7 @@ var ShareScreenStore = exports["default"] = /*#__PURE__*/function () {
       _classPrivateFieldSet(_E, this, v);
     }
   }, {
-    key: "currentSelectionType",
+    key: "shareWithAudio",
     get: function get() {
       return _classPrivateFieldGet(_F, this);
     },
@@ -279,7 +291,7 @@ var ShareScreenStore = exports["default"] = /*#__PURE__*/function () {
       _classPrivateFieldSet(_F, this, v);
     }
   }, {
-    key: "shareWithAudio",
+    key: "boardOwnerUser",
     get: function get() {
       return _classPrivateFieldGet(_G, this);
     },
@@ -287,7 +299,7 @@ var ShareScreenStore = exports["default"] = /*#__PURE__*/function () {
       _classPrivateFieldSet(_G, this, v);
     }
   }, {
-    key: "boardOwnerUser",
+    key: "currentSelectionBounds",
     get: function get() {
       return _classPrivateFieldGet(_H, this);
     },
@@ -295,7 +307,7 @@ var ShareScreenStore = exports["default"] = /*#__PURE__*/function () {
       _classPrivateFieldSet(_H, this, v);
     }
   }, {
-    key: "currentSelectionBounds",
+    key: "connectionState",
     get: function get() {
       return _classPrivateFieldGet(_I, this);
     },
@@ -332,6 +344,11 @@ var ShareScreenStore = exports["default"] = /*#__PURE__*/function () {
     get: function get() {
       return this._deviceProvider.getDisplayList();
     }
+  }, {
+    key: "currentShareAudioProcessingChannel",
+    get: function get() {
+      return this._screenShareDataSource.currentShareAudioProcessingChannel;
+    }
   }, {
     key: "setShareWithAudioState",
     value: function setShareWithAudioState(withAudio) {
@@ -363,8 +380,8 @@ var ShareScreenStore = exports["default"] = /*#__PURE__*/function () {
     }()
   }, {
     key: "setShareAudioProcessingChannel",
-    value: function setShareAudioProcessingChannel(currentShareAudioProcessingChannel) {
-      this.currentShareAudioProcessingChannel = currentShareAudioProcessingChannel;
+    value: function setShareAudioProcessingChannel(channel) {
+      this._screenShareDataSource.setCurrentShareAudioProcessingChannel(channel);
     }
   }, {
     key: "handlerBoardShareStop",
@@ -386,6 +403,7 @@ var ShareScreenStore = exports["default"] = /*#__PURE__*/function () {
       (_this$_screenTrack = this._screenTrack) === null || _this$_screenTrack === void 0 || _this$_screenTrack.removeObserver(this._observer);
       this._boardControl.removeObserver(this._boardObserver);
       this._roomProvider.removeObserver(this._roomObserver);
+      this._connectionProvider.removeObserver(this._connectionObserver);
     }
   }, {
     key: "openRelaunchTipsDialog",
@@ -480,6 +498,7 @@ var ShareScreenStore = exports["default"] = /*#__PURE__*/function () {
         var audioProcessingChannel,
           bounds,
           excludeWindows,
+          electronBounds,
           screenTrack,
           _args3 = arguments;
         return _regenerator["default"].wrap(function _callee3$(_context3) {
@@ -487,29 +506,38 @@ var ShareScreenStore = exports["default"] = /*#__PURE__*/function () {
             case 0:
               audioProcessingChannel = _args3.length > 3 && _args3[3] !== undefined ? _args3[3] : _shareAudio.AudioProcessingChannel.MONO;
               bounds = _args3.length > 4 ? _args3[4] : undefined;
+              if (!(this.connectionState !== _fcrCore.FcrConnectionState.CONNECTED || !this._isOnline)) {
+                _context3.next = 5;
+                break;
+              }
+              this._showToast((0, _i18n.transI18n)('fmt_screenshare_toast_network_error_unable_start_screen_share'), 'error');
+              return _context3.abrupt("return", Promise.reject(false));
+            case 5:
               excludeWindows = [];
               if ((0, _env.isElectron)()) this._closeShareScreenSelection();
               if (!(id.split('-')[0] === 'whiteboard')) {
-                _context3.next = 9;
+                _context3.next = 12;
                 break;
               }
               if (!(!this._securityStore.hasStartBoardPermission() && !this.isHost)) {
-                _context3.next = 7;
+                _context3.next = 10;
                 break;
               }
               return _context3.abrupt("return", this._showToast((0, _i18n.transI18n)('fmt_screenshare_tips_hostprohibits'), 'error'));
-            case 7:
+            case 10:
               this._eventProvider.sendEvent(_constant.FcrUIAction.OPEN_WHITEBOARD);
               return _context3.abrupt("return");
-            case 9:
+            case 12:
+              electronBounds = (0, _env.isElectron)() ? window.runtime.screen.getDisplayNearestPoint(bounds) : null;
+              this._screenShareDataSource.setCurrentShareBounds((electronBounds === null || electronBounds === void 0 ? void 0 : electronBounds.bounds) || bounds);
               if (!(this.screenSharingState === _fcrCore.FcrMediaSourceState.OPEN)) {
-                _context3.next = 13;
+                _context3.next = 18;
                 break;
               }
               this._handleReplaceScreen(id, type, withAudio, audioProcessingChannel, bounds);
               this._setShareLock(false);
               return _context3.abrupt("return");
-            case 13:
+            case 18:
               this._eventProvider.sendEvent(_constant.FcrUIAction.SET_CURRENT_SHARE_SCREEN, {
                 id: id,
                 type: type,
@@ -517,26 +545,26 @@ var ShareScreenStore = exports["default"] = /*#__PURE__*/function () {
               });
               _context3.t0 = this.supportEnumScreen;
               if (!_context3.t0) {
-                _context3.next = 19;
+                _context3.next = 24;
                 break;
               }
-              _context3.next = 18;
+              _context3.next = 23;
               return this._validateShareStart(id, type);
-            case 18:
+            case 23:
               _context3.t0 = !_context3.sent;
-            case 19:
+            case 24:
               if (!_context3.t0) {
-                _context3.next = 21;
+                _context3.next = 26;
                 break;
               }
               return _context3.abrupt("return");
-            case 21:
+            case 26:
               if (!this._shareLocked) {
-                _context3.next = 23;
+                _context3.next = 28;
                 break;
               }
               return _context3.abrupt("return", this._showToast((0, _i18n.transI18n)('fmt_screenshare_tips_enablecollection'), 'error'));
-            case 23:
+            case 28:
               this._setShareLock(true);
               this.setShareWithAudioState(withAudio);
               this._currentShareId = id;
@@ -544,25 +572,25 @@ var ShareScreenStore = exports["default"] = /*#__PURE__*/function () {
               this.currentSelectionBounds = bounds;
               if (withAudio) this._handleShareStartWithAudio();
               if (this._hasScreenSharePermission()) {
-                _context3.next = 32;
+                _context3.next = 37;
                 break;
               }
               this._setShareLock(false);
               return _context3.abrupt("return");
-            case 32:
+            case 37:
               this._initControlbar(); // 初始化控制栏，web 和 electron 都需要执行
               if (!(0, _env.isElectron)()) {
-                _context3.next = 39;
+                _context3.next = 44;
                 break;
               }
-              _context3.next = 36;
+              _context3.next = 41;
               return this._createScreenStream(id);
-            case 36:
-              _context3.next = 38;
+            case 41:
+              _context3.next = 43;
               return this._getExcludeWindows();
-            case 38:
+            case 43:
               excludeWindows = _context3.sent;
-            case 39:
+            case 44:
               screenTrack = this._deviceProvider.getScreenTrack(id);
               this._screenTrack = screenTrack;
               screenTrack.addObserver(this._observer);
@@ -571,7 +599,7 @@ var ShareScreenStore = exports["default"] = /*#__PURE__*/function () {
                 withAudio: withAudio,
                 excludeWindows: excludeWindows
               });
-            case 43:
+            case 48:
             case "end":
               return _context3.stop();
           }
@@ -809,19 +837,16 @@ var ShareScreenStore = exports["default"] = /*#__PURE__*/function () {
               audioSourceId = this._loopbackAudioSourceId;
               _context7.next = 6;
               return this._streamControl.addLocalScreenStream({
-                streamType: _type2.AgoraRteMediaStreamType.BOTH
+                streamType: _type2.AgoraRteMediaStreamType.BOTH,
+                videoSourceId: videoSourceId,
+                audioSourceId: audioSourceId
               })["finally"](function () {
                 _this6._setShareLock(false);
               });
             case 6:
               streamId = _context7.sent;
-              this._streamControl.bindLocalStreams([{
-                streamId: streamId,
-                audioSourceId: audioSourceId,
-                videoSourceId: videoSourceId
-              }]);
               this._currentShareStreamId = streamId;
-            case 9:
+            case 8:
             case "end":
               return _context7.stop();
           }
@@ -965,11 +990,12 @@ var ShareScreenStore = exports["default"] = /*#__PURE__*/function () {
     }
   }, {
     key: "_isStoppedFor",
-    value: function _isStoppedFor(events, reason) {
+    value: function _isStoppedFor(events, reason, ownerIsMe) {
       var _this8 = this;
       return events && events.find(function (event) {
         var _event$cause;
-        return ((_event$cause = event.cause) === null || _event$cause === void 0 || (_event$cause = _event$cause.data) === null || _event$cause === void 0 ? void 0 : _event$cause.reason) === reason && event.modifiedStream.owner.userId === _this8.localUser.userId;
+        var condition = ownerIsMe ? event.modifiedStream.owner.userId === _this8.localUser.userId : event.modifiedStream.owner.userId !== _this8.localUser.userId;
+        return ((_event$cause = event.cause) === null || _event$cause === void 0 || (_event$cause = _event$cause.data) === null || _event$cause === void 0 ? void 0 : _event$cause.reason) === reason && condition;
       });
     }
   }, {
@@ -978,6 +1004,7 @@ var ShareScreenStore = exports["default"] = /*#__PURE__*/function () {
       var _this$_screenTrack10,
         _this9 = this;
       var isClosedByOther = this._isStoppedFor(events, _types.FcrBoardInactiveReason.CLOSE);
+      var isClosed = this._isStoppedFor(events, _types.FcrBoardInactiveReason.CLOSE, false);
       var isSeizedByOther = this._isStoppedFor(events, _types.FcrBoardInactiveReason.SEIZE);
       var operatorUser = (isSeizedByOther === null || isSeizedByOther === void 0 ? void 0 : isSeizedByOther.operatorUser) || (isClosedByOther === null || isClosedByOther === void 0 ? void 0 : isClosedByOther.operatorUser);
       var ownerUser = (isSeizedByOther === null || isSeizedByOther === void 0 ? void 0 : isSeizedByOther.modifiedStream.owner) || (isClosedByOther === null || isClosedByOther === void 0 ? void 0 : isClosedByOther.modifiedStream.owner);
@@ -985,7 +1012,6 @@ var ShareScreenStore = exports["default"] = /*#__PURE__*/function () {
       var isMyOwnShare = this.localUser.userId === (ownerUser === null || ownerUser === void 0 ? void 0 : ownerUser.userId);
       (isSeizedByOther || isClosedByOther) && !selfOperated && ((_this$_screenTrack10 = this._screenTrack) === null || _this$_screenTrack10 === void 0 ? void 0 : _this$_screenTrack10.stop());
       isClosedByOther && !selfOperated && isMyOwnShare && this._eventProvider.sendEvent(_constant.FcrUIAction.SHOW_TOAST, {
-        type: 'info',
         message: (0, _i18n.transI18n)('fmt_share_tips_sharingdisabled')
       });
       switch (process) {
@@ -1000,18 +1026,38 @@ var ShareScreenStore = exports["default"] = /*#__PURE__*/function () {
             } // web 下如果是替换的逻辑，不需要关闭分享
             (_this$_screenTrack11 = this._screenTrack) === null || _this$_screenTrack11 === void 0 || _this$_screenTrack11.stop();
           }
+          if (isClosed) {
+            this._eventProvider.sendEvent(_constant.FcrUIAction.SHOW_TOAST, {
+              message: (0, _i18n.transI18n)('fmt_screenshare_whiteboard_tips_stopped')
+            });
+          }
           break;
       }
     }
   }, {
     key: "_addEventListeners",
     value: function _addEventListeners() {
-      window.addEventListener('online', this._syncShareStreamState);
+      window.addEventListener('online', this._handleOnline);
+      window.addEventListener('offline', this._handleOffline);
     }
   }, {
     key: "_removeEventListeners",
     value: function _removeEventListeners() {
-      window.removeEventListener('online', this._syncShareStreamState);
+      window.removeEventListener('online', this._handleOnline);
+      window.removeEventListener('offline', this._handleOffline);
+    }
+  }, {
+    key: "_handleOnline",
+    value: function _handleOnline() {
+      this._isOnline = true;
+      this.logger.info('ononline');
+      this._syncShareStreamState();
+    }
+  }, {
+    key: "_handleOffline",
+    value: function _handleOffline() {
+      this._isOnline = false;
+      this.logger.info('onoffline');
     }
   }, {
     key: "_onUiEvent",
@@ -1275,16 +1321,16 @@ var ShareScreenStore = exports["default"] = /*#__PURE__*/function () {
   }]);
 }();
 _ShareScreenStore = ShareScreenStore;
-var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_ShareScreenStore, [[_mobx.observable, 1, "screenSharingState"], [_mobx.observable, 1, "applicationCaptureSources"], [_mobx.observable, 1, "screenCaptureSources"], [_mobx.observable, 1, "currentShareAudioProcessingChannel"], [_mobx.observable, 1, "currentSelection"], [_mobx.observable, 1, "currentSelectionType"], [_mobx.observable, 1, "shareWithAudio"], [_mobx.observable, 1, "boardOwnerUser"], [_mobx.observable, 1, "currentSelectionBounds"], [_mobx.computed, 3, "localUser"], [_mobx.computed, 3, "localUserRole"], [_mobx.computed, 3, "isHost"], [_setShareWithAudioStateDecs, 18, "setShareWithAudioState"], [_hasLoopbackDeviceDecs, 18, "hasLoopbackDevice"], [_setShareAudioProcessingChannelDecs, 18, "setShareAudioProcessingChannel"], [_decorator.bound, 2, "handlerBoardShareStop"], [_decorator.bound, 2, "release"], [_openRelaunchTipsDialogDecs, 18, "openRelaunchTipsDialog"], [_startPreviewDecs, 18, "startPreview"], [_handleStopShareDecs, 18, "handleStopShare"], [_handleStartShareDecs, 18, "handleStartShare"], [_startLoopbackDecs, 18, "_startLoopback"], [_handleShareStartWithAudioDecs, 18, "_handleShareStartWithAudio"], [_handleShareStopWithAudioDecs, 18, "_handleShareStopWithAudio"], [_openShareScreenSelectionDecs, 18, "_openShareScreenSelection"], [_closeShareScreenSelectionDecs, 18, "_closeShareScreenSelection"], [_setControlBarWindowIdDecs, 18, "_setControlBarWindowId"], [_openVideoWindowDialogDecs, 18, "_openVideoWindowDialog"], [_closeControlBarDecs, 18, "_closeControlBar"], [_closeVideoWindowDialogDecs, 18, "_closeVideoWindowDialog"], [_setWithAudioStateDecs, 18, "_setWithAudioState"], [_handleReplaceScreenDecs, 18, "_handleReplaceScreen"], [_decorator.bound, 2, "_handleWebScreenCaptureStateUpdated"], [_handleScreenCaptureStateUpdatedDecs, 18, "_handleScreenCaptureStateUpdated"], [_setShareLockDecs, 18, "_setShareLock"], [_decorator.bound, 2, "_syncShareStreamState"], [_handleStreamUpdateDecs, 18, "_handleStreamUpdate"], [_initControlbarDecs, 18, "_initControlbar"], [_handleChooseScreenDecs, 16, "handleChooseScreen"]], []).e, 11);
+var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_ShareScreenStore, [[_mobx.observable, 1, "screenSharingState"], [_mobx.observable, 1, "applicationCaptureSources"], [_mobx.observable, 1, "screenCaptureSources"], [_mobx.observable, 1, "currentSelection"], [_mobx.observable, 1, "currentSelectionType"], [_mobx.observable, 1, "shareWithAudio"], [_mobx.observable, 1, "boardOwnerUser"], [_mobx.observable, 1, "currentSelectionBounds"], [_mobx.observable, 1, "connectionState"], [_setShareWithAudioStateDecs, 18, "setShareWithAudioState"], [_hasLoopbackDeviceDecs, 18, "hasLoopbackDevice"], [_setShareAudioProcessingChannelDecs, 18, "setShareAudioProcessingChannel"], [_decorator.bound, 2, "handlerBoardShareStop"], [_decorator.bound, 2, "release"], [_openRelaunchTipsDialogDecs, 18, "openRelaunchTipsDialog"], [_startPreviewDecs, 18, "startPreview"], [_handleStopShareDecs, 18, "handleStopShare"], [_handleStartShareDecs, 18, "handleStartShare"], [_startLoopbackDecs, 18, "_startLoopback"], [_handleShareStartWithAudioDecs, 18, "_handleShareStartWithAudio"], [_handleShareStopWithAudioDecs, 18, "_handleShareStopWithAudio"], [_openShareScreenSelectionDecs, 18, "_openShareScreenSelection"], [_closeShareScreenSelectionDecs, 18, "_closeShareScreenSelection"], [_setControlBarWindowIdDecs, 18, "_setControlBarWindowId"], [_openVideoWindowDialogDecs, 18, "_openVideoWindowDialog"], [_closeControlBarDecs, 18, "_closeControlBar"], [_closeVideoWindowDialogDecs, 18, "_closeVideoWindowDialog"], [_setWithAudioStateDecs, 18, "_setWithAudioState"], [_handleReplaceScreenDecs, 18, "_handleReplaceScreen"], [_decorator.bound, 2, "_handleWebScreenCaptureStateUpdated"], [_handleScreenCaptureStateUpdatedDecs, 18, "_handleScreenCaptureStateUpdated"], [_setShareLockDecs, 18, "_setShareLock"], [_decorator.bound, 2, "_syncShareStreamState"], [_handleStreamUpdateDecs, 18, "_handleStreamUpdate"], [_decorator.bound, 2, "_handleOnline"], [_decorator.bound, 2, "_handleOffline"], [_initControlbarDecs, 18, "_initControlbar"], [_handleChooseScreenDecs, 16, "handleChooseScreen"]], []).e, 11);
 _init_screenSharingState = _applyDecs$e[0];
 _init_applicationCaptureSources = _applyDecs$e[1];
 _init_screenCaptureSources = _applyDecs$e[2];
-_init_currentShareAudioProcessingChannel = _applyDecs$e[3];
-_init_currentSelection = _applyDecs$e[4];
-_init_currentSelectionType = _applyDecs$e[5];
-_init_shareWithAudio = _applyDecs$e[6];
-_init_boardOwnerUser = _applyDecs$e[7];
-_init_currentSelectionBounds = _applyDecs$e[8];
+_init_currentSelection = _applyDecs$e[3];
+_init_currentSelectionType = _applyDecs$e[4];
+_init_shareWithAudio = _applyDecs$e[5];
+_init_boardOwnerUser = _applyDecs$e[6];
+_init_currentSelectionBounds = _applyDecs$e[7];
+_init_connectionState = _applyDecs$e[8];
 _init_handleChooseScreen = _applyDecs$e[9];
 _initProto = _applyDecs$e[10];
 var StoreContext = exports.StoreContext = /*#__PURE__*/(0, _react.createContext)(null);

package/lib/modules/share-screen/view.js

@@ -9,9 +9,9 @@ var _fcrCore = require("fcr-core");
 var _env = require("agora-foundation/lib/utilities/env");
 var _mobxReact = require("mobx-react");
 var _react = require("react");
-require("./index.css");
 var _shareStateBar = require("./components/share-state-bar");
 var _store = require("./store");
+require("./index.css");
 var _jsxRuntime = require("react/jsx-runtime");
 var View = exports.View = (0, _mobxReact.observer)(function () {
   var _useContext = (0, _react.useContext)(_store.StoreContext),

package/lib/modules/state-bar/index.css

@@ -65,7 +65,8 @@
   cursor: pointer;
 }
 
-.fcr-state-bar__info-network:hover {
+.fcr-state-bar__info-network:hover,
+.fcr-state-bar__info-network.active {
   background: var(--fcr_web_ui_scene_hover);
 }
 
@@ -89,7 +90,8 @@
   pointer-events: none;
 }
 
-.fcr-state-bar__info-detail:hover {
+.fcr-state-bar__info-detail:hover,
+.fcr-state-bar__info-detail.active {
   background: var(--fcr_web_ui_scene_hover);
 }
 

package/lib/modules/state-bar/index.d.ts

@@ -10,6 +10,7 @@ import { FcrUIMemberSharedDataSource } from '../../shared-data-source/member-dat
 import { FcrUILocalStorageProvider } from '../../providers/local-storage-provider';
 import { FcrUIAbilityProviderImpl } from 'fcr-ui-scene/src/providers/ability-provider';
 import { FcrUIMeetingTimeSharedDataSource } from '../../shared-data-source/meeting-time';
+import { FcrUIDialogProvider } from '../../providers/dialog-provider';
 export declare class StateBarUIModule extends UIModule {
     private _store?;
     currentRoomControlProvider?: FcrUICurrentRoomControlProvider;
@@ -25,6 +26,7 @@ export declare class StateBarUIModule extends UIModule {
     messageProvider?: FcrUIMessageProvider;
     localStorageProvider?: FcrUILocalStorageProvider;
     abilityProvider?: FcrUIAbilityProviderImpl;
+    dialogProvider?: FcrUIDialogProvider;
     onNodeWillActive(): void;
     getComponent(): import("react/jsx-runtime").JSX.Element;
     onNodeWillInactive(): void;

package/lib/modules/state-bar/index.js

@@ -57,7 +57,8 @@ var StateBarUIModule = exports.StateBarUIModule = /*#__PURE__*/function (_UIModu
         sharedMemberDataSource: this.sharedMemberDataSource,
         localStorageProvider: this.localStorageProvider,
         abilityProvider: this.abilityProvider,
-        sharedMeetingTimeDataSource: this.sharedMeetingTimeDataSource
+        sharedMeetingTimeDataSource: this.sharedMeetingTimeDataSource,
+        dialogProvider: this.dialogProvider
       });
     }
   }, {

package/lib/modules/state-bar/layout-config.js

@@ -114,6 +114,7 @@ var LayoutConfig = exports.LayoutConfig = (0, _mobxReact.observer)(function (pro
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_view.MyFcrToolTip, {
     content: t('fmt_uimanager_labels_Switchview'),
     children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_popover.FcrPopover, {
+      showArrow: false,
       trigger: "click",
       content: /*#__PURE__*/(0, _jsxRuntime.jsx)(LayoutPanel, {
         gridViews: layoutSize,

package/lib/modules/state-bar/live-streaming-state.js

@@ -128,6 +128,7 @@ var LiveStreamingState = exports.LiveStreamingState = (0, _mobxReact.observer)(f
     });
   };
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_popover.FcrPopover, {
+    showArrow: false,
     content: /*#__PURE__*/(0, _jsxRuntime.jsx)(PopoverContent, {}),
     placement: "bottomRight",
     visible: visible,

package/lib/modules/state-bar/meeting-detail.css

@@ -24,7 +24,7 @@
   word-break: break-all;
   text-align: left;
   min-height: 34px;
-  line-height: 34px;
+  line-height: 23px;
 }
 
 .meeting-details__content-meeting-id,
@@ -126,3 +126,12 @@
 .meeting-details__footer > button > p > span {
   margin-left: 8px;
 }
+
+.meeting-details__footer_copy_btn {
+  display: flex;
+  align-items: center;
+}
+
+.meeting-details__icon {
+  margin-right: 4px;
+}

package/lib/modules/state-bar/meeting-details.js

@@ -21,7 +21,7 @@ var _react = require("react");
 var _store = require("./store");
 require("./meeting-detail.css");
 var _classnames = _interopRequireDefault(require("classnames"));
-var _meetingDetail2 = require("../../utilities/meeting-detail");
+var _tooltip = require("agora-ui-foundation/lib/components/tooltip");
 var _jsxRuntime = require("react/jsx-runtime");
 var CopyState = /*#__PURE__*/function (CopyState) {
   CopyState[CopyState["COPYINIT"] = 1] = "COPYINIT";
@@ -49,15 +49,15 @@ var MeetingDetails = exports.MeetingDetails = (0, _mobxReact.observer)(function
     password = _useContext.password,
     meetingId = _useContext.meetingId,
     showToast = _useContext.showToast,
-    meetingTime = _useContext.meetingTime;
+    meetingTime = _useContext.meetingTime,
+    roomDetailCopyText = _useContext.roomDetailCopyText;
   var shareLink = (0, _react.useMemo)(function () {
     return getShareLink();
   }, []);
   if (!roomInfo || !localUser) return /*#__PURE__*/(0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {});
   var displayMeetingId = (0, _tools.renderMeetingId)(meetingId, roomInfo.roomId);
-  var duration = (scheduleInfo === null || scheduleInfo === void 0 ? void 0 : scheduleInfo.duration) || 0;
-  var meetingSetTime = (0, _meetingDetail2.generateMeetingDuration)((scheduleInfo === null || scheduleInfo === void 0 ? void 0 : scheduleInfo.startTime) || 0, duration);
-  var detailText = (0, _meetingDetail2.generateMeetingDetail)(localUser.userName, roomInfo.roomName, meetingSetTime, shareLink, displayMeetingId, password !== null && password !== void 0 ? password : '');
+  // const renderMeetingRoom = renderMeetingName(roomInfo.roomName);
+  var renderMeetingRoomName = roomInfo.roomName;
   function handleCopyMeetingId(copyContent) {
     if (!copyContent) return;
     var content = meetingId ? copyContent : copyContent.replace(/\s+/g, '');
@@ -111,7 +111,7 @@ var MeetingDetails = exports.MeetingDetails = (0, _mobxReact.observer)(function
       copyIcon: _type.FcrIconType.FCR_RESET,
       copyText: t('fmt_meeting_call_voice_call_button_copy_info')
     });
-    (0, _copyText.copyText)(detailText).then(function () {
+    (0, _copyText.copyText)(roomDetailCopyText).then(function () {
       copyTimer = setTimeout(function () {
         setCopyInfoState({
           copyState: CopyState.COPIED,
@@ -151,9 +151,13 @@ var MeetingDetails = exports.MeetingDetails = (0, _mobxReact.observer)(function
     className: "meeting-details",
     children: [/*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
       className: "meeting-details__content",
-      children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
-        className: "meeting-details__content-meeting-subject",
-        children: roomInfo.roomName
+      children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_tooltip.FcrToolTip, {
+        content: roomInfo.roomName,
+        placement: "bottom",
+        children: /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+          className: "meeting-details__content-meeting-subject",
+          children: renderMeetingRoomName
+        })
       }), /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
         className: "meeting-details__content-meeting-id",
         children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("label", {
@@ -162,11 +166,14 @@ var MeetingDetails = exports.MeetingDetails = (0, _mobxReact.observer)(function
           children: displayMeetingId
         }), /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
           onClick: function onClick() {
-            return handleCopyMeetingId(displayMeetingId);
+            return handleCopyMeetingId(meetingId || roomInfo.roomId);
           },
           children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_icon.FcrIcon, {
             type: _type.FcrIconType.FCR_COPY_ICON,
-            size: 20
+            size: 20,
+            colors: {
+              iconPrimary: 'var(--fcr_ui_scene_icontext1)'
+            }
           })
         })]
       }), !!password && /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
@@ -183,7 +190,10 @@ var MeetingDetails = exports.MeetingDetails = (0, _mobxReact.observer)(function
           },
           children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_icon.FcrIcon, {
             type: _type.FcrIconType.FCR_COPY_ICON,
-            size: 20
+            size: 20,
+            colors: {
+              iconPrimary: 'var(--fcr_ui_scene_icontext1)'
+            }
           })
         })]
       }), /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
@@ -198,7 +208,10 @@ var MeetingDetails = exports.MeetingDetails = (0, _mobxReact.observer)(function
           },
           children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_icon.FcrIcon, {
             type: _type.FcrIconType.FCR_COPY_ICON,
-            size: 20
+            size: 20,
+            colors: {
+              iconPrimary: 'var(--fcr_ui_scene_icontext1)'
+            }
           })
         })]
       }), /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
@@ -211,22 +224,25 @@ var MeetingDetails = exports.MeetingDetails = (0, _mobxReact.observer)(function
       })]
     }), /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
       className: "meeting-details__footer",
-      children: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_button.FcrButton, {
+      children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_button.FcrButton, {
         size: "XS",
         shape: "rounded",
         onClick: handlerCopyMeetingDetail,
-        children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_icon.FcrIcon, {
-          className: (0, _classnames["default"])({
-            'meeting-details__reset-icon': copyInfoState.copyState === CopyState.COPYING
-          }),
-          type: copyInfoState.copyIcon,
-          size: 20,
-          colors: {
-            iconPrimary: 'var(--fcr_ui_scene_white10)'
-          }
-        }), /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
-          children: copyInfoState.copyText
-        })]
+        children: /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
+          className: "meeting-details__footer_copy_btn",
+          children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_icon.FcrIcon, {
+            className: (0, _classnames["default"])('meeting-details__icon', {
+              'meeting-details__reset-icon': copyInfoState.copyState === CopyState.COPYING
+            }),
+            type: copyInfoState.copyIcon,
+            size: 20,
+            colors: {
+              iconPrimary: 'var(--fcr_ui_scene_white10)'
+            }
+          }), /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+            children: copyInfoState.copyText
+          })]
+        })
       })
     })]
   });