fcr-ui-scene 3.5.1 → 3.6.0

package/lib/modules/dialog/store.js

@@ -7,6 +7,7 @@ require("core-js/modules/es.error.cause.js");
 require("core-js/modules/es.error.to-string.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");
 require("core-js/modules/es.function.name.js");
 require("core-js/modules/es.number.constructor.js");
 require("core-js/modules/es.object.create.js");
@@ -32,7 +33,6 @@ require("core-js/modules/es.array.includes.js");
 require("core-js/modules/es.array.iterator.js");
 require("core-js/modules/es.array.push.js");
 require("core-js/modules/es.array.some.js");
-require("core-js/modules/es.function.bind.js");
 require("core-js/modules/es.map.js");
 require("core-js/modules/es.object.to-string.js");
 require("core-js/modules/es.string.includes.js");
@@ -80,9 +80,10 @@ var _dialogProvider = require("../../providers/dialog-provider");
 var _type2 = require("agora-rte-sdk/lib/core/rtc/type");
 var _logger = require("../../utilities/logger");
 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, _getCurrentSharingScreenBoundsDecs, _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, _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); }
@@ -107,7 +108,7 @@ var _G = /*#__PURE__*/new WeakMap();
 var _H = /*#__PURE__*/new WeakMap();
 var _I = /*#__PURE__*/new WeakMap();
 var _J = /*#__PURE__*/new WeakMap();
