fcr-ui-scene 3.6.2 → 3.6.3

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

@@ -55,22 +55,21 @@ var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/cl
 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 _decorator = require("agora-foundation/lib/decorator");
-var _type2 = require("fcr-core/lib/room-control/type");
+var _type = require("fcr-core/lib/room-control/type");
 var _fcrCore = require("fcr-core");
-var _type3 = require("fcr-core/lib/type");
+var _type2 = require("fcr-core/lib/type");
 var _react = require("react");
 var _stopButton = _interopRequireDefault(require("./components/stop-live-streaming/stop-button"));
 var _constant = require("../../utilities/constant");
 var _enums = require("./enums");
 var _leaveMeeting = require("../components/leave-meeting");
-var _type4 = require("../../type");
+var _type3 = require("../../type");
 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_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_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, _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; }
@@ -95,10 +94,7 @@ var _K = /*#__PURE__*/new WeakMap();
 var _L = /*#__PURE__*/new WeakMap();
 var _M = /*#__PURE__*/new WeakMap();
 var _N = /*#__PURE__*/new WeakMap();
-var _O = /*#__PURE__*/new WeakMap();
-var _P = /*#__PURE__*/new WeakMap();
-var _Q = /*#__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, {
+_ref = (_leaveConfirmRefDecs = [_mobx.observable, _mobx.observable.ref], _setCheckedStateMapDecs = [_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, {
   leading: true
@@ -157,33 +153,25 @@ var ControlBarStore = exports["default"] = /*#__PURE__*/function () {
     });
     (0, _defineProperty2["default"])(this, "_participantDialogId", '');
     _classPrivateFieldInitSpec(this, _A, _init_leaveConfirmRef(this, undefined));
