fcr-ui-scene 3.7.7 → 3.7.8

package/lib/modules/action-bar/store.d.ts

@@ -29,7 +29,6 @@ import { FcrUIScreenShareSharedDataSource } from '../../shared-data-source/scree
 import { FcrUIAbilityProviderImpl } from '../../providers/ability-provider';
 import { FcrUISharedApplistSource } from '../../shared-data-source/app-list-data';
 import { FcrUIApplistProvider } from '../../providers/app-list-provider';
-import { FcrUISharedWhiteboardDataSource } from '../../shared-data-source/whiteboard-data';
 export declare enum AudioConnectType {
     NONE = 0,
     COMPUTER = 1,
@@ -63,7 +62,6 @@ export default class ActionBarStore {
     private _abilityProvider;
     private _applistProvider;
     private _sharedApplistDataSource;
-    private _sharedWhiteboardDataSource;
     private _userObserver;
     private _roomObserver;
     private _mainRoomObserver;
@@ -80,6 +78,7 @@ export default class ActionBarStore {
     accessor cloudRecordingState: FcrRecordingState;
     accessor connectionSettingVisible: boolean;
     accessor folded: boolean;
+    accessor boardOwnerUser: FcrUserInfo | null;
     accessor showArrow: boolean;
     accessor phoneMicEnabled: boolean;
     accessor chatTabIndex: FcrUIRoomType;
@@ -111,7 +110,6 @@ export default class ActionBarStore {
         abilityProvider: FcrUIAbilityProviderImpl;
         applistProvider: FcrUIApplistProvider;
         sharedApplistDataSource: FcrUISharedApplistSource;
-        sharedWhiteboardDataSource: FcrUISharedWhiteboardDataSource;
     });
     private _handleApplistItemClick;
     get checkedStateMap(): FcrSecurityCheckedStateType;
@@ -154,6 +152,7 @@ export default class ActionBarStore {
     get hasWatermarkDisablePermission(): boolean;
     get hasEnableStartSharePermission(): boolean;
     get hasAllowWriteBoardPermission(): boolean;
+    get hasCloseWriteBoardPermission(): boolean;
     get hasScreenShare(): boolean;
     get hasAllowScreenShareAndBoardPermission(): boolean;
     get hasAllowChatPermission(): boolean;
@@ -175,10 +174,8 @@ export default class ActionBarStore {
     get endMeetingPopoverOpened(): boolean;
     set newMessageCount(value: import("./types").ChatRoomStoreMap);
     get latestMessage(): import("../../providers/chat-provider").FcrChatRoomReceiveMessage | undefined;
+    get isRecordingSupported(): boolean;
     get hasSecurityPermissions(): boolean;
-    get isMeSharingScreen(): boolean;
-    get isMeSharingBoard(): boolean;
-    get boardOwnerUser(): FcrUserInfo | undefined;
     pauseCloudRecording(): void;
     resumeCloudRecording(): void;
     stopCloudRecording(): void;

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

@@ -75,15 +75,16 @@ var _type = require("fcr-core/lib/type");
 var _decorator = require("agora-foundation/lib/decorator");
 var _type2 = require("../../type");
 var _env = require("agora-foundation/lib/utilities/env");
-var _type3 = require("agora-ui-foundation/lib/components/icon/type");
+var _type3 = require("../whiteboard/type");
+var _type4 = require("agora-ui-foundation/lib/components/icon/type");
 var _i18n = require("agora-ui-foundation/lib/i18n");
-var _type4 = require("fcr-core/lib/room-control/type");
+var _type5 = require("fcr-core/lib/room-control/type");
 var _react = require("react");
 var _constant = require("../../utilities/constant");
 var _enums = require("./enums");
 var _logger = require("../../utilities/logger");
 var _ActionBarStore;
-var _initProto, _init_newMessageTooltipVisible, _init_totalWaitingRoomUser, _init_liveStreamingState, _init_currentMenuIs, _init_cloudRecordingState, _init_connectionSettingVisible, _init_folded, _init_showArrow, _init_phoneMicEnabled, _init_chatTabIndex, _init_stateBarLeaveMeeting, _init_hasOfflineUserExistence, _init_connectionState, _init_appActionbarPopoverVisible, _setCheckedStateMapDecs, _pauseCloudRecordingDecs, _resumeCloudRecordingDecs, _stopCloudRecordingDecs, _showLockedRoomToastDecs, _toggleLayoutBarLockDecs, _showNewMessageTooltipDecs, _hideNewMessageTooltipDecs, _switchMenuDecs, _setPopoverOpenedDecs, _setStateBarLeaveMeetingDecs, _handleJoinWaitingRoomDecs, _toggleFoldDecs, _setShowArrowDecs, _setEnableWaitingRoomDecs, _kickOutWaitingRoomAllMemberDecs, _moveToMainRoomAllMemberDecs, _handleRemoteUsersJoinedDecs, _handleRemoteUsersLeftDecs, _handleLiveStreamingStateUpdatedDecs, _handleChatVisibleDecs, _setAppActionbarPopoverVisibleDecs, _operateWaitingRoomDecs, _handleCloudRecordingStateUpdatedDecs, _setOutputLanguageDecs, _subscribeLanguageDecs, _subscribeExtraOriginLanguageDecs, _getOfflineUserExistenceStateDecs, _clickWidgetDecs, _closeWidgetDecs, _ref;
+var _initProto, _init_newMessageTooltipVisible, _init_totalWaitingRoomUser, _init_liveStreamingState, _init_currentMenuIs, _init_cloudRecordingState, _init_connectionSettingVisible, _init_folded, _init_boardOwnerUser, _init_showArrow, _init_phoneMicEnabled, _init_chatTabIndex, _init_stateBarLeaveMeeting, _init_hasOfflineUserExistence, _init_connectionState, _init_appActionbarPopoverVisible, _setCheckedStateMapDecs, _pauseCloudRecordingDecs, _resumeCloudRecordingDecs, _stopCloudRecordingDecs, _showLockedRoomToastDecs, _toggleLayoutBarLockDecs, _showNewMessageTooltipDecs, _hideNewMessageTooltipDecs, _switchMenuDecs, _setPopoverOpenedDecs, _setStateBarLeaveMeetingDecs, _handleJoinWaitingRoomDecs, _toggleFoldDecs, _setShowArrowDecs, _setEnableWaitingRoomDecs, _kickOutWaitingRoomAllMemberDecs, _moveToMainRoomAllMemberDecs, _handleRemoteUsersJoinedDecs, _handleRemoteUsersLeftDecs, _handleLiveStreamingStateUpdatedDecs, _handleChatVisibleDecs, _setAppActionbarPopoverVisibleDecs, _operateWaitingRoomDecs, _handleCloudRecordingStateUpdatedDecs, _setOutputLanguageDecs, _subscribeLanguageDecs, _subscribeExtraOriginLanguageDecs, _getOfflineUserExistenceStateDecs, _clickWidgetDecs, _closeWidgetDecs, _ref;
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2["default"])(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _classPrivateFieldInitSpec(e, t, a) { _checkPrivateRedeclaration(e, t), t.set(e, a); }
@@ -116,6 +117,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();
 _ref = (_setCheckedStateMapDecs = [_mobx.action, _mobx.action.bound], _pauseCloudRecordingDecs = [_decorator.bound, (0, _decorator.debounced)(500, {
   leading: true
 })], _resumeCloudRecordingDecs = [_decorator.bound, (0, _decorator.debounced)(500, {
@@ -168,13 +170,14 @@ var ActionBarStore = exports["default"] = /*#__PURE__*/function () {
     _classPrivateFieldInitSpec(this, _E, _init_cloudRecordingState(this));
     _classPrivateFieldInitSpec(this, _F, _init_connectionSettingVisible(this, false));
     _classPrivateFieldInitSpec(this, _G, _init_folded(this, false));
-    _classPrivateFieldInitSpec(this, _H, _init_showArrow(this, false));
-    _classPrivateFieldInitSpec(this, _I, _init_phoneMicEnabled(this, false));
-    _classPrivateFieldInitSpec(this, _J, _init_chatTabIndex(this, _type2.FcrUIRoomType.MAIN_ROOM));
-    _classPrivateFieldInitSpec(this, _K, _init_stateBarLeaveMeeting(this, false));
-    _classPrivateFieldInitSpec(this, _L, _init_hasOfflineUserExistence(this, true));
-    _classPrivateFieldInitSpec(this, _M, _init_connectionState(this, _fcrCore.FcrConnectionState.CONNECTED));
-    _classPrivateFieldInitSpec(this, _N, _init_appActionbarPopoverVisible(this, false));
+    _classPrivateFieldInitSpec(this, _H, _init_boardOwnerUser(this, null));
+    _classPrivateFieldInitSpec(this, _I, _init_showArrow(this, false));
+    _classPrivateFieldInitSpec(this, _J, _init_phoneMicEnabled(this, false));
+    _classPrivateFieldInitSpec(this, _K, _init_chatTabIndex(this, _type2.FcrUIRoomType.MAIN_ROOM));
+    _classPrivateFieldInitSpec(this, _L, _init_stateBarLeaveMeeting(this, false));
+    _classPrivateFieldInitSpec(this, _M, _init_hasOfflineUserExistence(this, true));
+    _classPrivateFieldInitSpec(this, _N, _init_connectionState(this, _fcrCore.FcrConnectionState.CONNECTED));
+    _classPrivateFieldInitSpec(this, _O, _init_appActionbarPopoverVisible(this, false));
     this._roomProvider = args.roomProvider;
     this._roomControl = args.roomControl;
     this._deviceProvider = args.deviceProvider;
@@ -196,7 +199,6 @@ var ActionBarStore = exports["default"] = /*#__PURE__*/function () {
     this._abilityProvider = args.abilityProvider;
     this._applistProvider = args.applistProvider;
     this._sharedApplistDataSource = args.sharedApplistDataSource;
-    this._sharedWhiteboardDataSource = args.sharedWhiteboardDataSource;
     this._applistProvider.addObserver(this._applistObserver);
     this._userControl = this._roomControl.getUserControl();
     this._roomType = (_this$_roomControl$ge = this._roomControl.getRoomInfo()) === null || _this$_roomControl$ge === void 0 ? void 0 : _this$_roomControl$ge.roomType;
@@ -204,7 +206,7 @@ var ActionBarStore = exports["default"] = /*#__PURE__*/function () {
     this.cloudRecordingState = this._roomControl.getCloudRecordingState();
     if (args.interpreterProvider) {
       this._interpreterProvider = args.interpreterProvider;
-      if (this._roomType === _type4.FcrRoomType.Mainroom) {
+      if (this._roomType === _type5.FcrRoomType.Mainroom) {
         this._roomProvider.addObserver(this._roomObserver);
         this._interpreterProvider.addObserver(this._interpreterProviderObserver);
       }
@@ -315,7 +317,7 @@ var ActionBarStore = exports["default"] = /*#__PURE__*/function () {
       _classPrivateFieldSet(_G, this, v);
     }
   }, {
-    key: "showArrow",
+    key: "boardOwnerUser",
     get: function get() {
       return _classPrivateFieldGet(_H, this);
     },
@@ -323,7 +325,7 @@ var ActionBarStore = exports["default"] = /*#__PURE__*/function () {
       _classPrivateFieldSet(_H, this, v);
     }
   }, {
-    key: "phoneMicEnabled",
+    key: "showArrow",
     get: function get() {
       return _classPrivateFieldGet(_I, this);
     },
@@ -331,7 +333,7 @@ var ActionBarStore = exports["default"] = /*#__PURE__*/function () {
       _classPrivateFieldSet(_I, this, v);
     }
   }, {
-    key: "chatTabIndex",
+    key: "phoneMicEnabled",
     get: function get() {
       return _classPrivateFieldGet(_J, this);
     },
@@ -339,7 +341,7 @@ var ActionBarStore = exports["default"] = /*#__PURE__*/function () {
       _classPrivateFieldSet(_J, this, v);
     }
   }, {
-    key: "stateBarLeaveMeeting",
+    key: "chatTabIndex",
     get: function get() {
       return _classPrivateFieldGet(_K, this);
     },
@@ -347,7 +349,7 @@ var ActionBarStore = exports["default"] = /*#__PURE__*/function () {
       _classPrivateFieldSet(_K, this, v);
     }
   }, {
-    key: "hasOfflineUserExistence",
+    key: "stateBarLeaveMeeting",
     get: function get() {
       return _classPrivateFieldGet(_L, this);
     },
@@ -355,7 +357,7 @@ var ActionBarStore = exports["default"] = /*#__PURE__*/function () {
       _classPrivateFieldSet(_L, this, v);
     }
   }, {
-    key: "connectionState",
+    key: "hasOfflineUserExistence",
     get: function get() {
       return _classPrivateFieldGet(_M, this);
     },
@@ -363,13 +365,21 @@ var ActionBarStore = exports["default"] = /*#__PURE__*/function () {
       _classPrivateFieldSet(_M, this, v);
     }
   }, {
-    key: "appActionbarPopoverVisible",
+    key: "connectionState",
     get: function get() {
       return _classPrivateFieldGet(_N, this);
     },
     set: function set(v) {
       _classPrivateFieldSet(_N, this, v);
     }
+  }, {
+    key: "appActionbarPopoverVisible",
+    get: function get() {
+      return _classPrivateFieldGet(_O, this);
+    },
+    set: function set(v) {
+      _classPrivateFieldSet(_O, this, v);
+    }
   }, {
     key: "_handleApplistItemClick",
     value: function _handleApplistItemClick() {
@@ -516,7 +526,8 @@ var ActionBarStore = exports["default"] = /*#__PURE__*/function () {
   }, {
     key: "hasStopScreenSharePermission",
     get: function get() {
-      return this.hasScreenShare && this.hasEnableStartScreenSharePermission && this.sharingOwnerUser && !this.isMeSharingScreen;
+      var _this$sharingOwnerUse;
+      return this.hasScreenShare && this.hasEnableStartScreenSharePermission && this.sharingOwnerUser && this.localUserId !== ((_this$sharingOwnerUse = this.sharingOwnerUser) === null || _this$sharingOwnerUse === void 0 ? void 0 : _this$sharingOwnerUse.userId);
     }
   }, {
     key: "sharingOwnerUser",
@@ -526,7 +537,8 @@ var ActionBarStore = exports["default"] = /*#__PURE__*/function () {
   }, {
     key: "hasEnableStartScreenSharePermission",
     get: function get() {
-      return this._privilegeProvider.hasStopScreenSharePermission();
+      var _this$sharingOwnerUse2;
+      return this._privilegeProvider.hasStopScreenSharePermission((_this$sharingOwnerUse2 = this.sharingOwnerUser) === null || _this$sharingOwnerUse2 === void 0 ? void 0 : _this$sharingOwnerUse2.userRole);
     }
   }, {
     key: "hasStartLiveStreamingPermission",
@@ -583,6 +595,12 @@ var ActionBarStore = exports["default"] = /*#__PURE__*/function () {
     get: function get() {
       return this._privilegeProvider.hasAllowWriteBoardPermission();
     }
+  }, {
+    key: "hasCloseWriteBoardPermission",
+    get: function get() {
+      var _this$boardOwnerUser;
+      return this._privilegeProvider.hasCloseBoardPermission((_this$boardOwnerUser = this.boardOwnerUser) === null || _this$boardOwnerUser === void 0 ? void 0 : _this$boardOwnerUser.userRole);
+    }
   }, {
     key: "hasScreenShare",
     get: function get() {
@@ -658,7 +676,7 @@ var ActionBarStore = exports["default"] = /*#__PURE__*/function () {
   }, {
     key: "isMainRoom",
     get: function get() {
-      return this._roomType === _type4.FcrRoomType.Mainroom;
+      return this._roomType === _type5.FcrRoomType.Mainroom;
     }
   }, {
     key: "hasAllowChangeNamePromission",
@@ -689,26 +707,14 @@ var ActionBarStore = exports["default"] = /*#__PURE__*/function () {
       return this._sharedChatDataSource.latestMessage;
     }
   }, {
-    key: "hasSecurityPermissions",
-    get: function get() {
-      return this.hasEnableStartSharePermission || this.hasAllowChatPermission || this.hasEnableStartAudioPermission || this.hasEnableChangeNamePermission || this.hasEnableStartVideoPermission || this.hasLockRoomPermission;
-    }
-  }, {
-    key: "isMeSharingScreen",
+    key: "isRecordingSupported",
     get: function get() {
-      var _this$_sharedScreenSh;
-      return ((_this$_sharedScreenSh = this._sharedScreenShareSharedDataSource.screenSharingOwner) === null || _this$_sharedScreenSh === void 0 ? void 0 : _this$_sharedScreenSh.userId) === this.localUserId;
+      return this._abilityProvider.isRecordingSupported();
     }
   }, {
-    key: "isMeSharingBoard",
-    get: function get() {
-      var _this$_sharedWhiteboa;
-      return ((_this$_sharedWhiteboa = this._sharedWhiteboardDataSource) === null || _this$_sharedWhiteboa === void 0 || (_this$_sharedWhiteboa = _this$_sharedWhiteboa.sharingUserInfo) === null || _this$_sharedWhiteboa === void 0 ? void 0 : _this$_sharedWhiteboa.userId) === this.localUserId;
-    }
-  }, {
-    key: "boardOwnerUser",
+    key: "hasSecurityPermissions",
     get: function get() {
-      return this._sharedWhiteboardDataSource.sharingUserInfo;
+      return this.hasEnableStartSharePermission || this.hasAllowChatPermission || this.hasEnableStartAudioPermission || this.hasEnableChangeNamePermission || this.hasEnableStartVideoPermission || this.hasLockRoomPermission;
     }
   }, {
     key: "pauseCloudRecording",
@@ -831,7 +837,7 @@ var ActionBarStore = exports["default"] = /*#__PURE__*/function () {
       this._roomControl.removeObserver(this._mainRoomObserver);
       this._eventProvider.removeObserver(this._uiEventObserver);
       this._applistProvider.removeObserver(this._applistObserver);
-      if (this._roomType === _type4.FcrRoomType.Mainroom) {
+      if (this._roomType === _type5.FcrRoomType.Mainroom) {
         var _this$_interpreterPro;
         this._roomProvider.removeObserver(this._roomObserver);
         (_this$_interpreterPro = this._interpreterProvider) === null || _this$_interpreterPro === void 0 || _this$_interpreterPro.removeObserver(this._interpreterProviderObserver);
@@ -1198,12 +1204,12 @@ var ActionBarStore = exports["default"] = /*#__PURE__*/function () {
     key: "_interceptShareScreen",
     value: function _interceptShareScreen() {
       var _this5 = this;
-      if (this.sharingOwnerUser && !this.isMeSharingScreen || this.boardOwnerUser && !this.isMeSharingBoard) {
-        var _this$sharingOwnerUse;
+      if (this.hasScreenShare || this.boardOwnerUser && this.boardOwnerUser.userId !== this.localUserId) {
+        var _this$sharingOwnerUse3;
         var confirmKey = this._dialogProvider.openConfirmDialog({
           title: (0, _i18n.transI18n)('fmt_share_tips_otherssharing'),
           content: (0, _i18n.transI18n)("fmt_share_tips_stopothersharing", {
-            reason1: ((_this$sharingOwnerUse = this.sharingOwnerUser) === null || _this$sharingOwnerUse === void 0 ? void 0 : _this$sharingOwnerUse.userName) || (0, _i18n.transI18n)('fmt_actionbar_screenshare_labels_others')
+            reason1: ((_this$sharingOwnerUse3 = this.sharingOwnerUser) === null || _this$sharingOwnerUse3 === void 0 ? void 0 : _this$sharingOwnerUse3.userName) || (0, _i18n.transI18n)('fmt_actionbar_screenshare_labels_others')
           }),
           okText: (0, _i18n.transI18n)('fmt_screenshare_continue_share'),
           okButtonProps: {
@@ -1228,9 +1234,9 @@ var ActionBarStore = exports["default"] = /*#__PURE__*/function () {
     key: "_interceptShareBoard",
     value: function _interceptShareBoard() {
       var _this6 = this;
-      if (this.boardOwnerUser && !this.isMeSharingBoard) {
+      if (this.boardOwnerUser && this.boardOwnerUser.userId !== this.localUserId) {
         var confirmKey = this._dialogProvider.openConfirmDialog({
-          icon: _type3.FcrIconType.FCR_SCREENSHARING,
+          icon: _type4.FcrIconType.FCR_SCREENSHARING,
           title: (0, _i18n.transI18n)('fmt_share_tips_othersharingboard'),
           content: (0, _i18n.transI18n)("fmt_share_tips_boardonly"),
           okText: (0, _i18n.transI18n)('fmt_screenshare_whiteboard_button_gotit'),
@@ -1297,6 +1303,26 @@ var ActionBarStore = exports["default"] = /*#__PURE__*/function () {
   }, {
     key: "_onEvent",
     value: function _onEvent(action, payload) {
+      // if (action === FcrUIAction.UPDATE_ASIDE) {
+      //   const { chat, participant } = payload as FcrUIUpdateAsideParams;
+      //   if (chat) {
+      //     this._chatRenderAt = 'aside';
+      //     this._handleChatVisible(true);
+      //   }
+      //   if (chat === false) {
+      //     this._handleChatVisible(false);
+      //   }
+      //   if (participant) {
+      //     this._participantsRenderAt = 'aside';
+      //     this._participantVisible = true;
+      //   }
+      //   if (participant === false) {
+      //     this._participantVisible = false;
+      //   }
+      // }
+      // if (action === FcrUIAction.RECEIVE_NEW_CHAT_MESSAGES) {
+      //   this._handleNewMessageEvent(payload as FcrUINewChatMessagesParams);
+      // }
       if (action === _constant.FcrUIAction.CLOSE_DIALOG) {
         var _ref2 = payload,
           dialogId = _ref2.dialogId;
@@ -1336,11 +1362,27 @@ var ActionBarStore = exports["default"] = /*#__PURE__*/function () {
       if (action === _constant.FcrUIAction.CLOSE_CONNECTION_DIALOG) {
         this.closeConnection();
       }
+      if (action === _constant.FcrUIAction.WHITEBOARD_CHANGED) {
+        var _ref4 = payload,
+          _action = _ref4.action,
+          value = _ref4.payload;
+        if (_action === _type3.WhiteboardBaseEvents.SET_OWNER_USER_ID) {
+          this.boardOwnerUser = value ? this.users.find(function (u) {
+            return u.userId === value;
+          }) : null;
+        }
+      }
       if (action === _constant.FcrUIAction.TOGGLE_PARTICIPANT_TAB) {
         if (!this.participantVisible) {
           this.toggleParticipants();
         }
       }
+      // if (action === FcrUIAction.CURRENT_PARTITIPANT_TAB) {
+      //   if (payload === FcrRoomType.Waitingroom) {
+      //     this.isNewWaitingRoomUserEnter = false;
+      //   }
+      //   this._participantTab = payload as FcrRoomType;
+      // }
       if (action === _constant.FcrUIAction.CHAT_ROOM_TAB_CHANGE) {
         this.chatTabIndex = payload;
         this.newMessageCount[this.chatTabIndex] = 0;
@@ -1510,7 +1552,7 @@ var ActionBarStore = exports["default"] = /*#__PURE__*/function () {
   }]);
 }();
 _ActionBarStore = ActionBarStore;
-var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_ActionBarStore, [[_mobx.observable, 1, "newMessageTooltipVisible"], [_mobx.observable, 1, "totalWaitingRoomUser"], [_mobx.observable, 1, "liveStreamingState"], [_mobx.observable, 1, "currentMenuIs"], [_mobx.observable, 1, "cloudRecordingState"], [_mobx.observable, 1, "connectionSettingVisible"], [_mobx.observable, 1, "folded"], [_mobx.observable, 1, "showArrow"], [_mobx.observable, 1, "phoneMicEnabled"], [_mobx.observable, 1, "chatTabIndex"], [_mobx.observable, 1, "stateBarLeaveMeeting"], [_mobx.observable, 1, "hasOfflineUserExistence"], [_mobx.observable, 1, "connectionState"], [_mobx.observable, 1, "appActionbarPopoverVisible"], [_mobx.computed, 3, "checkedStateMap"], [_setCheckedStateMapDecs, 18, "setCheckedStateMap"], [_mobx.computed, 3, "registeredWidgetConfigs"], [_mobx.computed, 3, "asideLayout"], [_mobx.computed, 3, "chatRenderAt"], [_mobx.computed, 3, "participantsRenderAt"], [_mobx.computed, 3, "participantVisible"], [_mobx.computed, 3, "chatVisible"], [_mobx.computed, 3, "hasStartScreenSharePermission"], [_mobx.computed, 3, "hasStopScreenSharePermission"], [_mobx.computed, 3, "sharingOwnerUser"], [_mobx.computed, 3, "hasEnableStartScreenSharePermission"], [_mobx.computed, 3, "hasStartLiveStreamingPermission"], [_mobx.computed, 3, "hasEnableStartAudioPermission"], [_mobx.computed, 3, "hasEnableChangeNamePermission"], [_mobx.computed, 3, "hasEnableStartVideoPermission"], [_mobx.computed, 3, "hasLockRoomPermission"], [_mobx.computed, 3, "hasEnableJoinWithAudioPermission"], [_mobx.computed, 3, "hasWaitingRoomPermission"], [_mobx.computed, 3, "hasWatermarkDisablePermission"], [_mobx.computed, 3, "hasEnableStartSharePermission"], [_mobx.computed, 3, "hasAllowWriteBoardPermission"], [_mobx.computed, 3, "hasAllowScreenShareAndBoardPermission"], [_mobx.computed, 3, "hasAllowChatPermission"], [_mobx.computed, 3, "hasStartCloudRecordingPermission"], [_mobx.computed, 3, "hasAssignHostBeforeLeavingPermission"], [_mobx.computed, 3, "hasEndRoomPermission"], [_mobx.computed, 3, "isScreenShareAndBoardEnabled"], [_mobx.computed, 3, "isBoardWriteEnabled"], [_mobx.computed, 3, "isWaterMarkEnabled"], [_mobx.computed, 3, "isMulti"], [_mobx.computed, 3, "hasEnableInterpreterPermission"], [_mobx.computed, 3, "hasDisableInterpreterPermission"], [_mobx.computed, 3, "microphoneEnabled"], [_mobx.computed, 3, "allNewMessage"], [_mobx.computed, 3, "isMainRoom"], [_mobx.computed, 3, "hasAllowChangeNamePromission"], [_mobx.computed, 3, "hasDisallowChangeNamePromission"], [_mobx.computed, 3, "newMessageCount"], [_mobx.computed, 3, "endMeetingPopoverOpened"], [_pauseCloudRecordingDecs, 2, "pauseCloudRecording"], [_resumeCloudRecordingDecs, 2, "resumeCloudRecording"], [_stopCloudRecordingDecs, 2, "stopCloudRecording"], [_decorator.bound, 2, "startCloudRecording"], [_showLockedRoomToastDecs, 18, "showLockedRoomToast"], [_toggleLayoutBarLockDecs, 18, "toggleLayoutBarLock"], [_showNewMessageTooltipDecs, 18, "showNewMessageTooltip"], [_hideNewMessageTooltipDecs, 18, "hideNewMessageTooltip"], [_switchMenuDecs, 18, "switchMenu"], [_mobx.computed, 3, "isLocked"], [_decorator.bound, 2, "isWaitingRoomEnabled"], [_decorator.bound, 2, "isAllowJoinWithAudioEnabled"], [_decorator.bound, 2, "enableMicrophone"], [_decorator.bound, 2, "setAllowWriteBoard"], [_decorator.bound, 2, "setAllowAnnotation"], [_decorator.bound, 2, "setAllowScreenShare"], [_setPopoverOpenedDecs, 18, "setPopoverOpened"], [_setStateBarLeaveMeetingDecs, 18, "setStateBarLeaveMeeting"], [_decorator.bound, 2, "allowJoinWithMuteAudio"], [_decorator.bound, 2, "setAllowJoinWithMuteAudio"], [_decorator.bound, 2, "isLockRoomEnabled"], [_decorator.bound, 2, "setLockRoomEnabled"], [_decorator.bound, 2, "setAllowShareScreen"], [_decorator.bound, 2, "allowShareScreen"], [_decorator.bound, 2, "allowWriteBoard"], [_decorator.bound, 2, "allowChat"], [_decorator.bound, 2, "setAllowChat"], [_decorator.bound, 2, "allowUnmuteSelfAudio"], [_decorator.bound, 2, "setAllowUnmuteSelfAudio"], [_decorator.bound, 2, "allowUnmuteSelfVideo"], [_decorator.bound, 2, "setAllowUnmuteSelfVideo"], [_decorator.bound, 2, "allowChangeName"], [_decorator.bound, 2, "toggleChat"], [_decorator.bound, 2, "openChat"], [_decorator.bound, 2, "closeChat"], [_decorator.bound, 2, "toggleParticipants"], [_decorator.bound, 2, "openParticipants"], [_decorator.bound, 2, "closeParticipants"], [_decorator.bound, 2, "openDeviceSettingDialog"], [_decorator.bound, 2, "startScreenShare"], [_decorator.bound, 2, "openInterpreterDialog"], [_decorator.bound, 2, "openWhiteboard"], [_decorator.bound, 2, "closeWhiteboard"], [_decorator.bound, 2, "closeShareScreen"], [_decorator.bound, 2, "openLiveStreamingDialog"], [_decorator.bound, 2, "toggleConnection"], [_decorator.bound, 2, "openConnection"], [_decorator.bound, 2, "closeConnection"], [_handleJoinWaitingRoomDecs, 18, "_handleJoinWaitingRoom"], [_toggleFoldDecs, 18, "toggleFold"], [_setShowArrowDecs, 18, "setShowArrow"], [_setEnableWaitingRoomDecs, 18, "setEnableWaitingRoom"], [_kickOutWaitingRoomAllMemberDecs, 18, "kickOutWaitingRoomAllMember"], [_moveToMainRoomAllMemberDecs, 18, "moveToMainRoomAllMember"], [_decorator.bound, 2, "_interceptShareScreen"], [_decorator.bound, 2, "_interceptShareBoard"], [_handleRemoteUsersJoinedDecs, 18, "_handleRemoteUsersJoined"], [_handleRemoteUsersLeftDecs, 18, "_handleRemoteUsersLeft"], [_handleLiveStreamingStateUpdatedDecs, 18, "_handleLiveStreamingStateUpdated"], [_handleChatVisibleDecs, 18, "_handleChatVisible"], [_setAppActionbarPopoverVisibleDecs, 18, "setAppActionbarPopoverVisible"], [_decorator.bound, 2, "setAllowWaterMark"], [_decorator.bound, 2, "setWaterMarkLineType"], [_decorator.bound, 2, "setAlllowChangeName"], [_decorator.bound, 2, "_onEvent"], [_operateWaitingRoomDecs, 18, "_operateWaitingRoom"], [_handleCloudRecordingStateUpdatedDecs, 18, "_handleCloudRecordingStateUpdated"], [_setOutputLanguageDecs, 18, "setOutputLanguage"], [_subscribeLanguageDecs, 18, "subscribeLanguage"], [_subscribeExtraOriginLanguageDecs, 18, "subscribeExtraOriginLanguage"], [_getOfflineUserExistenceStateDecs, 18, "getOfflineUserExistenceState"], [_clickWidgetDecs, 18, "clickWidget"], [_closeWidgetDecs, 18, "closeWidget"]], []).e, 15);
+var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_ActionBarStore, [[_mobx.observable, 1, "newMessageTooltipVisible"], [_mobx.observable, 1, "totalWaitingRoomUser"], [_mobx.observable, 1, "liveStreamingState"], [_mobx.observable, 1, "currentMenuIs"], [_mobx.observable, 1, "cloudRecordingState"], [_mobx.observable, 1, "connectionSettingVisible"], [_mobx.observable, 1, "folded"], [_mobx.observable, 1, "boardOwnerUser"], [_mobx.observable, 1, "showArrow"], [_mobx.observable, 1, "phoneMicEnabled"], [_mobx.observable, 1, "chatTabIndex"], [_mobx.observable, 1, "stateBarLeaveMeeting"], [_mobx.observable, 1, "hasOfflineUserExistence"], [_mobx.observable, 1, "connectionState"], [_mobx.observable, 1, "appActionbarPopoverVisible"], [_mobx.computed, 3, "checkedStateMap"], [_setCheckedStateMapDecs, 18, "setCheckedStateMap"], [_mobx.computed, 3, "registeredWidgetConfigs"], [_mobx.computed, 3, "asideLayout"], [_mobx.computed, 3, "chatRenderAt"], [_mobx.computed, 3, "participantsRenderAt"], [_mobx.computed, 3, "participantVisible"], [_mobx.computed, 3, "chatVisible"], [_mobx.computed, 3, "hasStartScreenSharePermission"], [_mobx.computed, 3, "hasStopScreenSharePermission"], [_mobx.computed, 3, "sharingOwnerUser"], [_mobx.computed, 3, "hasEnableStartScreenSharePermission"], [_mobx.computed, 3, "hasStartLiveStreamingPermission"], [_mobx.computed, 3, "hasEnableStartAudioPermission"], [_mobx.computed, 3, "hasEnableChangeNamePermission"], [_mobx.computed, 3, "hasEnableStartVideoPermission"], [_mobx.computed, 3, "hasLockRoomPermission"], [_mobx.computed, 3, "hasEnableJoinWithAudioPermission"], [_mobx.computed, 3, "hasWaitingRoomPermission"], [_mobx.computed, 3, "hasWatermarkDisablePermission"], [_mobx.computed, 3, "hasEnableStartSharePermission"], [_mobx.computed, 3, "hasAllowWriteBoardPermission"], [_mobx.computed, 3, "hasCloseWriteBoardPermission"], [_mobx.computed, 3, "hasAllowScreenShareAndBoardPermission"], [_mobx.computed, 3, "hasAllowChatPermission"], [_mobx.computed, 3, "hasStartCloudRecordingPermission"], [_mobx.computed, 3, "hasAssignHostBeforeLeavingPermission"], [_mobx.computed, 3, "hasEndRoomPermission"], [_mobx.computed, 3, "isScreenShareAndBoardEnabled"], [_mobx.computed, 3, "isBoardWriteEnabled"], [_mobx.computed, 3, "isWaterMarkEnabled"], [_mobx.computed, 3, "isMulti"], [_mobx.computed, 3, "hasEnableInterpreterPermission"], [_mobx.computed, 3, "hasDisableInterpreterPermission"], [_mobx.computed, 3, "microphoneEnabled"], [_mobx.computed, 3, "allNewMessage"], [_mobx.computed, 3, "isMainRoom"], [_mobx.computed, 3, "hasAllowChangeNamePromission"], [_mobx.computed, 3, "hasDisallowChangeNamePromission"], [_mobx.computed, 3, "newMessageCount"], [_mobx.computed, 3, "endMeetingPopoverOpened"], [_pauseCloudRecordingDecs, 2, "pauseCloudRecording"], [_resumeCloudRecordingDecs, 2, "resumeCloudRecording"], [_stopCloudRecordingDecs, 2, "stopCloudRecording"], [_decorator.bound, 2, "startCloudRecording"], [_showLockedRoomToastDecs, 18, "showLockedRoomToast"], [_toggleLayoutBarLockDecs, 18, "toggleLayoutBarLock"], [_showNewMessageTooltipDecs, 18, "showNewMessageTooltip"], [_hideNewMessageTooltipDecs, 18, "hideNewMessageTooltip"], [_switchMenuDecs, 18, "switchMenu"], [_mobx.computed, 3, "isLocked"], [_decorator.bound, 2, "isWaitingRoomEnabled"], [_decorator.bound, 2, "isAllowJoinWithAudioEnabled"], [_decorator.bound, 2, "enableMicrophone"], [_decorator.bound, 2, "setAllowWriteBoard"], [_decorator.bound, 2, "setAllowAnnotation"], [_decorator.bound, 2, "setAllowScreenShare"], [_setPopoverOpenedDecs, 18, "setPopoverOpened"], [_setStateBarLeaveMeetingDecs, 18, "setStateBarLeaveMeeting"], [_decorator.bound, 2, "allowJoinWithMuteAudio"], [_decorator.bound, 2, "setAllowJoinWithMuteAudio"], [_decorator.bound, 2, "isLockRoomEnabled"], [_decorator.bound, 2, "setLockRoomEnabled"], [_decorator.bound, 2, "setAllowShareScreen"], [_decorator.bound, 2, "allowShareScreen"], [_decorator.bound, 2, "allowWriteBoard"], [_decorator.bound, 2, "allowChat"], [_decorator.bound, 2, "setAllowChat"], [_decorator.bound, 2, "allowUnmuteSelfAudio"], [_decorator.bound, 2, "setAllowUnmuteSelfAudio"], [_decorator.bound, 2, "allowUnmuteSelfVideo"], [_decorator.bound, 2, "setAllowUnmuteSelfVideo"], [_decorator.bound, 2, "allowChangeName"], [_decorator.bound, 2, "toggleChat"], [_decorator.bound, 2, "openChat"], [_decorator.bound, 2, "closeChat"], [_decorator.bound, 2, "toggleParticipants"], [_decorator.bound, 2, "openParticipants"], [_decorator.bound, 2, "closeParticipants"], [_decorator.bound, 2, "openDeviceSettingDialog"], [_decorator.bound, 2, "startScreenShare"], [_decorator.bound, 2, "openInterpreterDialog"], [_decorator.bound, 2, "openWhiteboard"], [_decorator.bound, 2, "closeWhiteboard"], [_decorator.bound, 2, "closeShareScreen"], [_decorator.bound, 2, "openLiveStreamingDialog"], [_decorator.bound, 2, "toggleConnection"], [_decorator.bound, 2, "openConnection"], [_decorator.bound, 2, "closeConnection"], [_handleJoinWaitingRoomDecs, 18, "_handleJoinWaitingRoom"], [_toggleFoldDecs, 18, "toggleFold"], [_setShowArrowDecs, 18, "setShowArrow"], [_setEnableWaitingRoomDecs, 18, "setEnableWaitingRoom"], [_kickOutWaitingRoomAllMemberDecs, 18, "kickOutWaitingRoomAllMember"], [_moveToMainRoomAllMemberDecs, 18, "moveToMainRoomAllMember"], [_decorator.bound, 2, "_interceptShareScreen"], [_decorator.bound, 2, "_interceptShareBoard"], [_handleRemoteUsersJoinedDecs, 18, "_handleRemoteUsersJoined"], [_handleRemoteUsersLeftDecs, 18, "_handleRemoteUsersLeft"], [_handleLiveStreamingStateUpdatedDecs, 18, "_handleLiveStreamingStateUpdated"], [_handleChatVisibleDecs, 18, "_handleChatVisible"], [_setAppActionbarPopoverVisibleDecs, 18, "setAppActionbarPopoverVisible"], [_decorator.bound, 2, "setAllowWaterMark"], [_decorator.bound, 2, "setWaterMarkLineType"], [_decorator.bound, 2, "setAlllowChangeName"], [_decorator.bound, 2, "_onEvent"], [_operateWaitingRoomDecs, 18, "_operateWaitingRoom"], [_handleCloudRecordingStateUpdatedDecs, 18, "_handleCloudRecordingStateUpdated"], [_setOutputLanguageDecs, 18, "setOutputLanguage"], [_subscribeLanguageDecs, 18, "subscribeLanguage"], [_subscribeExtraOriginLanguageDecs, 18, "subscribeExtraOriginLanguage"], [_getOfflineUserExistenceStateDecs, 18, "getOfflineUserExistenceState"], [_clickWidgetDecs, 18, "clickWidget"], [_closeWidgetDecs, 18, "closeWidget"]], []).e, 16);
 _init_newMessageTooltipVisible = _applyDecs$e[0];
 _init_totalWaitingRoomUser = _applyDecs$e[1];
 _init_liveStreamingState = _applyDecs$e[2];
@@ -1518,12 +1560,13 @@ _init_currentMenuIs = _applyDecs$e[3];
 _init_cloudRecordingState = _applyDecs$e[4];
 _init_connectionSettingVisible = _applyDecs$e[5];
 _init_folded = _applyDecs$e[6];
-_init_showArrow = _applyDecs$e[7];
-_init_phoneMicEnabled = _applyDecs$e[8];
-_init_chatTabIndex = _applyDecs$e[9];
-_init_stateBarLeaveMeeting = _applyDecs$e[10];
-_init_hasOfflineUserExistence = _applyDecs$e[11];
-_init_connectionState = _applyDecs$e[12];
-_init_appActionbarPopoverVisible = _applyDecs$e[13];
-_initProto = _applyDecs$e[14];
+_init_boardOwnerUser = _applyDecs$e[7];
+_init_showArrow = _applyDecs$e[8];
+_init_phoneMicEnabled = _applyDecs$e[9];
+_init_chatTabIndex = _applyDecs$e[10];
+_init_stateBarLeaveMeeting = _applyDecs$e[11];
+_init_hasOfflineUserExistence = _applyDecs$e[12];
+_init_connectionState = _applyDecs$e[13];
+_init_appActionbarPopoverVisible = _applyDecs$e[14];
+_initProto = _applyDecs$e[15];
 var ActionBarContext = exports.ActionBarContext = /*#__PURE__*/(0, _react.createContext)(null);

package/lib/modules/annotation/store.js

@@ -512,19 +512,20 @@ var AnnotationStore = exports.AnnotationStore = /*#__PURE__*/function () {
   }, {
     key: "_addWindowResizeListener",
     value: function _addWindowResizeListener() {
-      // if (!this._resizeWatcherTimer && isElectron()) {
-      //   this._resizeWatcherTimer = setInterval(() => {
-      //     this._updateBoundsByActiveWindow();
-      //   }, 2000);
-      // }
+      var _this3 = this;
+      if (!this._resizeWatcherTimer && (0, _env.isElectron)()) {
+        this._resizeWatcherTimer = setInterval(function () {
+          _this3._updateBoundsByActiveWindow();
+        }, 2000);
+      }
     }
   }, {
     key: "_removeWindowResizeListenner",
     value: function _removeWindowResizeListenner() {
-      // if (this._resizeWatcherTimer && isElectron()) {
-      //   clearInterval(this._resizeWatcherTimer);
-      //   this._resizeWatcherTimer = null;
-      // }
+      if (this._resizeWatcherTimer && (0, _env.isElectron)()) {
+        clearInterval(this._resizeWatcherTimer);
+        this._resizeWatcherTimer = null;
+      }
     }
   }, {
     key: "_checkIfAnnotationCanStart",

package/lib/modules/components/control-bar/components/switch-theme/index.js

@@ -39,7 +39,9 @@ var WhiteboardSwitchTheme = function WhiteboardSwitchTheme(props) {
     },
     overlayOffset: 4,
     showArrow: false,
-    getTooltipContainer: function getTooltipContainer() {
+    getTooltipContainer: function getTooltipContainer(_target) {
+      // window.document 是主窗口内的, 为了在子窗口中获取主窗口的 DOM 节点, 所以使用 _target.ownerDocument
+      var document = _target.ownerDocument || window.document;
       var target = document.getElementById('fcr-whiteboard-controlbar');
       return target;
     },
@@ -57,7 +59,7 @@ var WhiteboardSwitchTheme = function WhiteboardSwitchTheme(props) {
               return item.theme === theme.theme;
             });
             setTheme(result);
-            setWhiteboardVisible(false);
+            setWhiteboardVisible(!whiteboardVisible);
           }
         }, theme.theme);
       }), /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {

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

@@ -291,9 +291,7 @@ var WhiteboardControlbar = exports.WhiteboardControlbar = function WhiteboardCon
             className: "fcr-whiteboard-controlbar-item",
             children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_switchTheme["default"], {
               whiteboardVisible: showSwitchTheme,
-              setWhiteboardVisible: function setWhiteboardVisible() {
-                return setShowSwitchTheme(!showSwitchTheme);
-              },
+              setWhiteboardVisible: setShowSwitchTheme,
               currentThemeType: currentTheme,
               setTheme: setTheme
             })

package/lib/modules/event-confirm/components/window/index.d.ts

@@ -1,7 +1,4 @@
 import { ConfirmContentProps } from 'agora-ui-foundation/lib/components/confirm-content';
-type ConfirmWindowProps = {
-    id: string;
+export declare const ConfirmWindow: ({ confirm }: {
     confirm: ConfirmContentProps;
-};
-export declare const ConfirmWindow: ({ id, confirm }: ConfirmWindowProps) => import("react/jsx-runtime").JSX.Element;
-export {};
+}) => import("react/jsx-runtime").JSX.Element;

package/lib/modules/event-confirm/components/window/index.js

@@ -39,14 +39,12 @@ function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbol
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2["default"])(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var ConfirmWindow = exports.ConfirmWindow = (0, _mobxReact.observer)(function (_ref) {
   var _rndRef$current;
-  var id = _ref.id,
-    confirm = _ref.confirm;
+  var confirm = _ref.confirm;
   var _useContext = (0, _react.useContext)(_store.StoreContext),
     screenBounds = _useContext.screenBounds,
     calculateMethods = _useContext.calculateMethods,
-    removeObserverWindow = _useContext.removeObserverWindow,
     log = _useContext.log,
-    setObserverWindow = _useContext.setObserverWindow;
+    mousePosition = _useContext.mousePosition;
   var _ref2 = (0, _env.isElectron)() ? (0, _react.useContext)(_useElectron.DialogInstanceContext) : {},
     browserWindow = _ref2.browserWindow;
   var rndRef = (0, _react.useRef)(null);
@@ -88,10 +86,6 @@ var ConfirmWindow = exports.ConfirmWindow = (0, _mobxReact.observer)(function (_
       x: Math.max(0, Math.min(maxX, x)),
       y: Math.max(0, Math.min(maxY, y))
     };
-    setObserverWindow(id, _objectSpread({
-      width: defaultSize.width,
-      height: rndRef.current.getBoundingClientRect().height
-    }, coord));
     setBounds(coord);
   });
   function recalculate(bounds) {
@@ -115,44 +109,26 @@ var ConfirmWindow = exports.ConfirmWindow = (0, _mobxReact.observer)(function (_
   var handleRecalculate = function handleRecalculate() {
     return recalculate();
   };
-  (0, _react.useEffect)(function () {
+  var initMouseEvents = function initMouseEvents(position) {
+    // 旧版本 mac 系统，ignore 会失效，所以作此处理
     if ((0, _env.isElectron)() && (0, _renderer.isMac)()) {
-      if (confirm.className === 'confirm-mouseover') {
+      var x = position.x,
+        y = position.y;
+      var isInConfirm = x > bounds.x && y > bounds.y && x < bounds.x + defaultSize.width && y < bounds.y + defaultSize.height;
+      if (isInConfirm) {
+        log("[event-confirm][initMouseEvents]: is in confirm ".concat(isInConfirm));
         browserWindow === null || browserWindow === void 0 || browserWindow.setIgnoreMouseEvents(false);
       } else {
         browserWindow === null || browserWindow === void 0 || browserWindow.setIgnoreMouseEvents(true, {
           forward: true
         });
+        log('[event-confirm][initMouseEvents]: out of confirm window');
       }
     }
-    return function () {
-      removeObserverWindow(id);
-    };
-  }, [confirm.className]);
-
-  // const initMouseEvents = (position: { x: number; y: number }) => {
-  //   // 旧版本 mac 系统，ignore 会失效，所以作此处理
-  //   if (isElectron() && isMac()) {
-  //     const { x, y } = position;
-  //     const isInConfirm =
-  //       x > bounds.x &&
-  //       y > bounds.y &&
-  //       x < bounds.x + defaultSize.width &&
-  //       y < bounds.y + defaultSize.height;
-  //     if (isInConfirm) {
-  //       log(`[event-confirm][initMouseEvents]: is in confirm ${isInConfirm}`);
-  //       browserWindow?.setIgnoreMouseEvents(false);
-  //     } else {
-  //       browserWindow?.setIgnoreMouseEvents(true, { forward: true });
-  //       log('[event-confirm][initMouseEvents]: out of confirm window');
-  //     }
-  //   }
-  // };
-
-  // useEffect(() => {
-  //   initMouseEvents(mousePosition);
-  // }, [mousePosition]);
-
+  };
+  (0, _react.useEffect)(function () {
+    initMouseEvents(mousePosition);
+  }, [mousePosition]);
   (0, _react.useEffect)(function () {
     recalculate();
     !calculateMethods.has(confirm) && calculateMethods.set(confirm, recalculate);

package/lib/modules/event-confirm/store.d.ts

@@ -14,20 +14,19 @@ export default class ConfirmStore {
     private _sharedScreenShareSharedDataSource;
     private _sharedConfirmDataSource;
     private _handleConfirmEventObserver;
-    private _handleMousePositionObserver;
     accessor isReplaceShare: boolean;
     accessor calculateMethods: Map<ConfirmContentProps, (bounds?: CurrentShareBounds | null) => void>;
     accessor reposition: number;
     accessor confirms: Map<string, {
-        id: string;
         params: ConfirmContentProps;
         timer?: () => void;
     }>;
     accessor screenBounds: CurrentShareBounds | Electron.Rectangle | null;
-    get confirmList(): {
-        id: string;
-        params: ConfirmContentProps;
-    }[];
+    get mousePosition(): {
+        x: number;
+        y: number;
+    };
+    get confirmList(): ConfirmContentProps[];
     get isSeizeScreen(): boolean;
     constructor({ uiEventStore, dialogProvider, screenShareProvider, sharedScreenShareSharedDataSource, sharedConfirmDataSource, }: {
         uiEventStore: FcrUIEventProvider;
@@ -37,14 +36,10 @@ export default class ConfirmStore {
         sharedConfirmDataSource: FcrUISharedConfirmDataSource;
     });
     addConfirm(payload: FcrUIDialogParams<ConfirmContentProps>): void;
-    removeObserverWindow(key: string): void;
-    setObserverWindow(key: string, window: CurrentShareBounds): void;
     resetIsReplace(): void;
     setMousePosition(e: MouseEvent): void;
     release(): void;
     log(log: string): void;
     private _handleConfirmEvent;
-    private _handleMousePositionObserverMouseOver;
-    private _handleMousePositionObserverMouseOut;
 }
 export declare const StoreContext: import("react").Context<ConfirmStore>;