fcr-ui-scene 3.6.4 → 3.7.1

package/lib/modules/dialog/store.js

@@ -5,6 +5,7 @@ require("core-js/modules/es.symbol.description.js");
 require("core-js/modules/es.symbol.to-primitive.js");
 require("core-js/modules/es.error.cause.js");
 require("core-js/modules/es.error.to-string.js");
+require("core-js/modules/es.array.for-each.js");
 require("core-js/modules/es.array.is-array.js");
 require("core-js/modules/es.date.to-primitive.js");
 require("core-js/modules/es.function.bind.js");
@@ -16,20 +17,24 @@ 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.string.includes.js");
 require("core-js/modules/esnext.function.metadata.js");
+require("core-js/modules/esnext.iterator.for-each.js");
 require("core-js/modules/esnext.symbol.metadata.js");
+require("core-js/modules/web.dom-collections.for-each.js");
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports["default"] = exports.TOP_LEVEL_DIALOG_LAYER = exports.StoreContext = exports.HIGH_LEVEL_DIALOG_LAYER = void 0;
+exports.dialogWindows = exports.dialogIdWindows = exports["default"] = exports.StoreContext = void 0;
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
+var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
+var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+require("core-js/modules/es.array.concat.js");
 require("core-js/modules/es.array.filter.js");
 require("core-js/modules/es.array.find.js");
-require("core-js/modules/es.array.for-each.js");
 require("core-js/modules/es.array.includes.js");
 require("core-js/modules/es.array.iterator.js");
 require("core-js/modules/es.array.push.js");
@@ -41,7 +46,6 @@ require("core-js/modules/es.weak-map.js");
 require("core-js/modules/esnext.iterator.constructor.js");
 require("core-js/modules/esnext.iterator.filter.js");
 require("core-js/modules/esnext.iterator.find.js");
-require("core-js/modules/esnext.iterator.for-each.js");
 require("core-js/modules/esnext.iterator.some.js");
 require("core-js/modules/esnext.map.delete-all.js");
 require("core-js/modules/esnext.map.emplace.js");
@@ -59,26 +63,19 @@ require("core-js/modules/esnext.map.some.js");
 require("core-js/modules/esnext.map.update.js");
 require("core-js/modules/esnext.weak-map.delete-all.js");
 require("core-js/modules/esnext.weak-map.emplace.js");
-require("core-js/modules/web.dom-collections.for-each.js");
 require("core-js/modules/web.dom-collections.iterator.js");
-var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
-var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _type = require("fcr-core/lib/type");
 var _decorator = require("agora-foundation/lib/decorator");
 var _env = require("agora-foundation/lib/utilities/env");
 var _mobx = require("mobx");
-var _dialogs = require("./dialogs");
 var _react = require("react");
-var _platform = require("../../utilities/platform");
 var _constant = require("../../utilities/constant");
 var _dialogProvider = require("../../providers/dialog-provider");
 var _logger = require("../../utilities/logger");
-var _tools = require("../../utilities/tools");
-var _useElectron = require("./hooks/useElectron");
+var _dialogUtils = require("../../utilities/dialog-utils");
 var _excluded = ["x", "y"];
 var _DialogStore;
-var _initProto, _init_openedDialogs, _init_confirmDialogs, _init_userCount, _init_participantElectronDialogContainer, _init_currentDialogBounds, _init_videoWindowBounds, _init_recordShareBounds, _init_allApplicationWindows, _setVideoWindowBoundsDecs, _recordCurrentSharingScreenBoundsDecs, _handleDialogEventDecs, _hanleAllUserCountUpdatedDecs, _ref;
+var _initProto, _init_openedDialogs, _init_confirmDialogs, _init_userCount, _init_participantElectronDialogContainer, _init_currentDialogBounds, _init_videoWindowBounds, _init_recordShareBounds, _init_allApplicationWindows, _setConfirmPositionDecs, _setVideoWindowBoundsDecs, _recordCurrentSharingScreenBoundsDecs, _handleDialogEventDecs, _hanleAllUserCountUpdatedDecs, _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); }
@@ -91,8 +88,8 @@ function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol"
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 function _setFunctionName(e, t, n) { "symbol" == _typeof(t) && (t = (t = t.description) ? "[" + t + "]" : ""); try { Object.defineProperty(e, "name", { configurable: !0, value: n ? n + " " + t : t }); } catch (e) {} return e; }
 function _checkInRHS(e) { if (Object(e) !== e) throw TypeError("right-hand side of 'in' should be an object, got " + (null !== e ? _typeof(e) : "null")); return e; }
-var HIGH_LEVEL_DIALOG_LAYER = exports.HIGH_LEVEL_DIALOG_LAYER = [_constant.FcrUIDialogKey.CHAT, _constant.FcrUIDialogKey.PARTICIPANT, _constant.FcrUIDialogKey.SHARE_SCREEN];
-var TOP_LEVEL_DIALOG_LAYER = exports.TOP_LEVEL_DIALOG_LAYER = [_constant.FcrUIDialogKey.SHOW_TOAST, _constant.FcrUIDialogKey.CONFIRM, _constant.FcrUIDialogKey.CONTROL_BAR, _constant.FcrUIDialogKey.VIDEO_WINDOW, _constant.FcrUIDialogKey.ANNOTATION];
+var dialogWindows = exports.dialogWindows = new Map();
+var dialogIdWindows = exports.dialogIdWindows = new Map();
 var _A = /*#__PURE__*/new WeakMap();
 var _B = /*#__PURE__*/new WeakMap();
 var _C = /*#__PURE__*/new WeakMap();
