fcr-ui-scene 3.6.0 → 3.6.2

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 { AgoraRtcScreenCaptureType } from 'agora-rte-sdk/lib/core/rtc/type';
+import { AgoraRtcScreenCaptureType, AgoraRtcWindowInfo } from 'agora-rte-sdk/lib/core/rtc/type';
 import { CurrentShareBounds } from '../control-bar/types';
 import { CurrentShareScreenTypes } from '../share-screen/types';
 import { FcrUIDialogComponent } from './type';
@@ -16,6 +16,7 @@ import { FcrUIChatProvider } from '../../providers/chat-provider';
 import { FcrUIAbilityProviderImpl } from 'fcr-ui-scene/src/providers/ability-provider';
 import { CurrentShareScreenWorkArea } from '../../utilities/tools';
 import { FcrUIScreenShareProvider } from '../../providers/screen-share-provider';
+import { FcrUIScreenShareSharedDataSource } from '../../shared-data-source/screen-share-data';
 export declare const HIGH_LEVEL_DIALOG_LAYER: FcrUIDialogKey[];
 export declare const TOP_LEVEL_DIALOG_LAYER: FcrUIDialogKey[];
 export default class DialogStore {
@@ -33,10 +34,12 @@ export default class DialogStore {
     private _screenShareProvider;
     private _sharedLayoutDataSource;
     private _phoneAudioConnectorProvider;
+    private _sharedScreenShareSharedDataSource;
     private _dialogComponentMapByKey;
     private _chatProvider;
     private _handleDialogEventObserver;
     private _userObserver;
+    private _electronDialogs;
     accessor openedDialogs: {
         dialogKey: FcrUIDialogKey;
         dialogId: string;
@@ -51,6 +54,7 @@ export default class DialogStore {
     accessor currentShareType: AgoraRtcScreenCaptureType;
     accessor currentShareBounds: CurrentShareBounds;
     accessor recordShareBounds: Map<CurrentShareBounds, CurrentShareScreenWorkArea>;
+    accessor allApplicationWindows: AgoraRtcWindowInfo[];
     get dialogComponentMapByKey(): Map<FcrUIDialogKey, FcrUIDialogComponent>;
     get participantCount(): number;
     get isManager(): boolean;
@@ -69,7 +73,8 @@ export default class DialogStore {
     get widgetDialogIds(): Map<string, string>;
     get chatRoomState(): import("fcr-core/lib/room-control/chatroom-control/type").FcrChatRoomConnectionState;
     get isSharingScreen(): boolean;
-    constructor({ uiEventStore, userControl, deviceStore, streamControl, localVideoRenderProvider, remoteVideoRenderManager, securityStore, sharedLayoutDataSource, dialogProvider, phoneAudioConnectorProvider, dialogsByKey, widgetProvider, screenShareProvider, chatProvider, }: {
+    get isSharingScreenOwner(): boolean;
+    constructor({ uiEventStore, userControl, deviceStore, streamControl, localVideoRenderProvider, remoteVideoRenderManager, securityStore, sharedLayoutDataSource, dialogProvider, phoneAudioConnectorProvider, dialogsByKey, widgetProvider, screenShareProvider, chatProvider, sharedScreenShareSharedDataSource, }: {
         streamControl: FcrStreamControl;
         userControl: FcrUserControl;
         uiEventStore: FcrUIEventProvider;
@@ -85,6 +90,7 @@ export default class DialogStore {
         chatProvider: FcrUIChatProvider;
         screenShareProvider: FcrUIScreenShareProvider;
         abilityProvider: FcrUIAbilityProviderImpl;
+        sharedScreenShareSharedDataSource: FcrUIScreenShareSharedDataSource;
     });
     setParticipantElectronDialogContainer(dom: HTMLElement | null): void;
     setVideoWindowBounds(payload: any): void;
@@ -100,6 +106,7 @@ export default class DialogStore {
     resizeVideoWindow(width: number, height: number): void;
     updateCurrentShareContent(payload: CurrentShareScreenTypes): void;
     recordCurrentSharingScreenBounds(): CurrentShareScreenWorkArea;
+    log(info: string): void;
     private _handleDialogEvent;
     private _hanleAllUserCountUpdated;
     private _focusDialog;

package/lib/modules/dialog/store.js

@@ -83,7 +83,7 @@ var _tools = require("../../utilities/tools");
 var _useElectron = require("./hooks/useElectron");
 var _excluded = ["x", "y"];
 var _DialogStore;
-var _initProto, _init_openedDialogs, _init_confirmDialogs, _init_userCount, _init_participantElectronDialogContainer, _init_currentDialogBounds, _init_videoWindowBounds, _init_currentShareId, _init_currentShareType, _init_currentShareBounds, _init_recordShareBounds, _setVideoWindowBoundsDecs, _updateCurrentShareContentDecs, _recordCurrentSharingScreenBoundsDecs, _handleDialogEventDecs, _hanleAllUserCountUpdatedDecs, _ref;
+var _initProto, _init_openedDialogs, _init_confirmDialogs, _init_userCount, _init_participantElectronDialogContainer, _init_currentDialogBounds, _init_videoWindowBounds, _init_currentShareId, _init_currentShareType, _init_currentShareBounds, _init_recordShareBounds, _init_allApplicationWindows, _setVideoWindowBoundsDecs, _updateCurrentShareContentDecs, _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); }
@@ -97,7 +97,7 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
 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];
+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 _A = /*#__PURE__*/new WeakMap();
 var _B = /*#__PURE__*/new WeakMap();
 var _C = /*#__PURE__*/new WeakMap();
@@ -108,6 +108,7 @@ var _G = /*#__PURE__*/new WeakMap();
 var _H = /*#__PURE__*/new WeakMap();
 var _I = /*#__PURE__*/new WeakMap();
 var _J = /*#__PURE__*/new WeakMap();
+var _K = /*#__PURE__*/new WeakMap();
 _ref = (_setVideoWindowBoundsDecs = [_mobx.action, _mobx.action.bound], _updateCurrentShareContentDecs = [_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) {
@@ -125,7 +126,8 @@ var DialogStore = exports["default"] = /*#__PURE__*/function () {
       dialogsByKey = _ref2.dialogsByKey,
       widgetProvider = _ref2.widgetProvider,
       screenShareProvider = _ref2.screenShareProvider,
-      chatProvider = _ref2.chatProvider;
+      chatProvider = _ref2.chatProvider,
+      sharedScreenShareSharedDataSource = _ref2.sharedScreenShareSharedDataSource;
     (0, _classCallCheck2["default"])(this, DialogStore);
     (0, _defineProperty2["default"])(this, _ref, (_initProto(this), (0, _logger.createLogger)({
       prefix: 'DialogStore'
@@ -136,6 +138,7 @@ var DialogStore = exports["default"] = /*#__PURE__*/function () {
     (0, _defineProperty2["default"])(this, "_userObserver", {
       onAllUserCountUpdated: this._hanleAllUserCountUpdated
     });
+    (0, _defineProperty2["default"])(this, "_electronDialogs", new Map());
     _classPrivateFieldInitSpec(this, _A, _init_openedDialogs(this, []));
     _classPrivateFieldInitSpec(this, _B, _init_confirmDialogs(this, new Map()));
     _classPrivateFieldInitSpec(this, _C, _init_userCount(this, 0));
@@ -151,6 +154,8 @@ var DialogStore = exports["default"] = /*#__PURE__*/function () {
       y: 0
     }));
     _classPrivateFieldInitSpec(this, _J, _init_recordShareBounds(this, new Map()));
+    _classPrivateFieldInitSpec(this, _K, _init_allApplicationWindows(this, []));
+    this._sharedScreenShareSharedDataSource = sharedScreenShareSharedDataSource;
     this._uiEventStore = uiEventStore;
     this._streamControl = streamControl;
     this._userControl = userControl;
@@ -253,6 +258,14 @@ var DialogStore = exports["default"] = /*#__PURE__*/function () {
     set: function set(v) {
       _classPrivateFieldSet(_J, this, v);
     }
+  }, {
+    key: "allApplicationWindows",
+    get: function get() {
+      return _classPrivateFieldGet(_K, this);
+    },
+    set: function set(v) {
+      _classPrivateFieldSet(_K, this, v);
+    }
   }, {
     key: "dialogComponentMapByKey",
     get: function get() {
@@ -326,7 +339,13 @@ var DialogStore = exports["default"] = /*#__PURE__*/function () {
   }, {
     key: "isSharingScreen",
     get: function get() {
-      return this._screenShareProvider.isSharingScreen;
+      return this._sharedScreenShareSharedDataSource.isSharingScreen;
+    }
+  }, {
+    key: "isSharingScreenOwner",
+    get: function get() {
+      var _this$_sharedScreenSh;
+      return ((_this$_sharedScreenSh = this._sharedScreenShareSharedDataSource.screenSharingOwner) === null || _this$_sharedScreenSh === void 0 ? void 0 : _this$_sharedScreenSh.userId) === this._userInfo.userId;
     }
   }, {
     key: "setParticipantElectronDialogContainer",
@@ -461,6 +480,11 @@ var DialogStore = exports["default"] = /*#__PURE__*/function () {
       }
       return screenBounds;
     }
+  }, {
+    key: "log",
+    value: function log(info) {
+      this.logger.info(info);
+    }
   }, {
     key: "_handleDialogEvent",
     value: function _handleDialogEvent(action, payload) {
@@ -469,8 +493,16 @@ var DialogStore = exports["default"] = /*#__PURE__*/function () {
         dialogId = _ref6.dialogId,
         _ref6$params = _ref6.params,
         params = _ref6$params === void 0 ? {} : _ref6$params;
+      var openInFragments = [_constant.FcrUIDialogKey.ANNOTATION];
       switch (action) {
         case _constant.FcrUIAction.OPEN_DIALOG:
+          if ((0, _env.isElectron)()) {
+            if (openInFragments.includes(dialogKey)) {
+              this._electronDialogs.set(dialogId, dialogKey);
+              window.runtime.open(dialogKey, dialogId);
+              return;
+            }
+          }
           this.logger.info('open_dialog: ', dialogKey, '====', dialogId);
           // 因为窗口可能会移动，因此需要矫正 global toast 和 confirm 的 Bounds
           var isToastOrConfirm = [_constant.FcrUIDialogKey.SHOW_TOAST, _constant.FcrUIDialogKey.CONFIRM].includes(dialogKey);
@@ -504,6 +536,13 @@ var DialogStore = exports["default"] = /*#__PURE__*/function () {
           }
           break;
         case _constant.FcrUIAction.CLOSE_DIALOG:
+          if ((0, _env.isElectron)()) {
+            var electronDialogKey = this._electronDialogs.get(dialogId);
+            if (electronDialogKey && openInFragments.includes(electronDialogKey)) {
+              window.runtime.close(electronDialogKey, dialogId);
+              return;
+            }
+          }
           this.openedDialogs = this.openedDialogs.filter(function (dialog) {
             return dialog.dialogId !== dialogId;
           });
@@ -541,7 +580,7 @@ var DialogStore = exports["default"] = /*#__PURE__*/function () {
   }]);
 }();
 _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, "currentShareId"], [_mobx.observable, 1, "currentShareType"], [_mobx.observable, 1, "currentShareBounds"], [_mobx.observable, 1, "recordShareBounds"], [_mobx.computed, 3, "connectType"], [_mobx.computed, 3, "hasOwnPstnStream"], [_mobx.computed, 3, "chatRoomState"], [_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"], [_updateCurrentShareContentDecs, 18, "updateCurrentShareContent"], [_recordCurrentSharingScreenBoundsDecs, 18, "recordCurrentSharingScreenBounds"], [_handleDialogEventDecs, 18, "_handleDialogEvent"], [_hanleAllUserCountUpdatedDecs, 18, "_hanleAllUserCountUpdated"], [_decorator.bound, 2, "_focusDialog"]], []).e, 11);
+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, "currentShareId"], [_mobx.observable, 1, "currentShareType"], [_mobx.observable, 1, "currentShareBounds"], [_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"], [_updateCurrentShareContentDecs, 18, "updateCurrentShareContent"], [_recordCurrentSharingScreenBoundsDecs, 18, "recordCurrentSharingScreenBounds"], [_decorator.bound, 2, "log"], [_handleDialogEventDecs, 18, "_handleDialogEvent"], [_hanleAllUserCountUpdatedDecs, 18, "_hanleAllUserCountUpdated"], [_decorator.bound, 2, "_focusDialog"]], []).e, 12);
 _init_openedDialogs = _applyDecs$e[0];
 _init_confirmDialogs = _applyDecs$e[1];
 _init_userCount = _applyDecs$e[2];
@@ -552,5 +591,6 @@ _init_currentShareId = _applyDecs$e[6];
 _init_currentShareType = _applyDecs$e[7];
 _init_currentShareBounds = _applyDecs$e[8];
 _init_recordShareBounds = _applyDecs$e[9];
-_initProto = _applyDecs$e[10];
+_init_allApplicationWindows = _applyDecs$e[10];
+_initProto = _applyDecs$e[11];
 var StoreContext = exports.StoreContext = /*#__PURE__*/(0, _react.createContext)(null);

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

@@ -0,0 +1,7 @@
+import { ConfirmContentProps } from 'agora-ui-foundation/lib/components/confirm-content';
+export declare const ConfirmWindow: ({ confirm, onMouseEnter, onMouseLeave, activeConfirm, }: {
+    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

@@ -0,0 +1,188 @@
+"use strict";
+
+require("core-js/modules/es.symbol.js");
+require("core-js/modules/es.array.filter.js");
+require("core-js/modules/es.array.for-each.js");
+require("core-js/modules/es.array.push.js");
+require("core-js/modules/es.object.define-properties.js");
+require("core-js/modules/es.object.define-property.js");
+require("core-js/modules/es.object.get-own-property-descriptor.js");
+require("core-js/modules/es.object.get-own-property-descriptors.js");
+require("core-js/modules/es.object.keys.js");
+require("core-js/modules/es.object.to-string.js");
+require("core-js/modules/esnext.async-iterator.filter.js");
+require("core-js/modules/esnext.async-iterator.for-each.js");
+require("core-js/modules/esnext.iterator.constructor.js");
+require("core-js/modules/esnext.iterator.filter.js");
+require("core-js/modules/esnext.iterator.for-each.js");
+require("core-js/modules/web.dom-collections.for-each.js");
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+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");
+var _react = require("react");
+var _store = require("../../store");
+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 _renderer = require("../../../../utilities/renderer");
+var _react2 = require("@use-gesture/react");
+var _jsxRuntime = require("react/jsx-runtime");
+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; }
+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 _useContext = (0, _react.useContext)(_store.StoreContext),
+    screenBounds = _useContext.screenBounds,
+    calculateMethods = _useContext.calculateMethods,
+    log = _useContext.log;
+  var _ref2 = (0, _env.isElectron)() ? (0, _react.useContext)(_useElectron.DialogInstanceContext) : {},
+    browserWindow = _ref2.browserWindow;
+  var rndRef = (0, _react.useRef)(null);
+  var windowFocusTimerRef = (0, _react.useRef)();
+  var defaultSize = {
+    width: confirm.width || 320,
+    height: confirm.height ? confirm.height : ((_rndRef$current = rndRef.current) === null || _rndRef$current === void 0 ? void 0 : _rndRef$current.getBoundingClientRect().height) || (confirm.icon ? 160 : 150)
+  };
+  var baseBounds = (0, _react.useMemo)(function () {
+    var _ref3 = screenBounds || {
+        width: window.innerWidth,
+        height: window.innerHeight
+      },
+      width = _ref3.width,
+      height = _ref3.height;
+    return {
+      x: width / 2 - defaultSize.width / 2,
+      y: height / 2 - defaultSize.height / 2,
+      width: width,
+      height: height
+    };
+  }, [screenBounds]);
+  var _useState = (0, _react.useState)({
+      x: baseBounds.x,
+      y: baseBounds.y
+    }),
+    _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
+    bounds = _useState2[0],
+    setBounds = _useState2[1];
+  var bind = (0, _react2.useDrag)(function (_ref4) {
+    var _ref4$delta = (0, _slicedToArray2["default"])(_ref4.delta, 2),
+      dx = _ref4$delta[0],
+      dy = _ref4$delta[1];
+    var x = bounds.x + dx;
+    var y = bounds.y + dy;
+    var maxX = baseBounds.width - defaultSize.width;
+    var maxY = baseBounds.height - defaultSize.height;
+    var coord = {
+      x: Math.max(0, Math.min(maxX, x)),
+      y: Math.max(0, Math.min(maxY, y))
+    };
+    setBounds(coord);
+  });
+  var ignoreMouseTimer = (0, _react.useRef)();
+  function recalculate(bounds) {
+    if (windowFocusTimerRef.current) {
+      clearTimeout(windowFocusTimerRef.current);
+      windowFocusTimerRef.current = undefined;
+    }
+    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)({
+        elem: rndRef.current,
+        browserWindow: browserWindow,
+        screenBounds: bounds || screenBounds,
+        callback: function callback(timerId) {
+          windowFocusTimerRef.current = timerId;
+        }
+      });
+    }
+  }
+  var handleRecalculate = function handleRecalculate() {
+    return recalculate();
+  };
+  (0, _react.useEffect)(function () {
+    recalculate();
+    !calculateMethods.has(confirm) && calculateMethods.set(confirm, recalculate);
+    (0, _env.isElectron)() && (0, _platform.isWindows)() && window.runtime.screen.addListener('display-removed', handleRecalculate);
+    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 下，弹出窗口层级不对的问题 */]);
+  (0, _react.useEffect)(function () {
+    log("when screen bounds changed ".concat(JSON.stringify(screenBounds)));
+    (0, _platform.isWindows)() && setBounds({
+      x: baseBounds.x,
+      y: baseBounds.y
+    });
+  }, [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();
+    }
+  };
+  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);
+      }
+    }
+  };
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", _objectSpread(_objectSpread({}, bind()), {}, {
+    onMouseLeave: handleMouseLeave,
+    onMouseEnter: handleMouseEnter,
+    onMouseMove: handleMouseEnter,
+    style: {
+      width: defaultSize.width,
+      height: confirm.height || 'auto',
+      left: "".concat(bounds.x, "px"),
+      top: "".concat(bounds.y, "px"),
+      position: 'absolute',
+      touchAction: 'none'
+    },
+    children: /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+      ref: rndRef,
+      onClick: function onClick(e) {
+        return e.stopPropagation();
+      },
+      onKeyUp: function onKeyUp(e) {
+        return e.stopPropagation();
+      },
+      onKeyDown: function onKeyDown(e) {
+        return e.stopPropagation();
+      },
+      className: "fcr-confirm-dialog-wrapper_web",
+      children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_confirmContent.ConfirmContent, _objectSpread({}, confirm))
+    })
+  }));
+});

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

@@ -6,20 +6,20 @@ import { FcrUICurrentRoomControlProvider, FcrUIRoomProvider } from '../../provid
 import { FcrUIMemberSharedDataSource } from '../../shared-data-source/member-data';
 import { FcrUIAbilityProviderImpl } from '../../providers/ability-provider';
 import { FcrUIScreenShareProvider } from '../../providers/screen-share-provider';
-import { FcrUIScreenShareDataSource } from '../../shared-data-source/screen-share-data-source';
+import { FcrUIScreenShareSharedDataSource } from '../../shared-data-source/screen-share-data';
 export declare class EventConfirmUIModule extends UIModule {
     private _store?;
     private _leaveMeetingStore?;
     eventProvider?: FcrUIEventProvider;
     dialogProvider?: FcrUIDialogProvider;
     privilegeProvider?: FcrUIPrivilegeProvider;
-    currentRoomControlProvider?: FcrUICurrentRoomControlProvider;
     screenShareProvider?: FcrUIScreenShareProvider;
+    currentRoomControlProvider?: FcrUICurrentRoomControlProvider;
     roomProvider?: FcrUIRoomProvider;
     sharedMemberDataSource?: FcrUIMemberSharedDataSource;
     abilityProvider?: FcrUIAbilityProviderImpl;
-    screenShareDataSource?: FcrUIScreenShareDataSource;
+    sharedScreenShareSharedDataSource?: FcrUIScreenShareSharedDataSource;
     onNodeWillActive(): void;
     onNodeWillInactive(): void;
-    getComponent(): import("react/jsx-runtime").JSX.Element;
+    getComponent(scene: string): import("react/jsx-runtime").JSX.Element;
 }

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

@@ -39,13 +39,13 @@ var EventConfirmUIModule = exports.EventConfirmUIModule = /*#__PURE__*/function
   return (0, _createClass2["default"])(EventConfirmUIModule, [{
     key: "onNodeWillActive",
     value: function onNodeWillActive() {
-      if (this.eventProvider && this.dialogProvider) {
+      if (this.eventProvider && this.dialogProvider && this.sharedScreenShareSharedDataSource) {
         var _this$currentRoomCont;
         this._store = new _store2["default"]({
           uiEventStore: this.eventProvider,
           dialogProvider: this.dialogProvider,
-          screenShareProvider: this.screenShareProvider,
-          screenShareDataSource: this.screenShareDataSource
+          sharedScreenShareSharedDataSource: this.sharedScreenShareSharedDataSource,
+          screenShareProvider: this.screenShareProvider
         });
         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);
       }
@@ -58,7 +58,9 @@ var EventConfirmUIModule = exports.EventConfirmUIModule = /*#__PURE__*/function
     }
   }, {
     key: "getComponent",
-    value: function getComponent() {
+    value: function getComponent(scene) {
+      var _this$_store2;
+      (_this$_store2 = this._store) === null || _this$_store2 === void 0 || _this$_store2.log("[EventConfirmUIModule]: [getComponent], scene: ".concat(scene));
       if (!this._store) {
         return /*#__PURE__*/(0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {});
       }

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

@@ -2,16 +2,15 @@ import { ConfirmContentProps } from 'agora-ui-foundation/lib/components/confirm-
 import { FcrUIEventProvider } from '../../providers/event-provider';
 import { FcrUIDialogParams } from '../../type';
 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 { FcrUIScreenShareDataSource } from '../../shared-data-source/screen-share-data-source';
 export default class ConfirmStore {
     protected logger: import("agora-foundation/lib/logger").Logger;
     private _disposers;
     private _uiEventProvider;
     private _dialogProvider;
-    private _screenShareProvider;
-    private _screenShareDataSource;
+    private _sharedScreenShareSharedDataSource;
     private _handleConfirmEventObserver;
     accessor isReplaceShare: boolean;
     accessor calculateMethods: Map<ConfirmContentProps, (bounds?: CurrentShareBounds | null) => void>;
@@ -23,11 +22,11 @@ export default class ConfirmStore {
     accessor screenBounds: CurrentShareBounds | Electron.Rectangle | null;
     get confirmList(): ConfirmContentProps[];
     get isSeizeScreen(): boolean;
-    constructor({ uiEventStore, dialogProvider, screenShareProvider, screenShareDataSource, }: {
+    constructor({ uiEventStore, dialogProvider, screenShareProvider, sharedScreenShareSharedDataSource, }: {
         uiEventStore: FcrUIEventProvider;
         dialogProvider: FcrUIDialogProvider;
         screenShareProvider: FcrUIScreenShareProvider;
-        screenShareDataSource: FcrUIScreenShareDataSource;
+        sharedScreenShareSharedDataSource: FcrUIScreenShareSharedDataSource;
     });
     addConfirm(payload: FcrUIDialogParams<ConfirmContentProps>): void;
     resetIsReplace(): void;

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

@@ -74,7 +74,6 @@ var _react = require("react");
 var _logger = require("../../utilities/logger");
 var _decorator = require("agora-foundation/lib/decorator");
 var _tools = require("../../utilities/tools");
-var _dialogs = require("../dialog/dialogs");
 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;
@@ -102,7 +101,7 @@ var ConfirmStore = exports["default"] = /*#__PURE__*/function () {
     var uiEventStore = _ref2.uiEventStore,
       dialogProvider = _ref2.dialogProvider,
       screenShareProvider = _ref2.screenShareProvider,
-      screenShareDataSource = _ref2.screenShareDataSource;
+      sharedScreenShareSharedDataSource = _ref2.sharedScreenShareSharedDataSource;
     (0, _classCallCheck2["default"])(this, ConfirmStore);
     (0, _defineProperty2["default"])(this, _ref, (_initProto(this), (0, _logger.createLogger)({
       prefix: 'ConfirmStore'
@@ -118,8 +117,7 @@ var ConfirmStore = exports["default"] = /*#__PURE__*/function () {
     _classPrivateFieldInitSpec(this, _E, _init_screenBounds(this, (0, _env.isElectron)() ? window.runtime.browserWindow.getBounds() : null));
     this._uiEventProvider = uiEventStore;
     this._dialogProvider = dialogProvider;
-    this._screenShareProvider = screenShareProvider;
-    this._screenShareDataSource = screenShareDataSource;
+    this._sharedScreenShareSharedDataSource = sharedScreenShareSharedDataSource;
     this._uiEventProvider.addObserver(this._handleConfirmEventObserver);
     this._dialogProvider.addObserver(this._handleConfirmEventObserver);
     this._disposers.push((0, _mobx.reaction)(function () {
@@ -130,17 +128,22 @@ var ConfirmStore = exports["default"] = /*#__PURE__*/function () {
         value === null || value === void 0 || (_value$timer = value.timer) === null || _value$timer === void 0 || _value$timer.call(value);
       });
     }), (0, _mobx.reaction)(function () {
-      var _this$_screenShareDat;
-      return (_this$_screenShareDat = _this._screenShareDataSource) === null || _this$_screenShareDat === void 0 ? void 0 : _this$_screenShareDat.currentShareBounds;
+      var _this$_sharedScreenSh;
+      return (_this$_sharedScreenSh = _this._sharedScreenShareSharedDataSource) === null || _this$_sharedScreenSh === void 0 ? void 0 : _this$_sharedScreenSh.currentSelectionBounds;
     }, function (bounds) {
       if (bounds) {
-        var _dialogWindows$get;
-        (_dialogWindows$get = _dialogs.dialogWindows.get(_constant.FcrUIDialogKey.CONFIRM)) === null || _dialogWindows$get === void 0 || _dialogWindows$get.setBounds(bounds);
-        _this.calculateMethods.forEach(function (method) {
-          return method(bounds);
+        var res = (0, _tools.followCorrectDisplay)({
+          dialogKey: _constant.FcrUIDialogKey.CONFIRM,
+          alwaysFollowScreen: true
         });
-        _this.logger.info("new sharing bounds is ".concat(JSON.stringify(bounds)));
-        _this.screenBounds = bounds;
+        if (res) {
+          var nearDisplayBounds = res.nearDisplayBounds;
+          _this.calculateMethods.forEach(function (method) {
+            return method(nearDisplayBounds);
+          });
+          _this.logger.info("new sharing bounds is ".concat(JSON.stringify(nearDisplayBounds)));
+          _this.screenBounds = nearDisplayBounds;
+        }
       } else {
         _this.logger.error("there is have no bounds ".concat(JSON.stringify(bounds)));
       }
@@ -148,10 +151,14 @@ var ConfirmStore = exports["default"] = /*#__PURE__*/function () {
       return _this.isSeizeScreen;
     }, function (isSeize) {
       if (isSeize && (0, _env.isElectron)()) {
-        var _ref3 = (0, _tools.followCorrectDisplay)(_constant.FcrUIDialogKey.CONFIRM, isSeize),
-          _bounds = _ref3.bounds;
-        _this.screenBounds = _bounds;
-        _this.logger.info("new sharing bounds is ".concat(JSON.stringify(_bounds), ", when seize screen emit"));
+        var _ref3 = (0, _tools.followCorrectDisplay)({
+            dialogKey: _constant.FcrUIDialogKey.CONFIRM,
+            alwaysFollowScreen: true,
+            extraRefControlbarCondition: isSeize
+          }),
+          nearDisplayBounds = _ref3.nearDisplayBounds;
+        _this.screenBounds = nearDisplayBounds;
+        _this.logger.info("new sharing bounds is ".concat(JSON.stringify(nearDisplayBounds), ", when seize screen emit"));
       }
     }), (0, _mobx.reaction)(function () {
       return _this.screenBounds;
@@ -193,7 +200,8 @@ var ConfirmStore = exports["default"] = /*#__PURE__*/function () {
     }
   }, {
     key: "screenBounds",
-    get: function get() {
+    get: // @observable accessor mousePosition: { x: number; y: number } = { x: 0, y: 0 };
+    function get() {
       return _classPrivateFieldGet(_E, this);
     },
     set: function set(v) {
@@ -210,8 +218,7 @@ var ConfirmStore = exports["default"] = /*#__PURE__*/function () {
   }, {
     key: "isSeizeScreen",
     get: function get() {
-      var _this$_screenSharePro;
-      return (_this$_screenSharePro = this._screenShareProvider) === null || _this$_screenSharePro === void 0 ? void 0 : _this$_screenSharePro.isSeizeStream;
+      return this._sharedScreenShareSharedDataSource.isSeizeStream;
     }
   }, {
     key: "addConfirm",
@@ -276,6 +283,12 @@ 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: "release",
     value: function release() {
@@ -298,12 +311,14 @@ var ConfirmStore = exports["default"] = /*#__PURE__*/function () {
       if ((payload === null || payload === void 0 ? void 0 : payload.dialogKey) === _constant.FcrUIDialogKey.CONFIRM) {
         switch (action) {
           case _constant.FcrUIAction.OPEN_DIALOG:
-            if (this.screenBounds) {
-              var _dialogWindows$get2;
-              (_dialogWindows$get2 = _dialogs.dialogWindows.get(_constant.FcrUIDialogKey.CONFIRM)) === null || _dialogWindows$get2 === void 0 || _dialogWindows$get2.setBounds(this.screenBounds);
-              this.logger.info("open confirm dialog with bounds ".concat(JSON.stringify(this.screenBounds)));
-            } else {
-              this.logger.error("the screen bounds is ".concat(JSON.stringify(this.screenBounds)));
+            if ((0, _env.isElectron)()) {
+              var _ref5 = (0, _tools.followCorrectDisplay)({
+                  dialogKey: _constant.FcrUIDialogKey.CONFIRM,
+                  alwaysFollowScreen: true
+                }),
+                nearDisplayBounds = _ref5.nearDisplayBounds;
+              this.screenBounds = nearDisplayBounds;
+              this.logger.info("open confirm dialog with bounds ".concat(JSON.stringify(nearDisplayBounds)));
             }
             this.addConfirm(payload);
             break;