fcr-ui-scene 3.4.5 → 3.5.0

package/lib/modules/dialog/store.js

@@ -10,8 +10,11 @@ require("core-js/modules/es.date.to-primitive.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");
+require("core-js/modules/es.object.define-properties.js");
 require("core-js/modules/es.object.define-property.js");
 require("core-js/modules/es.object.get-own-property-descriptor.js");
+require("core-js/modules/es.object.get-own-property-descriptors.js");
+require("core-js/modules/es.object.keys.js");
 require("core-js/modules/esnext.function.metadata.js");
 require("core-js/modules/esnext.symbol.metadata.js");
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
@@ -20,25 +23,26 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = exports.TOP_LEVEL_DIALOG_LAYER = exports.StoreContext = exports.HIGH_LEVEL_DIALOG_LAYER = void 0;
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 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");
+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.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");
 require("core-js/modules/esnext.map.every.js");
@@ -57,24 +61,26 @@ 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 _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _type = require("fcr-core/lib/type");
 var _decorator = require("agora-foundation/lib/decorator");
-var _logger = require("agora-foundation/lib/logger");
 var _env = require("agora-foundation/lib/utilities/env");
 var _mobx = require("mobx");
 var _dialogs = require("./dialogs");
-var _type2 = require("fcr-core/lib/room-control/chatroom-control/type");
 var _react = require("react");
 var _platform = require("../../utilities/platform");
 var _constant = require("../../utilities/constant");
 var _dialogProvider = require("../../providers/dialog-provider");
-var _type3 = require("agora-rte-sdk/lib/core/rtc/type");
+var _type2 = require("agora-rte-sdk/lib/core/rtc/type");
+var _logger = require("../../utilities/logger");
+var _tools = require("../../utilities/tools");
+var _excluded = ["x", "y"];
 var _DialogStore;
-var _initProto, _init_openedDialogs, _init_payloadDialogs, _init_confirmDialogs, _init_userCount, _init_participantElectronDialogContainer, _init_chatRoomState, _init_currentDialogBounds, _init_videoWindowBounds, _init_currentShareId, _init_currentShareType, _init_currentShareBounds, _setVideoWindowBoundsDecs, _updateCurrentShareContentDecs, _handleDialogEventDecs, _handleConnectionUpdatedDecs, _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, _getCurrentSharingScreenBoundsDecs, _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); }
 function _checkPrivateRedeclaration(e, t) { if (t.has(e)) throw new TypeError("Cannot initialize the same private elements twice on an object"); }
 function _classPrivateFieldSet(s, a, r) { return s.set(_assertClassBrand(s, a), r), r; }
@@ -97,14 +103,12 @@ var _G = /*#__PURE__*/new WeakMap();
 var _H = /*#__PURE__*/new WeakMap();
 var _I = /*#__PURE__*/new WeakMap();
 var _J = /*#__PURE__*/new WeakMap();
