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

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

@@ -15,6 +15,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.shadowOffset = exports.leaveFullScreenHandler = exports.enterFullScreenHandler = exports.DialogInstanceContext = void 0;
 exports.useElectronDialog = useElectronDialog;
+var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 require("core-js/modules/es.array.concat.js");
@@ -23,9 +25,11 @@ require("core-js/modules/es.array.includes.js");
 require("core-js/modules/es.date.to-json.js");
 require("core-js/modules/es.json.stringify.js");
 require("core-js/modules/es.object.to-string.js");
+require("core-js/modules/es.promise.js");
 require("core-js/modules/es.string.includes.js");
 require("core-js/modules/esnext.iterator.constructor.js");
 require("core-js/modules/esnext.iterator.for-each.js");
+require("core-js/modules/esnext.promise.with-resolvers.js");
 require("core-js/modules/web.dom-collections.for-each.js");
 var _react = require("react");
 var _store = require("../store");
@@ -34,6 +38,7 @@ var _reactDom = require("react-dom");
 var _levelConfig = require("../level-config");
 var _dialogUtils = require("../../../utilities/dialog-utils");
 var _constant = require("../../../utilities/constant");
+var _mobx = require("mobx");
 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; }
@@ -68,7 +73,8 @@ function useElectronDialog(props) {
     _props$hasCustomShado = props.hasCustomShadow,
     hasCustomShadow = _props$hasCustomShado === void 0 ? true : _props$hasCustomShado,
     _props$disableShortcu = props.disableShortcutClose,
-    disableShortcutClose = _props$disableShortcu === void 0 ? false : _props$disableShortcu;
+    disableShortcutClose = _props$disableShortcu === void 0 ? false : _props$disableShortcu,
+    beforeClose = props.beforeClose;
   var dialogIdOrKey = dialogId || dialogKey;
   var windowRef = (0, _react.useRef)();
   var newRendernerWindowRef = (0, _react.useRef)();
@@ -89,7 +95,7 @@ function useElectronDialog(props) {
   });
   (0, _react.useEffect)(function () {
     var node;
-    window.runtime.openRendererWindow(dialogIdOrKey, function (dom, browserWindow, newRendererWindow) {
+    window.runtime.openRendererWindow(dialogIdOrKey, function (dom, browserWindow, newRendererWindow, baseUrl) {
       node = dom;
       windowRef.current = browserWindow;
       newRendernerWindowRef.current = newRendererWindow;
@@ -100,9 +106,12 @@ function useElectronDialog(props) {
         store === null || store === void 0 || store.log("[dialog]: open dialog can I find dialog with dialogKey: ".concat(dialogKey, ": ").concat(_store.dialogWindows.has(dialogKey)));
         _store.dialogWindows.set(dialogKey, browserWindow);
       }
+      var isControlbar = dialogKey === _constant.FcrUIDialogKey.CONTROL_BAR;
+      var follow = isControlbar ? false : 'screen';
       var _ref = (0, _dialogUtils.followCorrectDisplay)({
           browserWindow: browserWindow,
-          alwaysFollowScreen: fullScreen
+          alwaysFollowScreen: fullScreen,
+          follow: follow
         }),
         nearDisplayBounds = _ref.nearDisplayBounds,
         followControlbar = _ref.followControlbar;
@@ -170,7 +179,11 @@ function useElectronDialog(props) {
       }
       focus && browserWindow.focus();
       store === null || store === void 0 || store.log("[useElectronDialog][dialog]: dialog ".concat(dialogIdOrKey, " focused"));
-      (0, _renderer.handleWillClose)(browserWindow, function () {
+      var _Promise$withResolver = Promise.withResolvers(),
+        promise = _Promise$withResolver.promise,
+        resolve = _Promise$withResolver.resolve;
+      function continueClose() {
+        store === null || store === void 0 || store.log("[useElectronDialog][dialog]: continueClose");
         (0, _reactDom.unmountComponentAtNode)(node);
         if (dialogId) {
           store.closeDilaogByDialogId(dialogId);
@@ -180,20 +193,60 @@ function useElectronDialog(props) {
         }
         onClose === null || onClose === void 0 || onClose({
           store: store,
-          browserWindow: browserWindow
+          browserWindow: browserWindow,
+          newRendererWindow: newRendererWindow
         });
+        return true;
+      }
+      var dialogInstanceValue = (0, _mobx.observable)({
+        browserWindow: browserWindow,
+        newRendererWindow: newRendererWindow,
+        resizable: !!customConfigs.resizable,
+        baseUrl: baseUrl,
+        closeDialog: function closeDialog() {
+          dialogId ? store.closeDilaogByDialogId(dialogId) : store.closeDialogByKey(dialogKey);
+        },
+        continueClose: function continueClose() {
+          return resolve(false);
+        },
+        interceptedClose: false,
+        setInterceptedClose: function setInterceptedClose(interceptedClose) {
+          dialogInstanceValue.interceptedClose = interceptedClose;
+        }
       });
+      (0, _renderer.handleWillClose)(browserWindow, /*#__PURE__*/(0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee() {
+        var interception;
+        return _regenerator["default"].wrap(function (_context) {
+          while (1) switch (_context.prev = _context.next) {
+            case 0:
+              interception = (beforeClose === null || beforeClose === void 0 ? void 0 : beforeClose({
+                store: store,
+                browserWindow: browserWindow,
+                newRendererWindow: newRendererWindow,
+                continueClose: function continueClose() {
+                  return resolve(false);
+                }
+              })) || false;
+              dialogInstanceValue.setInterceptedClose(interception);
+              if (!interception) {
+                _context.next = 1;
+                break;
+              }
+              _context.next = 1;
+              return promise;
+            case 1:
+              continueClose();
+              return _context.abrupt("return", false);
+            case 2:
+            case "end":
+              return _context.stop();
+          }
+        }, _callee);
+      })));
       (0, _reactDom.render)(/*#__PURE__*/(0, _jsxRuntime.jsx)(_store.StoreContext.Provider, {
         value: store,
         children: /*#__PURE__*/(0, _jsxRuntime.jsx)(DialogInstanceContext.Provider, {
-          value: {
-            browserWindow: browserWindow,
-            newRendererWindow: newRendererWindow,
-            resizable: !!customConfigs.resizable,
-            closeDialog: function closeDialog() {
-              return dialogId ? store.closeDilaogByDialogId(dialogId) : store.closeDialogByKey(dialogKey);
-            }
-          },
+          value: dialogInstanceValue,
           children: typeof children === 'function' ? children(browserWindow) : children
         })
       }), dom);

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

@@ -3,7 +3,7 @@ import { FcrUIDeviceProvider } from '../../providers/device-provider';
 import { FcrStreamControl, FcrUserControl } from 'fcr-core';
 import { FcrChatRoomControl } from 'fcr-core/lib/room-control/chatroom-control/type';
 import { FcrUIEventProvider } from '../../providers/event-provider';
-import { FcrUICurrentRoomControlProvider, FcrUIMainRoomControlProvider, FcrUIWaitingRoomControlProvider } from '../../providers/room-provider';
+import { FcrUICurrentRoomControlProvider, FcrUIMainRoomControlProvider, FcrUIRoomProvider, FcrUIWaitingRoomControlProvider } from '../../providers/room-provider';
 import { FcrUISharedLayoutDataSource } from '../../shared-data-source/layout-data';
 import { FcrUILocalVideoRenderProvider, FcrUIRemoteVideoRenderProvider } from '../../providers/renderer-provider';
 import { FcrUIPrivilegeProvider } from '../../providers/privilege-provider';
@@ -13,10 +13,11 @@ import { FcrUIAbilityProviderImpl } from '../../providers/ability-provider';
 import { FcrUIDialogInfo } from './type';
 import { FcrUIWidgetProvider } from '../../providers/widget-provider';
 import { FcrUIChatProvider } from '../../providers/chat-provider';
-import { FcrUIScreenShareProvider } from '../../providers/screen-share-provider';
 import { FcrUIScreenShareSharedDataSource } from '../../shared-data-source/screen-share-data';
 import { FcrUISharedConfirmDataSource } from '../../shared-data-source/confirm-data';
 import { FcrUIAnnotationProvider } from '../../providers/annotation-provider';
+import { FcrUIMultiDisplayProvider } from '../../providers/multi-display-provider';
+import { FcrUISharedSettingDataSource } from '../../shared-data-source/setting';
 export declare class DialogUIModule extends UIModule {
     private _dialogsByKey;
     private _store?;
@@ -35,12 +36,14 @@ export declare class DialogUIModule extends UIModule {
     mainRoomControlProvider?: FcrUIMainRoomControlProvider;
     waitingRoomControlProvider?: FcrUIWaitingRoomControlProvider;
     widgetProvider?: FcrUIWidgetProvider;
-    screenShareProvider: FcrUIScreenShareProvider;
     sharedScreenShareSharedDataSource: FcrUIScreenShareSharedDataSource;
     sharedConfirmDataSource: FcrUISharedConfirmDataSource;
     chatProvider?: FcrUIChatProvider;
     abilityProvider?: FcrUIAbilityProviderImpl;
     annotationProvider?: FcrUIAnnotationProvider;
+    multiDisplayProvider?: FcrUIMultiDisplayProvider;
+    roomProvider?: FcrUIRoomProvider;
+    sharedSettingDataSource?: FcrUISharedSettingDataSource;
     onNodeWillActive(): void;
     onNodeWillInactive(): void;
     getComponent(): import("react/jsx-runtime").JSX.Element;

package/lib/modules/dialog/index.js

@@ -68,7 +68,7 @@ var DialogUIModule = exports.DialogUIModule = /*#__PURE__*/function (_UIModule)
       var _this$currentRoomCont, _this$currentRoomCont2;
       this.streamControl = (_this$currentRoomCont = this.currentRoomControlProvider) === null || _this$currentRoomCont === void 0 ? void 0 : _this$currentRoomCont.currentRoomControl.getStreamControl();
       this.userControl = (_this$currentRoomCont2 = this.currentRoomControlProvider) === null || _this$currentRoomCont2 === void 0 ? void 0 : _this$currentRoomCont2.currentRoomControl.getUserControl();
-      if (this.userControl && this.deviceProvider && this.streamControl && this.remoteVideoRenderProvider && this.eventProvider && this.localVideoRenderProvider && this.sharedLayoutDataSource && this.dialogProvider && this.phoneAudioConnectorProvider && this.widgetProvider && this.chatProvider && this.abilityProvider && this.sharedConfirmDataSource && this.annotationProvider) {
+      if (this.userControl && this.deviceProvider && this.streamControl && this.remoteVideoRenderProvider && this.eventProvider && this.localVideoRenderProvider && this.sharedLayoutDataSource && this.dialogProvider && this.phoneAudioConnectorProvider && this.widgetProvider && this.chatProvider && this.abilityProvider && this.sharedConfirmDataSource && this.annotationProvider && this.roomProvider && this.sharedSettingDataSource) {
         var _this$currentRoomCont3, _this$mainRoomControl, _this$waitingRoomCont;
         this._store = new _store["default"]({
           userControl: this.userControl,
@@ -85,10 +85,12 @@ var DialogUIModule = exports.DialogUIModule = /*#__PURE__*/function (_UIModule)
           widgetProvider: this.widgetProvider,
           chatProvider: this.chatProvider,
           abilityProvider: this.abilityProvider,
-          screenShareProvider: this.screenShareProvider,
           sharedScreenShareSharedDataSource: this.sharedScreenShareSharedDataSource,
           sharedConfirmDataSource: this.sharedConfirmDataSource,
-          annotationProvider: this.annotationProvider
+          annotationProvider: this.annotationProvider,
+          multiDisplayProvider: this.multiDisplayProvider,
+          roomProvider: this.roomProvider,
+          sharedSettingDataSource: this.sharedSettingDataSource
         });
       }
     }

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

@@ -18,4 +18,4 @@ var diffPlatformTopLevelLayer = exports.diffPlatformTopLevelLayer = (0, _platfor
  * 其他窗口层级为 normal，在打开窗口时，聚焦窗口
  */
 var HIGH_LEVEL_DIALOG_LAYER = exports.HIGH_LEVEL_DIALOG_LAYER = [_constant.FcrUIDialogKey.CHAT, _constant.FcrUIDialogKey.PARTICIPANT, _constant.FcrUIDialogKey.SHARE_SCREEN];
-var TOP_LEVEL_DIALOG_LAYER = exports.TOP_LEVEL_DIALOG_LAYER = [_constant.FcrUIDialogKey.SHOW_TOAST, _constant.FcrUIDialogKey.CONFIRM, _constant.FcrUIDialogKey.CONTROL_BAR, _constant.FcrUIDialogKey.VIDEO_WINDOW, _constant.FcrUIDialogKey.ANNOTATION, _constant.FcrUIDialogKey.SYSTEM_PREFERENCE];
+var TOP_LEVEL_DIALOG_LAYER = exports.TOP_LEVEL_DIALOG_LAYER = [_constant.FcrUIDialogKey.SHOW_TOAST, _constant.FcrUIDialogKey.CONFIRM, _constant.FcrUIDialogKey.CONTROL_BAR, _constant.FcrUIDialogKey.VIDEO_WINDOW, _constant.FcrUIDialogKey.ANNOTATION, _constant.FcrUIDialogKey.SYSTEM_PREFERENCE, _constant.FcrUIDialogKey.RENAME];

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

@@ -7,17 +7,19 @@ 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, AgoraRtcWindowInfo } from 'agora-rte-sdk/lib/core/rtc/type';
+import { FcrWindowInfo } from 'fcr-core/lib/type';
 import { CurrentShareBounds } from '../control-bar/types';
 import { FcrUIDialogComponent } from './type';
 import { FcrUIWidgetProvider } from '../../providers/widget-provider';
 import { FcrUIChatProvider } from '../../providers/chat-provider';
 import { FcrUIAbilityProviderImpl } from 'fcr-ui-scene/src/providers/ability-provider';
-import { FcrUIScreenShareProvider } from '../../providers/screen-share-provider';
 import { FcrUIScreenShareSharedDataSource } from '../../shared-data-source/screen-share-data';
 import { FcrUISharedConfirmDataSource } from '../../shared-data-source/confirm-data';
 import { CurrentShareScreenWorkArea } from '../../utilities/dialog-utils';
 import { FcrUIAnnotationProvider } from '../../providers/annotation-provider';
+import { FcrUIMultiDisplayProvider } from '../../providers/multi-display-provider';
+import { FcrUIRoomProvider } from '../../providers/room-provider';
+import { FcrUISharedSettingDataSource } from '../../shared-data-source/setting';
 export declare let dialogWindows: Map<FcrUIDialogKey, Electron.BrowserWindow>;
 export declare let dialogIdWindows: Map<string, Electron.BrowserWindow>;
 export default class DialogStore {
@@ -32,17 +34,22 @@ export default class DialogStore {
     private _remoteVideoRenderManager;
     private _dialogProvider;
     private _widgetProvider;
-    private _screenShareProvider;
+    private _sharedSettingDataSource;
+    private _roomProvider;
     private _sharedLayoutDataSource;
     private _phoneAudioConnectorProvider;
     private _sharedScreenShareSharedDataSource;
     private _sharedConfirmDataSource;
     private _dialogComponentMapByKey;
     private _chatProvider;
-    private _handleDialogEventObserver;
-    private _userObserver;
+    private _multiDisplayProvider?;
     private _electronDialogs;
     private _annotationProvider;
+    private _disposers;
+    private _handleDialogEventObserver;
+    private _userObserver;
+    private _roomObserver;
+    private _handleSecondaryWindowEventObserver;
     accessor openedDialogs: {
         dialogKey: FcrUIDialogKey;
         dialogId: string;
@@ -54,9 +61,10 @@ export default class DialogStore {
     accessor currentDialogBounds: Map<FcrUIDialogKey, number>;
     accessor videoWindowBounds: any;
     accessor recordShareBounds: Map<CurrentShareBounds, CurrentShareScreenWorkArea>;
-    accessor allApplicationWindows: AgoraRtcWindowInfo[];
+    accessor allApplicationWindows: FcrWindowInfo[];
+    accessor interceptClose: boolean;
     get currentShareId(): string;
-    get currentShareType(): AgoraRtcScreenCaptureType;
+    get currentShareType(): import("fcr-core/lib/type").FcrScreenCaptureType;
     get currentShareBounds(): CurrentShareBounds;
     get dialogComponentMapByKey(): Map<FcrUIDialogKey, FcrUIDialogComponent>;
     get participantCount(): number;
@@ -71,13 +79,14 @@ export default class DialogStore {
     get remoteVideoRenderManager(): FcrUIRemoteVideoRenderProvider;
     get localVideoRenderProvider(): FcrUILocalVideoRenderProvider;
     get waitingRoomState(): boolean;
+    get isMultiDisplayActive(): boolean;
     get connectType(): import("../../type").FcrUIConnectType;
     get hasOwnPstnStream(): boolean;
     get widgetDialogIds(): Map<string, string>;
     get chatRoomState(): import("fcr-core/lib/type").FcrChatRoomConnectionState;
     get isSharingScreen(): boolean;
     get isSharingScreenOwner(): boolean;
-    constructor({ eventProvider, userControl, deviceStore, streamControl, localVideoRenderProvider, remoteVideoRenderManager, securityStore, sharedLayoutDataSource, dialogProvider, phoneAudioConnectorProvider, dialogsByKey, widgetProvider, screenShareProvider, chatProvider, sharedScreenShareSharedDataSource, sharedConfirmDataSource, annotationProvider, }: {
+    constructor({ eventProvider, userControl, deviceStore, streamControl, localVideoRenderProvider, remoteVideoRenderManager, securityStore, sharedLayoutDataSource, dialogProvider, phoneAudioConnectorProvider, dialogsByKey, widgetProvider, chatProvider, sharedScreenShareSharedDataSource, sharedConfirmDataSource, annotationProvider, multiDisplayProvider, roomProvider, sharedSettingDataSource, }: {
         streamControl: FcrStreamControl;
         userControl: FcrUserControl;
         eventProvider: FcrUIEventProvider;
@@ -91,11 +100,13 @@ export default class DialogStore {
         dialogsByKey: Map<FcrUIDialogKey, FcrUIDialogComponent>;
         widgetProvider: FcrUIWidgetProvider;
         chatProvider: FcrUIChatProvider;
-        screenShareProvider: FcrUIScreenShareProvider;
         abilityProvider: FcrUIAbilityProviderImpl;
         sharedScreenShareSharedDataSource: FcrUIScreenShareSharedDataSource;
         sharedConfirmDataSource: FcrUISharedConfirmDataSource;
         annotationProvider: FcrUIAnnotationProvider;
+        multiDisplayProvider?: FcrUIMultiDisplayProvider;
+        roomProvider: FcrUIRoomProvider;
+        sharedSettingDataSource: FcrUISharedSettingDataSource;
     });
     setConfirmPosition(position: {
         x: number;
@@ -114,8 +125,11 @@ export default class DialogStore {
     release(): void;
     resizeVideoWindow(width: number, height: number): void;
     recordCurrentSharingScreenBounds(): CurrentShareScreenWorkArea;
+    moveMainWindowToIndexLeastDisplay(): void;
     log(info: string): void;
     private _handleDialogEvent;
     private _hanleAllUserCountUpdated;
+    private _handleSecondaryWindowEvent;
+    private _setInterceptClose;
 }
 export declare const StoreContext: import("react").Context<DialogStore>;

package/lib/modules/dialog/store.js

@@ -5,7 +5,6 @@ require("core-js/modules/es.symbol.description.js");
 require("core-js/modules/es.symbol.to-primitive.js");
 require("core-js/modules/es.error.cause.js");
 require("core-js/modules/es.error.to-string.js");
-require("core-js/modules/es.array.for-each.js");
 require("core-js/modules/es.array.is-array.js");
 require("core-js/modules/es.date.to-primitive.js");
 require("core-js/modules/es.function.bind.js");
@@ -18,9 +17,7 @@ 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.function.metadata.js");
-require("core-js/modules/esnext.iterator.for-each.js");
 require("core-js/modules/esnext.symbol.metadata.js");
-require("core-js/modules/web.dom-collections.for-each.js");
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
@@ -35,6 +32,7 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 require("core-js/modules/es.array.concat.js");
 require("core-js/modules/es.array.filter.js");
 require("core-js/modules/es.array.find.js");
+require("core-js/modules/es.array.for-each.js");
 require("core-js/modules/es.array.includes.js");
 require("core-js/modules/es.array.iterator.js");
 require("core-js/modules/es.array.push.js");
@@ -46,6 +44,7 @@ require("core-js/modules/es.weak-map.js");
 require("core-js/modules/esnext.iterator.constructor.js");
 require("core-js/modules/esnext.iterator.filter.js");
 require("core-js/modules/esnext.iterator.find.js");
+require("core-js/modules/esnext.iterator.for-each.js");
 require("core-js/modules/esnext.iterator.some.js");
 require("core-js/modules/esnext.map.delete-all.js");
 require("core-js/modules/esnext.map.emplace.js");
@@ -63,6 +62,7 @@ require("core-js/modules/esnext.map.some.js");
 require("core-js/modules/esnext.map.update.js");
 require("core-js/modules/esnext.weak-map.delete-all.js");
 require("core-js/modules/esnext.weak-map.emplace.js");
+require("core-js/modules/web.dom-collections.for-each.js");
 require("core-js/modules/web.dom-collections.iterator.js");
 var _type = require("fcr-core/lib/type");
 var _decorator = require("agora-foundation/lib/decorator");
@@ -73,9 +73,10 @@ var _constant = require("../../utilities/constant");
 var _dialogProvider = require("../../providers/dialog-provider");
 var _logger = require("../../utilities/logger");
 var _dialogUtils = require("../../utilities/dialog-utils");
+var _type2 = require("../secondary-window/type");
 var _excluded = ["x", "y"];
 var _DialogStore;
-var _initProto, _init_openedDialogs, _init_confirmDialogs, _init_userCount, _init_participantElectronDialogContainer, _init_currentDialogBounds, _init_videoWindowBounds, _init_recordShareBounds, _init_allApplicationWindows, _setConfirmPositionDecs, _setVideoWindowBoundsDecs, _recordCurrentSharingScreenBoundsDecs, _handleDialogEventDecs, _hanleAllUserCountUpdatedDecs, _ref;
+var _initProto, _init_openedDialogs, _init_confirmDialogs, _init_userCount, _init_participantElectronDialogContainer, _init_currentDialogBounds, _init_videoWindowBounds, _init_recordShareBounds, _init_allApplicationWindows, _init_interceptClose, _setConfirmPositionDecs, _setVideoWindowBoundsDecs, _recordCurrentSharingScreenBoundsDecs, _handleDialogEventDecs, _hanleAllUserCountUpdatedDecs, _handleSecondaryWindowEventDecs, _setInterceptCloseDecs, _ref;
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2["default"])(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _classPrivateFieldInitSpec(e, t, a) { _checkPrivateRedeclaration(e, t), t.set(e, a); }
@@ -98,7 +99,8 @@ var _E = /*#__PURE__*/new WeakMap();
 var _F = /*#__PURE__*/new WeakMap();
 var _G = /*#__PURE__*/new WeakMap();
 var _H = /*#__PURE__*/new WeakMap();
-_ref = (_setConfirmPositionDecs = [_mobx.action, _mobx.action.bound], _setVideoWindowBoundsDecs = [_mobx.action, _mobx.action.bound], _recordCurrentSharingScreenBoundsDecs = [_mobx.action, _mobx.action.bound], _handleDialogEventDecs = [_mobx.action, _mobx.action.bound], _hanleAllUserCountUpdatedDecs = [_mobx.action, _mobx.action.bound], "logger");
+var _I = /*#__PURE__*/new WeakMap();
+_ref = (_setConfirmPositionDecs = [_mobx.action, _mobx.action.bound], _setVideoWindowBoundsDecs = [_mobx.action, _mobx.action.bound], _recordCurrentSharingScreenBoundsDecs = [_mobx.action, _mobx.action.bound], _handleDialogEventDecs = [_mobx.action, _mobx.action.bound], _hanleAllUserCountUpdatedDecs = [_mobx.action, _mobx.action.bound], _handleSecondaryWindowEventDecs = [_mobx.action, _mobx.action.bound], _setInterceptCloseDecs = [_mobx.action, _mobx.action.bound], "logger");
 var DialogStore = exports["default"] = /*#__PURE__*/function () {
   function DialogStore(_ref2) {
     var _this = this;
@@ -114,22 +116,35 @@ var DialogStore = exports["default"] = /*#__PURE__*/function () {
       phoneAudioConnectorProvider = _ref2.phoneAudioConnectorProvider,
       dialogsByKey = _ref2.dialogsByKey,
       widgetProvider = _ref2.widgetProvider,
-      screenShareProvider = _ref2.screenShareProvider,
       chatProvider = _ref2.chatProvider,
       sharedScreenShareSharedDataSource = _ref2.sharedScreenShareSharedDataSource,
       sharedConfirmDataSource = _ref2.sharedConfirmDataSource,
-      annotationProvider = _ref2.annotationProvider;
+      annotationProvider = _ref2.annotationProvider,
+      multiDisplayProvider = _ref2.multiDisplayProvider,
+      roomProvider = _ref2.roomProvider,
+      sharedSettingDataSource = _ref2.sharedSettingDataSource;
     (0, _classCallCheck2["default"])(this, DialogStore);
     (0, _defineProperty2["default"])(this, _ref, (_initProto(this), (0, _logger.createLogger)({
       prefix: 'DialogStore'
     })));
+    (0, _defineProperty2["default"])(this, "_electronDialogs", new Map());
+    (0, _defineProperty2["default"])(this, "_disposers", []);
     (0, _defineProperty2["default"])(this, "_handleDialogEventObserver", {
       onEvent: this._handleDialogEvent
     });
     (0, _defineProperty2["default"])(this, "_userObserver", {
       onAllUserCountUpdated: this._hanleAllUserCountUpdated
     });
-    (0, _defineProperty2["default"])(this, "_electronDialogs", new Map());
+    (0, _defineProperty2["default"])(this, "_roomObserver", {
+      onExitRoom: this._setInterceptClose,
+      onRoutingChanged: this._setInterceptClose,
+      onRoomClosed: this._setInterceptClose,
+      onLeaveMainRoom: this._setInterceptClose,
+      onLocalUserKickedOut: this._setInterceptClose
+    });
+    (0, _defineProperty2["default"])(this, "_handleSecondaryWindowEventObserver", {
+      onContentDistributionUpdated: this._handleSecondaryWindowEvent
+    });
     _classPrivateFieldInitSpec(this, _A, _init_openedDialogs(this, []));
     _classPrivateFieldInitSpec(this, _B, _init_confirmDialogs(this, new Map()));
     _classPrivateFieldInitSpec(this, _C, _init_userCount(this, 0));
@@ -138,6 +153,8 @@ var DialogStore = exports["default"] = /*#__PURE__*/function () {
     _classPrivateFieldInitSpec(this, _F, _init_videoWindowBounds(this, {}));
     _classPrivateFieldInitSpec(this, _G, _init_recordShareBounds(this, new Map()));
     _classPrivateFieldInitSpec(this, _H, _init_allApplicationWindows(this, []));
+    // 是否拦截窗口关闭的行为，只在退出房间时修改此值，不可作为它用，如需拦截都通过这个值进行全局控制，否则在退出房间的时候无法关闭窗口
+    _classPrivateFieldInitSpec(this, _I, _init_interceptClose(this, true));
     this._sharedScreenShareSharedDataSource = sharedScreenShareSharedDataSource;
     this._eventProvider = eventProvider;
     this._streamControl = streamControl;
@@ -153,16 +170,28 @@ var DialogStore = exports["default"] = /*#__PURE__*/function () {
     this._dialogComponentMapByKey = dialogsByKey;
     this._widgetProvider = widgetProvider;
     this._chatProvider = chatProvider;
-    this._screenShareProvider = screenShareProvider;
     this._annotationProvider = annotationProvider;
+    this._multiDisplayProvider = multiDisplayProvider;
+    this._roomProvider = roomProvider;
+    this._sharedSettingDataSource = sharedSettingDataSource;
     this._userControl.addObserver(this._userObserver);
     this._eventProvider.addObserver(this._handleDialogEventObserver);
     this._dialogProvider.addObserver(this._handleDialogEventObserver);
+    this._roomProvider.addObserver(this._roomObserver);
+    if (this._multiDisplayProvider) {
+      this._multiDisplayProvider.addObserver(this._handleSecondaryWindowEventObserver);
+    }
     this._userInfo = userControl.getLocalUser();
     (0, _mobx.runInAction)(function () {
       _this.userCount = _this._userControl.getAllUserCount();
-      _this._annotationProvider.initAnnotationWindow();
+      // this._annotationProvider.initAnnotationWindow();
     });
+    this._disposers.push((0, _mobx.reaction)(function () {
+      return _this._sharedSettingDataSource.settingConfig.setting.isDualDisplayMode;
+    }, function (isDualDisplayMode) {
+      console.log('isDualDisplayMode =>', isDualDisplayMode);
+      _this.interceptClose = isDualDisplayMode;
+    }));
   }
   return (0, _createClass2["default"])(DialogStore, [{
     key: "openedDialogs",
@@ -228,6 +257,14 @@ var DialogStore = exports["default"] = /*#__PURE__*/function () {
     set: function set(v) {
       _classPrivateFieldSet(_H, this, v);
     }
+  }, {
+    key: "interceptClose",
+    get: function get() {
+      return _classPrivateFieldGet(_I, this);
+    },
+    set: function set(v) {
+      _classPrivateFieldSet(_I, this, v);
+    }
   }, {
     key: "currentShareId",
     get: function get() {
@@ -293,6 +330,14 @@ var DialogStore = exports["default"] = /*#__PURE__*/function () {
     get: function get() {
       return this._securityStore.isWaitingRoomEnabled();
     }
+  }, {
+    key: "isMultiDisplayActive",
+    get: function get() {
+      if (this._multiDisplayProvider) {
+        return this._multiDisplayProvider.isActive;
+      }
+      return false;
+    }
   }, {
     key: "connectType",
     get: function get() {
@@ -407,6 +452,13 @@ var DialogStore = exports["default"] = /*#__PURE__*/function () {
       this._userControl.removeObserver(this._userObserver);
       this._dialogProvider.removeObserver(this._handleDialogEventObserver);
       this._eventProvider.removeObserver(this._handleDialogEventObserver);
+      this._roomProvider.removeObserver(this._roomObserver);
+      if (this._multiDisplayProvider) {
+        this._multiDisplayProvider.removeObserver(this._handleSecondaryWindowEventObserver);
+      }
+      this._disposers.forEach(function (disposer) {
+        return disposer();
+      });
       dialogWindows.clear();
     }
   }, {
@@ -452,6 +504,13 @@ var DialogStore = exports["default"] = /*#__PURE__*/function () {
       }
       return screenBounds;
     }
+  }, {
+    key: "moveMainWindowToIndexLeastDisplay",
+    value: function moveMainWindowToIndexLeastDisplay() {
+      if (this._multiDisplayProvider) {
+        this._multiDisplayProvider.moveMainWindowToIndexLeastDisplay();
+      }
+    }
   }, {
     key: "log",
     value: function log(info) {
@@ -528,10 +587,22 @@ var DialogStore = exports["default"] = /*#__PURE__*/function () {
     value: function _hanleAllUserCountUpdated(_roomId, count) {
       this.userCount = count;
     }
+  }, {
+    key: "_handleSecondaryWindowEvent",
+    value: function _handleSecondaryWindowEvent(distribution) {
+      if (distribution.secondaryWindow.type === _type2.FcrUIDisplayDistributionContentType.HIDDEN) {
+        this.interceptClose = false;
+      }
+    }
+  }, {
+    key: "_setInterceptClose",
+    value: function _setInterceptClose() {
+      this.interceptClose = false;
+    }
   }]);
 }();
 _DialogStore = DialogStore;
-var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_DialogStore, [[_mobx.observable, 1, "openedDialogs"], [_mobx.observable, 1, "confirmDialogs"], [_mobx.observable, 1, "userCount"], [_mobx.observable, 1, "participantElectronDialogContainer"], [_mobx.observable, 1, "currentDialogBounds"], [_mobx.observable, 1, "videoWindowBounds"], [_mobx.observable, 1, "recordShareBounds"], [_mobx.observable, 1, "allApplicationWindows"], [_mobx.computed, 3, "connectType"], [_mobx.computed, 3, "hasOwnPstnStream"], [_mobx.computed, 3, "chatRoomState"], [_mobx.computed, 3, "isSharingScreen"], [_setConfirmPositionDecs, 18, "setConfirmPosition"], [_mobx.action, 2, "setParticipantElectronDialogContainer"], [_setVideoWindowBoundsDecs, 18, "setVideoWindowBounds"], [_decorator.bound, 2, "closeDialogByKey"], [_decorator.bound, 2, "closeDilaogByDialogId"], [_decorator.bound, 2, "closeSystemPreferenceDialog"], [_decorator.bound, 2, "closeChatFromDialog"], [_decorator.bound, 2, "moveChatFromDialogToAside"], [_decorator.bound, 2, "closeConnectionDialog"], [_decorator.bound, 2, "closeParticipantDialog"], [_decorator.bound, 2, "moveParticipantFromDialogToAside"], [_decorator.bound, 2, "resizeVideoWindow"], [_recordCurrentSharingScreenBoundsDecs, 18, "recordCurrentSharingScreenBounds"], [_decorator.bound, 2, "log"], [_handleDialogEventDecs, 18, "_handleDialogEvent"], [_hanleAllUserCountUpdatedDecs, 18, "_hanleAllUserCountUpdated"]], []).e, 9);
+var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_DialogStore, [[_mobx.observable, 1, "openedDialogs"], [_mobx.observable, 1, "confirmDialogs"], [_mobx.observable, 1, "userCount"], [_mobx.observable, 1, "participantElectronDialogContainer"], [_mobx.observable, 1, "currentDialogBounds"], [_mobx.observable, 1, "videoWindowBounds"], [_mobx.observable, 1, "recordShareBounds"], [_mobx.observable, 1, "allApplicationWindows"], [_mobx.observable, 1, "interceptClose"], [_mobx.computed, 3, "connectType"], [_mobx.computed, 3, "hasOwnPstnStream"], [_mobx.computed, 3, "chatRoomState"], [_mobx.computed, 3, "isSharingScreen"], [_setConfirmPositionDecs, 18, "setConfirmPosition"], [_mobx.action, 2, "setParticipantElectronDialogContainer"], [_setVideoWindowBoundsDecs, 18, "setVideoWindowBounds"], [_decorator.bound, 2, "closeDialogByKey"], [_decorator.bound, 2, "closeDilaogByDialogId"], [_decorator.bound, 2, "closeSystemPreferenceDialog"], [_decorator.bound, 2, "closeChatFromDialog"], [_decorator.bound, 2, "moveChatFromDialogToAside"], [_decorator.bound, 2, "closeConnectionDialog"], [_decorator.bound, 2, "closeParticipantDialog"], [_decorator.bound, 2, "moveParticipantFromDialogToAside"], [_decorator.bound, 2, "resizeVideoWindow"], [_recordCurrentSharingScreenBoundsDecs, 18, "recordCurrentSharingScreenBounds"], [_decorator.bound, 2, "moveMainWindowToIndexLeastDisplay"], [_decorator.bound, 2, "log"], [_handleDialogEventDecs, 18, "_handleDialogEvent"], [_hanleAllUserCountUpdatedDecs, 18, "_hanleAllUserCountUpdated"], [_handleSecondaryWindowEventDecs, 18, "_handleSecondaryWindowEvent"], [_setInterceptCloseDecs, 18, "_setInterceptClose"]], []).e, 10);
 _init_openedDialogs = _applyDecs$e[0];
 _init_confirmDialogs = _applyDecs$e[1];
 _init_userCount = _applyDecs$e[2];
@@ -540,5 +611,6 @@ _init_currentDialogBounds = _applyDecs$e[4];
 _init_videoWindowBounds = _applyDecs$e[5];
 _init_recordShareBounds = _applyDecs$e[6];
 _init_allApplicationWindows = _applyDecs$e[7];
-_initProto = _applyDecs$e[8];
+_init_interceptClose = _applyDecs$e[8];
+_initProto = _applyDecs$e[9];
 var StoreContext = exports.StoreContext = /*#__PURE__*/(0, _react.createContext)(null);

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

@@ -11,6 +11,7 @@ export type FcrUIDialogOnOpenedProps = {
 export type FcrUIDialogOnCloseProps = {
     store: DialogStore;
     browserWindow: Electron.BrowserWindow;
+    newRendererWindow: Window;
 };
 export type FcrUIDialogHooksProps = {
     /**
@@ -75,6 +76,13 @@ export type FcrUIDialogHooksProps = {
      * @param disableShortcutClose - 是否可以用快捷键关闭窗口，默认为 false
      */
     disableShortcutClose?: boolean;
+    /**
+     * @param beforeClose - 当 dialog 关闭前的回调函数，函数签名为 dialog 的 store
+     * @returns interception 是否允许关闭，如果返回 true，则 dialog 不会关闭
+     */
+    beforeClose?: (props: Pick<FcrUIDialogOnOpenedProps, 'store' | 'browserWindow' | 'newRendererWindow'> & {
+        continueClose: () => void;
+    }) => boolean;
 };
 export type FcrUIDialogComponent = React.FC<FcrDialogProps>;
 export type FcrDialogProps = {

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

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