fcr-ui-scene 3.5.0 → 3.6.0

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

@@ -8,24 +8,26 @@ 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/esnext.async-iterator.filter.js");
 require("core-js/modules/esnext.iterator.filter.js");
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.shadowOffset = exports.DialogInstanceContext = void 0;
+exports.shadowOffset = exports.diffPlatformTopLevelLayer = exports.diffPlatformHighLevelLayer = exports.DialogInstanceContext = void 0;
 exports.useElectronDialog = useElectronDialog;
 exports.useElectronDialogByDialogId = useElectronDialogByDialogId;
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 require("core-js/modules/es.array.concat.js");
 require("core-js/modules/es.array.for-each.js");
 require("core-js/modules/es.array.includes.js");
 require("core-js/modules/es.object.to-string.js");
 require("core-js/modules/es.string.includes.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.for-each.js");
 require("core-js/modules/web.dom-collections.for-each.js");
-var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _react = require("react");
 var _store = require("../store");
 var _dialogs = require("../dialogs");
@@ -37,6 +39,19 @@ 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 DialogInstanceContext = exports.DialogInstanceContext = /*#__PURE__*/(0, _react.createContext)(null);
 var shadowOffset = exports.shadowOffset = 15 + 15;
+// windows 平台对层级支持的不完整，初始化时，如果低于 pup-up-menu 层级将不起作用，因此做此区分
+var diffPlatformHighLevelLayer = exports.diffPlatformHighLevelLayer = (0, _renderer.isWindows)() ? 'pop-up-menu' : 'torn-off-menu';
+var diffPlatformTopLevelLayer = exports.diffPlatformTopLevelLayer = (0, _renderer.isWindows)() ? 'screen-saver' : 'modal-panel';
+var enterFullScreenHandler = function enterFullScreenHandler() {
+  _dialogs.dialogWindows.forEach(function (win, k) {
+    !_store.TOP_LEVEL_DIALOG_LAYER.includes(k) && win.setAlwaysOnTop(true, diffPlatformHighLevelLayer);
+  });
+};
+var leaveFullScreenHandler = function leaveFullScreenHandler() {
+  _dialogs.dialogWindows.forEach(function (win, k) {
+    ![].concat((0, _toConsumableArray2["default"])(_store.TOP_LEVEL_DIALOG_LAYER), (0, _toConsumableArray2["default"])(_store.HIGH_LEVEL_DIALOG_LAYER)).includes(k) && win.setAlwaysOnTop(true, 'normal');
+  });
+};
 function useElectronDialog(props) {
   var store = (0, _react.useContext)(_store.StoreContext);
   var customConfigs = props.config,
@@ -161,8 +176,10 @@ function useElectronDialog(props) {
           forward: true
         } : ignoreMouseEvents);
       }
-      browserWindow.setAlwaysOnTop(typeof alwaysOnTop === 'boolean' ? alwaysOnTop : typeof alwaysOnTop === 'string', typeof alwaysOnTop === 'string' ? alwaysOnTop : 'pop-up-menu');
-      _store.HIGH_LEVEL_DIALOG_LAYER.includes(dialogKey) && browserWindow.setAlwaysOnTop(true, 'pop-up-menu');
+      browserWindow.setAlwaysOnTop(typeof alwaysOnTop === 'boolean' ? alwaysOnTop : typeof alwaysOnTop === 'string', typeof alwaysOnTop === 'string' ? alwaysOnTop : diffPlatformHighLevelLayer);
+      if (_store.HIGH_LEVEL_DIALOG_LAYER.includes(dialogKey)) {
+        browserWindow.setAlwaysOnTop(true, diffPlatformHighLevelLayer);
+      }
       if (!scroll) {
         browserWindow.webContents.insertCSS("\n            ::-webkit-scrollbar {\n              display: none;\n            }\n            #root {\n              padding: ".concat(hasCustomShadow ? shadowOffset / 2 : 0, "px;\n              display: ").concat(hasCustomShadow ? 'flex' : 'block', ";\n              align-items: center;\n            }\n          "));
       }
