fcr-ui-scene 3.4.0 → 3.4.1

package/lib/modules/dialog/store.js

@@ -20,9 +20,9 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = exports.StoreContext = void 0;
-var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 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");
@@ -34,9 +34,11 @@ 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.map.delete-all.js");
 require("core-js/modules/esnext.map.emplace.js");
 require("core-js/modules/esnext.map.every.js");
@@ -53,9 +55,9 @@ 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 _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
-var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
@@ -66,14 +68,12 @@ var _env = require("agora-foundation/lib/utilities/env");
 var _mobx = require("mobx");
 var _constant = require("../../utilities/constant");
 var _dialogs = require("./dialogs");
-var _type2 = require("../whiteboard/type");
 var _i18n = require("agora-ui-foundation/lib/i18n");
-var _renderer = require("../../utilities/renderer");
-var _type3 = require("agora-rte-sdk/lib/core/rtc/type");
-var _type4 = require("fcr-core/lib/room-control/chatroom-control/type");
+var _type2 = require("fcr-core/lib/room-control/chatroom-control/type");
 var _react = require("react");
+var _platform = require("../../utilities/platform");
 var _DialogStore;
-var _initProto, _init_openedDialogs, _init_payloadDialogs, _init_confirmDialogs, _init_userCount, _init_participantElectronDialogContainer, _init_chatRoomState, _init_currentDialogBounds, _init_videoWindowBounds, _setVideoWindowBoundsDecs, _setDialogBoundsDecs, _handleDialogEventDecs, _handleConnectionUpdatedDecs, _hanleAllUserCountUpdatedDecs, _ref;
+var _initProto, _init_openedDialogs, _init_payloadDialogs, _init_confirmDialogs, _init_userCount, _init_participantElectronDialogContainer, _init_chatRoomState, _init_currentDialogBounds, _init_videoWindowBounds, _setVideoWindowBoundsDecs, _handleDialogEventDecs, _handleConnectionUpdatedDecs, _hanleAllUserCountUpdatedDecs, _ref;
 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; }
@@ -92,22 +92,19 @@ var _E = /*#__PURE__*/new WeakMap();
 var _F = /*#__PURE__*/new WeakMap();
 var _G = /*#__PURE__*/new WeakMap();
 var _H = /*#__PURE__*/new WeakMap();