@@ -101,7 +98,7 @@ var _E = /*#__PURE__*/new WeakMap();
 var _F = /*#__PURE__*/new WeakMap();
 var _G = /*#__PURE__*/new WeakMap();
 var _H = /*#__PURE__*/new WeakMap();
-_ref = (_setVideoWindowBoundsDecs = [_mobx.action, _mobx.action.bound], _recordCurrentSharingScreenBoundsDecs = [_mobx.action, _mobx.action.bound], _handleDialogEventDecs = [_mobx.action, _mobx.action.bound], _hanleAllUserCountUpdatedDecs = [_mobx.action, _mobx.action.bound], "logger");
+_ref = (_setConfirmPositionDecs = [_mobx.action, _mobx.action.bound], _setVideoWindowBoundsDecs = [_mobx.action, _mobx.action.bound], _recordCurrentSharingScreenBoundsDecs = [_mobx.action, _mobx.action.bound], _handleDialogEventDecs = [_mobx.action, _mobx.action.bound], _hanleAllUserCountUpdatedDecs = [_mobx.action, _mobx.action.bound], "logger");
 var DialogStore = exports["default"] = /*#__PURE__*/function () {
   function DialogStore(_ref2) {
     var _this = this;
@@ -119,7 +116,9 @@ var DialogStore = exports["default"] = /*#__PURE__*/function () {
       widgetProvider = _ref2.widgetProvider,
       screenShareProvider = _ref2.screenShareProvider,
       chatProvider = _ref2.chatProvider,
-      sharedScreenShareSharedDataSource = _ref2.sharedScreenShareSharedDataSource;
+      sharedScreenShareSharedDataSource = _ref2.sharedScreenShareSharedDataSource,
+      sharedConfirmDataSource = _ref2.sharedConfirmDataSource,
+      annotationProvider = _ref2.annotationProvider;
     (0, _classCallCheck2["default"])(this, DialogStore);
     (0, _defineProperty2["default"])(this, _ref, (_initProto(this), (0, _logger.createLogger)({
       prefix: 'DialogStore'
@@ -148,18 +147,21 @@ var DialogStore = exports["default"] = /*#__PURE__*/function () {
     this._deviceStore = deviceStore;
     this._securityStore = securityStore;
     this._sharedLayoutDataSource = sharedLayoutDataSource;
+    this._sharedConfirmDataSource = sharedConfirmDataSource;
     this._dialogProvider = dialogProvider;
     this._phoneAudioConnectorProvider = phoneAudioConnectorProvider;
     this._dialogComponentMapByKey = dialogsByKey;
     this._widgetProvider = widgetProvider;
     this._chatProvider = chatProvider;
     this._screenShareProvider = screenShareProvider;
+    this._annotationProvider = annotationProvider;
     this._userControl.addObserver(this._userObserver);
     this._eventProvider.addObserver(this._handleDialogEventObserver);
     this._dialogProvider.addObserver(this._handleDialogEventObserver);
     this._userInfo = userControl.getLocalUser();
     (0, _mobx.runInAction)(function () {
       _this.userCount = _this._userControl.getAllUserCount();
+      _this._annotationProvider.initAnnotationWindow();
     });
   }
   return (0, _createClass2["default"])(DialogStore, [{
@@ -322,6 +324,11 @@ var DialogStore = exports["default"] = /*#__PURE__*/function () {
       var _this$_sharedScreenSh;
       return ((_this$_sharedScreenSh = this._sharedScreenShareSharedDataSource.screenSharingOwner) === null || _this$_sharedScreenSh === void 0 ? void 0 : _this$_sharedScreenSh.userId) === this._userInfo.userId;
     }
+  }, {
+    key: "setConfirmPosition",
+    value: function setConfirmPosition(position) {
+      this._sharedConfirmDataSource.setPosition(position);
+    }
   }, {
     key: "setParticipantElectronDialogContainer",
     value: function setParticipantElectronDialogContainer(dom) {
@@ -400,7 +407,7 @@ var DialogStore = exports["default"] = /*#__PURE__*/function () {
       this._userControl.removeObserver(this._userObserver);
       this._dialogProvider.removeObserver(this._handleDialogEventObserver);
       this._eventProvider.removeObserver(this._handleDialogEventObserver);
-      _dialogs.dialogWindows.clear();
+      dialogWindows.clear();
     }
   }, {
     key: "resizeVideoWindow",
@@ -437,7 +444,7 @@ var DialogStore = exports["default"] = /*#__PURE__*/function () {
         this.logger.info('recordCurrentSharingScreenBounds is called and the recordShareBounds has currentShareBounds value, the value is', screenBounds);
       } else {
         recordShareBounds.clear();
-        screenBounds = (0, _tools.getCurrentSharingWorkArea)({
+        screenBounds = (0, _dialogUtils.getCurrentSharingWorkArea)({
           currentShareBounds: this.currentShareBounds
         });
         recordShareBounds.set(currentShareBounds, screenBounds);
@@ -461,6 +468,7 @@ var DialogStore = exports["default"] = /*#__PURE__*/function () {
       var openInFragments = [_constant.FcrUIDialogKey.ANNOTATION];
       switch (action) {
         case _constant.FcrUIAction.OPEN_DIALOG:
+          // 如果 dialogKey 是 openInFragments 中的一个，则打开 Fragment 窗口
           if ((0, _env.isElectron)()) {
             if (openInFragments.includes(dialogKey)) {
               this._electronDialogs.set(dialogId, dialogKey);
@@ -468,31 +476,23 @@ var DialogStore = exports["default"] = /*#__PURE__*/function () {
               return;
             }
           }
-          this.logger.info('open_dialog: ', dialogKey, '====', dialogId);
-          // 因为窗口可能会移动，因此需要矫正 global toast 和 confirm 的 Bounds
-          var isToastOrConfirm = [_constant.FcrUIDialogKey.SHOW_TOAST, _constant.FcrUIDialogKey.CONFIRM].includes(dialogKey);
-          this._focusDialog(dialogKey, dialogId);
-          if (isToastOrConfirm && (0, _env.isElectron)()) {
-            var _dialogWindows$get, _dialogWindows$get2;
-            // followCorrectDisplay([FcrUIDialogKey.CONFIRM, FcrUIDialogKey.SHOW_TOAST]); 已经内置到各自的 store
-            if (!(0, _platform.isWindows)()) {
-              _dialogs.dialogWindows.forEach(function (window, key) {
-                if (key === dialogKey || HIGH_LEVEL_DIALOG_LAYER.includes(key) || TOP_LEVEL_DIALOG_LAYER.includes(key)) return;
-                window.setAlwaysOnTop(true, 'normal');
-              });
-            }
-            (_dialogWindows$get = _dialogs.dialogWindows.get(dialogKey)) === null || _dialogWindows$get === void 0 || _dialogWindows$get.focus();
-            (_dialogWindows$get2 = _dialogs.dialogWindows.get(dialogKey)) === null || _dialogWindows$get2 === void 0 || _dialogWindows$get2.setAlwaysOnTop(true, _useElectron.diffPlatformTopLevelLayer);
-            // toast 有独立逻辑 src/event-dialog
-            // confirm 有独立逻辑 src/evnet-confirm
-            return;
-          }
+          this.logger.info("[dialog]: open dialog with dialogKey: ".concat(dialogKey, ", dialogId: ").concat(dialogId));
           var currentDialog = this.openedDialogs.find(function (dialog) {
             return dialog.dialogId === dialogId;
           });
           if (currentDialog) {
-            this._focusDialog(dialogKey, dialogId);
+            this.logger.info("[dialog]: find dialog with ".concat(dialogIdWindows.has(dialogId) ? 'dialogId' : 'dialogKey', ": ").concat(dialogKey, ", focus it"));
+            if (dialogIdWindows.has(dialogId)) {
+              var _window = dialogIdWindows.get(dialogId);
+              _window === null || _window === void 0 || _window.show();
+              _window === null || _window === void 0 || _window.focus();
+            } else {
+              var _window2 = dialogWindows.get(dialogKey);
+              _window2 === null || _window2 === void 0 || _window2.show();
+              _window2 === null || _window2 === void 0 || _window2.focus();
+            }
           } else {
+            this.logger.info("[dialog]: can't find dialog with dialogKey: ".concat(dialogKey, " or dialogId: ").concat(dialogId, ", push to openedDialogs"));
             this.openedDialogs.push({
               dialogKey: dialogKey,
               dialogId: dialogId,
@@ -528,24 +528,10 @@ var DialogStore = exports["default"] = /*#__PURE__*/function () {
     value: function _hanleAllUserCountUpdated(_roomId, count) {
       this.userCount = count;
     }
-  }, {
-    key: "_focusDialog",
-    value: function _focusDialog(dialogKey, dialogId) {
-      if ((0, _env.isElectron)()) {
-        var canFindById = _dialogs.dialogIdWindows.has(dialogId);
-        if (canFindById) {
-          var _dialogIdWindows$get;
-          (_dialogIdWindows$get = _dialogs.dialogIdWindows.get(dialogId)) === null || _dialogIdWindows$get === void 0 || _dialogIdWindows$get.focus();
-        } else {
-          var _dialogWindows$get3;
-          (_dialogWindows$get3 = _dialogs.dialogWindows.get(dialogKey)) === null || _dialogWindows$get3 === void 0 || _dialogWindows$get3.focus();
-        }
-      }
-    }
   }]);
 }();
 _DialogStore = DialogStore;
-var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_DialogStore, [[_mobx.observable, 1, "openedDialogs"], [_mobx.observable, 1, "confirmDialogs"], [_mobx.observable, 1, "userCount"], [_mobx.observable, 1, "participantElectronDialogContainer"], [_mobx.observable, 1, "currentDialogBounds"], [_mobx.observable, 1, "videoWindowBounds"], [_mobx.observable, 1, "recordShareBounds"], [_mobx.observable, 1, "allApplicationWindows"], [_mobx.computed, 3, "connectType"], [_mobx.computed, 3, "hasOwnPstnStream"], [_mobx.computed, 3, "chatRoomState"], [_mobx.computed, 3, "isSharingScreen"], [_mobx.action, 2, "setParticipantElectronDialogContainer"], [_setVideoWindowBoundsDecs, 18, "setVideoWindowBounds"], [_decorator.bound, 2, "closeDialogByKey"], [_decorator.bound, 2, "closeDilaogByDialogId"], [_decorator.bound, 2, "closeSystemPreferenceDialog"], [_decorator.bound, 2, "closeChatFromDialog"], [_decorator.bound, 2, "moveChatFromDialogToAside"], [_decorator.bound, 2, "closeConnectionDialog"], [_decorator.bound, 2, "closeParticipantDialog"], [_decorator.bound, 2, "moveParticipantFromDialogToAside"], [_decorator.bound, 2, "resizeVideoWindow"], [_recordCurrentSharingScreenBoundsDecs, 18, "recordCurrentSharingScreenBounds"], [_decorator.bound, 2, "log"], [_handleDialogEventDecs, 18, "_handleDialogEvent"], [_hanleAllUserCountUpdatedDecs, 18, "_hanleAllUserCountUpdated"], [_decorator.bound, 2, "_focusDialog"]], []).e, 9);
+var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_DialogStore, [[_mobx.observable, 1, "openedDialogs"], [_mobx.observable, 1, "confirmDialogs"], [_mobx.observable, 1, "userCount"], [_mobx.observable, 1, "participantElectronDialogContainer"], [_mobx.observable, 1, "currentDialogBounds"], [_mobx.observable, 1, "videoWindowBounds"], [_mobx.observable, 1, "recordShareBounds"], [_mobx.observable, 1, "allApplicationWindows"], [_mobx.computed, 3, "connectType"], [_mobx.computed, 3, "hasOwnPstnStream"], [_mobx.computed, 3, "chatRoomState"], [_mobx.computed, 3, "isSharingScreen"], [_setConfirmPositionDecs, 18, "setConfirmPosition"], [_mobx.action, 2, "setParticipantElectronDialogContainer"], [_setVideoWindowBoundsDecs, 18, "setVideoWindowBounds"], [_decorator.bound, 2, "closeDialogByKey"], [_decorator.bound, 2, "closeDilaogByDialogId"], [_decorator.bound, 2, "closeSystemPreferenceDialog"], [_decorator.bound, 2, "closeChatFromDialog"], [_decorator.bound, 2, "moveChatFromDialogToAside"], [_decorator.bound, 2, "closeConnectionDialog"], [_decorator.bound, 2, "closeParticipantDialog"], [_decorator.bound, 2, "moveParticipantFromDialogToAside"], [_decorator.bound, 2, "resizeVideoWindow"], [_recordCurrentSharingScreenBoundsDecs, 18, "recordCurrentSharingScreenBounds"], [_decorator.bound, 2, "log"], [_handleDialogEventDecs, 18, "_handleDialogEvent"], [_hanleAllUserCountUpdatedDecs, 18, "_hanleAllUserCountUpdated"]], []).e, 9);
 _init_openedDialogs = _applyDecs$e[0];
 _init_confirmDialogs = _applyDecs$e[1];
 _init_userCount = _applyDecs$e[2];

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

@@ -1,13 +1,24 @@
 import React from 'react';
 import { FcrUIDialogKey } from '../../utilities/constant';
 import DialogStore from './store';
+export type FcrUIDialogOnOpenedProps = {
+    browserWindow: Electron.BrowserWindow;
+    newRendererWindow: Window;
+    store: DialogStore;
+    setBounds: (bounds: Partial<Electron.Rectangle>, animate?: boolean) => void;
+    nearDisplayBounds: Electron.Rectangle;
+};
+export type FcrUIDialogOnCloseProps = {
+    store: DialogStore;
+    browserWindow: Electron.BrowserWindow;
+};
 export type FcrUIDialogHooksProps = {
     /**
      * @param dialogKey - dialog 窗口的 key，为 FcrUIDialogKey 的枚举之一
      */
     dialogKey: FcrUIDialogKey;
     /**
-     * @param dialogId - dialog 窗口的 id，标识唯一窗口
+     * @param dialogId - dialog 窗口的 id，标识唯一窗口，如果 dialogKey 和 dialogId 都存在，则优先使用 dialogId
      */
     dialogId?: string;
     /**
@@ -18,20 +29,11 @@ export type FcrUIDialogHooksProps = {
     /**
      * @param onClose - 当 dialog 关闭时的回调函数，函数签名为 dialog 的 store
      * */
-    onClose?: (props: {
-        store: DialogStore;
-        browserWindow: Electron.BrowserWindow;
-    }) => void;
+    onClose?: (props: FcrUIDialogOnCloseProps) => void;
     /**
      * @param onOpened - 当 dialog 打开时的回调函数，函数签名为 dialog 的 store、browserwindow 对象和设置 bounds 的方法，此 bounds 不同于 browserwindow 的 setBounds 会为宽高自动加上阴影的设置
      */
-    onOpened?: (props: {
-        browserWindow: Electron.BrowserWindow;
-        newRendererWindow: Window;
-        store: DialogStore;
-        setBounds: (bounds: Partial<Electron.Rectangle>, animate?: boolean) => void;
-        nearDisplayBounds: Electron.Rectangle;
-    }) => void;
+    onOpened?: (props: FcrUIDialogOnOpenedProps) => void;
     /**
      * * @param onUnmounted - 当 dialog 卸载时的回调函数，函数签名为 dialog 的 store
      */
@@ -83,3 +85,4 @@ export type FcrUIDialogInfo = {
     key: FcrUIDialogKey;
     component: FcrUIDialogComponent;
 };
+export type FcrUIDialogHooksConfig = Omit<FcrUIDialogHooksProps, 'dialogKey' | 'config' | 'children' | 'onClose' | 'onOpened' | 'onUnmounted'>;

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

@@ -1,7 +1,4 @@
 import { ConfirmContentProps } from 'agora-ui-foundation/lib/components/confirm-content';
-export declare const ConfirmWindow: ({ confirm, onMouseEnter, onMouseLeave, activeConfirm, }: {
+export declare const ConfirmWindow: ({ confirm }: {
     confirm: ConfirmContentProps;
-    onMouseEnter: (title: string | undefined) => void;
-    onMouseLeave: () => void;
-    activeConfirm: string | undefined;
 }) => import("react/jsx-runtime").JSX.Element;

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

@@ -22,7 +22,6 @@ exports.ConfirmWindow = void 0;
 require("core-js/modules/es.array.concat.js");
 require("core-js/modules/es.date.to-json.js");
 require("core-js/modules/es.json.stringify.js");
-require("core-js/modules/web.timers.js");
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _mobxReact = require("mobx-react");
@@ -32,7 +31,7 @@ var _useElectron = require("../../../dialog/hooks/useElectron");
 var _env = require("agora-foundation/lib/utilities/env");
 var _confirmContent = require("agora-ui-foundation/lib/components/confirm-content");
 var _platform = require("../../../../utilities/platform");
-var _tools = require("../../../../utilities/tools");
+var _dialogUtils = require("../../../../utilities/dialog-utils");
 var _renderer = require("../../../../utilities/renderer");
 var _react2 = require("@use-gesture/react");
 var _jsxRuntime = require("react/jsx-runtime");
@@ -40,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 confirm = _ref.confirm,
-    onMouseEnter = _ref.onMouseEnter,
-    onMouseLeave = _ref.onMouseLeave,
-    activeConfirm = _ref.activeConfirm;
+  var confirm = _ref.confirm;
   var _useContext = (0, _react.useContext)(_store.StoreContext),
     screenBounds = _useContext.screenBounds,
     calculateMethods = _useContext.calculateMethods,
-    log = _useContext.log;
+    log = _useContext.log,
+    mousePosition = _useContext.mousePosition;
   var _ref2 = (0, _env.isElectron)() ? (0, _react.useContext)(_useElectron.DialogInstanceContext) : {},
     browserWindow = _ref2.browserWindow;
   var rndRef = (0, _react.useRef)(null);
@@ -91,7 +88,6 @@ var ConfirmWindow = exports.ConfirmWindow = (0, _mobxReact.observer)(function (_
     };
     setBounds(coord);
   });
-  var ignoreMouseTimer = (0, _react.useRef)();
   function recalculate(bounds) {
     if (windowFocusTimerRef.current) {
       clearTimeout(windowFocusTimerRef.current);
@@ -100,7 +96,7 @@ var ConfirmWindow = exports.ConfirmWindow = (0, _mobxReact.observer)(function (_
     log("call handle checkMouseOver condition:  ".concat((0, _env.isElectron)(), " && ").concat((0, _platform.isWindows)(), " && ").concat(browserWindow, " && ").concat(rndRef.current, " && ").concat(JSON.stringify(screenBounds)));
     if ((0, _env.isElectron)() && (0, _platform.isWindows)() && browserWindow && rndRef.current && screenBounds) {
       log("handleCheckMouseOver called , the bounds is ".concat(JSON.stringify(bounds || screenBounds)));
-      (0, _tools.handleCheckMouseOver)({
+      (0, _dialogUtils.handleCheckMouseOver)({
         elem: rndRef.current,
         browserWindow: browserWindow,
         screenBounds: bounds || screenBounds,
@@ -113,6 +109,26 @@ var ConfirmWindow = exports.ConfirmWindow = (0, _mobxReact.observer)(function (_
   var handleRecalculate = function handleRecalculate() {
     return recalculate();
   };
+  var initMouseEvents = function initMouseEvents(position) {
+    // 旧版本 mac 系统，ignore 会失效，所以作此处理
+    if ((0, _env.isElectron)() && (0, _renderer.isMac)()) {
+      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');
+      }
+    }
+  };
+  (0, _react.useEffect)(function () {
+    initMouseEvents(mousePosition);
+  }, [mousePosition]);
   (0, _react.useEffect)(function () {
     recalculate();
     !calculateMethods.has(confirm) && calculateMethods.set(confirm, recalculate);
@@ -120,7 +136,6 @@ var ConfirmWindow = exports.ConfirmWindow = (0, _mobxReact.observer)(function (_
     return function () {
       clearTimeout(windowFocusTimerRef.current);
       calculateMethods["delete"](confirm);
-      ignoreMouseTimer.current && clearInterval(ignoreMouseTimer.current);
       (0, _env.isElectron)() && (0, _platform.isWindows)() && window.runtime.screen.removeListener('display-removed', handleRecalculate);
     };
   }, [rndRef.current /** hack 处理 windows 下，弹出窗口层级不对的问题 */]);
@@ -132,34 +147,30 @@ var ConfirmWindow = exports.ConfirmWindow = (0, _mobxReact.observer)(function (_
     });
   }, [screenBounds]);
   var handleMouseEnter = function handleMouseEnter() {
-    ignoreMouseTimer.current && activeConfirm === confirm.title && clearInterval(ignoreMouseTimer.current);
     if ((0, _env.isElectron)()) {
-      onMouseEnter(confirm.title);
-      browserWindow === null || browserWindow === void 0 || browserWindow.setIgnoreMouseEvents(false);
       browserWindow === null || browserWindow === void 0 || browserWindow.focus();
+      browserWindow === null || browserWindow === void 0 || browserWindow.setIgnoreMouseEvents(false);
     }
   };
   var handleMouseLeave = function handleMouseLeave() {
     if ((0, _env.isElectron)()) {
-      onMouseLeave();
       log("[event-confirm]: handleMouseLeave, ignore mouse events: true");
       browserWindow === null || browserWindow === void 0 || browserWindow.setIgnoreMouseEvents(true, {
         forward: true
       });
-      // 修复老版本的 mac 下，ignore 会失效的问题
-      if (activeConfirm === undefined && (0, _renderer.isMac)()) {
-        ignoreMouseTimer.current = setInterval(function () {
-          browserWindow === null || browserWindow === void 0 || browserWindow.setIgnoreMouseEvents(true, {
-            forward: true
-          });
-        }, 1000);
-      }
     }
   };
+  var handleMouseMove = function handleMouseMove() {
+    browserWindow === null || browserWindow === void 0 || browserWindow.moveTop();
+    browserWindow === null || browserWindow === void 0 || browserWindow.focus();
+    browserWindow === null || browserWindow === void 0 || browserWindow.setIgnoreMouseEvents(false);
+  };
   return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", _objectSpread(_objectSpread({}, bind()), {}, {
     onMouseLeave: handleMouseLeave,
     onMouseEnter: handleMouseEnter,
-    onMouseMove: handleMouseEnter,
+    onMouseMove: handleMouseMove,
+    onMouseOver: handleMouseEnter,
+    onClick: handleMouseMove,
     style: {
       width: defaultSize.width,
       height: confirm.height || 'auto',

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

@@ -7,6 +7,7 @@ import { FcrUIMemberSharedDataSource } from '../../shared-data-source/member-dat
 import { FcrUIAbilityProviderImpl } from '../../providers/ability-provider';
 import { FcrUIScreenShareProvider } from '../../providers/screen-share-provider';
 import { FcrUIScreenShareSharedDataSource } from '../../shared-data-source/screen-share-data';
+import { FcrUISharedConfirmDataSource } from '../../shared-data-source/confirm-data';
 export declare class EventConfirmUIModule extends UIModule {
     private _store?;
     private _leaveMeetingStore?;
@@ -19,6 +20,7 @@ export declare class EventConfirmUIModule extends UIModule {
     sharedMemberDataSource?: FcrUIMemberSharedDataSource;
     abilityProvider?: FcrUIAbilityProviderImpl;
     sharedScreenShareSharedDataSource?: FcrUIScreenShareSharedDataSource;
+    sharedConfirmDataSource?: FcrUISharedConfirmDataSource;
     onNodeWillActive(): void;
     onNodeWillInactive(): void;
     getComponent(scene: string): import("react/jsx-runtime").JSX.Element;

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

@@ -38,13 +38,14 @@ var EventConfirmUIModule = exports.EventConfirmUIModule = /*#__PURE__*/function
   return (0, _createClass2["default"])(EventConfirmUIModule, [{
     key: "onNodeWillActive",
     value: function onNodeWillActive() {
-      if (this.eventProvider && this.dialogProvider && this.sharedScreenShareSharedDataSource) {
+      if (this.eventProvider && this.dialogProvider && this.sharedScreenShareSharedDataSource && this.sharedConfirmDataSource) {
         var _this$currentRoomCont;
         this._store = new _store2["default"]({
           uiEventStore: this.eventProvider,
           dialogProvider: this.dialogProvider,
           sharedScreenShareSharedDataSource: this.sharedScreenShareSharedDataSource,
-          screenShareProvider: this.screenShareProvider
+          screenShareProvider: this.screenShareProvider,
+          sharedConfirmDataSource: this.sharedConfirmDataSource
         });
         this._leaveMeetingStore = new _store.LeaveMeetingStore(this.privilegeProvider, this.roomProvider, (_this$currentRoomCont = this.currentRoomControlProvider) === null || _this$currentRoomCont === void 0 ? void 0 : _this$currentRoomCont.currentRoomControl, this.sharedMemberDataSource, this.abilityProvider, this.dialogProvider);
       }

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

@@ -5,12 +5,14 @@ import { FcrUIDialogProvider } from '../../providers/dialog-provider';
 import { FcrUIScreenShareSharedDataSource } from '../../shared-data-source/screen-share-data';
 import { FcrUIScreenShareProvider } from '../../providers/screen-share-provider';
 import { CurrentShareBounds } from '../control-bar/types';
+import { FcrUISharedConfirmDataSource } from '../../shared-data-source/confirm-data';
 export default class ConfirmStore {
     protected logger: import("agora-foundation/lib/logger").Logger;
     private _disposers;
     private _uiEventProvider;
     private _dialogProvider;
     private _sharedScreenShareSharedDataSource;
+    private _sharedConfirmDataSource;
     private _handleConfirmEventObserver;
     accessor isReplaceShare: boolean;
     accessor calculateMethods: Map<ConfirmContentProps, (bounds?: CurrentShareBounds | null) => void>;
@@ -20,16 +22,22 @@ export default class ConfirmStore {
         timer?: () => void;
     }>;
     accessor screenBounds: CurrentShareBounds | Electron.Rectangle | null;
+    get mousePosition(): {
+        x: number;
+        y: number;
+    };
     get confirmList(): ConfirmContentProps[];
     get isSeizeScreen(): boolean;
-    constructor({ uiEventStore, dialogProvider, screenShareProvider, sharedScreenShareSharedDataSource, }: {
+    constructor({ uiEventStore, dialogProvider, screenShareProvider, sharedScreenShareSharedDataSource, sharedConfirmDataSource, }: {
         uiEventStore: FcrUIEventProvider;
         dialogProvider: FcrUIDialogProvider;
         screenShareProvider: FcrUIScreenShareProvider;
         sharedScreenShareSharedDataSource: FcrUIScreenShareSharedDataSource;
+        sharedConfirmDataSource: FcrUISharedConfirmDataSource;
     });
     addConfirm(payload: FcrUIDialogParams<ConfirmContentProps>): void;
     resetIsReplace(): void;
+    setMousePosition(e: MouseEvent): void;
     release(): void;
     log(log: string): void;
     private _handleConfirmEvent;

package/lib/modules/event-confirm/store.js

@@ -70,10 +70,10 @@ var _constant = require("../../utilities/constant");
 var _react = require("react");
 var _logger = require("../../utilities/logger");
 var _decorator = require("agora-foundation/lib/decorator");
-var _tools = require("../../utilities/tools");
+var _dialogUtils = require("../../utilities/dialog-utils");
 var _env = require("agora-foundation/lib/utilities/env");
 var _ConfirmStore;
-var _initProto, _init_isReplaceShare, _init_calculateMethods, _init_reposition, _init_confirms, _init_screenBounds, _addConfirmDecs, _resetIsReplaceDecs, _handleConfirmEventDecs, _ref;
+var _initProto, _init_isReplaceShare, _init_calculateMethods, _init_reposition, _init_confirms, _init_screenBounds, _addConfirmDecs, _resetIsReplaceDecs, _setMousePositionDecs, _handleConfirmEventDecs, _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); }
@@ -91,14 +91,15 @@ var _B = /*#__PURE__*/new WeakMap();
 var _C = /*#__PURE__*/new WeakMap();
 var _D = /*#__PURE__*/new WeakMap();
 var _E = /*#__PURE__*/new WeakMap();
-_ref = (_addConfirmDecs = [_mobx.action, _mobx.action.bound], _resetIsReplaceDecs = [_mobx.action, _mobx.action.bound], _handleConfirmEventDecs = [_mobx.action, _mobx.action.bound], "logger");
+_ref = (_addConfirmDecs = [_mobx.action, _mobx.action.bound], _resetIsReplaceDecs = [_mobx.action, _mobx.action.bound], _setMousePositionDecs = [_mobx.action, _mobx.action.bound], _handleConfirmEventDecs = [_mobx.action, _mobx.action.bound], "logger");
 var ConfirmStore = exports["default"] = /*#__PURE__*/function () {
   function ConfirmStore(_ref2) {
     var _this = this;
     var uiEventStore = _ref2.uiEventStore,
       dialogProvider = _ref2.dialogProvider,
       screenShareProvider = _ref2.screenShareProvider,
-      sharedScreenShareSharedDataSource = _ref2.sharedScreenShareSharedDataSource;
+      sharedScreenShareSharedDataSource = _ref2.sharedScreenShareSharedDataSource,
+      sharedConfirmDataSource = _ref2.sharedConfirmDataSource;
     (0, _classCallCheck2["default"])(this, ConfirmStore);
     (0, _defineProperty2["default"])(this, _ref, (_initProto(this), (0, _logger.createLogger)({
       prefix: 'ConfirmStore'
@@ -115,6 +116,7 @@ var ConfirmStore = exports["default"] = /*#__PURE__*/function () {
     this._uiEventProvider = uiEventStore;
     this._dialogProvider = dialogProvider;
     this._sharedScreenShareSharedDataSource = sharedScreenShareSharedDataSource;
+    this._sharedConfirmDataSource = sharedConfirmDataSource;
     this._uiEventProvider.addObserver(this._handleConfirmEventObserver);
     this._dialogProvider.addObserver(this._handleConfirmEventObserver);
     this._disposers.push((0, _mobx.reaction)(function () {
@@ -129,7 +131,7 @@ var ConfirmStore = exports["default"] = /*#__PURE__*/function () {
       return (_this$_sharedScreenSh = _this._sharedScreenShareSharedDataSource) === null || _this$_sharedScreenSh === void 0 ? void 0 : _this$_sharedScreenSh.currentSelectionBounds;
     }, function (bounds) {
       if (bounds) {
-        var res = (0, _tools.followCorrectDisplay)({
+        var res = (0, _dialogUtils.followCorrectDisplay)({
           dialogKey: _constant.FcrUIDialogKey.CONFIRM,
           alwaysFollowScreen: true
         });
@@ -148,7 +150,7 @@ var ConfirmStore = exports["default"] = /*#__PURE__*/function () {
       return _this.isSeizeScreen;
     }, function (isSeize) {
       if (isSeize && (0, _env.isElectron)()) {
-        var _ref3 = (0, _tools.followCorrectDisplay)({
+        var _ref3 = (0, _dialogUtils.followCorrectDisplay)({
             dialogKey: _constant.FcrUIDialogKey.CONFIRM,
             alwaysFollowScreen: true,
             extraRefControlbarCondition: isSeize
@@ -197,13 +199,17 @@ var ConfirmStore = exports["default"] = /*#__PURE__*/function () {
     }
   }, {
     key: "screenBounds",
-    get: // @observable accessor mousePosition: { x: number; y: number } = { x: 0, y: 0 };
-    function get() {
+    get: function get() {
       return _classPrivateFieldGet(_E, this);
     },
     set: function set(v) {
       _classPrivateFieldSet(_E, this, v);
     }
+  }, {
+    key: "mousePosition",
+    get: function get() {
+      return this._sharedConfirmDataSource.position;
+    }
   }, {
     key: "confirmList",
     get: function get() {
@@ -280,12 +286,14 @@ var ConfirmStore = exports["default"] = /*#__PURE__*/function () {
     value: function resetIsReplace() {
       this.isReplaceShare = false;
     }
-
-    // @action.bound
-    // setMousePosition(e: MouseEvent) {
-    //   console.log('setMousePosition', e.pageX, e.pageY);
-    //   this.mousePosition = { x: e.pageX, y: e.pageY };
-    // }
+  }, {
+    key: "setMousePosition",
+    value: function setMousePosition(e) {
+      this._sharedConfirmDataSource.setPosition({
+        x: e.screenX,
+        y: e.screenY
+      });
+    }
   }, {
     key: "release",
     value: function release() {
@@ -309,7 +317,7 @@ var ConfirmStore = exports["default"] = /*#__PURE__*/function () {
         switch (action) {
           case _constant.FcrUIAction.OPEN_DIALOG:
             if ((0, _env.isElectron)()) {
-              var _ref5 = (0, _tools.followCorrectDisplay)({
+              var _ref5 = (0, _dialogUtils.followCorrectDisplay)({
                   dialogKey: _constant.FcrUIDialogKey.CONFIRM,
                   alwaysFollowScreen: true
                 }),
@@ -328,7 +336,7 @@ var ConfirmStore = exports["default"] = /*#__PURE__*/function () {
   }]);
 }();
 _ConfirmStore = ConfirmStore;
-var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_ConfirmStore, [[_mobx.observable, 1, "isReplaceShare"], [_mobx.observable, 1, "calculateMethods"], [_mobx.observable, 1, "reposition"], [_mobx.observable, 1, "confirms"], [_mobx.observable, 1, "screenBounds"], [_mobx.computed, 3, "confirmList"], [_addConfirmDecs, 18, "addConfirm"], [_resetIsReplaceDecs, 18, "resetIsReplace"], [_decorator.bound, 2, "log"], [_handleConfirmEventDecs, 18, "_handleConfirmEvent"]], []).e, 6);
+var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_ConfirmStore, [[_mobx.observable, 1, "isReplaceShare"], [_mobx.observable, 1, "calculateMethods"], [_mobx.observable, 1, "reposition"], [_mobx.observable, 1, "confirms"], [_mobx.observable, 1, "screenBounds"], [_mobx.computed, 3, "confirmList"], [_addConfirmDecs, 18, "addConfirm"], [_resetIsReplaceDecs, 18, "resetIsReplace"], [_setMousePositionDecs, 18, "setMousePosition"], [_decorator.bound, 2, "log"], [_handleConfirmEventDecs, 18, "_handleConfirmEvent"]], []).e, 6);
 _init_isReplaceShare = _applyDecs$e[0];
 _init_calculateMethods = _applyDecs$e[1];
 _init_reposition = _applyDecs$e[2];