@@ -195,28 +212,21 @@ function useElectronDialog(props) {
         })
       }), dom);
     }, config);
+    if ((0, _renderer.isMac)()) {
+      // 这组监听是为了处理 mac 全屏模式下，弹窗会因为主窗口全屏而变成独立窗口的问题
+      window.runtime.browserWindow.addListener('enter-full-screen', enterFullScreenHandler);
+      window.runtime.browserWindow.addListener('leave-full-screen', leaveFullScreenHandler);
+    }
     return function () {
       node && (0, _reactDom.unmountComponentAtNode)(node);
-      window.runtime.closeRendererWindow(dialogKey);
-      if (windowRef.current && !windowRef.current.isDestroyed()) {
-        windowRef.current.hide();
-        windowRef.current.close();
+      if ((0, _renderer.isMac)()) {
+        window.runtime.browserWindow.removeListener('enter-full-screen', enterFullScreenHandler);
+        window.runtime.browserWindow.removeListener('leave-full-screen', leaveFullScreenHandler);
       }
+      window.runtime.closeRendererWindow(dialogKey);
       onUnmounted === null || onUnmounted === void 0 || onUnmounted(store);
     };
   }, []);
-
-  // 这组监听是为了处理 mac 全屏模式下，弹窗会因为主窗口全屏而变成独立窗口的问题
-  window.runtime.browserWindow.addListener('enter-full-screen', function () {
-    _dialogs.dialogWindows.forEach(function (win, k) {
-      !_store.TOP_LEVEL_DIALOG_LAYER.includes(k) && win.setAlwaysOnTop(true, 'pop-up-menu');
-    });
-  });
-  window.runtime.browserWindow.addListener('leave-full-screen', function () {
-    _dialogs.dialogWindows.forEach(function (win, k) {
-      ![].concat((0, _toConsumableArray2["default"])(_store.TOP_LEVEL_DIALOG_LAYER), (0, _toConsumableArray2["default"])(_store.HIGH_LEVEL_DIALOG_LAYER)).includes(k) && win.setAlwaysOnTop(true, 'normal');
-    });
-  });
   return {
     store: store,
     browserWindow: windowRef.current,
@@ -268,6 +278,7 @@ function useElectronDialogByDialogId(props) {
       node = dom;
       windowRef.current = browserWindow;
       newRendernerWindowRef.current = newRendererWindow;
+      _dialogs.dialogIdWindows.set(winUniqueId, browserWindow);
       var thisWindowBounds = browserWindow.getBounds();
       var mainAppWindowBounds = window.runtime.browserWindow.getBounds();
       var nearDisplayBounds = window.runtime.screen.getDisplayNearestPoint(mainAppWindowBounds).bounds;
@@ -337,7 +348,7 @@ function useElectronDialogByDialogId(props) {
           forward: true
         } : ignoreMouseEvents);
       }
-      browserWindow.setAlwaysOnTop(typeof alwaysOnTop === 'boolean' ? alwaysOnTop : typeof alwaysOnTop === 'string', typeof alwaysOnTop === 'string' ? alwaysOnTop : 'pop-up-menu');
+      browserWindow.setAlwaysOnTop(typeof alwaysOnTop === 'boolean' ? alwaysOnTop : typeof alwaysOnTop === 'string', typeof alwaysOnTop === 'string' ? alwaysOnTop : diffPlatformHighLevelLayer);
       if (!scroll) {
         browserWindow.webContents.insertCSS("\n            ::-webkit-scrollbar {\n              display: none;\n            }\n            #root {\n              padding: ".concat(hasCustomShadow ? shadowOffset / 2 : 0, "px;\n              display: ").concat(hasCustomShadow ? 'flex' : 'block', ";\n              align-items: center;\n            }\n          "));
       }
@@ -369,28 +380,21 @@ function useElectronDialogByDialogId(props) {
         })
       }), dom);
     }, config);