-_ref = (_setVideoWindowBoundsDecs = [_mobx.action, _mobx.action.bound], _setDialogBoundsDecs = [_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], _handleDialogEventDecs = [_mobx.action, _mobx.action.bound], _handleConnectionUpdatedDecs = [_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,
-      userInfo = _ref2.userInfo,
       userControl = _ref2.userControl,
       chatRoomControl = _ref2.chatRoomControl,
       deviceStore = _ref2.deviceStore,
       streamControl = _ref2.streamControl,
-      remoteVideoRenderManager = _ref2.remoteVideoRenderManager;
+      remoteVideoRenderManager = _ref2.remoteVideoRenderManager,
+      securityStore = _ref2.securityStore;
     (0, _classCallCheck2["default"])(this, DialogStore);
     (0, _defineProperty2["default"])(this, _ref, (_initProto(this), (0, _logger.getLogger)()));
-    (0, _defineProperty2["default"])(this, "_currentShareId", '');
-    (0, _defineProperty2["default"])(this, "_currentShareType", _type3.AgoraRtcScreenCaptureType.WINDOW);
-    (0, _defineProperty2["default"])(this, "_electronDialogs", {});
     (0, _defineProperty2["default"])(this, "_connnectBeforeCloseDetect", true);
     (0, _defineProperty2["default"])(this, "_userObserver", {
       onAllUserCountUpdated: this._hanleAllUserCountUpdated.bind(this)
@@ -122,57 +119,22 @@ var DialogStore = exports["default"] = /*#__PURE__*/function () {
     _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, _type4.FcrChatRoomConnectionState.Disconnected));
-    _classPrivateFieldInitSpec(this, _G, _init_currentDialogBounds(this, {
-      x: 0,
-      y: 0,
-      width: 0,
-      height: 0
-    }));
+    _classPrivateFieldInitSpec(this, _F, _init_chatRoomState(this, _type2.FcrChatRoomConnectionState.Disconnected));
+    _classPrivateFieldInitSpec(this, _G, _init_currentDialogBounds(this, new Map()));
     _classPrivateFieldInitSpec(this, _H, _init_videoWindowBounds(this, {}));
     this._uiEventStore = uiEventStore;
-    this._userInfo = userInfo;
+    this._userInfo = userControl.getLocalUser();
     this._streamControl = streamControl;
     this._userControl = userControl;
     this._remoteVideoRenderManager = remoteVideoRenderManager;
     this._deviceStore = deviceStore;
     this._chatRoomControl = chatRoomControl;
+    this._securityStore = securityStore;
     userControl.addObserver(this._userObserver);
     uiEventStore.addObserver({
       onEvent: this._handleDialogEvent.bind(this)
     });
     chatRoomControl.addObserver(this._chatRoomObserver);
-    uiEventStore.addObserver({
-      onEvent: function onEvent(action, payload) {
-        if (action === _constant.UIAction.WHITEBOARD_CHANGED) {
-          if (payload.action === _type2.WhiteboardControlbarEvents.LONEYWINDOW) {
-            if (!payload.payload) {
-              _this.closeWhiteboardDialog();
-            }
-          }
-        }
-        if (action === _constant.UIAction.CLOSE_WHITEBOARD) {
-          _this.closeWhiteboardDialog();
-        }
-        // 因为窗口可能会移动，因此需要矫正 global toast 的 Bounds
-        if (action === _constant.UIAction.OPEN_DIALOG) {
-          if ([_constant.DialogKey.SHOW_TOAST, _constant.DialogKey.CONFIRM].includes(payload.dialogKey) && (0, _env.isElectron)()) {
-            var toastWindow = _dialogs.dialogWindows.get(_constant.DialogKey.SHOW_TOAST);
-            var confirmWindow = _dialogs.dialogWindows.get(_constant.DialogKey.CONFIRM);
-            var controlbar = _dialogs.dialogWindows.get(_constant.DialogKey.CONTROL_BAR);
-            var nearDispaly = window.runtime.screen.getDisplayNearestPoint((controlbar === null || controlbar === void 0 ? void 0 : controlbar.getBounds()) || window.runtime.browserWindow.getBounds()).bounds;
-            var bounds = {
-              x: Math.floor(nearDispaly.x),
-              y: Math.floor(nearDispaly.y),
-              width: Math.floor(nearDispaly.width),
-              height: Math.floor(nearDispaly.height)
-            };
-            toastWindow === null || toastWindow === void 0 || toastWindow.setBounds(bounds);
-            confirmWindow === null || confirmWindow === void 0 || confirmWindow.setBounds(bounds);
-          }
-        }
-      }
-    });
     (0, _mobx.runInAction)(function () {
       _this.userCount = _this._userControl.getAllUserCount();
     });
@@ -266,6 +228,11 @@ var DialogStore = exports["default"] = /*#__PURE__*/function () {
     get: function get() {
       return this._remoteVideoRenderManager;
     }
+  }, {
+    key: "waitingRoomState",
+    get: function get() {
+      return this._securityStore.isWaitingRoomEnabled();
+    }
   }, {
     key: "setParticipantElectronDialogContainer",
     value: function setParticipantElectronDialogContainer(dom) {
@@ -285,51 +252,6 @@ var DialogStore = exports["default"] = /*#__PURE__*/function () {
       })) === null || _this$openedDialogs$f === void 0 ? void 0 : _this$openedDialogs$f.dialogId;
       dialogId && this._uiEventStore.closeDialog(dialogId);
     }
-  }, {
-    key: "closeInterpreterDialog",
-    value: function closeInterpreterDialog() {
-      // const dialogId = this.openedDialogs.find(
-      //   (dialog) => dialog.dialogKey === DialogKey.INTERPRETER,
-      // )?.dialogId;
-      // dialogId && this._uiEventStore.closeDialog(dialogId);
-      this._uiEventStore.sendEvent(_constant.UIAction.CLOSE_INTERPRETER_DIALOG);
-    }
-  }, {
-    key: "setCurrentShareId",
-    value: function setCurrentShareId(id, type) {
-      this._currentShareId = id;
-      this._currentShareType = type;
-    }
-  }, {
-    key: "getSharingWorkArea",
-    value: function () {
-      var _getSharingWorkArea = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee() {
-        var allWindows;
-        return _regenerator["default"].wrap(function _callee$(_context) {
-          while (1) switch (_context.prev = _context.next) {
-            case 0:
-              if (this._currentShareId) {
-                _context.next = 2;
-                break;
-              }
-              return _context.abrupt("return");
-            case 2:
-              _context.next = 4;
-              return this._deviceStore.mediaControl.getWindowList();
-            case 4:
-              allWindows = _context.sent;
-              return _context.abrupt("return", (0, _renderer.getCurrentSharingWorkArea)(this._currentShareId, this._currentShareType, allWindows));
-            case 6:
-            case "end":
-              return _context.stop();
-          }
-        }, _callee, this);
-      }));
-      function getSharingWorkArea() {
-        return _getSharingWorkArea.apply(this, arguments);
-      }
-      return getSharingWorkArea;
-    }()
   }, {
     key: "closeSystemPreferenceDialog",
     value: function closeSystemPreferenceDialog() {
@@ -340,17 +262,6 @@ var DialogStore = exports["default"] = /*#__PURE__*/function () {
     value: function closeChatFromDialog() {
       this.closeDialogByKey(_constant.DialogKey.CHAT);
     }
-  }, {
-    key: "closeWhiteboardDialog",
-    value: function closeWhiteboardDialog() {
-      this.closeDialogByKey(_constant.DialogKey.WHITEBOARD);
-    }
-  }, {
-    key: "closeDialogChat",
-    value: function closeDialogChat() {
-      this.closeChatFromDialog();
-      this._uiEventStore.notifyChatResetTarget();
-    }
   }, {
     key: "moveChatFromDialogToAside",
     value: function moveChatFromDialogToAside() {
@@ -359,11 +270,6 @@ var DialogStore = exports["default"] = /*#__PURE__*/function () {
         chat: true
       });
     }
-  }, {
-    key: "closeLiveStreamingDialog",
-    value: function closeLiveStreamingDialog() {
-      this.closeDialogByKey(_constant.DialogKey.LIVE_STREAMING);
-    }
   }, {
     key: "closeConnectionDialog",
     value: function closeConnectionDialog() {
@@ -404,11 +310,6 @@ var DialogStore = exports["default"] = /*#__PURE__*/function () {
         this.closeDialogByKey(_constant.DialogKey.CONNECTION_GATEWAY);
       }
     }
-  }, {
-    key: "closeInviteDialog",
-    value: function closeInviteDialog() {
-      this._uiEventStore.closeInviteDialog();
-    }
   }, {
     key: "moveParticipantFromDialogToAside",
     value: function moveParticipantFromDialogToAside() {
@@ -417,21 +318,6 @@ var DialogStore = exports["default"] = /*#__PURE__*/function () {
         participant: true
       });
     }
-  }, {
-    key: "moveToMainRoomAllMember",
-    value: function moveToMainRoomAllMember(isOperate) {
-      this._uiEventStore.sendEvent(_constant.UIAction.MOVE_TO_MAIN_ROOM_ALL_MEMBER, isOperate);
-    }
-  }, {
-    key: "closeWaitingRoomDialog",
-    value: function closeWaitingRoomDialog() {
-      this._uiEventStore.closeWaitingRoomDialog();
-    }
-  }, {
-    key: "closeRemoveAdmitWaitingRoomDialog",
-    value: function closeRemoveAdmitWaitingRoomDialog(dialogKey) {
-      this._uiEventStore.closeRemoveAdmitWaitingRoomDialog(dialogKey);
-    }
   }, {
     key: "release",
     value: function release() {
@@ -446,29 +332,46 @@ var DialogStore = exports["default"] = /*#__PURE__*/function () {
         height: height
       });
     }