-var _K = /*#__PURE__*/new WeakMap();
-_ref = (_setVideoWindowBoundsDecs = [_mobx.action, _mobx.action.bound], _updateCurrentShareContentDecs = [_mobx.action, _mobx.action.bound], _handleDialogEventDecs = [_mobx.action, _mobx.action.bound], _handleConnectionUpdatedDecs = [_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], _getCurrentSharingScreenBoundsDecs = [_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;
     var uiEventStore = _ref2.uiEventStore,
       userControl = _ref2.userControl,
-      chatRoomControl = _ref2.chatRoomControl,
       deviceStore = _ref2.deviceStore,
       streamControl = _ref2.streamControl,
       localVideoRenderProvider = _ref2.localVideoRenderProvider,
@@ -112,53 +116,52 @@ var DialogStore = exports["default"] = /*#__PURE__*/function () {
       securityStore = _ref2.securityStore,
       sharedLayoutDataSource = _ref2.sharedLayoutDataSource,
       dialogProvider = _ref2.dialogProvider,
-      phoneAudioConnectorProvider = _ref2.phoneAudioConnectorProvider;
+      phoneAudioConnectorProvider = _ref2.phoneAudioConnectorProvider,
+      dialogsByKey = _ref2.dialogsByKey,
+      widgetProvider = _ref2.widgetProvider,
+      chatProvider = _ref2.chatProvider;
     (0, _classCallCheck2["default"])(this, DialogStore);
-    (0, _defineProperty2["default"])(this, _ref, (_initProto(this), (0, _logger.getLogger)()));
-    (0, _defineProperty2["default"])(this, "_connnectBeforeCloseDetect", true);
+    (0, _defineProperty2["default"])(this, _ref, (_initProto(this), (0, _logger.createLogger)({
+      prefix: 'DialogStore'
+    })));
     (0, _defineProperty2["default"])(this, "_handleDialogEventObserver", {
       onEvent: this._handleDialogEvent.bind(this)
     });
     (0, _defineProperty2["default"])(this, "_userObserver", {
       onAllUserCountUpdated: this._hanleAllUserCountUpdated.bind(this)
     });
-    (0, _defineProperty2["default"])(this, "_chatRoomObserver", {
-      onConnectionStateUpdated: this._handleConnectionUpdated.bind(this),
-      onErrorOccurred: function onErrorOccurred(error) {},
-      onTextMessageReceived: function onTextMessageReceived(message) {}
-    });
     _classPrivateFieldInitSpec(this, _A, _init_openedDialogs(this, []));
-    _classPrivateFieldInitSpec(this, _B, _init_payloadDialogs(this, new Map()));
-    _classPrivateFieldInitSpec(this, _C, _init_confirmDialogs(this, new Map()));
-    _classPrivateFieldInitSpec(this, _D, _init_userCount(this, 0));
-    _classPrivateFieldInitSpec(this, _E, _init_participantElectronDialogContainer(this, null));
-    _classPrivateFieldInitSpec(this, _F, _init_chatRoomState(this, _type2.FcrChatRoomConnectionState.Disconnected));
-    _classPrivateFieldInitSpec(this, _G, _init_currentDialogBounds(this, new Map()));
-    _classPrivateFieldInitSpec(this, _H, _init_videoWindowBounds(this, {}));
-    _classPrivateFieldInitSpec(this, _I, _init_currentShareId(this, ''));
-    _classPrivateFieldInitSpec(this, _J, _init_currentShareType(this, _type3.AgoraRtcScreenCaptureType.SCREEN));
-    _classPrivateFieldInitSpec(this, _K, _init_currentShareBounds(this, {
+    _classPrivateFieldInitSpec(this, _B, _init_confirmDialogs(this, new Map()));
+    _classPrivateFieldInitSpec(this, _C, _init_userCount(this, 0));
+    _classPrivateFieldInitSpec(this, _D, _init_participantElectronDialogContainer(this, null));
+    _classPrivateFieldInitSpec(this, _E, _init_currentDialogBounds(this, new Map()));
+    _classPrivateFieldInitSpec(this, _F, _init_videoWindowBounds(this, {}));
+    _classPrivateFieldInitSpec(this, _G, _init_currentShareId(this, ''));
+    _classPrivateFieldInitSpec(this, _H, _init_currentShareType(this, _type2.AgoraRtcScreenCaptureType.SCREEN));
+    _classPrivateFieldInitSpec(this, _I, _init_currentShareBounds(this, {
       width: 0,
       height: 0,
       x: 0,
       y: 0
     }));
+    _classPrivateFieldInitSpec(this, _J, _init_recordShareBounds(this, new Map()));
     this._uiEventStore = uiEventStore;
-    this._userInfo = userControl.getLocalUser();
     this._streamControl = streamControl;
     this._userControl = userControl;
     this._remoteVideoRenderManager = remoteVideoRenderManager;
     this._localVideoRenderProvider = localVideoRenderProvider;
     this._deviceStore = deviceStore;
-    this._chatRoomControl = chatRoomControl;
     this._securityStore = securityStore;
     this._sharedLayoutDataSource = sharedLayoutDataSource;
     this._dialogProvider = dialogProvider;
     this._phoneAudioConnectorProvider = phoneAudioConnectorProvider;
+    this._dialogComponentMapByKey = dialogsByKey;
+    this._widgetProvider = widgetProvider;
+    this._chatProvider = chatProvider;
     this._userControl.addObserver(this._userObserver);
     this._uiEventStore.addObserver(this._handleDialogEventObserver);
     this._dialogProvider.addObserver(this._handleDialogEventObserver);
-    this._chatRoomControl.addObserver(this._chatRoomObserver);
+    this._userInfo = userControl.getLocalUser();
     (0, _mobx.runInAction)(function () {
       _this.userCount = _this._userControl.getAllUserCount();
     });
@@ -172,7 +175,7 @@ var DialogStore = exports["default"] = /*#__PURE__*/function () {
       _classPrivateFieldSet(_A, this, v);
     }
   }, {
-    key: "payloadDialogs",
+    key: "confirmDialogs",
     get: function get() {
       return _classPrivateFieldGet(_B, this);
     },
@@ -180,7 +183,7 @@ var DialogStore = exports["default"] = /*#__PURE__*/function () {
       _classPrivateFieldSet(_B, this, v);
     }
   }, {
-    key: "confirmDialogs",
+    key: "userCount",
     get: function get() {
       return _classPrivateFieldGet(_C, this);
     },
@@ -188,7 +191,7 @@ var DialogStore = exports["default"] = /*#__PURE__*/function () {
       _classPrivateFieldSet(_C, this, v);
     }
   }, {
-    key: "userCount",
+    key: "participantElectronDialogContainer",
     get: function get() {
       return _classPrivateFieldGet(_D, this);
     },
@@ -196,7 +199,7 @@ var DialogStore = exports["default"] = /*#__PURE__*/function () {
       _classPrivateFieldSet(_D, this, v);
     }
   }, {
-    key: "participantElectronDialogContainer",
+    key: "currentDialogBounds",
     get: function get() {
       return _classPrivateFieldGet(_E, this);
     },
@@ -204,7 +207,7 @@ var DialogStore = exports["default"] = /*#__PURE__*/function () {
       _classPrivateFieldSet(_E, this, v);
     }
   }, {
-    key: "chatRoomState",
+    key: "videoWindowBounds",
     get: function get() {
       return _classPrivateFieldGet(_F, this);
     },
@@ -212,7 +215,7 @@ var DialogStore = exports["default"] = /*#__PURE__*/function () {
       _classPrivateFieldSet(_F, this, v);
     }
   }, {
-    key: "currentDialogBounds",
+    key: "currentShareId",
     get: function get() {
       return _classPrivateFieldGet(_G, this);
     },
@@ -220,7 +223,7 @@ var DialogStore = exports["default"] = /*#__PURE__*/function () {
       _classPrivateFieldSet(_G, this, v);
     }
   }, {
-    key: "videoWindowBounds",
+    key: "currentShareType",
     get: function get() {
       return _classPrivateFieldGet(_H, this);
     },
@@ -228,7 +231,7 @@ var DialogStore = exports["default"] = /*#__PURE__*/function () {
       _classPrivateFieldSet(_H, this, v);
     }
   }, {
-    key: "currentShareId",
+    key: "currentShareBounds",
     get: function get() {
       return _classPrivateFieldGet(_I, this);
     },
@@ -236,7 +239,7 @@ var DialogStore = exports["default"] = /*#__PURE__*/function () {
       _classPrivateFieldSet(_I, this, v);
     }
   }, {
-    key: "currentShareType",
+    key: "recordShareBounds",
     get: function get() {
       return _classPrivateFieldGet(_J, this);
     },
@@ -244,12 +247,9 @@ var DialogStore = exports["default"] = /*#__PURE__*/function () {
       _classPrivateFieldSet(_J, this, v);
     }
   }, {
-    key: "currentShareBounds",
+    key: "dialogComponentMapByKey",
     get: function get() {
-      return _classPrivateFieldGet(_K, this);
-    },
-    set: function set(v) {
-      _classPrivateFieldSet(_K, this, v);
+      return this._dialogComponentMapByKey;
     }
   }, {
     key: "participantCount",
@@ -261,6 +261,16 @@ var DialogStore = exports["default"] = /*#__PURE__*/function () {
     get: function get() {
       return this._userInfo.userRole === _type.FcrUserRole.HOST;
     }
+  }, {
+    key: "dialogs",
+    get: function get() {
+      return this.openedDialogs.length > 1 && this.openedDialogs.some(function (_ref3) {
+        var dialogKey = _ref3.dialogKey;
+        dialogKey === _constant.FcrUIDialogKey.SYSTEM_PREFERENCE;
+      }) ? this.openedDialogs.filter(function (dialog) {
+        return dialog.dialogKey === _constant.FcrUIDialogKey.SYSTEM_PREFERENCE;
+      }) : this.openedDialogs;
+    }
   }, {
     key: "streamControl",
     get: function get() {
@@ -296,6 +306,16 @@ var DialogStore = exports["default"] = /*#__PURE__*/function () {
     get: function get() {
       return this._phoneAudioConnectorProvider.hasOwnPstnStream;
     }
+  }, {
+    key: "widgetDialogIds",
+    get: function get() {
+      return this._widgetProvider.dialogIds;
+    }
+  }, {
+    key: "chatRoomState",
+    get: function get() {
+      return this._chatProvider.chatConnectionState;
+    }
   }, {
     key: "setParticipantElectronDialogContainer",
     value: function setParticipantElectronDialogContainer(dom) {
@@ -313,7 +333,16 @@ var DialogStore = exports["default"] = /*#__PURE__*/function () {
       var dialogId = (_this$openedDialogs$f = this.openedDialogs.find(function (dialog) {
         return dialog.dialogKey === dialogKey;
       })) === null || _this$openedDialogs$f === void 0 ? void 0 : _this$openedDialogs$f.dialogId;
-      dialogId && this._uiEventStore.closeDialog(dialogId);
+      dialogId && this._dialogProvider.closeDialog(dialogId);
+    }
+  }, {
+    key: "closeDilaogByDialogId",
+    value: function closeDilaogByDialogId(dialogId) {
+      var _this$openedDialogs$f2;
+      var id = (_this$openedDialogs$f2 = this.openedDialogs.find(function (dialog) {
+        return dialog.dialogId === dialogId;
+      })) === null || _this$openedDialogs$f2 === void 0 ? void 0 : _this$openedDialogs$f2.dialogId;
+      id && this._dialogProvider.closeDialog(id);
     }
   }, {
     key: "closeSystemPreferenceDialog",
@@ -363,9 +392,9 @@ var DialogStore = exports["default"] = /*#__PURE__*/function () {
     key: "release",
     value: function release() {
       this._userControl.removeObserver(this._userObserver);
-      this._chatRoomControl.removeObserver(this._chatRoomObserver);
       this._dialogProvider.removeObserver(this._handleDialogEventObserver);
       this._uiEventStore.removeObserver(this._handleDialogEventObserver);
+      _dialogs.dialogWindows.clear();
     }
   }, {
     key: "resizeVideoWindow",
@@ -385,24 +414,60 @@ var DialogStore = exports["default"] = /*#__PURE__*/function () {
       this.currentShareType = type;
       this.currentShareBounds = bounds;
     }
+  }, {
+    key: "getCurrentSharingScreenBounds",
+    value: function getCurrentSharingScreenBounds() {
+      var recordShareBounds = this.recordShareBounds;
+      var currentShareBounds = this.currentShareBounds;
+      var screenBounds = undefined;
+      if (recordShareBounds.has(currentShareBounds)) {
+        var _window$runtime$scree;
+        var _ref4 = recordShareBounds.get(currentShareBounds),
+          ox = _ref4.x,
+          oy = _ref4.y,
+          bounds = (0, _objectWithoutProperties2["default"])(_ref4, _excluded);
+        var _ref5 = ((_window$runtime$scree = window.runtime.screen.getAllDisplays().find(function (display) {
+            return bounds.displayId === display.id;
+          })) === null || _window$runtime$scree === void 0 ? void 0 : _window$runtime$scree.bounds) || {
+            x: ox,
+            y: oy
+          },
+          x = _ref5.x,
+          y = _ref5.y;
+        screenBounds = _objectSpread({
+          x: x,
+          y: y
+        }, bounds);
+      } else {
+        recordShareBounds.clear();
+        screenBounds = (0, _tools.getCurrentSharingWorkArea)({
+          currentShareId: this.currentShareId,
+          currentShareType: this.currentShareType,
+          allApplicationWindows: [],
+          currentShareBounds: this.currentShareBounds
+        });
+        recordShareBounds.set(currentShareBounds, screenBounds);
+      }
+      return screenBounds;
+    }
   }, {
     key: "_handleDialogEvent",
     value: function _handleDialogEvent(action, payload) {
-      var _dialogWindows$get3;
-      var _ref3 = payload || {},
-        dialogKey = _ref3.dialogKey,
-        dialogId = _ref3.dialogId,
-        _ref3$params = _ref3.params,
-        params = _ref3$params === void 0 ? {} : _ref3$params;
+      var _ref6 = payload || {},
+        dialogKey = _ref6.dialogKey,
+        dialogId = _ref6.dialogId,
+        _ref6$params = _ref6.params,
+        params = _ref6$params === void 0 ? {} : _ref6$params;
       switch (action) {
         case _constant.FcrUIAction.OPEN_DIALOG:
           // 因为窗口可能会移动，因此需要矫正 global toast 和 confirm 的 Bounds
-          if ([_constant.FcrUIDialogKey.SHOW_TOAST, _constant.FcrUIDialogKey.CONFIRM].includes(dialogKey) && (0, _env.isElectron)()) {
+          var isToastOrConfirm = [_constant.FcrUIDialogKey.SHOW_TOAST, _constant.FcrUIDialogKey.CONFIRM].includes(dialogKey);
+          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 === null || controlbar === void 0 ? void 0 : controlbar.getBounds()) || window.runtime.browserWindow.getBounds()).bounds;
+            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),
@@ -411,10 +476,12 @@ var DialogStore = exports["default"] = /*#__PURE__*/function () {
             };
             toastWindow === null || toastWindow === void 0 || toastWindow.setBounds(bounds);
             confirmWindow === null || confirmWindow === void 0 || confirmWindow.setBounds(bounds);
-            !(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;
-              window.setAlwaysOnTop(true, 'normal');
-            });
+            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;
+                window.setAlwaysOnTop(true, 'normal');
+              });
+            }
             (_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');
             // toast 有独立逻辑 src/event-dialog
@@ -424,12 +491,16 @@ var DialogStore = exports["default"] = /*#__PURE__*/function () {
           var currentDialog = this.openedDialogs.find(function (dialog) {
             return dialog.dialogId === dialogId;
           });
-          if (currentDialog) return (_dialogWindows$get3 = _dialogs.dialogWindows.get(dialogKey)) === null || _dialogWindows$get3 === void 0 ? void 0 : _dialogWindows$get3.focus();
-          this.openedDialogs.push({
-            dialogKey: dialogKey,
-            dialogId: dialogId
-          });
-          this.payloadDialogs.set(dialogKey, params);
+          if (currentDialog) {
+            var _dialogWindows$get3;
+            (_dialogWindows$get3 = _dialogs.dialogWindows.get(dialogKey)) === null || _dialogWindows$get3 === void 0 || _dialogWindows$get3.focus();
+          } else {
+            this.openedDialogs.push({
+              dialogKey: dialogKey,
+              dialogId: dialogId,
+              params: params
+            });
+          }
           break;
         case _constant.FcrUIAction.CLOSE_DIALOG:
           this.openedDialogs = this.openedDialogs.filter(function (dialog) {
@@ -440,17 +511,12 @@ var DialogStore = exports["default"] = /*#__PURE__*/function () {
           this.setVideoWindowBounds(payload);
           break;
         case _constant.FcrUIAction.SET_DIALOG_BOUNDS:
-          var _ref4 = payload,
-            height = _ref4.height;
+          var _ref7 = payload,
+            height = _ref7.height;
           if (dialogKey) this.currentDialogBounds.set(dialogKey, height);
           break;
       }
     }
-  }, {
-    key: "_handleConnectionUpdated",
-    value: function _handleConnectionUpdated(_, state) {
-      this.chatRoomState = state;
-    }
   }, {
     key: "_hanleAllUserCountUpdated",
     value: function _hanleAllUserCountUpdated(_roomId, count) {
@@ -459,17 +525,16 @@ var DialogStore = exports["default"] = /*#__PURE__*/function () {
   }]);
 }();
 _DialogStore = DialogStore;
-var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_DialogStore, [[_mobx.observable, 1, "openedDialogs"], [_mobx.observable, 1, "payloadDialogs"], [_mobx.observable, 1, "confirmDialogs"], [_mobx.observable, 1, "userCount"], [_mobx.observable, 1, "participantElectronDialogContainer"], [_mobx.observable, 1, "chatRoomState"], [_mobx.observable, 1, "currentDialogBounds"], [_mobx.observable, 1, "videoWindowBounds"], [_mobx.observable, 1, "currentShareId"], [_mobx.observable, 1, "currentShareType"], [_mobx.observable, 1, "currentShareBounds"], [_mobx.computed, 3, "connectType"], [_mobx.computed, 3, "hasOwnPstnStream"], [_mobx.action, 2, "setParticipantElectronDialogContainer"], [_setVideoWindowBoundsDecs, 18, "setVideoWindowBounds"], [_decorator.bound, 2, "closeDialogByKey"], [_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"], [_handleDialogEventDecs, 18, "_handleDialogEvent"], [_handleConnectionUpdatedDecs, 18, "_handleConnectionUpdated"], [_hanleAllUserCountUpdatedDecs, 18, "_hanleAllUserCountUpdated"]], []).e, 12);
+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);
 _init_openedDialogs = _applyDecs$e[0];
-_init_payloadDialogs = _applyDecs$e[1];
-_init_confirmDialogs = _applyDecs$e[2];
-_init_userCount = _applyDecs$e[3];
-_init_participantElectronDialogContainer = _applyDecs$e[4];
-_init_chatRoomState = _applyDecs$e[5];
-_init_currentDialogBounds = _applyDecs$e[6];
-_init_videoWindowBounds = _applyDecs$e[7];
-_init_currentShareId = _applyDecs$e[8];
-_init_currentShareType = _applyDecs$e[9];
-_init_currentShareBounds = _applyDecs$e[10];
-_initProto = _applyDecs$e[11];
+_init_confirmDialogs = _applyDecs$e[1];
+_init_userCount = _applyDecs$e[2];
+_init_participantElectronDialogContainer = _applyDecs$e[3];
+_init_currentDialogBounds = _applyDecs$e[4];
+_init_videoWindowBounds = _applyDecs$e[5];
+_init_currentShareId = _applyDecs$e[6];
+_init_currentShareType = _applyDecs$e[7];
+_init_currentShareBounds = _applyDecs$e[8];
+_init_recordShareBounds = _applyDecs$e[9];
+_initProto = _applyDecs$e[10];
 var StoreContext = exports.StoreContext = /*#__PURE__*/(0, _react.createContext)(null);

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

@@ -0,0 +1,84 @@
+import React from 'react';
+import { FcrUIDialogKey } from '../../utilities/constant';
+import DialogStore from './store';
+export type FcrUIDialogHooksProps = {
+    /**
+     * @param dialogKey - dialog 窗口的 key，为 FcrUIDialogKey 的枚举之一
+     */
+    dialogKey: FcrUIDialogKey;
+    /**
+     * @param dialogId - dialog 窗口的 id，标识唯一窗口
+     */
+    dialogId?: string;
+    /**
+     * @param config - electron 的 BrowserWindowConstructorOptions 配置，当自定义配置的 hasCustomShadow 开启时，其中的 width 和 height 会自动加上阴影的宽度
+     * @param height - The height value should be based on the maximum content height of the tab
+     */
+    config: Electron.BrowserWindowConstructorOptions;
+    /**
+     * @param onClose - 当 dialog 关闭时的回调函数，函数签名为 dialog 的 store
+     * */
+    onClose?: (props: {
+        store: DialogStore;
+        browserWindow: Electron.BrowserWindow;
+    }) => void;
+    /**
+     * @param onOpened - 当 dialog 打开时的回调函数，函数签名为 dialog 的 store、browserwindow 对象和设置 bounds 的方法，此 bounds 不同于 browserwindow 的 setBounds 会为宽高自动加上阴影的设置
+     */
+    onOpened?: (props: {
+        browserWindow: Electron.BrowserWindow;
+        newRendererWindow: Window;
+        store: DialogStore;
+        setBounds: (bounds: Partial<Electron.Rectangle>, animate?: boolean) => void;
+        nearDisplayBounds: Electron.Rectangle;
+    }) => void;
+    /**
+     * * @param onUnmounted - 当 dialog 卸载时的回调函数，函数签名为 dialog 的 store
+     */
+    onUnmounted?: (store: DialogStore) => void;
+    /**
+     * @param children - dialog 的内容
+     */
+    children: React.ReactNode;
+    /**
+     * @param scroll - 是否显示滚动栏，默认为 false
+     */
+    scroll?: boolean;
+    /**
+     * @param focus -  在 dialog 窗口打开之后，调用 browserWindow 的 focus 方法， 默认为 true
+     */
+    focus?: boolean;
+    /**
+     * @param ignoreMouseEvents - 在 dialog 窗口打开之后，设置是否忽略鼠标事件
+     */
+    ignoreMouseEvents?: boolean | Electron.IgnoreMouseEventsOptions;
+    /**
+     * @param alwaysOnTop - 在 dialog 窗口打开之后，主动调用一次 browserWindow 的 setAlwaysOnTop(true, 'normal') 方法，默认为true
+     * @type boolean | 'normal' | 'floating' | 'torn-off-menu' | 'modal-panel' | 'main-menu' | 'status' | 'pop-up-menu' | 'screen-saver'
+     */
+    alwaysOnTop?: boolean | 'normal' | 'floating' | 'torn-off-menu' | 'modal-panel' | 'main-menu' | 'status' | 'pop-up-menu' | 'screen-saver';
+    /**
+     * @param fullScreen - 自定义全屏设置，和 electron 的全屏设置不同，它会以主窗口的位置为基准，给新打开的窗口设置和屏幕一样的大小
+     */
+    fullScreen?: boolean;
+    /**
+     * @param polyfills - 这个可以以一句话的形式描述 polyfills，比如：fix-toast-window-flash，并通过这个字段来判断进行特殊处理
+     */
+    polyfills?: string[];
+    /**
+     * @param hasCustomShadow - 通过缩小 electron 容器内的容器宽度加 css 样式阴影实现，所以会让原生 electron 的拖动响应的边产生偏移，所以如果窗口是可拖动的，需要设置为 false。默认值 true。目前窗口有三种，一种是作为 toast 和 confirm 容器的窗口，这种窗口因为是全屏显示不需要阴影，一种是 participant 和 chat 窗口，这俩窗口需要拉伸操作，所以用系统阴影，不用自定义阴影。还有一种是独立的窗口，这种窗口不需要拉伸，所以用自定义阴影，配置为 true 时，窗口会给宽高加上阴影的偏移量，所以 toast 和 confirm 窗口需要设置为 false
+     * */
+    hasCustomShadow?: boolean;
+    /**
+     * @param disableShortcutClose - 是否可以用快捷键关闭窗口，默认为 false
+     */
+    disableShortcutClose?: boolean;
+};
+export type FcrUIDialogComponent = React.FC<FcrDialogProps>;
+export type FcrDialogProps = {
+    params: unknown;
+};
+export type FcrUIDialogInfo = {
+    key: FcrUIDialogKey;
+    component: FcrUIDialogComponent;
+};

package/lib/modules/dialog/type.js

@@ -0,0 +1,6 @@
+"use strict";
+
+require("core-js/modules/es.object.define-property.js");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});

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

@@ -1,5 +1,2 @@
 import './index.css';
-import { ConfirmContentProps } from 'agora-ui-foundation/lib/components/confirm-content';
-export declare const View: ({ dialogs }: {
-    dialogs: Map<string, (params?: ConfirmContentProps) => React.JSX.Element>;
-}) => import("react/jsx-runtime").JSX.Element;
+export declare const View: () => import("react/jsx-runtime").JSX.Element;

package/lib/modules/dialog/view.js

@@ -6,25 +6,29 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.View = void 0;
 require("core-js/modules/es.array.map.js");
-require("core-js/modules/esnext.async-iterator.map.js");
+require("core-js/modules/es.object.to-string.js");
+require("core-js/modules/esnext.iterator.constructor.js");
 require("core-js/modules/esnext.iterator.map.js");
 var _mobxReact = require("mobx-react");
 var _react = require("react");
 var _store = require("./store");
 require("./index.css");
 var _jsxRuntime = require("react/jsx-runtime");
-var View = exports.View = (0, _mobxReact.observer)(function (_ref) {
-  var dialogs = _ref.dialogs;
+var View = exports.View = (0, _mobxReact.observer)(function () {
   var _useContext = (0, _react.useContext)(_store.StoreContext),
-    openedDialogs = _useContext.openedDialogs,
-    payloadDialogs = _useContext.payloadDialogs;
+    dialogs = _useContext.dialogs,
+    dialogComponentMapByKey = _useContext.dialogComponentMapByKey;
   return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
     className: "dialog-container",
-    children: openedDialogs.map(function (_ref2) {
-      var dialogKey = _ref2.dialogKey;
-      var dialog = dialogs.get(dialogKey);
-      if (dialog) {
-        return dialog(payloadDialogs.get(dialogKey));
+    children: dialogs.map(function (_ref) {
+      var dialogKey = _ref.dialogKey,
+        dialogId = _ref.dialogId,
+        params = _ref.params;
+      var DialogComponent = dialogComponentMapByKey.get(dialogKey);
+      if (DialogComponent) {
+        return /*#__PURE__*/(0, _jsxRuntime.jsx)(DialogComponent, {
+          params: params
+        }, dialogId);
       }
       return null;
     })

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

@@ -10,3 +10,14 @@
 .confirm-wrapper div {
   pointer-events: all;
 }
+
+.fcr-confirm-dialog-wrapper {
+  background: #fff;
+}
+
+.fcr-confirm-dialog-wrapper_web {
+  background: var(--fcr_mobile_ui_scene_color_popup_fill2);
+  border-radius: var(--fcr_cornerradius_xl);
+  box-shadow: var(--fcr_web_light_dropup);
+  border: 1px solid var(--fcr_ui_scene_line1);
+}