fcr-ui-scene 3.7.3 → 3.7.4-rc.1

package/lib/modules/dialog/components/dialog-container/index.js

@@ -26,14 +26,15 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = exports.DialogContainerStore = void 0;
+require("core-js/modules/es.parse-int.js");
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = _interopRequireWildcard(require("react"));
 var _mobxReact = require("mobx-react");
-var _react2 = require("@use-gesture/react");
 var _env = require("agora-foundation/lib/utilities/env");
 var _store = require("../../store");
 var _body = require("./component/body");
+var _reactRnd = require("react-rnd");
 var _jsxRuntime = require("react/jsx-runtime");
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, "default": e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
 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; }
@@ -41,6 +42,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 var DialogContainerStore = exports.DialogContainerStore = /*#__PURE__*/(0, _react.createContext)({});
 var DialogContainer = (0, _mobxReact.observer)(function (props) {
   var width = props.width,
+    height = props.height,
     title = props.title,
     onClose = props.onClose,
     children = props.children,
@@ -50,7 +52,11 @@ var DialogContainer = (0, _mobxReact.observer)(function (props) {
     dialogId = props.dialogId,
     autoHeight = props.autoHeight,
     closable = props.closable,
-    style = props.style;
+    style = props.style,
+    maxWidth = props.maxWidth,
+    maxHeight = props.maxHeight,
+    minWidth = props.minWidth,
+    minHeight = props.minHeight;
   var _ref = (0, _react.useContext)(_store.StoreContext) || {
       closeDialogByKey: onClose
     },
@@ -76,61 +82,78 @@ var DialogContainer = (0, _mobxReact.observer)(function (props) {
   });
   if ((0, _env.isElectron)()) return container;
   var rndRef = (0, _react.useRef)(null);
-  var size = (0, _react.useMemo)(function () {
-    var _rndRef$current;
+  var windowWidth = window.innerWidth;
+  var windowHeight = window.innerHeight;
+
+  // 应用尺寸限制的辅助函数
+  var constrainSize = function constrainSize(newSize) {
+    var constrainedWidth = newSize.width;
+    var constrainedHeight = newSize.height;
+
+    // 应用最小尺寸限制
+    if (minWidth && constrainedWidth < minWidth) {
+      constrainedWidth = minWidth;
+    }
+    if (minHeight && constrainedHeight < minHeight) {
+      constrainedHeight = minHeight;
+    }
+
+    // 应用最大尺寸限制
+    if (maxWidth && constrainedWidth > maxWidth) {
+      constrainedWidth = maxWidth;
+    }
+    if (maxHeight && constrainedHeight > maxHeight) {
+      constrainedHeight = maxHeight;
+    }
     return {
-      width: width || 400,
-      height: props.height ? props.height : ((_rndRef$current = rndRef.current) === null || _rndRef$current === void 0 ? void 0 : _rndRef$current.getBoundingClientRect().height) || 160
+      width: constrainedWidth,
+      height: constrainedHeight
     };
-  }, [props.height]);
-  var windowWidth = window.innerWidth;
-  var height = window.innerHeight;
-  var x = windowWidth / 2 - size.width / 2;
-  var y = height / 2 - size.height / 2;
-  var windowBounds = {
-    x: x,
-    y: y,
-    width: window.innerWidth,
-    height: window.innerHeight
   };
   var _useState = (0, _react.useState)({
+      width: width || 400,
+      height: height || 160
+    }),
+    _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
+    size = _useState2[0],
+    updateSize = _useState2[1];
+  var x = windowWidth / 2 - size.width / 2;
+  var y = windowHeight / 2 - size.height / 2;
+  var _useState3 = (0, _react.useState)({
       x: x,
       y: y
     }),
-    _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
-    bounds = _useState2[0],
-    setBounds = _useState2[1];
-  var bind = (0, _react2.useDrag)(function (_ref2) {
-    var _ref2$delta = (0, _slicedToArray2["default"])(_ref2.delta, 2),
-      dx = _ref2$delta[0],
-      dy = _ref2$delta[1];
-    var x = bounds.x + dx;
-    var y = bounds.y + dy;
-    var maxX = windowBounds.width - size.width;
-    var maxY = windowBounds.height - size.height;
-    var coord = {
-      x: Math.max(0, Math.min(maxX, x)),
-      y: Math.max(0, Math.min(maxY, y))
-    };
-    setBounds(coord);
-  });
-  return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+    _useState4 = (0, _slicedToArray2["default"])(_useState3, 2),
+    position = _useState4[0],
+    updatePosition = _useState4[1];
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactRnd.Rnd, {
     style: _objectSpread({
-      width: size.width,
-      height: size.height,
-      left: "".concat(bounds.x, "px"),
-      top: "".concat(bounds.y, "px"),
       position: 'absolute',
       touchAction: 'none',
       display: 'flex',
       flexDirection: 'column'
     }, style),
-    children: /*#__PURE__*/(0, _jsxRuntime.jsx)(DialogContainerStore.Provider, {
-      value: {
-        bind: bind
-      },
-      children: container
-    })
+    size: size,
+    position: position,
+    minWidth: minWidth,
+    minHeight: minHeight,
+    maxWidth: maxWidth,
+    maxHeight: maxHeight,
+    onDragStop: function onDragStop(e, d) {
+      updatePosition({
+        x: d.x,
+        y: d.y
+      });
+    },
+    onResizeStop: function onResizeStop(e, direction, ref, delta, position) {
+      var newSize = constrainSize({
+        width: parseInt(ref.style.width),
+        height: parseInt(ref.style.height)
+      });
+      updateSize(newSize);
+      updatePosition(position);
+    },
+    children: container
   });
 });
 var _default = exports["default"] = DialogContainer;

package/lib/modules/dialog/components/normal-window/index.js

@@ -46,6 +46,10 @@ function NormalWindow(props) {
     title: title === false || title ? title : config.title,
     width: width || config.width,
     height: height || config.height,
+    maxWidth: config.maxWidth,
+    maxHeight: config.maxHeight,
+    minWidth: config.minWidth,
+    minHeight: config.minHeight,
     dialogKey: dialogKey,
     actions: actions,
     style: style,

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

@@ -6,7 +6,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.title = exports.setBounds = exports.config = exports.ControlBarDialog = void 0;
-require("core-js/modules/web.timers.js");
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _constant = require("../../../../utilities/constant");
@@ -96,52 +95,30 @@ var ControlBarDialog = exports.ControlBarDialog = (0, _mobxReact.observer)(funct
 });
 var setBounds = exports.setBounds = /*#__PURE__*/function () {
   var _ref3 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee2(currentShareBounds, browserWindow) {
-    var _getCurrentSharingWor, originWidth, originHeight, x, y, WINDOWS_SCREEN_BOUNDARY_WIDTH, width, height, firstBounds;
+    var _getCurrentSharingWor, originWidth, originHeight, x, y;
     return _regenerator["default"].wrap(function (_context2) {
       while (1) switch (_context2.prev = _context2.next) {
         case 0:
           _getCurrentSharingWor = (0, _dialogUtils.getCurrentSharingWorkArea)({
             currentShareBounds: currentShareBounds
-          }), originWidth = _getCurrentSharingWor.width, originHeight = _getCurrentSharingWor.height, x = _getCurrentSharingWor.x, y = _getCurrentSharingWor.y;
-          /* 使用window.screen.availWidth在windows上会黑屏，详见jira:APAAS-5732
-                怀疑是在windows上BrowserWindow有一个边框，所以需要减去一定的宽度。
-                实验结果最低是4。这里减去10留一点buffer，防止其他操作系统的边框不一致。
-                */
-          WINDOWS_SCREEN_BOUNDARY_WIDTH = 10;
-          width = (0, _platform.isWindows)() ? originWidth - WINDOWS_SCREEN_BOUNDARY_WIDTH : originWidth;
-          height = originHeight; // 重新设置窗口大小
+          }), originWidth = _getCurrentSharingWor.width, originHeight = _getCurrentSharingWor.height, x = _getCurrentSharingWor.x, y = _getCurrentSharingWor.y; // // 重新设置窗口大小
           if ((0, _platform.isWindows)()) {
-            // 修复 windows 分辨率差别大的多显示器场景下的窗口缩放问题
-            browserWindow === null || browserWindow === void 0 || browserWindow.setBounds({
+            browserWindow.isMaximized() && browserWindow.unmaximize();
+            browserWindow.setBounds({
               x: x,
               y: y,
-              width: width,
-              height: height
+              width: 800,
+              height: 600
             });
-            firstBounds = browserWindow.getBounds();
+            browserWindow.maximize();
+          } else {
             browserWindow.setBounds({
-              x: firstBounds.x === 0 ? 0 : -firstBounds.x,
-              y: firstBounds.y === 0 ? 0 : -firstBounds.y,
-              width: width,
-              height: height
-            });
-          }
-          setTimeout(function () {
-            browserWindow === null || browserWindow === void 0 || browserWindow.setBounds({
               x: x,
               y: y,
               width: originWidth,
               height: originHeight
             });
-            browserWindow === null || browserWindow === void 0 || browserWindow.setMaximumSize(originWidth, originHeight);
-            browserWindow.focus();
-          }, 100);
-          setTimeout(function () {
-            browserWindow === null || browserWindow === void 0 || browserWindow.setBounds({
-              width: originWidth,
-              height: originHeight
-            });
-          }, 100);
+          }
         case 1:
         case "end":
           return _context2.stop();

package/lib/modules/dialog/dialogs/sub-window/index.js

@@ -88,6 +88,10 @@ var SubWindowDialog = exports.SubWindowDialog = function SubWindowDialog(props)
         browserWindow.maximize();
         browserWindow.setTitle(window.runtime.browserWindow.getTitle());
       }
+      // 退出房间后，被关闭窗口是隐藏而不是退出，所以在重新显示时需要重置状态
+      browserWindow.on('show', function () {
+        store.interceptClose = true;
+      });
     },
     beforeClose: function beforeClose() {
       var interception = store.interceptClose;

package/lib/modules/dialog/dialogs/video-window/index.js

@@ -55,19 +55,30 @@ var VideoWindowDialog = exports.VideoWindowDialog = (0, _mobxReact.observer)(fun
     }, [videoWindowBounds]),
     height = _useMemo.videoWindowHeight,
     type = _useMemo.videoWindowPreviewType;
-  var setCalcBounds = function setCalcBounds(x, y, width) {
+  var getBoundsPosition = function getBoundsPosition(x, y, width) {
     return {
       x: x + width - _type.DefaultVideoWindowWidth - 144,
-      y: y + 80,
-      width: _type.DefaultVideoWindowWidth,
-      height: _type.DefaultVideoWindowSmallTypeHeight
+      y: y + 80
     };
   };
-  var _window$runtime$scree = window.runtime.screen.getDisplayNearestPoint(currentShareBounds).bounds,
-    x = _window$runtime$scree.x,
-    y = _window$runtime$scree.y,
-    width = _window$runtime$scree.width;
-  var initalBounds = setCalcBounds(x, y, width);
+  var _useMemo2 = (0, _react.useMemo)(function () {
+      var _window$runtime$scree = window.runtime.screen.getDisplayNearestPoint(currentShareBounds).bounds,
+        x = _window$runtime$scree.x,
+        y = _window$runtime$scree.y,
+        width = _window$runtime$scree.width;
+      var initalBounds = _objectSpread(_objectSpread({}, getBoundsPosition(x, y, width)), {}, {
+        width: _type.DefaultVideoWindowWidth,
+        height: _type.DefaultVideoWindowSmallTypeHeight
+      });
+      return {
+        x: x,
+        y: y,
+        initalBounds: initalBounds
+      };
+    }, [currentShareBounds.height, currentShareBounds.width, currentShareBounds.x, currentShareBounds.y]),
+    x = _useMemo2.x,
+    y = _useMemo2.y,
+    initalBounds = _useMemo2.initalBounds;
   var config = _objectSpread(_objectSpread({
     title: title,
     type: 'panel',
@@ -122,24 +133,16 @@ var VideoWindowDialog = exports.VideoWindowDialog = (0, _mobxReact.observer)(fun
             var _window$runtime$scree2 = window.runtime.screen.getDisplayNearestPoint(shareBounds).bounds,
               _x = _window$runtime$scree2.x,
               _y = _window$runtime$scree2.y,
-              _width = _window$runtime$scree2.width;
-            browserWindow.setBounds(setCalcBounds(_x, _y, _width));
-            store.log("[VideoWindowDialog]: [onOpened],  x: ".concat(_x, ", y: ").concat(_y, ", width: ").concat(_width));
+              width = _window$runtime$scree2.width;
+            browserWindow.setBounds(getBoundsPosition(_x, _y, width));
+            store.log("[VideoWindowDialog]: [onOpened],  x: ".concat(_x, ", y: ").concat(_y, ", width: ").concat(width));
           }
         }
         reCalculate();
         calculateRef.current = reCalculate;
-
-        // @ts-ignore
-        window.runtime.screen.addListener('display-metrics-changed', calculateRef.current);
+        window.runtime.screen.addListener('display-metrics-changed', reCalculate);
         window.runtime.screen.addListener('display-removed', reCalculate);
         window.runtime.screen.addListener('display-added', reCalculate);
-        // browserWindow.on(
-        //   'move',
-        //   debounce(() => {
-        //     popoverWatcher(browserWindow, newRendererWindow);
-        //   }, 100),
-        // );
         debounceRef.current = (0, _debounce["default"])(function (event, bounds) {
           setNewBounds(bounds);
           popoverWatcher(browserWindow, newRendererWindow);
@@ -155,8 +158,10 @@ var VideoWindowDialog = exports.VideoWindowDialog = (0, _mobxReact.observer)(fun
         if (!(browserWindow !== null && browserWindow !== void 0 && browserWindow.isDestroyed())) {
           // @ts-ignore
           browserWindow.removeListener('custom-resize', debounceRef.current);
-          // @ts-ignore
-          window.runtime.screen.removeListener('display-metrics-changed', calculateRef.current);
+          var listener = calculateRef.current;
+          window.runtime.screen.removeListener('display-metrics-changed', listener);
+          window.runtime.screen.removeListener('display-removed', listener);
+          window.runtime.screen.removeListener('display-added', listener);
           changeVideoWindowConfig(browserWindow);
           browserWindow.setResizable(false);
           browserWindow.setBounds(initalBounds);

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

@@ -106,9 +106,12 @@ function useElectronDialog(props) {
         store === null || store === void 0 || store.log("[dialog]: open dialog can I find dialog with dialogKey: ".concat(dialogKey, ": ").concat(_store.dialogWindows.has(dialogKey)));
         _store.dialogWindows.set(dialogKey, browserWindow);
       }
+      var isControlbar = dialogKey === _constant.FcrUIDialogKey.CONTROL_BAR;
+      var follow = isControlbar ? false : 'screen';
       var _ref = (0, _dialogUtils.followCorrectDisplay)({
           browserWindow: browserWindow,
-          alwaysFollowScreen: fullScreen
+          alwaysFollowScreen: fullScreen,
+          follow: follow
         }),
         nearDisplayBounds = _ref.nearDisplayBounds,
         followControlbar = _ref.followControlbar;

package/lib/modules/dialog/level-config.js

@@ -18,4 +18,4 @@ var diffPlatformTopLevelLayer = exports.diffPlatformTopLevelLayer = (0, _platfor
  * 其他窗口层级为 normal，在打开窗口时，聚焦窗口
  */
 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, _constant.FcrUIDialogKey.SYSTEM_PREFERENCE];
+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, _constant.FcrUIDialogKey.SYSTEM_PREFERENCE, _constant.FcrUIDialogKey.RENAME];

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

@@ -7,7 +7,7 @@ import { FcrUIEventProvider } from '../../providers/event-provider';
 import { FcrUISharedLayoutDataSource } from '../../shared-data-source/layout-data';
 import { FcrUIDialogProvider } from '../../providers/dialog-provider';
 import { FcrUIPhoneAudioConnectorProvider } from '../../providers/phone-audio-provider';
-import { AgoraRtcWindowInfo } from 'agora-rte-sdk/lib/core/rtc/type';
+import { FcrWindowInfo } from 'fcr-core/lib/type';
 import { CurrentShareBounds } from '../control-bar/types';
 import { FcrUIDialogComponent } from './type';
 import { FcrUIWidgetProvider } from '../../providers/widget-provider';
@@ -61,10 +61,10 @@ export default class DialogStore {
     accessor currentDialogBounds: Map<FcrUIDialogKey, number>;
     accessor videoWindowBounds: any;
     accessor recordShareBounds: Map<CurrentShareBounds, CurrentShareScreenWorkArea>;
-    accessor allApplicationWindows: AgoraRtcWindowInfo[];
+    accessor allApplicationWindows: FcrWindowInfo[];
     accessor interceptClose: boolean;
     get currentShareId(): string;
-    get currentShareType(): import("agora-rte-sdk/lib/core/rtc/type").AgoraRtcScreenCaptureType;
+    get currentShareType(): import("fcr-core/lib/type").FcrScreenCaptureType;
     get currentShareBounds(): CurrentShareBounds;
     get dialogComponentMapByKey(): Map<FcrUIDialogKey, FcrUIDialogComponent>;
     get participantCount(): number;
@@ -130,5 +130,6 @@ export default class DialogStore {
     private _handleDialogEvent;
     private _hanleAllUserCountUpdated;
     private _handleSecondaryWindowEvent;
+    private _setInterceptClose;
 }
 export declare const StoreContext: import("react").Context<DialogStore>;

package/lib/modules/dialog/store.js

@@ -76,7 +76,7 @@ var _dialogUtils = require("../../utilities/dialog-utils");
 var _type2 = require("../secondary-window/type");
 var _excluded = ["x", "y"];
 var _DialogStore;
-var _initProto, _init_openedDialogs, _init_confirmDialogs, _init_userCount, _init_participantElectronDialogContainer, _init_currentDialogBounds, _init_videoWindowBounds, _init_recordShareBounds, _init_allApplicationWindows, _init_interceptClose, _setConfirmPositionDecs, _setVideoWindowBoundsDecs, _recordCurrentSharingScreenBoundsDecs, _handleDialogEventDecs, _hanleAllUserCountUpdatedDecs, _handleSecondaryWindowEventDecs, _ref;
+var _initProto, _init_openedDialogs, _init_confirmDialogs, _init_userCount, _init_participantElectronDialogContainer, _init_currentDialogBounds, _init_videoWindowBounds, _init_recordShareBounds, _init_allApplicationWindows, _init_interceptClose, _setConfirmPositionDecs, _setVideoWindowBoundsDecs, _recordCurrentSharingScreenBoundsDecs, _handleDialogEventDecs, _hanleAllUserCountUpdatedDecs, _handleSecondaryWindowEventDecs, _setInterceptCloseDecs, _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); }
@@ -100,7 +100,7 @@ var _F = /*#__PURE__*/new WeakMap();
 var _G = /*#__PURE__*/new WeakMap();
 var _H = /*#__PURE__*/new WeakMap();
 var _I = /*#__PURE__*/new WeakMap();
-_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], _handleSecondaryWindowEventDecs = [_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], _handleSecondaryWindowEventDecs = [_mobx.action, _mobx.action.bound], _setInterceptCloseDecs = [_mobx.action, _mobx.action.bound], "logger");
 var DialogStore = exports["default"] = /*#__PURE__*/function () {
   function DialogStore(_ref2) {
     var _this = this;
@@ -136,12 +136,11 @@ var DialogStore = exports["default"] = /*#__PURE__*/function () {
       onAllUserCountUpdated: this._hanleAllUserCountUpdated
     });
     (0, _defineProperty2["default"])(this, "_roomObserver", {
-      onExitRoom: function onExitRoom() {
-        _this.interceptClose = false;
-      },
-      onRoutingChanged: function onRoutingChanged() {
-        _this.interceptClose = false;
-      }
+      onExitRoom: this._setInterceptClose,
+      onRoutingChanged: this._setInterceptClose,
+      onRoomClosed: this._setInterceptClose,
+      onLeaveMainRoom: this._setInterceptClose,
+      onLocalUserKickedOut: this._setInterceptClose
     });
     (0, _defineProperty2["default"])(this, "_handleSecondaryWindowEventObserver", {
       onContentDistributionUpdated: this._handleSecondaryWindowEvent
@@ -185,7 +184,7 @@ var DialogStore = exports["default"] = /*#__PURE__*/function () {
     this._userInfo = userControl.getLocalUser();
     (0, _mobx.runInAction)(function () {
       _this.userCount = _this._userControl.getAllUserCount();
-      _this._annotationProvider.initAnnotationWindow();
+      // this._annotationProvider.initAnnotationWindow();
     });
     this._disposers.push((0, _mobx.reaction)(function () {
       return _this._sharedSettingDataSource.settingConfig.setting.isDualDisplayMode;
@@ -595,10 +594,15 @@ var DialogStore = exports["default"] = /*#__PURE__*/function () {
         this.interceptClose = false;
       }
     }
+  }, {
+    key: "_setInterceptClose",
+    value: function _setInterceptClose() {
+      this.interceptClose = false;
+    }
   }]);
 }();
 _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.observable, 1, "interceptClose"], [_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, "moveMainWindowToIndexLeastDisplay"], [_decorator.bound, 2, "log"], [_handleDialogEventDecs, 18, "_handleDialogEvent"], [_hanleAllUserCountUpdatedDecs, 18, "_hanleAllUserCountUpdated"], [_handleSecondaryWindowEventDecs, 18, "_handleSecondaryWindowEvent"]], []).e, 10);
+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.observable, 1, "interceptClose"], [_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, "moveMainWindowToIndexLeastDisplay"], [_decorator.bound, 2, "log"], [_handleDialogEventDecs, 18, "_handleDialogEvent"], [_hanleAllUserCountUpdatedDecs, 18, "_hanleAllUserCountUpdated"], [_handleSecondaryWindowEventDecs, 18, "_handleSecondaryWindowEvent"], [_setInterceptCloseDecs, 18, "_setInterceptClose"]], []).e, 10);
 _init_openedDialogs = _applyDecs$e[0];
 _init_confirmDialogs = _applyDecs$e[1];
 _init_userCount = _applyDecs$e[2];

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

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

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

@@ -39,12 +39,14 @@ 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;
+  var id = _ref.id,
+    confirm = _ref.confirm;
   var _useContext = (0, _react.useContext)(_store.StoreContext),
     screenBounds = _useContext.screenBounds,
     calculateMethods = _useContext.calculateMethods,
+    removeObserverWindow = _useContext.removeObserverWindow,
     log = _useContext.log,
-    mousePosition = _useContext.mousePosition;
+    setObserverWindow = _useContext.setObserverWindow;
   var _ref2 = (0, _env.isElectron)() ? (0, _react.useContext)(_useElectron.DialogInstanceContext) : {},
     browserWindow = _ref2.browserWindow;
   var rndRef = (0, _react.useRef)(null);
@@ -86,6 +88,10 @@ 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) {
@@ -109,26 +115,44 @@ var ConfirmWindow = exports.ConfirmWindow = (0, _mobxReact.observer)(function (_
   var handleRecalculate = function handleRecalculate() {
     return recalculate();
   };
-  var initMouseEvents = function initMouseEvents(position) {
-    // 旧版本 mac 系统，ignore 会失效，所以作此处理
+  (0, _react.useEffect)(function () {
     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));
+      if (confirm.className === 'confirm-mouseover') {
         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]);
+    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 () {
     recalculate();
     !calculateMethods.has(confirm) && calculateMethods.set(confirm, recalculate);

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

@@ -1,5 +1,3 @@
-
-
 .fcr-event-confirm-wrapper.fcr-event-confirm-container {
   width: 100vw;
   height: 100vh;

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

@@ -14,19 +14,20 @@ 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 mousePosition(): {
-        x: number;
-        y: number;
-    };
-    get confirmList(): ConfirmContentProps[];
+    get confirmList(): {
+        id: string;
+        params: ConfirmContentProps;
+    }[];
     get isSeizeScreen(): boolean;
     constructor({ uiEventStore, dialogProvider, screenShareProvider, sharedScreenShareSharedDataSource, sharedConfirmDataSource, }: {
         uiEventStore: FcrUIEventProvider;
@@ -36,10 +37,14 @@ 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>;