-  }, {
-    key: "_setDialogBounds",
-    value: function _setDialogBounds(payload) {
-      this.currentDialogBounds = payload;
-    }
   }, {
     key: "_handleDialogEvent",
     value: function _handleDialogEvent(action, payload) {
-      var _dialogWindows$get;
+      var _dialogWindows$get3;
       var _ref3 = payload || {},
-        _ref3$dialogKey = _ref3.dialogKey,
-        dialogKey = _ref3$dialogKey === void 0 ? '' : _ref3$dialogKey,
+        dialogKey = _ref3.dialogKey,
         dialogId = _ref3.dialogId,
         _ref3$params = _ref3.params,
         params = _ref3$params === void 0 ? {} : _ref3$params;
-      if (dialogKey === _constant.DialogKey.SHOW_TOAST) return; // toast 有独立逻辑 src/event-dialog
-      if (dialogKey === _constant.DialogKey.CONFIRM) return; // confirm 有独立逻辑 src/evnet-confirm
-      var currentDialog = this.openedDialogs.find(function (dialog) {
-        return dialog.dialogId === dialogId;
-      });
       switch (action) {
         case _constant.UIAction.OPEN_DIALOG:
-          if (currentDialog) return (_dialogWindows$get = _dialogs.dialogWindows.get(dialogKey)) === null || _dialogWindows$get === void 0 ? void 0 : _dialogWindows$get.focus();
+          // 因为窗口可能会移动，因此需要矫正 global toast 和 confirm 的 Bounds
+          if ([_constant.DialogKey.SHOW_TOAST, _constant.DialogKey.CONFIRM].includes(dialogKey) && (0, _env.isElectron)()) {
+            var _dialogWindows$get, _dialogWindows$get2;
+            var toastWindow = _dialogs.dialogWindows.get(_constant.DialogKey.SHOW_TOAST);
+            var confirmWindow = _dialogs.dialogWindows.get(_constant.DialogKey.CONFIRM);
+            var controlbar = _dialogs.dialogWindows.get(_constant.DialogKey.CONTROL_BAR);
+            var nearDispaly = window.runtime.screen.getDisplayNearestPoint((controlbar === null || controlbar === void 0 ? void 0 : controlbar.getBounds()) || window.runtime.browserWindow.getBounds()).bounds;
+            var bounds = {
+              x: Math.floor(nearDispaly.x),
+              y: Math.floor(nearDispaly.y),
+              width: Math.floor(nearDispaly.width),
+              height: Math.floor(nearDispaly.height)
+            };
+            toastWindow === null || toastWindow === void 0 || toastWindow.setBounds(bounds);
+            confirmWindow === null || confirmWindow === void 0 || confirmWindow.setBounds(bounds);
+            !(0, _platform.isWindows)() && _dialogs.dialogWindows.forEach(function (window, key) {
+              if (key === dialogKey) return;
+              window.setAlwaysOnTop(true, 'floating');
+            });
+            (_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
+            // confirm 有独立逻辑 src/evnet-confirm
+            return;
+          }
+          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
@@ -483,12 +386,10 @@ var DialogStore = exports["default"] = /*#__PURE__*/function () {
         case _constant.UIAction.VIDEO_WINDOW_BOUNDS:
           this.setVideoWindowBounds(payload);
           break;
-        case _constant.UIAction.SET_WINDOW_BOUNDS:
+        case _constant.UIAction.SET_DIALOG_BOUNDS:
           var _ref4 = payload,
             height = _ref4.height;
-          this._setDialogBounds({
-            height: height
-          });
+          if (dialogKey) this.currentDialogBounds.set(dialogKey, height);
           break;
       }
     }
@@ -505,7 +406,7 @@ 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.action, 2, "setParticipantElectronDialogContainer"], [_setVideoWindowBoundsDecs, 18, "setVideoWindowBounds"], [_decorator.bound, 2, "closeDialogByKey"], [_decorator.bound, 2, "closeInterpreterDialog"], [_decorator.bound, 2, "setCurrentShareId"], [_decorator.bound, 2, "closeSystemPreferenceDialog"], [_decorator.bound, 2, "closeChatFromDialog"], [_decorator.bound, 2, "closeWhiteboardDialog"], [_decorator.bound, 2, "closeDialogChat"], [_decorator.bound, 2, "moveChatFromDialogToAside"], [_decorator.bound, 2, "closeLiveStreamingDialog"], [_decorator.bound, 2, "closeConnectionDialog"], [_decorator.bound, 2, "closeInviteDialog"], [_decorator.bound, 2, "moveParticipantFromDialogToAside"], [_decorator.bound, 2, "moveToMainRoomAllMember"], [_decorator.bound, 2, "closeWaitingRoomDialog"], [_decorator.bound, 2, "closeRemoveAdmitWaitingRoomDialog"], [_decorator.bound, 2, "resizeVideoWindow"], [_setDialogBoundsDecs, 18, "_setDialogBounds"], [_handleDialogEventDecs, 18, "_handleDialogEvent"], [_handleConnectionUpdatedDecs, 18, "_handleConnectionUpdated"], [_hanleAllUserCountUpdatedDecs, 18, "_hanleAllUserCountUpdated"]], []).e, 9);
+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.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, "moveParticipantFromDialogToAside"], [_decorator.bound, 2, "resizeVideoWindow"], [_handleDialogEventDecs, 18, "_handleDialogEvent"], [_handleConnectionUpdatedDecs, 18, "_handleConnectionUpdated"], [_hanleAllUserCountUpdatedDecs, 18, "_hanleAllUserCountUpdated"]], []).e, 9);
 _init_openedDialogs = _applyDecs$e[0];
 _init_payloadDialogs = _applyDecs$e[1];
 _init_confirmDialogs = _applyDecs$e[2];

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