-_ref = (_setVideoWindowBoundsDecs = [_mobx.action, _mobx.action.bound], _updateCurrentShareContentDecs = [_mobx.action, _mobx.action.bound], _getCurrentSharingScreenBoundsDecs = [_mobx.action, _mobx.action.bound], _handleDialogEventDecs = [_mobx.action, _mobx.action.bound], _hanleAllUserCountUpdatedDecs = [_mobx.action, _mobx.action.bound], "logger");
+_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) {
     var _this = this;
@@ -123,16 +124,17 @@ var DialogStore = exports["default"] = /*#__PURE__*/function () {
       phoneAudioConnectorProvider = _ref2.phoneAudioConnectorProvider,
       dialogsByKey = _ref2.dialogsByKey,
       widgetProvider = _ref2.widgetProvider,
+      screenShareProvider = _ref2.screenShareProvider,
       chatProvider = _ref2.chatProvider;
     (0, _classCallCheck2["default"])(this, DialogStore);
     (0, _defineProperty2["default"])(this, _ref, (_initProto(this), (0, _logger.createLogger)({
       prefix: 'DialogStore'
     })));
     (0, _defineProperty2["default"])(this, "_handleDialogEventObserver", {
-      onEvent: this._handleDialogEvent.bind(this)
+      onEvent: this._handleDialogEvent
     });
     (0, _defineProperty2["default"])(this, "_userObserver", {
-      onAllUserCountUpdated: this._hanleAllUserCountUpdated.bind(this)
+      onAllUserCountUpdated: this._hanleAllUserCountUpdated
     });
     _classPrivateFieldInitSpec(this, _A, _init_openedDialogs(this, []));
     _classPrivateFieldInitSpec(this, _B, _init_confirmDialogs(this, new Map()));
@@ -162,6 +164,7 @@ var DialogStore = exports["default"] = /*#__PURE__*/function () {
     this._dialogComponentMapByKey = dialogsByKey;
     this._widgetProvider = widgetProvider;
     this._chatProvider = chatProvider;
+    this._screenShareProvider = screenShareProvider;
     this._userControl.addObserver(this._userObserver);
     this._uiEventStore.addObserver(this._handleDialogEventObserver);
     this._dialogProvider.addObserver(this._handleDialogEventObserver);
@@ -320,6 +323,11 @@ var DialogStore = exports["default"] = /*#__PURE__*/function () {
     get: function get() {
       return this._chatProvider.chatConnectionState;
     }
+  }, {
+    key: "isSharingScreen",
+    get: function get() {
+      return this._screenShareProvider.isSharingScreen;
+    }
   }, {
     key: "setParticipantElectronDialogContainer",
     value: function setParticipantElectronDialogContainer(dom) {
@@ -419,8 +427,8 @@ var DialogStore = exports["default"] = /*#__PURE__*/function () {
       this.currentShareBounds = bounds;
     }
   }, {
-    key: "getCurrentSharingScreenBounds",
-    value: function getCurrentSharingScreenBounds() {
+    key: "recordCurrentSharingScreenBounds",
+    value: function recordCurrentSharingScreenBounds() {
       var recordShareBounds = this.recordShareBounds;
       var currentShareBounds = this.currentShareBounds;
       var screenBounds = undefined;
@@ -442,15 +450,14 @@ var DialogStore = exports["default"] = /*#__PURE__*/function () {
           x: x,
           y: y
         }, bounds);
+        this.logger.info('recordCurrentSharingScreenBounds is called and the recordShareBounds has currentShareBounds value, the value is', screenBounds);
       } else {
         recordShareBounds.clear();
         screenBounds = (0, _tools.getCurrentSharingWorkArea)({
-          currentShareId: this.currentShareId,
-          currentShareType: this.currentShareType,
-          allApplicationWindows: [],
           currentShareBounds: this.currentShareBounds
         });
         recordShareBounds.set(currentShareBounds, screenBounds);
+        this.logger.info('recordCurrentSharingScreenBounds is called and the recordShareBounds is initialled, the value is', screenBounds);
       }
       return screenBounds;
     }
@@ -464,22 +471,13 @@ var DialogStore = exports["default"] = /*#__PURE__*/function () {
         params = _ref6$params === void 0 ? {} : _ref6$params;
       switch (action) {
         case _constant.FcrUIAction.OPEN_DIALOG:
+          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;
-            var toastWindow = _dialogs.dialogWindows.get(_constant.FcrUIDialogKey.SHOW_TOAST);
-            var confirmWindow = _dialogs.dialogWindows.get(_constant.FcrUIDialogKey.CONFIRM);
-            var controlbar = _dialogs.dialogWindows.get(_constant.FcrUIDialogKey.CONTROL_BAR);
-            var nearDispaly = window.runtime.screen.getDisplayNearestPoint(controlbar && controlbar.isVisible() ? controlbar === null || controlbar === void 0 ? void 0 : controlbar.getBounds() : window.runtime.browserWindow.getBounds()).bounds;
-            var bounds = {
-              x: Math.floor(nearDispaly.x),
-              y: Math.floor(nearDispaly.y),
-              width: Math.floor(nearDispaly.width),
-              height: Math.floor(nearDispaly.height)
-            };
-            toastWindow === null || toastWindow === void 0 || toastWindow.setBounds(bounds);
-            confirmWindow === null || confirmWindow === void 0 || confirmWindow.setBounds(bounds);
+            // 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;
@@ -487,7 +485,7 @@ var DialogStore = exports["default"] = /*#__PURE__*/function () {
               });
             }
             (_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, 'screen-saver');
+            (_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;
@@ -496,8 +494,7 @@ var DialogStore = exports["default"] = /*#__PURE__*/function () {
             return dialog.dialogId === dialogId;
           });
           if (currentDialog) {
-            var _dialogWindows$get3;
-            (_dialogWindows$get3 = _dialogs.dialogWindows.get(dialogKey)) === null || _dialogWindows$get3 === void 0 || _dialogWindows$get3.focus();
+            this._focusDialog(dialogKey, dialogId);
           } else {
             this.openedDialogs.push({
               dialogKey: dialogKey,
@@ -510,6 +507,7 @@ var DialogStore = exports["default"] = /*#__PURE__*/function () {
           this.openedDialogs = this.openedDialogs.filter(function (dialog) {
             return dialog.dialogId !== dialogId;
           });
+          this.closeDialogByKey(dialogKey);
           break;
         case _constant.FcrUIAction.VIDEO_WINDOW_BOUNDS:
           this.setVideoWindowBounds(payload);
@@ -526,10 +524,24 @@ 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, "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"], [_getCurrentSharingScreenBoundsDecs, 18, "getCurrentSharingScreenBounds"], [_handleDialogEventDecs, 18, "_handleDialogEvent"], [_hanleAllUserCountUpdatedDecs, 18, "_hanleAllUserCountUpdated"]], []).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.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);
 _init_openedDialogs = _applyDecs$e[0];
 _init_confirmDialogs = _applyDecs$e[1];
 _init_userCount = _applyDecs$e[2];

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

@@ -77,6 +77,7 @@ export type FcrUIDialogHooksProps = {
 export type FcrUIDialogComponent = React.FC<FcrDialogProps>;
 export type FcrDialogProps = {
     params: unknown;
+    dialogId: string;
 };
 export type FcrUIDialogInfo = {
     key: FcrUIDialogKey;

package/lib/modules/dialog/view.js

@@ -26,7 +26,8 @@ var View = exports.View = (0, _mobxReact.observer)(function () {
       var DialogComponent = dialogComponentMapByKey.get(dialogKey);
       if (DialogComponent) {
         return /*#__PURE__*/(0, _jsxRuntime.jsx)(DialogComponent, {
-          params: params
+          params: params,
+          dialogId: dialogId
         }, dialogId);
       }
       return null;

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

@@ -6,6 +6,7 @@ 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';
 export declare class EventConfirmUIModule extends UIModule {
     private _store?;
     private _leaveMeetingStore?;
@@ -17,6 +18,7 @@ export declare class EventConfirmUIModule extends UIModule {
     roomProvider?: FcrUIRoomProvider;
     sharedMemberDataSource?: FcrUIMemberSharedDataSource;
     abilityProvider?: FcrUIAbilityProviderImpl;
+    screenShareDataSource?: FcrUIScreenShareDataSource;
     onNodeWillActive(): void;
     onNodeWillInactive(): void;
     getComponent(): import("react/jsx-runtime").JSX.Element;

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

@@ -44,7 +44,8 @@ var EventConfirmUIModule = exports.EventConfirmUIModule = /*#__PURE__*/function
         this._store = new _store2["default"]({
           uiEventStore: this.eventProvider,
           dialogProvider: this.dialogProvider,
-          screenShareProvider: this.screenShareProvider
+          screenShareProvider: this.screenShareProvider,
+          screenShareDataSource: this.screenShareDataSource
         });
         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

@@ -3,28 +3,36 @@ import { FcrUIEventProvider } from '../../providers/event-provider';
 import { FcrUIDialogParams } from '../../type';
 import { FcrUIDialogProvider } from '../../providers/dialog-provider';
 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 _handleConfirmEventObserver;
     accessor isReplaceShare: boolean;
+    accessor calculateMethods: Map<ConfirmContentProps, (bounds?: CurrentShareBounds | null) => void>;
+    accessor reposition: number;
     accessor confirms: Map<string, {
         params: ConfirmContentProps;
         timer?: () => void;
     }>;
+    accessor screenBounds: CurrentShareBounds | Electron.Rectangle | null;
     get confirmList(): ConfirmContentProps[];
     get isSeizeScreen(): boolean;
-    constructor({ uiEventStore, dialogProvider, screenShareProvider, }: {
+    constructor({ uiEventStore, dialogProvider, screenShareProvider, screenShareDataSource, }: {
         uiEventStore: FcrUIEventProvider;
         dialogProvider: FcrUIDialogProvider;
         screenShareProvider: FcrUIScreenShareProvider;
+        screenShareDataSource: FcrUIScreenShareDataSource;
     });
     addConfirm(payload: FcrUIDialogParams<ConfirmContentProps>): void;
     resetIsReplace(): void;
     release(): void;
+    log(log: string): void;
     private _handleConfirmEvent;
 }
 export declare const StoreContext: import("react").Context<ConfirmStore>;

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

@@ -32,7 +32,9 @@ require("core-js/modules/es.array.from.js");
 require("core-js/modules/es.array.iterator.js");
 require("core-js/modules/es.array.map.js");
 require("core-js/modules/es.array.push.js");
+require("core-js/modules/es.date.to-json.js");
 require("core-js/modules/es.function.bind.js");
+require("core-js/modules/es.json.stringify.js");
 require("core-js/modules/es.map.js");
 require("core-js/modules/es.object.to-string.js");
 require("core-js/modules/es.string.iterator.js");
@@ -70,8 +72,12 @@ var _mobx = require("mobx");
 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 _dialogs = require("../dialog/dialogs");
+var _env = require("agora-foundation/lib/utilities/env");
 var _ConfirmStore;
-var _initProto, _init_isReplaceShare, _init_confirms, _addConfirmDecs, _resetIsReplaceDecs, _handleConfirmEventDecs, _ref;
+var _initProto, _init_isReplaceShare, _init_calculateMethods, _init_reposition, _init_confirms, _init_screenBounds, _addConfirmDecs, _resetIsReplaceDecs, _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); }
@@ -86,13 +92,17 @@ function _setFunctionName(e, t, n) { "symbol" == _typeof(t) && (t = (t = t.descr
 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 _A = /*#__PURE__*/new WeakMap();
 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");
 var ConfirmStore = exports["default"] = /*#__PURE__*/function () {
   function ConfirmStore(_ref2) {
     var _this = this;
     var uiEventStore = _ref2.uiEventStore,
       dialogProvider = _ref2.dialogProvider,
-      screenShareProvider = _ref2.screenShareProvider;
+      screenShareProvider = _ref2.screenShareProvider,
+      screenShareDataSource = _ref2.screenShareDataSource;
     (0, _classCallCheck2["default"])(this, ConfirmStore);
     (0, _defineProperty2["default"])(this, _ref, (_initProto(this), (0, _logger.createLogger)({
       prefix: 'ConfirmStore'
@@ -102,10 +112,14 @@ var ConfirmStore = exports["default"] = /*#__PURE__*/function () {
       onEvent: this._handleConfirmEvent.bind(this)
     });
     _classPrivateFieldInitSpec(this, _A, _init_isReplaceShare(this, false));
-    _classPrivateFieldInitSpec(this, _B, _init_confirms(this, new Map()));
+    _classPrivateFieldInitSpec(this, _B, _init_calculateMethods(this, new Map()));
+    _classPrivateFieldInitSpec(this, _C, _init_reposition(this, 0));
+    _classPrivateFieldInitSpec(this, _D, _init_confirms(this, new Map()));
+    _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._uiEventProvider.addObserver(this._handleConfirmEventObserver);
     this._dialogProvider.addObserver(this._handleConfirmEventObserver);
     this._disposers.push((0, _mobx.reaction)(function () {
@@ -115,6 +129,34 @@ var ConfirmStore = exports["default"] = /*#__PURE__*/function () {
         var _value$timer;
         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;
+    }, 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);
+        });
+        _this.logger.info("new sharing bounds is ".concat(JSON.stringify(bounds)));
+        _this.screenBounds = bounds;
+      } else {
+        _this.logger.error("there is have no bounds ".concat(JSON.stringify(bounds)));
+      }
+    }), (0, _mobx.reaction)(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"));
+      }
+    }), (0, _mobx.reaction)(function () {
+      return _this.screenBounds;
+    }, function (bounds) {
+      _this.logger.debug("the bounds is  changed=>", bounds);
     }));
   }
   return (0, _createClass2["default"])(ConfirmStore, [{
@@ -126,13 +168,37 @@ var ConfirmStore = exports["default"] = /*#__PURE__*/function () {
       _classPrivateFieldSet(_A, this, v);
     }
   }, {
-    key: "confirms",
+    key: "calculateMethods",
     get: function get() {
       return _classPrivateFieldGet(_B, this);
     },
     set: function set(v) {
       _classPrivateFieldSet(_B, this, v);
     }
+  }, {
+    key: "reposition",
+    get: function get() {
+      return _classPrivateFieldGet(_C, this);
+    },
+    set: function set(v) {
+      _classPrivateFieldSet(_C, this, v);
+    }
+  }, {
+    key: "confirms",
+    get: function get() {
+      return _classPrivateFieldGet(_D, this);
+    },
+    set: function set(v) {
+      _classPrivateFieldSet(_D, this, v);
+    }
+  }, {
+    key: "screenBounds",
+    get: function get() {
+      return _classPrivateFieldGet(_E, this);
+    },
+    set: function set(v) {
+      _classPrivateFieldSet(_E, this, v);
+    }
   }, {
     key: "confirmList",
     get: function get() {
@@ -169,7 +235,11 @@ var ConfirmStore = exports["default"] = /*#__PURE__*/function () {
         }),
         timer: timer
       };
-      if (!this.confirms.get(dialogId)) {
+      if (this.confirms.has(dialogId)) {
+        this.calculateMethods.forEach(function (method) {
+          return method(_this2.screenBounds);
+        });
+      } else {
         this.confirms.set(dialogId, confirmParams);
       }
       var confirmInstance = this.confirms.get(dialogId);
@@ -210,18 +280,31 @@ var ConfirmStore = exports["default"] = /*#__PURE__*/function () {
     key: "release",
     value: function release() {
       this.confirms.clear();
+      this.calculateMethods.clear();
       this._disposers.forEach(function (disposer) {
         return disposer();
       });
       this._dialogProvider.removeObserver(this._handleConfirmEventObserver);
       this._uiEventProvider.removeObserver(this._handleConfirmEventObserver);
     }
+  }, {
+    key: "log",
+    value: function log(_log) {
+      this.logger.info(_log);
+    }
   }, {
     key: "_handleConfirmEvent",
     value: function _handleConfirmEvent(action, payload) {
       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)));
+            }
             this.addConfirm(payload);
             break;
           case _constant.FcrUIAction.CLOSE_DIALOG:
@@ -233,8 +316,11 @@ var ConfirmStore = exports["default"] = /*#__PURE__*/function () {
   }]);
 }();
 _ConfirmStore = ConfirmStore;
-var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_ConfirmStore, [[_mobx.observable, 1, "isReplaceShare"], [_mobx.observable, 1, "confirms"], [_mobx.computed, 3, "confirmList"], [_addConfirmDecs, 18, "addConfirm"], [_resetIsReplaceDecs, 18, "resetIsReplace"], [_handleConfirmEventDecs, 18, "_handleConfirmEvent"]], []).e, 3);
+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);
 _init_isReplaceShare = _applyDecs$e[0];
-_init_confirms = _applyDecs$e[1];
-_initProto = _applyDecs$e[2];
+_init_calculateMethods = _applyDecs$e[1];
+_init_reposition = _applyDecs$e[2];
+_init_confirms = _applyDecs$e[3];
+_init_screenBounds = _applyDecs$e[4];
+_initProto = _applyDecs$e[5];
 var StoreContext = exports.StoreContext = /*#__PURE__*/(0, _react.createContext)(null);

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

@@ -21,7 +21,10 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.View = void 0;
+require("core-js/modules/es.array.concat.js");
 require("core-js/modules/es.array.map.js");
+require("core-js/modules/es.date.to-json.js");
+require("core-js/modules/es.json.stringify.js");
 require("core-js/modules/esnext.async-iterator.map.js");
 require("core-js/modules/esnext.iterator.map.js");
 require("core-js/modules/web.timers.js");
@@ -38,8 +41,6 @@ var _react2 = require("@use-gesture/react");
 var _env = require("agora-foundation/lib/utilities/env");
 var _tools = require("../../utilities/tools");
 var _platform = require("../../utilities/platform");
-var _dialogs = require("../dialog/dialogs");
-var _constant = require("../../utilities/constant");
 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; }
@@ -72,7 +73,9 @@ var ConfirmWindow = (0, _mobxReact.observer)(function (_ref2) {
   var _rndRef$current;
   var confirm = _ref2.confirm;
   var _useContext2 = (0, _react.useContext)(_store.StoreContext),
-    isSeizeScreen = _useContext2.isSeizeScreen;
+    screenBounds = _useContext2.screenBounds,
+    calculateMethods = _useContext2.calculateMethods,
+    log = _useContext2.log;
   var _ref3 = (0, _env.isElectron)() ? (0, _react.useContext)(_useElectron.DialogInstanceContext) : {},
     browserWindow = _ref3.browserWindow;
   var rndRef = (0, _react.useRef)(null);
@@ -81,48 +84,35 @@ var ConfirmWindow = (0, _mobxReact.observer)(function (_ref2) {
     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 = {
-    x: window.innerWidth / 2 - defaultSize.width / 2,
-    y: window.innerHeight / 2 - defaultSize.height / 2,
-    width: window.innerWidth,
-    height: window.innerHeight
-  };
-  var _useMemo = (0, _react.useMemo)(function () {
-      var mainWindowBounds = (0, _env.isElectron)() ? window.runtime.browserWindow.getBounds() : baseBounds;
-      var controlbar = _dialogs.dialogWindows.get(_constant.FcrUIDialogKey.CONTROL_BAR);
-      // 按当前的窗口管理方式，在关闭 controlbar 的时候，controlbar 实际上是隐藏了自己，所以，依然能够通过 controlbar 访问到，所以需要判断是否是 visible 状态
-      // 屏幕抢占时，需要判断是否是抢占屏幕，决定是取 controlbar 的位置计算热区，还是走原有逻辑
-      var needControlbar = controlbar && (isSeizeScreen || controlbar.isVisible());
-      var nearDisplay = (0, _env.isElectron)() ? window.runtime.screen.getDisplayNearestPoint(needControlbar ? controlbar === null || controlbar === void 0 ? void 0 : controlbar.getBounds() : mainWindowBounds).bounds // 如果有 controlbar，就以 controlbar 的位置展示 confirm
-      : baseBounds;
-      return {
-        nearDisplay: nearDisplay,
-        controlbar: controlbar,
-        mainWindowBounds: mainWindowBounds,
-        needControlbar: needControlbar
-      };
-    }, []),
-    nearDisplay = _useMemo.nearDisplay,
-    controlbar = _useMemo.controlbar,
-    mainWindowBounds = _useMemo.mainWindowBounds,
-    needControlbar = _useMemo.needControlbar;
-  var x = nearDisplay.width / 2 - defaultSize.width / 2;
-  var y = nearDisplay.height / 2 - defaultSize.height / 2;
+  var baseBounds = (0, _react.useMemo)(function () {
+    var _ref4 = screenBounds || {
+        width: window.innerWidth,
+        height: window.innerHeight
+      },
+      width = _ref4.width,
+      height = _ref4.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: x,
-      y: y
+      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 bind = (0, _react2.useDrag)(function (_ref5) {
+    var _ref5$delta = (0, _slicedToArray2["default"])(_ref5.delta, 2),
+      dx = _ref5$delta[0],
+      dy = _ref5$delta[1];
     var x = bounds.x + dx;
     var y = bounds.y + dy;
-    var maxX = nearDisplay.width - defaultSize.width;
-    var maxY = nearDisplay.height - defaultSize.height;
+    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))
@@ -130,29 +120,48 @@ var ConfirmWindow = (0, _mobxReact.observer)(function (_ref2) {
     setBounds(coord);
   });
   var ignoreMouseTimer = (0, _react.useRef)();
-  function recalclate() {
-    if ((0, _env.isElectron)() && (0, _platform.isWindows)() && browserWindow && rndRef.current) {
-      var screenBounds = window.runtime.screen.getDisplayNearestPoint(needControlbar ? controlbar === null || controlbar === void 0 ? void 0 : controlbar.getBounds() : mainWindowBounds).bounds;
+  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: screenBounds,
+        screenBounds: bounds || screenBounds,
         callback: function callback(timerId) {
           windowFocusTimerRef.current = timerId;
         }
       });
     }
   }
+  var handleRecalculate = function handleRecalculate() {
+    return recalculate();
+  };
   (0, _react.useEffect)(function () {
-    browserWindow === null || browserWindow === void 0 || browserWindow.setIgnoreMouseEvents(false);
-    recalclate();
-    (0, _env.isElectron)() && (0, _platform.isWindows)() && window.runtime.screen.addListener('display-removed', recalclate);
+    browserWindow === null || browserWindow === void 0 || browserWindow.setIgnoreMouseEvents(true, {
+      forward: true
+    });
+    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', recalclate);
+      (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 && clearInterval(ignoreMouseTimer.current);
     if ((0, _env.isElectron)()) {

package/lib/modules/{sound-effect → event-sound}/index.d.ts

@@ -1,7 +1,8 @@
 import { UIModule } from '../../base';
 import { FcrUIDeviceProvider } from '../../providers/device-provider';
 import { FcrUIConnectionProvider } from '../../providers/room-provider';
-declare enum SoundEffectType {
+import { FcrUISharedSettingDataSource } from '../../shared-data-source/setting';
+export declare enum SoundEffectType {
     INCOMMING_MESSAGE = "incomming_message",
     INCOMMING_PRIVATE_MESSAGE = "incomming_private_message",
     REMOTE_USER_JOINED = "remote_user_joined",
@@ -20,6 +21,7 @@ export declare class SoundEffectUIModule extends UIModule {
     private _userControl;
     private _deviceStore;
     private _connectionControl;
+    sharedSettingDataSource: FcrUISharedSettingDataSource | undefined;
     deviceProvider: FcrUIDeviceProvider | undefined;
     connectionProvider: FcrUIConnectionProvider | undefined;
     private _duration;
@@ -45,4 +47,3 @@ export declare class SoundEffectUIModule extends UIModule {
     private _handleUserJoined;
     handlePlaySoundEffect(name: SoundEffectType): void;
 }
-export {};