fcr-ui-scene 3.7.2 → 3.7.3

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 { AgoraRtcWindowInfo } from 'agora-rte-sdk/lib/core/rtc/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;
@@ -55,8 +62,9 @@ export default class DialogStore {
     accessor videoWindowBounds: any;
     accessor recordShareBounds: Map<CurrentShareBounds, CurrentShareScreenWorkArea>;
     accessor allApplicationWindows: AgoraRtcWindowInfo[];
+    accessor interceptClose: boolean;
     get currentShareId(): string;
-    get currentShareType(): AgoraRtcScreenCaptureType;
+    get currentShareType(): import("agora-rte-sdk/lib/core/rtc/type").AgoraRtcScreenCaptureType;
     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,10 @@ 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;
 }
 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, _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], "logger");
 var DialogStore = exports["default"] = /*#__PURE__*/function () {
   function DialogStore(_ref2) {
     var _this = this;
@@ -114,22 +116,36 @@ 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: function onExitRoom() {
+        _this.interceptClose = false;
+      },
+      onRoutingChanged: function onRoutingChanged() {
+        _this.interceptClose = false;
+      }
+    });
+    (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 +154,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 +171,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._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 +258,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 +331,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 +453,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 +505,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 +588,17 @@ 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;
+      }
+    }
   }]);
 }();
 _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"]], []).e, 10);
 _init_openedDialogs = _applyDecs$e[0];
 _init_confirmDialogs = _applyDecs$e[1];
 _init_userCount = _applyDecs$e[2];
@@ -540,5 +607,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/index.css