@@ -0,0 +1,59 @@
+type FcrUIDialogHooksProps = {
+  /**
+   * @param dialogKey - dialog 窗口的 key，为 FcrUIDialogKey 的枚举之一
+   */
+  dialogKey: FcrUIDialogKey;
+  /**
+   * @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?: (store: DialogStore) => void;
+  /**
+   * @param onOpened - 当 dialog 打开时的回调函数，函数签名为 dialog 的 store、browserwindow 对象和设置 bounds 的方法，此 bounds 不同于 browserwindow 的 setBounds 会为宽高自动加上阴影的设置
+   */
+  onOpened?: (props: {
+    browserWindow: Electron.BrowserWindow;
+    store: DialogStore;
+    setBounds: (bounds: Partial<Electron.Rectangle>, animate?: boolean) => void;
+  }) => 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, 'screen-saver') 方法，默认为true
+   */
+  alwaysOnTop?: boolean;
+  /**
+   * @param fullScreen - 自定义全屏设置，和 electron 的全屏设置不同，它会以主窗口的位置为基准，给新打开的窗口设置和屏幕一样的大小
+   */
+  fullScreen?: boolean;
+  /**
+   * @param polyfills - 这个可以以一句话的形式描述 polyfills，比如：fix-toast-window-flash，并通过这个字段来判断进行特殊处理
+   */
+  polyfills?: string[];
+  /**
+   * @param hasCustomShadow - 默认值 true, 目前窗口有两种，一种是作为 toast 和 confirm 容器的窗口，这种窗口没有阴影，另外一种是独立的窗口，这种窗口有阴影，配置为 true 时，窗口会给宽高加上阴影的偏移量，所以 toast 和 confirm 窗口需要设置为 false
+   * */
+  hasCustomShadow?: boolean;
+};

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