+    if ((0, _renderer.isMac)()) {
+      // 这组监听是为了处理 mac 全屏模式下，弹窗会因为主窗口全屏而变成独立窗口的问题
+      window.runtime.browserWindow.addListener('enter-full-screen', enterFullScreenHandler);
+      window.runtime.browserWindow.addListener('leave-full-screen', leaveFullScreenHandler);
+    }
     return function () {
       node && (0, _reactDom.unmountComponentAtNode)(node);
-      window.runtime.closeRendererWindow(winUniqueId);
-      if (windowRef.current && !windowRef.current.isDestroyed()) {
-        windowRef.current.hide();
-        windowRef.current.close();
+      if ((0, _renderer.isMac)()) {
+        window.runtime.browserWindow.removeListener('enter-full-screen', enterFullScreenHandler);
+        window.runtime.browserWindow.removeListener('leave-full-screen', leaveFullScreenHandler);
       }
+      window.runtime.closeRendererWindow(winUniqueId);
       onUnmounted === null || onUnmounted === void 0 || onUnmounted(store);
     };
   }, []);
-
-  // 这组监听是为了处理 mac 全屏模式下，弹窗会因为主窗口全屏而变成独立窗口的问题
-  window.runtime.browserWindow.addListener('enter-full-screen', function () {
-    _dialogs.dialogWindows.forEach(function (win, k) {
-      !_store.TOP_LEVEL_DIALOG_LAYER.includes(k) && win.setAlwaysOnTop(true, 'pop-up-menu');
-    });
-  });
-  window.runtime.browserWindow.addListener('leave-full-screen', function () {
-    _dialogs.dialogWindows.forEach(function (win, k) {
-      ![].concat((0, _toConsumableArray2["default"])(_store.TOP_LEVEL_DIALOG_LAYER), (0, _toConsumableArray2["default"])(_store.HIGH_LEVEL_DIALOG_LAYER)).includes(k) && win.setAlwaysOnTop(true, 'normal');
-    });
-  });
   return {
     store: store,
     browserWindow: windowRef.current,

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

@@ -15,6 +15,7 @@ import { CurrentShareScreenTypes } from '../share-screen/types';
 import { FcrUIDialogInfo } from './type';
 import { FcrUIWidgetProvider } from '../../providers/widget-provider';
 import { FcrUIChatProvider } from '../../providers/chat-provider';
+import { FcrUIScreenShareProvider } from '../../providers/screen-share-provider';
 export declare class DialogUIModule extends UIModule {
     private _dialogsByKey;
     private _store?;
@@ -33,6 +34,7 @@ export declare class DialogUIModule extends UIModule {
     mainRoomControlProvider?: FcrUIMainRoomControlProvider;
     waitingRoomControlProvider?: FcrUIWaitingRoomControlProvider;
     widgetProvider?: FcrUIWidgetProvider;
+    screenShareProvider: FcrUIScreenShareProvider;
     chatProvider?: FcrUIChatProvider;
     abilityProvider?: FcrUIAbilityProviderImpl;
     onNodeWillActive(): void;

package/lib/modules/dialog/index.js

@@ -10,6 +10,7 @@ require("core-js/modules/es.object.get-own-property-descriptors.js");
 require("core-js/modules/es.object.keys.js");
 require("core-js/modules/es.reflect.construct.js");
 require("core-js/modules/es.weak-map.js");
+require("core-js/modules/esnext.async-iterator.filter.js");
 require("core-js/modules/esnext.iterator.filter.js");
 require("core-js/modules/esnext.weak-map.delete-all.js");
 require("core-js/modules/esnext.weak-map.emplace.js");
@@ -26,6 +27,7 @@ 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.iterator.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.for-each.js");
 require("core-js/modules/esnext.map.delete-all.js");
@@ -97,7 +99,8 @@ var DialogUIModule = exports.DialogUIModule = /*#__PURE__*/function (_UIModule)
           dialogsByKey: this._dialogsByKey,
           widgetProvider: this.widgetProvider,
           chatProvider: this.chatProvider,
-          abilityProvider: this.abilityProvider
+          abilityProvider: this.abilityProvider,
+          screenShareProvider: this.screenShareProvider
         });
         this.eventProvider.addObserver({
           onEvent: this.onUiEvent.bind(this)

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

@@ -15,6 +15,7 @@ import { FcrUIWidgetProvider } from '../../providers/widget-provider';
 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';
 export declare const HIGH_LEVEL_DIALOG_LAYER: FcrUIDialogKey[];
 export declare const TOP_LEVEL_DIALOG_LAYER: FcrUIDialogKey[];
 export default class DialogStore {
@@ -29,6 +30,7 @@ export default class DialogStore {
     private _remoteVideoRenderManager;
     private _dialogProvider;
     private _widgetProvider;
+    private _screenShareProvider;
     private _sharedLayoutDataSource;
     private _phoneAudioConnectorProvider;
     private _dialogComponentMapByKey;
@@ -65,7 +67,9 @@ export default class DialogStore {
     get connectType(): import("../../type").FcrUIConnectType;
     get hasOwnPstnStream(): boolean;
     get widgetDialogIds(): Map<string, string>;
-    constructor({ uiEventStore, userControl, deviceStore, streamControl, localVideoRenderProvider, remoteVideoRenderManager, securityStore, sharedLayoutDataSource, dialogProvider, phoneAudioConnectorProvider, dialogsByKey, widgetProvider, chatProvider, }: {
+    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, }: {
         streamControl: FcrStreamControl;
         userControl: FcrUserControl;
         uiEventStore: FcrUIEventProvider;
@@ -79,9 +83,9 @@ export default class DialogStore {
         dialogsByKey: Map<FcrUIDialogKey, FcrUIDialogComponent>;
         widgetProvider: FcrUIWidgetProvider;
         chatProvider: FcrUIChatProvider;
+        screenShareProvider: FcrUIScreenShareProvider;
         abilityProvider: FcrUIAbilityProviderImpl;
     });
-    get chatRoomState(): import("fcr-core/lib/room-control/chatroom-control/type").FcrChatRoomConnectionState;
     setParticipantElectronDialogContainer(dom: HTMLElement | null): void;
     setVideoWindowBounds(payload: any): void;
     closeDialogByKey(dialogKey: FcrUIDialogKey): void;
@@ -95,8 +99,9 @@ export default class DialogStore {
     release(): void;
     resizeVideoWindow(width: number, height: number): void;
     updateCurrentShareContent(payload: CurrentShareScreenTypes): void;
-    getCurrentSharingScreenBounds(): CurrentShareScreenWorkArea;
+    recordCurrentSharingScreenBounds(): CurrentShareScreenWorkArea;
     private _handleDialogEvent;
     private _hanleAllUserCountUpdated;
+    private _focusDialog;
 }
 export declare const StoreContext: import("react").Context<DialogStore>;

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,12 +33,15 @@ 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");
 require("core-js/modules/es.string.iterator.js");
 require("core-js/modules/es.weak-map.js");
+require("core-js/modules/esnext.async-iterator.filter.js");
+require("core-js/modules/esnext.async-iterator.find.js");
+require("core-js/modules/esnext.async-iterator.for-each.js");
+require("core-js/modules/esnext.async-iterator.some.js");
 require("core-js/modules/esnext.iterator.constructor.js");
 require("core-js/modules/esnext.iterator.filter.js");
 require("core-js/modules/esnext.iterator.find.js");
@@ -76,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); }
@@ -103,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;
@@ -119,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()));
@@ -158,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);
@@ -316,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) {
@@ -415,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;
@@ -438,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;
     }
@@ -460,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;
@@ -483,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;
@@ -492,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,
@@ -506,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);
@@ -522,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

@@ -6,8 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.View = void 0;
 require("core-js/modules/es.array.map.js");
-require("core-js/modules/es.object.to-string.js");
-require("core-js/modules/esnext.iterator.constructor.js");
+require("core-js/modules/esnext.async-iterator.map.js");
 require("core-js/modules/esnext.iterator.map.js");
 var _mobxReact = require("mobx-react");
 var _react = require("react");
@@ -27,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>;