@@ -1,4 +1,6 @@
-.confirm-wrapper {
+
+
+.fcr-event-confirm-wrapper.fcr-event-confirm-container {
   width: 100vw;
   height: 100vh;
   position: absolute;
@@ -7,7 +9,8 @@
   z-index: 2000;
   pointer-events: none;
 }
-.confirm-wrapper div {
+
+.fcr-event-confirm-wrapper.fcr-event-confirm-container div {
   pointer-events: all;
 }
 

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

@@ -31,9 +31,7 @@ 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");
@@ -72,6 +70,7 @@ var _logger = require("../../utilities/logger");
 var _decorator = require("agora-foundation/lib/decorator");
 var _dialogUtils = require("../../utilities/dialog-utils");
 var _env = require("agora-foundation/lib/utilities/env");
+var _imports = require("fcr-core/lib/imports");
 var _ConfirmStore;
 var _initProto, _init_isReplaceShare, _init_calculateMethods, _init_reposition, _init_confirms, _init_screenBounds, _addConfirmDecs, _resetIsReplaceDecs, _setMousePositionDecs, _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; }
@@ -140,11 +139,11 @@ var ConfirmStore = exports["default"] = /*#__PURE__*/function () {
           _this.calculateMethods.forEach(function (method) {
             return method(nearDisplayBounds);
           });
-          _this.logger.info("new sharing bounds is ".concat(JSON.stringify(nearDisplayBounds)));
+          _this.logger.info("new sharing bounds is ".concat((0, _imports.jsonstring)(nearDisplayBounds)));
           _this.screenBounds = nearDisplayBounds;
         }
       } else {
-        _this.logger.error("there is have no bounds ".concat(JSON.stringify(bounds)));
+        _this.logger.error("there is have no bounds ".concat((0, _imports.jsonstring)(bounds)));
       }
     }), (0, _mobx.reaction)(function () {
       return _this.isSeizeScreen;
@@ -157,12 +156,12 @@ var ConfirmStore = exports["default"] = /*#__PURE__*/function () {
           }),
           nearDisplayBounds = _ref3.nearDisplayBounds;
         _this.screenBounds = nearDisplayBounds;
-        _this.logger.info("new sharing bounds is ".concat(JSON.stringify(nearDisplayBounds), ", when seize screen emit"));
+        _this.logger.info("new sharing bounds is ".concat((0, _imports.jsonstring)(nearDisplayBounds), ", when seize screen emit"));
       }
     }), (0, _mobx.reaction)(function () {
       return _this.screenBounds;
     }, function (bounds) {
-      _this.logger.debug("the bounds is  changed=>", bounds);
+      _this.logger.debug("the bounds changed, bounds: ".concat((0, _imports.jsonstring)(bounds)));
     }));
   }
   return (0, _createClass2["default"])(ConfirmStore, [{
@@ -323,7 +322,7 @@ var ConfirmStore = exports["default"] = /*#__PURE__*/function () {
                 }),
                 nearDisplayBounds = _ref5.nearDisplayBounds;
               this.screenBounds = nearDisplayBounds;
-              this.logger.info("open confirm dialog with bounds ".concat(JSON.stringify(nearDisplayBounds)));
+              this.logger.info("open confirm dialog with bounds: ".concat((0, _imports.jsonstring)(nearDisplayBounds)));
             }
             this.addConfirm(payload);
             break;

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

@@ -42,7 +42,7 @@ var View = exports.View = (0, _mobxReact.observer)(function () {
   }, [confirmList]);
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {
     children: /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
-      className: "confirm-wrapper",
+      className: "fcr-event-confirm-wrapper fcr-event-confirm-container",
       children: (0, _toConsumableArray2["default"])(confirmList).map(function (confirm) {
         return /*#__PURE__*/(0, _jsxRuntime.jsx)(_window.ConfirmWindow, {
           confirm: confirm

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

@@ -34,6 +34,7 @@ export declare class SoundEffectUIModule extends UIModule {
     private _roomObserver;
     private _streamsObserver;
     private _userObserver;
+    private _whiteboardObserver;
     onNodeWillActive(): void;
     onNodeWillInactive(): void;
     release(): void;

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

@@ -119,15 +119,16 @@ var SoundEffectUIModule = exports.SoundEffectUIModule = /*#__PURE__*/function (_
     (0, _defineProperty2["default"])(_this, "_userObserver", {
       onRemoteUsersJoined: _this._handleUserJoined
     });
+    (0, _defineProperty2["default"])(_this, "_whiteboardObserver", {
+      onActive: _this._handleWhiteboardActive
+    });
     return _this;
   }
   (0, _inherits2["default"])(SoundEffectUIModule, _UIModule);
   return (0, _createClass2["default"])(SoundEffectUIModule, [{
     key: "onNodeWillActive",
     value: function onNodeWillActive() {
-      var _this$currentRoomCont,
-        _this$sharedConfigDat,
-        _this2 = this;
+      var _this$currentRoomCont, _this$sharedConfigDat;
       if (!((_this$currentRoomCont = this.currentRoomControlProvider) !== null && _this$currentRoomCont !== void 0 && _this$currentRoomCont.currentRoomControl)) {
         return;
       }
@@ -152,11 +153,7 @@ var SoundEffectUIModule = exports.SoundEffectUIModule = /*#__PURE__*/function (_
         this._roomControl.addObserver(this._roomObserver);
       }
       if (this._whiteboardControl) {
-        this._whiteboardControl.addObserver({
-          onActive: function onActive() {
-            return _this2._handleWhiteboardActive();
-          }
-        });
+        this._whiteboardControl.addObserver(this._whiteboardObserver);
       }
       if (this._userControl) {
         this._userControl.addObserver(this._userObserver);
@@ -173,21 +170,11 @@ var SoundEffectUIModule = exports.SoundEffectUIModule = /*#__PURE__*/function (_
   }, {
     key: "release",
     value: function release() {
-      var _this$_chatRoomContro,
-        _this$_roomControl,
-        _this$_streamControl,
-        _this$_whiteboardCont,
-        _this3 = this,
-        _this$_connectionCont,
-        _this$_userControl;
+      var _this$_chatRoomContro, _this$_roomControl, _this$_streamControl, _this$_whiteboardCont, _this$_connectionCont, _this$_userControl;
       (_this$_chatRoomContro = this._chatRoomControl) === null || _this$_chatRoomContro === void 0 || _this$_chatRoomContro.removeObserver(this._chatRoomObserver);
       (_this$_roomControl = this._roomControl) === null || _this$_roomControl === void 0 || _this$_roomControl.removeObserver(this._roomObserver);
       (_this$_streamControl = this._streamControl) === null || _this$_streamControl === void 0 || _this$_streamControl.removeObserver(this._streamsObserver);
-      (_this$_whiteboardCont = this._whiteboardControl) === null || _this$_whiteboardCont === void 0 || _this$_whiteboardCont.removeObserver({
-        onActive: function onActive() {
-          return _this3._handleWhiteboardActive();
-        }
-      });
+      (_this$_whiteboardCont = this._whiteboardControl) === null || _this$_whiteboardCont === void 0 || _this$_whiteboardCont.removeObserver(this._whiteboardObserver);
       (_this$_connectionCont = this._connectionControl) === null || _this$_connectionCont === void 0 || _this$_connectionCont.removeObserver(this._engineObserver);
       (_this$_userControl = this._userControl) === null || _this$_userControl === void 0 || _this$_userControl.removeObserver(this._userObserver);
       this._clearSoundEffectTimer();
@@ -270,11 +257,11 @@ var SoundEffectUIModule = exports.SoundEffectUIModule = /*#__PURE__*/function (_
   }, {
     key: "_handleStreamsAdded",
     value: function _handleStreamsAdded(roomId, events) {
-      var _this4 = this;
+      var _this2 = this;
       events.forEach(function (e) {
         var modifiedStream = e.modifiedStream;
         if (modifiedStream.videoSourceType === _fcrCore.FcrVideoSourceType.SCREEN) {
-          _this4.handlePlaySoundEffect(SoundEffectType.SCREEN_SHARING_STARTED);
+          _this2.handlePlaySoundEffect(SoundEffectType.SCREEN_SHARING_STARTED);
         }
       });
     }
@@ -302,7 +289,7 @@ var SoundEffectUIModule = exports.SoundEffectUIModule = /*#__PURE__*/function (_
     key: "handlePlaySoundEffect",
     value: function handlePlaySoundEffect(name) {
       var _this$sharedSettingDa,
-        _this5 = this;
+        _this3 = this;
       if (!((_this$sharedSettingDa = this.sharedSettingDataSource) !== null && _this$sharedSettingDa !== void 0 && _this$sharedSettingDa.setting.isPlaySound)) {
         return;
       }
@@ -322,7 +309,7 @@ var SoundEffectUIModule = exports.SoundEffectUIModule = /*#__PURE__*/function (_
         }
         var newTimer = window.setTimeout(function () {
           _player.stop();
-          _this5._soundEffectTimer["delete"](name);
+          _this3._soundEffectTimer["delete"](name);
         }, this._duration);
         this._soundEffectTimer.set(name, newTimer);
       }

package/lib/modules/invite/components/pstn-invite.js

@@ -110,7 +110,6 @@ var PSTNInvite = exports.PSTNInvite = (0, _mobxReact.observer)(function () {
         case 2:
           checkPhoneNumber();
           checkInput(inviteUserName, setIsInviteUserNameError);
-          console.log('invitePhoneNumber', invitePhoneNumber);
           if (!(!inviteUserName || !invitePhoneNumber || !(0, _regex.isPhoneNumber)(invitePhoneNumber))) {
             _context.next = 3;
             break;