@@ -49,6 +49,9 @@ var View = exports.View = (0, _mobxReact.observer)(function () {
     if ((0, _toConsumableArray2["default"])(confirmList).length === 0) {
       browserWindow === null || browserWindow === void 0 || browserWindow.setIgnoreMouseEvents(true);
       browserWindow === null || browserWindow === void 0 || browserWindow.blur();
+    } else {
+      browserWindow === null || browserWindow === void 0 || browserWindow.focus();
+      browserWindow === null || browserWindow === void 0 || browserWindow.setAlwaysOnTop(true, 'screen-saver');
     }
   }, [confirmList]);
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {
@@ -124,7 +127,7 @@ var ConfirmWindow = (0, _mobxReact.observer)(function (_ref2) {
     return function () {
       clearTimeout(windowFocusTimerRef.current);
     };
-  }, []);
+  }, [rndRef.current /** hack 处理 windows 下，弹出窗口层级不对的问题 */]);
   var handleMouseEnter = function handleMouseEnter() {
     (0, _env.isElectron)() && (browserWindow === null || browserWindow === void 0 ? void 0 : browserWindow.setIgnoreMouseEvents(false, {
       forward: true

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

@@ -1 +1,5 @@
+export declare enum InviteType {
+    PSTN = "PSTN",
+    VOIP = "VOIP"
+}
 export declare const View: () => import("react/jsx-runtime").JSX.Element;

package/lib/modules/invite/view.js

@@ -5,43 +5,39 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.View = void 0;
+exports.View = exports.InviteType = void 0;
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
-var _objectDestructuringEmpty2 = _interopRequireDefault(require("@babel/runtime/helpers/objectDestructuringEmpty"));
-var _tabs = require("agora-ui-foundation/lib/components/tabs");
 var _mobxReact = require("mobx-react");
 var _react = require("react");
-var _store = require("./store");
 var _pstnInvite = require("./pstn-invite");
 var _voipInvite = require("./voip-invite");
 var _i18n = require("agora-ui-foundation/lib/i18n");
+var _tabFrame = _interopRequireDefault(require("../components/tab-frame"));
 var _jsxRuntime = require("react/jsx-runtime");
-var InviteType = /*#__PURE__*/function (InviteType) {
+var InviteType = exports.InviteType = /*#__PURE__*/function (InviteType) {
   InviteType["PSTN"] = "PSTN";
   InviteType["VOIP"] = "VOIP";
   return InviteType;
-}(InviteType || {});
+}({});
 var View = exports.View = (0, _mobxReact.observer)(function () {
-  (0, _objectDestructuringEmpty2["default"])((0, _react.useContext)(_store.StoreContext));
   var _useState = (0, _react.useState)(InviteType.PSTN),
     _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
     currentInviteType = _useState2[0],
     setCurrentInviteType = _useState2[1];
   var transI18n = (0, _i18n.useI18n)();
-  return /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
-    className: "invite",
-    children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_tabs.FcrTabs, {
-      items: [{
-        label: transI18n('fmt_pstn_label_phonecall'),
-        key: InviteType.PSTN
-      }, {
-        label: transI18n('fmt_sip_options_H323'),
-        key: InviteType.VOIP
-      }],
-      activeKey: currentInviteType,
-      onChange: function onChange(key) {
-        return setCurrentInviteType(key);
-      }
-    }), currentInviteType === InviteType.PSTN && /*#__PURE__*/(0, _jsxRuntime.jsx)(_pstnInvite.PSTNInvite, {}), currentInviteType === InviteType.VOIP && /*#__PURE__*/(0, _jsxRuntime.jsx)(_voipInvite.VoipInvite, {})]
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_tabFrame["default"], {
+    activeKey: currentInviteType,
+    onChange: function onChange(key) {
+      return setCurrentInviteType(key);
+    },
+    tabs: [{
+      label: "".concat(transI18n('fmt_pstn_label_phonecall')),
+      key: InviteType.PSTN,
+      content: /*#__PURE__*/(0, _jsxRuntime.jsx)(_pstnInvite.PSTNInvite, {})
+    }, {
+      label: "".concat(transI18n('fmt_sip_options_H323')),
+      key: InviteType.VOIP,
+      content: /*#__PURE__*/(0, _jsxRuntime.jsx)(_voipInvite.VoipInvite, {})
+    }]
   });
 });

package/lib/modules/invite/voip-invite.js

@@ -183,7 +183,7 @@ var VoipInvite = exports.VoipInvite = (0, _mobxReact.observer)(function () {
             onClick: function onClick() {
               return setCurrentVoipType(VoipType.H323);
             },
-            children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+            children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
               children: "H323"
             }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_radio.FcrRadio, {
               styleType: "white",
@@ -197,8 +197,8 @@ var VoipInvite = exports.VoipInvite = (0, _mobxReact.observer)(function () {
             onClick: function onClick() {
               return setCurrentVoipType(VoipType.SIP);
             },
-            children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
-              children: " SIP"
+            children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+              children: "SIP"
             }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_radio.FcrRadio, {
               styleType: "white",
               value: VoipType.SIP

package/lib/modules/layout/components/Aside.js

@@ -23,6 +23,16 @@ var _type2 = require("fcr-core/lib/room-control/chatroom-control/type");
 var _jsxRuntime = require("react/jsx-runtime");
 var minHeight = 350;
 var DividerHeight = 16;
+var ParticipantDialogHeader = (0, _mobxReact.observer)(function () {
+  var store = (0, _react.useContext)(_store.StoreContext);
+  var transI18n = (0, _i18n.useI18n)();
+  return /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
+    children: [transI18n('fmt_role_participant'), "(", /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+      className: "participant-dialog-header-count",
+      children: store.participantCount
+    }), ")"]
+  });
+});
 var Aside = exports.Aside = (0, _mobxReact.observer)(function (_ref) {
   var width = _ref.width,
     onDragHandler = _ref.onDragHandler,
@@ -88,7 +98,7 @@ var Aside = exports.Aside = (0, _mobxReact.observer)(function (_ref) {
         children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_windowHeader.FcrWindowHeader, {
           showClose: false // 在 Aside 中有自定义的按钮样式，不用 header 中的关闭按钮
           ,
-          title: "".concat(transI18n('fmt_role_participant'), "(").concat(participantCount, ")"),
+          title: /*#__PURE__*/(0, _jsxRuntime.jsx)(ParticipantDialogHeader, {}),
           type: _windowHeader.WindowType.MODAL,
           onTypeChange: moveParticipantFromAsideToDialog,
           onClose: closeParticipantFromAside,

package/lib/modules/layout/components/Carousel.js

@@ -221,7 +221,7 @@ var Carousel = exports.Carousel = (0, _mobxReact.observer)(function () {
                 }),
                 videoRenderMode: _type3.AgoraRtcRenderMode.FIT,
                 videoStreamType: _type3.AgoraRtcVideoStreamType.LOW_STREAM,
-                showAvatar: false,
+                showAvatar: true,
                 windowData: windowData,
                 onDoubleClick: function onDoubleClick() {
                   if (windowData.videoSourceType === _fcrCore.FcrVideoSourceType.SCREEN || windowData.isPin) {

package/lib/modules/layout/components/Layout.js

@@ -54,7 +54,10 @@ var Layout = exports.Layout = (0, _mobxReact.observer)(function () {
     getWaterMarkContent = layoutStore.getWaterMarkContent,
     isMulti = layoutStore.isMulti,
     isWaterMarkEnabled = layoutStore.isWaterMarkEnabled,
-    localUser = layoutStore.localUser;
+    localUser = layoutStore.localUser,
+    setAsideWidth = layoutStore.setAsideWidth,
+    toggleAside = layoutStore.toggleAside,
+    asideWidthChanged = layoutStore.asideWidthChanged;
   var _useDelayedMeasure = (0, _hooks.useDelayedMeasure)(),
     _useDelayedMeasure2 = (0, _slicedToArray2["default"])(_useDelayedMeasure, 2),
     _ref = _useDelayedMeasure2[0],
@@ -77,10 +80,10 @@ var Layout = exports.Layout = (0, _mobxReact.observer)(function () {
         //   !aside && toggleAside(true);
         //   return clamped;
         // });
-        // setAsideWidth(clamped);
+        setAsideWidth(clamped);
       } else {
-        // aside && toggleAside(false);
-        // asideWidthChanged(0);
+        aside && toggleAside(false);
+        asideWidthChanged(0);
       }
     };
     var onPointerUp = function onPointerUp() {

package/lib/modules/layout/components/index.css

@@ -318,7 +318,8 @@
 .fcr-layout-content-gallery-arrow {
   pointer-events: auto;
   position: absolute;
-  top: calc(100% - 160px);
+  /* top: calc(100% - 160px); */
+  bottom: 155px;
   background-color: var(--fcr_web_ui_scene_fill4_popup);
   border-radius: 8px;
   box-shadow: var(--fcr_web_light_dropup);
@@ -650,3 +651,7 @@
   flex-flow: column nowrap;
   justify-content: flex-end;
 }
+
+.participant-dialog-header-count {
+  font-weight: 400;
+}

package/lib/modules/layout/index.js

@@ -16,6 +16,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.LayoutUIModule = void 0;
+var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
@@ -27,6 +28,7 @@ var _toast = _interopRequireDefault(require("../dialog/components/toast"));
 var _store = _interopRequireWildcard(require("./store"));
 var _view = require("./view");
 var _jsxRuntime = require("react/jsx-runtime");
+var _excluded = ["globalToast", "confirm"];
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { "default": e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n["default"] = e, t && t.set(e, n), n; }
 function _callSuper(t, o, e) { return o = (0, _getPrototypeOf2["default"])(o), (0, _possibleConstructorReturn2["default"])(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], (0, _getPrototypeOf2["default"])(t).constructor) : o.apply(t, e)); }
@@ -44,17 +46,16 @@ var LayoutUIModule = exports.LayoutUIModule = /*#__PURE__*/function (_UIModule)
     key: "getComponent",
     value: function getComponent() {
       var slots = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-      var globaleToastComponent = slots.globalToast;
-      var confirmComponent = slots.confirm;
-      delete slots.globalToast;
-      delete slots.confirm;
-      this._store.updateSlots(slots);
+      var globalToast = slots.globalToast,
+        confirm = slots.confirm,
+        restSlots = (0, _objectWithoutProperties2["default"])(slots, _excluded);
+      this._store.updateSlots(restSlots);
       return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_store.StoreContext.Provider, {
         value: this._store,
         children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_view.View, {}), /*#__PURE__*/(0, _jsxRuntime.jsx)(_toast["default"], {
-          children: globaleToastComponent
+          children: globalToast
         }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_confirm.ConfirmDialog, {
-          children: confirmComponent
+          children: confirm
         })]
       });
     }