-    _classPrivateFieldInitSpec(this, _B, _init_currentShareId(this, ''));
-    _classPrivateFieldInitSpec(this, _C, _init_currentShareType(this, _type.AgoraRtcScreenCaptureType.SCREEN));
-    _classPrivateFieldInitSpec(this, _D, _init_currentShareBounds(this, {
-      width: 0,
-      height: 0,
-      x: 0,
-      y: 0
-    }));
-    _classPrivateFieldInitSpec(this, _E, _init_recordShareBounds(this, new Map()));
-    _classPrivateFieldInitSpec(this, _F, _init_cloudRecordingState(this, _type3.FcrRecordingState.Stopped));
-    _classPrivateFieldInitSpec(this, _G, _init_isHost(this, false));
-    _classPrivateFieldInitSpec(this, _H, _init_roomDuration(this, 0));
-    _classPrivateFieldInitSpec(this, _I, _init_startTime(this, new Date().getTime()));
-    _classPrivateFieldInitSpec(this, _J, _init_playUrl(this, ''));
-    _classPrivateFieldInitSpec(this, _K, _init_liveStreamingState(this, _type3.FcrLiveStreamingState.STOPPED));
-    _classPrivateFieldInitSpec(this, _L, _init_allApplicationWindows(this, []));
-    _classPrivateFieldInitSpec(this, _M, _init_roomInfo(this, {
+    _classPrivateFieldInitSpec(this, _B, _init_recordShareBounds(this, new Map()));
+    _classPrivateFieldInitSpec(this, _C, _init_cloudRecordingState(this, _type2.FcrRecordingState.Stopped));
+    _classPrivateFieldInitSpec(this, _D, _init_isHost(this, false));
+    _classPrivateFieldInitSpec(this, _E, _init_roomDuration(this, 0));
+    _classPrivateFieldInitSpec(this, _F, _init_startTime(this, new Date().getTime()));
+    _classPrivateFieldInitSpec(this, _G, _init_playUrl(this, ''));
+    _classPrivateFieldInitSpec(this, _H, _init_liveStreamingState(this, _type2.FcrLiveStreamingState.STOPPED));
+    _classPrivateFieldInitSpec(this, _I, _init_allApplicationWindows(this, []));
+    _classPrivateFieldInitSpec(this, _J, _init_roomInfo(this, {
       roomId: '',
       roomName: '',
-      roomType: _type2.FcrRoomType.Mainroom,
+      roomType: _type.FcrRoomType.Mainroom,
       password: '',
       inviteLink: ''
     }));
-    _classPrivateFieldInitSpec(this, _N, _init_isShowMeetingDetailPortal(this, false));
-    _classPrivateFieldInitSpec(this, _O, _init_hiddenShareActionNav(this, false));
-    _classPrivateFieldInitSpec(this, _P, _init_boardOwnerUser(this, ''));
-    _classPrivateFieldInitSpec(this, _Q, _init_currentShareDisplayId(this, 0));
+    _classPrivateFieldInitSpec(this, _K, _init_isShowMeetingDetailPortal(this, false));
+    _classPrivateFieldInitSpec(this, _L, _init_hiddenShareActionNav(this, false));
+    _classPrivateFieldInitSpec(this, _M, _init_boardOwnerUser(this, ''));
+    _classPrivateFieldInitSpec(this, _N, _init_currentShareDisplayId(this, 0));
     this._uiEventStore = uiEventStore;
     this._roomControl = roomControl;
     this._securityStore = securityStore;
@@ -236,7 +224,7 @@ var ControlBarStore = exports["default"] = /*#__PURE__*/function () {
       _classPrivateFieldSet(_A, this, v);
     }
   }, {
-    key: "currentShareId",
+    key: "recordShareBounds",
     get: function get() {
       return _classPrivateFieldGet(_B, this);
     },
@@ -244,7 +232,7 @@ var ControlBarStore = exports["default"] = /*#__PURE__*/function () {
       _classPrivateFieldSet(_B, this, v);
     }
   }, {
-    key: "currentShareType",
+    key: "cloudRecordingState",
     get: function get() {
       return _classPrivateFieldGet(_C, this);
     },
@@ -252,7 +240,7 @@ var ControlBarStore = exports["default"] = /*#__PURE__*/function () {
       _classPrivateFieldSet(_C, this, v);
     }
   }, {
-    key: "currentShareBounds",
+    key: "isHost",
     get: function get() {
       return _classPrivateFieldGet(_D, this);
     },
@@ -260,7 +248,7 @@ var ControlBarStore = exports["default"] = /*#__PURE__*/function () {
       _classPrivateFieldSet(_D, this, v);
     }
   }, {
-    key: "recordShareBounds",
+    key: "roomDuration",
     get: function get() {
       return _classPrivateFieldGet(_E, this);
     },
@@ -268,7 +256,7 @@ var ControlBarStore = exports["default"] = /*#__PURE__*/function () {
       _classPrivateFieldSet(_E, this, v);
     }
   }, {
-    key: "cloudRecordingState",
+    key: "startTime",
     get: function get() {
       return _classPrivateFieldGet(_F, this);
     },
@@ -276,7 +264,7 @@ var ControlBarStore = exports["default"] = /*#__PURE__*/function () {
       _classPrivateFieldSet(_F, this, v);
     }
   }, {
-    key: "isHost",
+    key: "playUrl",
     get: function get() {
       return _classPrivateFieldGet(_G, this);
     },
@@ -284,7 +272,7 @@ var ControlBarStore = exports["default"] = /*#__PURE__*/function () {
       _classPrivateFieldSet(_G, this, v);
     }
   }, {
-    key: "roomDuration",
+    key: "liveStreamingState",
     get: function get() {
       return _classPrivateFieldGet(_H, this);
     },
@@ -292,7 +280,7 @@ var ControlBarStore = exports["default"] = /*#__PURE__*/function () {
       _classPrivateFieldSet(_H, this, v);
     }
   }, {
-    key: "startTime",
+    key: "allApplicationWindows",
     get: function get() {
       return _classPrivateFieldGet(_I, this);
     },
@@ -300,7 +288,7 @@ var ControlBarStore = exports["default"] = /*#__PURE__*/function () {
       _classPrivateFieldSet(_I, this, v);
     }
   }, {
-    key: "playUrl",
+    key: "roomInfo",
     get: function get() {
       return _classPrivateFieldGet(_J, this);
     },
@@ -308,7 +296,7 @@ var ControlBarStore = exports["default"] = /*#__PURE__*/function () {
       _classPrivateFieldSet(_J, this, v);
     }
   }, {
-    key: "liveStreamingState",
+    key: "isShowMeetingDetailPortal",
     get: function get() {
       return _classPrivateFieldGet(_K, this);
     },
@@ -316,7 +304,7 @@ var ControlBarStore = exports["default"] = /*#__PURE__*/function () {
       _classPrivateFieldSet(_K, this, v);
     }
   }, {
-    key: "allApplicationWindows",
+    key: "hiddenShareActionNav",
     get: function get() {
       return _classPrivateFieldGet(_L, this);
     },
@@ -324,7 +312,7 @@ var ControlBarStore = exports["default"] = /*#__PURE__*/function () {
       _classPrivateFieldSet(_L, this, v);
     }
   }, {
-    key: "roomInfo",
+    key: "boardOwnerUser",
     get: function get() {
       return _classPrivateFieldGet(_M, this);
     },
@@ -332,7 +320,7 @@ var ControlBarStore = exports["default"] = /*#__PURE__*/function () {
       _classPrivateFieldSet(_M, this, v);
     }
   }, {
-    key: "isShowMeetingDetailPortal",
+    key: "currentShareDisplayId",
     get: function get() {
       return _classPrivateFieldGet(_N, this);
     },
@@ -340,33 +328,24 @@ var ControlBarStore = exports["default"] = /*#__PURE__*/function () {
       _classPrivateFieldSet(_N, this, v);
     }
   }, {
-    key: "hiddenShareActionNav",
+    key: "shareWithAudio",
     get: function get() {
-      return _classPrivateFieldGet(_O, this);
-    },
-    set: function set(v) {
-      _classPrivateFieldSet(_O, this, v);
+      return this._sharedScreenShareSharedDataSource.shareWithAudio;
     }
   }, {
-    key: "boardOwnerUser",
+    key: "currentShareId",
     get: function get() {
-      return _classPrivateFieldGet(_P, this);
-    },
-    set: function set(v) {
-      _classPrivateFieldSet(_P, this, v);
+      return this._sharedScreenShareSharedDataSource.currentShareId;
     }
   }, {
-    key: "currentShareDisplayId",
+    key: "currentShareType",
     get: function get() {
-      return _classPrivateFieldGet(_Q, this);
-    },
-    set: function set(v) {
-      _classPrivateFieldSet(_Q, this, v);
+      return this._sharedScreenShareSharedDataSource.currentShareType;
     }
   }, {
-    key: "shareWithAudio",
+    key: "currentShareBounds",
     get: function get() {
-      return this._sharedScreenShareSharedDataSource.shareWithAudio;
+      return this._sharedScreenShareSharedDataSource.currentSelectionBounds;
     }
   }, {
     key: "privilegeProvider",
@@ -529,32 +508,16 @@ var ControlBarStore = exports["default"] = /*#__PURE__*/function () {
     get: function get() {
       return this._sharedScreenShareSharedDataSource.isSharingScreen;
     }
+  }, {
+    key: "isReplaceScreen",
+    get: function get() {
+      return this._sharedScreenShareSharedDataSource.isReplaceScreen;
+    }
   }, {
     key: "setCheckedStateMap",
     value: function setCheckedStateMap(val) {
       this._sharedSecuritySharedDataSource.setCheckedStateMap(val);
     }
-  }, {
-    key: "initControlBar",
-    value: function initControlBar(payload, _browserWindow) {
-      // this._screenShareDataSource.setCurrentShareAudioProcessingChannel(
-      //   payload.currentShareAudioProcessingChannel,
-      // );
-      this.currentShareId = payload.currentShareId;
-      this.currentShareType = payload.currentShareType;
-      this.currentShareBounds = payload.currentShareBounds;
-      this.setShareWithAudioState(payload.shareWithAudio);
-    }
-  }, {
-    key: "updateCurrentShareContent",
-    value: function updateCurrentShareContent(payload) {
-      var id = payload.id,
-        type = payload.type,
-        bounds = payload.bounds;
-      this.currentShareId = id;
-      this.currentShareType = type;
-      this.currentShareBounds = bounds;
-    }
   }, {
     key: "setShareWithAudioState",
     value: function setShareWithAudioState(withAudio) {
@@ -628,7 +591,7 @@ var ControlBarStore = exports["default"] = /*#__PURE__*/function () {
           var dispose = (0, _mobx.reaction)(function () {
             return _this2.liveStreamingState;
           }, function (liveStreamingState) {
-            if (liveStreamingState === _type3.FcrLiveStreamingState.STOPPED) {
+            if (liveStreamingState === _type2.FcrLiveStreamingState.STOPPED) {
               _this2._liveStreamingDialogKey && _this2._uiEventStore.closeDialog(_this2._liveStreamingDialogKey);
               dispose();
             }
@@ -677,7 +640,7 @@ var ControlBarStore = exports["default"] = /*#__PURE__*/function () {
     key: "startCloudRecording",
     value: function startCloudRecording() {
       this._roomControl.startCloudRecording({
-        audioProfile: _type3.FcrCloudRecordingAudioProfile.DEFAULT,
+        audioProfile: _type2.FcrCloudRecordingAudioProfile.DEFAULT,
         videoEncoderConfig: {
           dimensions: {
             width: 1280,
@@ -770,28 +733,25 @@ var ControlBarStore = exports["default"] = /*#__PURE__*/function () {
   }, {
     key: "_resetMessageCount",
     value: function _resetMessageCount() {
-      this.newMessageCount = (0, _defineProperty2["default"])({}, _type4.FcrUIRoomType.MAIN_ROOM, 0);
+      this.newMessageCount = (0, _defineProperty2["default"])({}, _type3.FcrUIRoomType.MAIN_ROOM, 0);
     }
   }]);
 }();
 _ControlBarStore = ControlBarStore;
-var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_ControlBarStore, [[_leaveConfirmRefDecs, 17, "leaveConfirmRef"], [_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, "hasAnnotationAllowWritePermission"], [_mobx.computed, 3, "hasAnnotationStartPermission"], [_mobx.computed, 3, "allowAnnotationWriteState"], [_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"], [_decorator.bound, 2, "toggleAnnotation"], [_decorator.bound, 2, "setAllAnnotationWrite"], [_decorator.bound, 2, "log"], [_resetMessageCountDecs, 18, "_resetMessageCount"]], []).e, 18);
+var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_ControlBarStore, [[_leaveConfirmRefDecs, 17, "leaveConfirmRef"], [_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, "hasAnnotationAllowWritePermission"], [_mobx.computed, 3, "hasAnnotationStartPermission"], [_mobx.computed, 3, "allowAnnotationWriteState"], [_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"], [_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"], [_decorator.bound, 2, "toggleAnnotation"], [_decorator.bound, 2, "setAllAnnotationWrite"], [_decorator.bound, 2, "log"], [_resetMessageCountDecs, 18, "_resetMessageCount"]], []).e, 15);
 _init_leaveConfirmRef = _applyDecs$e[0];
-_init_currentShareId = _applyDecs$e[1];
-_init_currentShareType = _applyDecs$e[2];
-_init_currentShareBounds = _applyDecs$e[3];
-_init_recordShareBounds = _applyDecs$e[4];
-_init_cloudRecordingState = _applyDecs$e[5];
-_init_isHost = _applyDecs$e[6];
-_init_roomDuration = _applyDecs$e[7];
-_init_startTime = _applyDecs$e[8];
-_init_playUrl = _applyDecs$e[9];
-_init_liveStreamingState = _applyDecs$e[10];
-_init_allApplicationWindows = _applyDecs$e[11];
-_init_roomInfo = _applyDecs$e[12];
-_init_isShowMeetingDetailPortal = _applyDecs$e[13];
-_init_hiddenShareActionNav = _applyDecs$e[14];
-_init_boardOwnerUser = _applyDecs$e[15];
-_init_currentShareDisplayId = _applyDecs$e[16];
-_initProto = _applyDecs$e[17];
+_init_recordShareBounds = _applyDecs$e[1];
+_init_cloudRecordingState = _applyDecs$e[2];
+_init_isHost = _applyDecs$e[3];
+_init_roomDuration = _applyDecs$e[4];
+_init_startTime = _applyDecs$e[5];
+_init_playUrl = _applyDecs$e[6];
+_init_liveStreamingState = _applyDecs$e[7];
+_init_allApplicationWindows = _applyDecs$e[8];
+_init_roomInfo = _applyDecs$e[9];
+_init_isShowMeetingDetailPortal = _applyDecs$e[10];
+_init_hiddenShareActionNav = _applyDecs$e[11];
+_init_boardOwnerUser = _applyDecs$e[12];
+_init_currentShareDisplayId = _applyDecs$e[13];
+_initProto = _applyDecs$e[14];
 var StoreContext = exports.StoreContext = /*#__PURE__*/(0, _react.createContext)(null);

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

@@ -58,6 +58,7 @@ var _tools = require("../../utilities/tools");
 var _enums = require("./enums");
 var _constant = require("../../utilities/constant");
 var _type2 = require("../../type");
+var _annotationButton = require("./components/annotation-button");
 var _jsxRuntime = require("react/jsx-runtime");
 var _excluded = ["x", "y"];
 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; }
@@ -74,6 +75,7 @@ var ControlBarView = exports.ControlBarView = (0, _mobxReact.observer)(function
     setShareAudioProcessingChannel = _useContext2.setShareAudioProcessingChannel,
     createNewShare = _useContext2.createNewShare,
     currentShareId = _useContext2.currentShareId,
+    isSharingScreen = _useContext2.isSharingScreen,
     handleMoreClick = _useContext2.handleMoreClick,
     liveStreamingState = _useContext2.liveStreamingState,
     cloudRecordingState = _useContext2.cloudRecordingState,
@@ -92,6 +94,7 @@ var ControlBarView = exports.ControlBarView = (0, _mobxReact.observer)(function
     showLockedRoomToast = _useContext2.showLockedRoomToast,
     checkedStateMap = _useContext2.checkedStateMap,
     setCheckedStateMap = _useContext2.setCheckedStateMap,
+    isReplaceScreen = _useContext2.isReplaceScreen,
     log = _useContext2.log;
   // 控制栏本身的高度
   var NAV_HEIGHT = 84;
@@ -281,14 +284,14 @@ var ControlBarView = exports.ControlBarView = (0, _mobxReact.observer)(function
         y: y
       }, bounds);
       browserWindow.setBounds(screenBounds);
-      log("[ControlBarView]: [getScreenBounds], screenBounds: ".concat(JSON.stringify(screenBounds)));
+      log("[ControlBarView]: [getScreenBounds][screen-share], screenBounds: ".concat(JSON.stringify(screenBounds)));
     } else {
       recordShareBounds.clear();
       screenBounds = (0, _tools.getCurrentSharingWorkArea)({
         currentShareBounds: currentShareBounds
       });
       recordShareBounds.set(currentShareBounds, screenBounds);
-      log("[ControlBarView]: [getScreenBounds], screenBounds: ".concat(JSON.stringify(screenBounds)));
+      log("[ControlBarView]: [getScreenBounds][screen-share], screenBounds: ".concat(JSON.stringify(screenBounds)));
     }
     return screenBounds;
   }
@@ -329,6 +332,45 @@ var ControlBarView = exports.ControlBarView = (0, _mobxReact.observer)(function
       clearInterval(windowFocusTimerRef.current);
     };
   }, [currentShareId]);
+
+  // useEffect(() => {
+  //   console.log('isReplaceScreen', isReplaceScreen);
+  //   return () => {
+  //     if (isReplaceScreen) {
+  //       const mainWindowVisible = window.runtime.browserWindow.isVisible();
+  //       log(
+  //         `[ControlBarView]:[screen-share]: control bar is destroying, main window is ${mainWindowVisible ? 'visible' : 'hidden'}, isReplaceScreen: ${isReplaceScreen}`,
+  //       );
+  //       // 当 control bar 卸载时，看看主窗口是否隐藏，如果隐藏，则显示主窗口
+  //       if (!mainWindowVisible) {
+  //         window.runtime.browserWindow.show();
+  //         log(
+  //           `[ControlBarView]:[screen-share]: main window is hiding at control bar destroyed, show main window`,
+  //         );
+  //       }
+  //       // 当 control bar 卸载时，看看 controlbar 的 window 是否仍然存在 ，如果存在则隐藏
+  //       if (browserWindow.isVisible()) {
+  //         browserWindow.hide();
+  //         log(
+  //           `[ControlBarView]:[screen-share]: control bar window is showing at control bar destroyed, hide control bar window`,
+  //         );
+  //       }
+  //     }
+  //   };
+  // }, [isReplaceScreen]);
+
+  // useEffect(() => {
+  //   return () => {
+  //     log(
+  //       `[ControlBarView]:[screen-share]: control bar is destroying, sharing state is ${isSharingScreen ? 'sharing' : 'not sharing'}`,
+  //     );
+  //     // 如果 controlbar 销毁后共享状态仍然进行，则再次尝试停止共享
+  //     if (isSharingScreen) {
+  //       handlerStopShare();
+  //     }
+  //   };
+  // }, [isSharingScreen]);
+
   return currentShareId ? /*#__PURE__*/(0, _jsxRuntime.jsx)("div", _objectSpread(_objectSpread({}, bind()), {}, {
     style: {
       width: 'fit-content',
@@ -393,7 +435,7 @@ var ControlBarView = exports.ControlBarView = (0, _mobxReact.observer)(function
             }
           }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_shareScreenButton.ShareScreenButton, {
             onCreateNewShareButtonClick: createNewShare
-          }), hasStopLiveStreamingPermission && liveStreamingState === _type.FcrLiveStreamingState.STARTED && /*#__PURE__*/(0, _jsxRuntime.jsx)(_stopLiveStreaming.StopLiveStreamingButton, {}), hasStartCloudRecordingPermission && cloudRecordingState !== _type.FcrRecordingState.Stopped && /*#__PURE__*/(0, _jsxRuntime.jsx)(_cloudRecordingButtons.CloudRecordingButtons, {}), /*#__PURE__*/(0, _jsxRuntime.jsx)(_badge.FcrBadge, {
+          }), hasAnnotationStartPermission && /*#__PURE__*/(0, _jsxRuntime.jsx)(_annotationButton.AnnotationButton, {}), hasStopLiveStreamingPermission && liveStreamingState === _type.FcrLiveStreamingState.STARTED && /*#__PURE__*/(0, _jsxRuntime.jsx)(_stopLiveStreaming.StopLiveStreamingButton, {}), hasStartCloudRecordingPermission && cloudRecordingState !== _type.FcrRecordingState.Stopped && /*#__PURE__*/(0, _jsxRuntime.jsx)(_cloudRecordingButtons.CloudRecordingButtons, {}), /*#__PURE__*/(0, _jsxRuntime.jsx)(_badge.FcrBadge, {
             count: newMessageCount[_type2.FcrUIRoomType.MAIN_ROOM] || 0,
             children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_more.More, {
               visible: moreVisible,

package/lib/modules/dialog/components/control-bar/index.d.ts

@@ -1,10 +1,8 @@
 import { ControlBarUIModule } from '../../../control-bar';
-import { FcrUIShareSelectionDisplayProps } from '../../../share-screen/types';
 import { PropsWithChildren } from 'react';
 import { CurrentShareBounds } from '../../../control-bar/types';
 export declare const config: Electron.BrowserWindowConstructorOptions;
 export declare const ControlBarDialog: (props: PropsWithChildren<{
-    params: FcrUIShareSelectionDisplayProps;
     module: ControlBarUIModule;
 }>) => null;
 export declare const setBounds: (currentShareBounds: CurrentShareBounds, browserWindow: Electron.BrowserWindow) => Promise<void>;

package/lib/modules/dialog/components/control-bar/index.js

@@ -32,15 +32,13 @@ var config = exports.config = {
   skipTaskbar: true
 };
 var ControlBarDialog = exports.ControlBarDialog = (0, _mobxReact.observer)(function (props) {
-  var module = props.module,
-    params = props.params;
+  var module = props.module;
   var eventProvider = module.eventProvider;
   var _useContext = (0, _react.useContext)(_store.StoreContext),
     currentShareId = _useContext.currentShareId,
     currentShareBounds = _useContext.currentShareBounds;
   var children = function children(browserWindow) {
     return module.getComponent({
-      params: params,
       browserWindow: browserWindow
     });
   };

package/lib/modules/dialog/hooks/useElectron.js

@@ -101,8 +101,9 @@ function useElectronDialog(props) {
           browserWindow: browserWindow,
           alwaysFollowScreen: fullScreen
         }),
-        nearDisplayBounds = _ref.nearDisplayBounds;
-      store === null || store === void 0 || store.log("[useElectronDialog]: dialogKey: ".concat(dialogKey, ", nearDisplayBounds: ").concat(JSON.stringify(nearDisplayBounds)));
+        nearDisplayBounds = _ref.nearDisplayBounds,
+        followControlbar = _ref.followControlbar;
+      store === null || store === void 0 || store.log("[useElectronDialog]: dialogKey: ".concat(dialogKey, ", ").concat(followControlbar ? 'control bar' : 'main window', " nearing display bounds: ").concat(JSON.stringify(nearDisplayBounds)));
 
       // 设置所有窗口为所有工作区可见
       browserWindow.setVisibleOnAllWorkspaces(true, {

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

@@ -10,8 +10,6 @@ import { FcrUIPrivilegeProvider } from '../../providers/privilege-provider';
 import { FcrUIDialogProvider } from '../../providers/dialog-provider';
 import { FcrUIPhoneAudioConnectorProvider } from '../../providers/phone-audio-provider';
 import { FcrUIAbilityProviderImpl } from '../../providers/ability-provider';
-import { FcrUIAction } from '../../utilities/constant';
-import { CurrentShareScreenTypes } from '../share-screen/types';
 import { FcrUIDialogInfo } from './type';
 import { FcrUIWidgetProvider } from '../../providers/widget-provider';
 import { FcrUIChatProvider } from '../../providers/chat-provider';
@@ -43,5 +41,4 @@ export declare class DialogUIModule extends UIModule {
     onNodeWillInactive(): void;
     getComponent(): import("react/jsx-runtime").JSX.Element;
     addDialogs(dialogs: FcrUIDialogInfo[]): void;
-    onUiEvent(event: FcrUIAction, payload: CurrentShareScreenTypes): void;
 }

package/lib/modules/dialog/index.js

@@ -1,17 +1,9 @@
 "use strict";
 
-require("core-js/modules/es.symbol.js");
-require("core-js/modules/es.array.filter.js");
-require("core-js/modules/es.array.push.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/es.reflect.construct.js");
 require("core-js/modules/es.weak-map.js");
-require("core-js/modules/esnext.async-iterator.filter.js");
-require("core-js/modules/esnext.iterator.filter.js");
 require("core-js/modules/esnext.weak-map.delete-all.js");
 require("core-js/modules/esnext.weak-map.emplace.js");
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
@@ -23,7 +15,6 @@ exports.DialogUIModule = void 0;
 require("core-js/modules/es.array.concat.js");
 require("core-js/modules/es.array.for-each.js");
 require("core-js/modules/es.array.iterator.js");
-require("core-js/modules/es.function.bind.js");
 require("core-js/modules/es.map.js");
 require("core-js/modules/es.object.to-string.js");
 require("core-js/modules/es.string.iterator.js");
@@ -56,12 +47,9 @@ var _base = require("../../base");
 var _store = _interopRequireWildcard(require("./store"));
 var _view = require("./view");
 var _type = require("fcr-core/lib/room-control/type");
-var _constant = require("../../utilities/constant");
 var _jsxRuntime = require("react/jsx-runtime");
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { "default": e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n["default"] = e, t && t.set(e, n), n; }
-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 _callSuper(t, o, e) { return o = (0, _getPrototypeOf2["default"])(o), (0, _possibleConstructorReturn2["default"])(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], (0, _getPrototypeOf2["default"])(t).constructor) : o.apply(t, e)); }
 function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
 var DialogUIModule = exports.DialogUIModule = /*#__PURE__*/function (_UIModule) {
@@ -91,7 +79,7 @@ var DialogUIModule = exports.DialogUIModule = /*#__PURE__*/function (_UIModule)
           remoteVideoRenderManager: this.remoteVideoRenderProvider,
           localVideoRenderProvider: this.localVideoRenderProvider,
           securityStore: ((_this$currentRoomCont3 = this.currentRoomControlProvider) === null || _this$currentRoomCont3 === void 0 || (_this$currentRoomCont3 = _this$currentRoomCont3.currentRoomControl.getRoomInfo()) === null || _this$currentRoomCont3 === void 0 ? void 0 : _this$currentRoomCont3.roomType) === _type.FcrRoomType.Mainroom ? (_this$mainRoomControl = this.mainRoomControlProvider) === null || _this$mainRoomControl === void 0 ? void 0 : _this$mainRoomControl.privilegeProvider : (_this$waitingRoomCont = this.waitingRoomControlProvider) === null || _this$waitingRoomCont === void 0 ? void 0 : _this$waitingRoomCont.privilegeProvider,
-          uiEventStore: this.eventProvider,
+          eventProvider: this.eventProvider,
           sharedLayoutDataSource: this.sharedLayoutDataSource,
           dialogProvider: this.dialogProvider,
           phoneAudioConnectorProvider: this.phoneAudioConnectorProvider,
@@ -102,9 +90,6 @@ var DialogUIModule = exports.DialogUIModule = /*#__PURE__*/function (_UIModule)
           screenShareProvider: this.screenShareProvider,
           sharedScreenShareSharedDataSource: this.sharedScreenShareSharedDataSource
         });
-        this.eventProvider.addObserver({
-          onEvent: this.onUiEvent.bind(this)
-        });
       }
     }
   }, {
@@ -132,14 +117,5 @@ var DialogUIModule = exports.DialogUIModule = /*#__PURE__*/function (_UIModule)
         _this2._dialogsByKey.set(dialog.key, dialog.component);
       });
     }
-  }, {
-    key: "onUiEvent",
-    value: function onUiEvent(event, payload) {
-      switch (event) {
-        case _constant.FcrUIAction.SET_CURRENT_SHARE_SCREEN:
-          this._store.updateCurrentShareContent(_objectSpread({}, payload));
-          break;
-      }
-    }
   }]);
 }(_base.UIModule);

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

@@ -9,7 +9,6 @@ import { FcrUIDialogProvider } from '../../providers/dialog-provider';
 import { FcrUIPhoneAudioConnectorProvider } from '../../providers/phone-audio-provider';
 import { AgoraRtcScreenCaptureType, AgoraRtcWindowInfo } from 'agora-rte-sdk/lib/core/rtc/type';
 import { CurrentShareBounds } from '../control-bar/types';
-import { CurrentShareScreenTypes } from '../share-screen/types';
 import { FcrUIDialogComponent } from './type';
 import { FcrUIWidgetProvider } from '../../providers/widget-provider';
 import { FcrUIChatProvider } from '../../providers/chat-provider';
@@ -21,7 +20,7 @@ export declare const HIGH_LEVEL_DIALOG_LAYER: FcrUIDialogKey[];
 export declare const TOP_LEVEL_DIALOG_LAYER: FcrUIDialogKey[];
 export default class DialogStore {
     protected logger: import("agora-foundation/lib/logger").Logger;
-    private _uiEventStore;
+    private _eventProvider;
     private _userInfo;
     private _streamControl;
     private _userControl;
@@ -50,11 +49,11 @@ export default class DialogStore {
     accessor participantElectronDialogContainer: HTMLElement | null;
     accessor currentDialogBounds: Map<FcrUIDialogKey, number>;
     accessor videoWindowBounds: any;
-    accessor currentShareId: string;
-    accessor currentShareType: AgoraRtcScreenCaptureType;
-    accessor currentShareBounds: CurrentShareBounds;
     accessor recordShareBounds: Map<CurrentShareBounds, CurrentShareScreenWorkArea>;
     accessor allApplicationWindows: AgoraRtcWindowInfo[];
+    get currentShareId(): string;
+    get currentShareType(): AgoraRtcScreenCaptureType;
+    get currentShareBounds(): CurrentShareBounds;
     get dialogComponentMapByKey(): Map<FcrUIDialogKey, FcrUIDialogComponent>;
     get participantCount(): number;
     get isManager(): boolean;
@@ -74,10 +73,10 @@ export default class DialogStore {
     get chatRoomState(): import("fcr-core/lib/room-control/chatroom-control/type").FcrChatRoomConnectionState;
     get isSharingScreen(): boolean;
     get isSharingScreenOwner(): boolean;
-    constructor({ uiEventStore, userControl, deviceStore, streamControl, localVideoRenderProvider, remoteVideoRenderManager, securityStore, sharedLayoutDataSource, dialogProvider, phoneAudioConnectorProvider, dialogsByKey, widgetProvider, screenShareProvider, chatProvider, sharedScreenShareSharedDataSource, }: {
+    constructor({ eventProvider, userControl, deviceStore, streamControl, localVideoRenderProvider, remoteVideoRenderManager, securityStore, sharedLayoutDataSource, dialogProvider, phoneAudioConnectorProvider, dialogsByKey, widgetProvider, screenShareProvider, chatProvider, sharedScreenShareSharedDataSource, }: {
         streamControl: FcrStreamControl;
         userControl: FcrUserControl;
-        uiEventStore: FcrUIEventProvider;
+        eventProvider: FcrUIEventProvider;
         securityStore: FcrUIPrivilegeProvider;
         deviceStore: FcrUIDeviceProvider;
         localVideoRenderProvider: FcrUILocalVideoRenderProvider;
@@ -104,7 +103,6 @@ export default class DialogStore {
     moveParticipantFromDialogToAside(): void;
     release(): void;
     resizeVideoWindow(width: number, height: number): void;
-    updateCurrentShareContent(payload: CurrentShareScreenTypes): void;
     recordCurrentSharingScreenBounds(): CurrentShareScreenWorkArea;
     log(info: string): void;
     private _handleDialogEvent;