fcr-ui-scene 3.4.0 → 3.4.1

package/lib/modules/control-bar/store.js

@@ -83,13 +83,13 @@ var _fcrCore = require("fcr-core");
 var _type3 = require("fcr-core/lib/type");
 var _react = require("react");
 var _type4 = require("../../type");
-var _leaveMeeting = require("../action-bar/leave/leave-meeting");
+var _leaveMeeting = require("../action-bar/components/leave/leave-meeting");
 var _type5 = require("./type");
 var _stopButton = _interopRequireDefault(require("./components/stop-live-streaming/stop-button"));
 var _env = require("agora-foundation/lib/utilities/env");
 var _jsxRuntime = require("react/jsx-runtime");
 var _ControlBarStore;
-var _initProto, _leaveConfirmRefDecs, _init_leaveConfirmRef, _init_shareWithAudio, _init_shareAudioProcessingChannel, _init_currentShareId, _init_currentShareType, _init_cloudRecordingState, _init_localUserRole, _init_isHost, _init_roomDuration, _init_startTime, _init_playUrl, _init_liveStreamingState, _init_allApplicationWindows, _init_roomInfo, _init_isShowMeetingDetailPortal, _init_users, _init_isPstnUser, _init_isMuteAudio, _init_hiddenShareActionNav, _init_boardOwnerUser, _init_meetingId, _initControlBarDecs, _setControlBarWindowBoundsDecs, _updateCurrentShareContentDecs, _setLocalUserRoleDecs, _setShareWithAudioStateDecs, _createNewShareDecs, _handlerStopShareDecs, _setShareAudioProcessingChannelDecs, _handleMoreClickDecs, _pauseCloudRecordingDecs, _resumeCloudRecordingDecs, _stopCloudRecordingDecs, _showToastDecs, _setShowMeetingDetailPortalDecs, _setEnableWaitingRoomDecs, _sendLeaveDecs, _sendEndDecs, _keepPhoneAudioConnectionDecs, _sendAssignDecs, _handleLeaveRoomDecs, _getCurrentSharingWorkAreaDecs, _handleRemoteUsersJoinedDecs, _handleRemoteUsersLeftDecs, _handleUserInfoUpdatedDecs, _ref;
+var _initProto, _leaveConfirmRefDecs, _init_leaveConfirmRef, _init_shareWithAudio, _init_shareAudioProcessingChannel, _init_currentShareId, _init_currentShareType, _init_cloudRecordingState, _init_localUserRole, _init_isHost, _init_roomDuration, _init_startTime, _init_playUrl, _init_liveStreamingState, _init_allApplicationWindows, _init_roomInfo, _init_isShowMeetingDetailPortal, _init_users, _init_isPstnUser, _init_isMuteAudio, _init_hiddenShareActionNav, _init_boardOwnerUser, _init_meetingId, _init_currentShareDisplayId, _initControlBarDecs, _setControlBarWindowBoundsDecs, _updateCurrentShareContentDecs, _setLocalUserRoleDecs, _setShareWithAudioStateDecs, _createNewShareDecs, _handlerStopShareDecs, _setShareAudioProcessingChannelDecs, _handleMoreClickDecs, _pauseCloudRecordingDecs, _resumeCloudRecordingDecs, _stopCloudRecordingDecs, _showToastDecs, _setShowMeetingDetailPortalDecs, _setEnableWaitingRoomDecs, _sendLeaveDecs, _sendEndDecs, _keepPhoneAudioConnectionDecs, _sendAssignDecs, _handleLeaveRoomDecs, _getCurrentSharingWorkAreaDecs, _handleRemoteUsersJoinedDecs, _handleRemoteUsersLeftDecs, _handleUserInfoUpdatedDecs, _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; }
@@ -121,6 +121,7 @@ var _R = /*#__PURE__*/new WeakMap();
 var _S = /*#__PURE__*/new WeakMap();
 var _T = /*#__PURE__*/new WeakMap();
 var _U = /*#__PURE__*/new WeakMap();
+var _V = /*#__PURE__*/new WeakMap();
 _ref = (_leaveConfirmRefDecs = [_mobx.observable, _mobx.observable.ref], _initControlBarDecs = [_mobx.action, _mobx.action.bound], _setControlBarWindowBoundsDecs = [_mobx.action, _mobx.action.bound], _updateCurrentShareContentDecs = [_mobx.action, _mobx.action.bound], _setLocalUserRoleDecs = [_mobx.action, _mobx.action.bound], _setShareWithAudioStateDecs = [_mobx.action, _mobx.action.bound], _createNewShareDecs = [_mobx.action, _mobx.action.bound], _handlerStopShareDecs = [_mobx.action, _mobx.action.bound], _setShareAudioProcessingChannelDecs = [_mobx.action, _mobx.action.bound], _handleMoreClickDecs = [_mobx.action, _mobx.action.bound], _pauseCloudRecordingDecs = [_decorator.bound, (0, _decorator.debounced)(500, {
   leading: true
 })], _resumeCloudRecordingDecs = [_decorator.bound, (0, _decorator.debounced)(500, {
@@ -180,6 +181,7 @@ var ControlBarStore = exports["default"] = /*#__PURE__*/function () {
     _classPrivateFieldInitSpec(this, _S, _init_hiddenShareActionNav(this, false));
     _classPrivateFieldInitSpec(this, _T, _init_boardOwnerUser(this, ''));
     _classPrivateFieldInitSpec(this, _U, _init_meetingId(this, undefined));
+    _classPrivateFieldInitSpec(this, _V, _init_currentShareDisplayId(this, 0));
     this._uiEventStore = uiEventStore;
     this._roomControl = roomControl;
     this._securityStore = securityStore;
@@ -405,6 +407,14 @@ var ControlBarStore = exports["default"] = /*#__PURE__*/function () {
     set: function set(v) {
       _classPrivateFieldSet(_U, this, v);
     }
+  }, {
+    key: "currentShareDisplayId",
+    get: function get() {
+      return _classPrivateFieldGet(_V, this);
+    },
+    set: function set(v) {
+      _classPrivateFieldSet(_V, this, v);
+    }
   }, {
     key: "localUser",
     get: function get() {
@@ -564,9 +574,15 @@ var ControlBarStore = exports["default"] = /*#__PURE__*/function () {
       switch (actionKey) {
         case _type5.MoreAction.OPEN_PARTICIPANTS:
           this._uiEventStore.openDialog(_constant.DialogKey.PARTICIPANT);
+          this._uiEventStore.updateAside({
+            participant: false
+          });
           break;
         case _type5.MoreAction.OPEN_CHAT:
           this._uiEventStore.openDialog(_constant.DialogKey.CHAT);
+          this._uiEventStore.updateAside({
+            chat: false
+          });
           break;
         case _type5.MoreAction.OPEN_LIVE_STEAMING_DIALOG:
           this._uiEventStore.openDialog(_constant.DialogKey.LIVE_STREAMING);
@@ -727,7 +743,7 @@ var ControlBarStore = exports["default"] = /*#__PURE__*/function () {
           end: this.sendEnd,
           assignHost: this.sendAssign,
           setHeight: function setHeight() {
-            _this6._uiEventStore.sendEvent(_constant.UIAction.SET_WINDOW_BOUNDS, {
+            _this6._uiEventStore.sendEvent(_constant.UIAction.SET_DIALOG_BOUNDS, {
               height: 230
             });
           }
@@ -781,6 +797,7 @@ var ControlBarStore = exports["default"] = /*#__PURE__*/function () {
         height = _ref4$bounds.height,
         displayId = _ref4.id,
         availTop = _ref4.workArea.y;
+      this.currentShareDisplayId = displayId;
       return {
         x: x,
         y: y,
@@ -855,7 +872,7 @@ var ControlBarStore = exports["default"] = /*#__PURE__*/function () {
   }]);
 }();
 _ControlBarStore = ControlBarStore;
-var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_ControlBarStore, [[_leaveConfirmRefDecs, 17, "leaveConfirmRef"], [_mobx.observable, 1, "shareWithAudio"], [_mobx.observable, 1, "shareAudioProcessingChannel"], [_mobx.observable, 1, "currentShareId"], [_mobx.observable, 1, "currentShareType"], [_mobx.observable, 1, "cloudRecordingState"], [_mobx.observable, 1, "localUserRole"], [_mobx.observable, 1, "isHost"], [_mobx.observable, 1, "roomDuration"], [_mobx.observable, 1, "startTime"], [_mobx.observable, 1, "playUrl"], [_mobx.observable, 1, "liveStreamingState"], [_mobx.observable, 1, "allApplicationWindows"], [_mobx.observable, 1, "roomInfo"], [_mobx.observable, 1, "isShowMeetingDetailPortal"], [_mobx.observable, 1, "users"], [_mobx.observable, 1, "isPstnUser"], [_mobx.observable, 1, "isMuteAudio"], [_mobx.observable, 1, "hiddenShareActionNav"], [_mobx.observable, 1, "boardOwnerUser"], [_mobx.observable, 1, "meetingId"], [_mobx.computed, 3, "hasSecurityPermission"], [_mobx.computed, 3, "hasStartCloudRecordingPermission"], [_mobx.computed, 3, "hasStopLiveStreamingPermission"], [_mobx.computed, 3, "hasGetLiveStreamingUrlPermission"], [_mobx.computed, 3, "hasStartLiveStreamingPermission"], [_mobx.computed, 3, "hasAssignHostBeforeLeavingPermission"], [_mobx.computed, 3, "hasEndRoomPermission"], [_initControlBarDecs, 18, "initControlBar"], [_setControlBarWindowBoundsDecs, 18, "setControlBarWindowBounds"], [_updateCurrentShareContentDecs, 18, "updateCurrentShareContent"], [_setLocalUserRoleDecs, 18, "setLocalUserRole"], [_setShareWithAudioStateDecs, 18, "setShareWithAudioState"], [_createNewShareDecs, 18, "createNewShare"], [_handlerStopShareDecs, 18, "handlerStopShare"], [_setShareAudioProcessingChannelDecs, 18, "setShareAudioProcessingChannel"], [_handleMoreClickDecs, 18, "handleMoreClick"], [_decorator.bound, 2, "openLiveStreamingDialog"], [_pauseCloudRecordingDecs, 2, "pauseCloudRecording"], [_resumeCloudRecordingDecs, 2, "resumeCloudRecording"], [_stopCloudRecordingDecs, 2, "stopCloudRecording"], [_decorator.bound, 2, "startCloudRecording"], [_decorator.bound, 2, "getCoordinate"], [_showToastDecs, 18, "showToast"], [_setShowMeetingDetailPortalDecs, 18, "setShowMeetingDetailPortal"], [_setEnableWaitingRoomDecs, 18, "setEnableWaitingRoom"], [_sendLeaveDecs, 18, "sendLeave"], [_sendEndDecs, 18, "sendEnd"], [_keepPhoneAudioConnectionDecs, 18, "keepPhoneAudioConnection"], [_sendAssignDecs, 18, "sendAssign"], [_handleLeaveRoomDecs, 18, "handleLeaveRoom"], [_getCurrentSharingWorkAreaDecs, 18, "getCurrentSharingWorkArea"], [_handleRemoteUsersJoinedDecs, 18, "_handleRemoteUsersJoined"], [_handleRemoteUsersLeftDecs, 18, "_handleRemoteUsersLeft"], [_handleUserInfoUpdatedDecs, 18, "_handleUserInfoUpdated"]], []).e, 22);
+var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_ControlBarStore, [[_leaveConfirmRefDecs, 17, "leaveConfirmRef"], [_mobx.observable, 1, "shareWithAudio"], [_mobx.observable, 1, "shareAudioProcessingChannel"], [_mobx.observable, 1, "currentShareId"], [_mobx.observable, 1, "currentShareType"], [_mobx.observable, 1, "cloudRecordingState"], [_mobx.observable, 1, "localUserRole"], [_mobx.observable, 1, "isHost"], [_mobx.observable, 1, "roomDuration"], [_mobx.observable, 1, "startTime"], [_mobx.observable, 1, "playUrl"], [_mobx.observable, 1, "liveStreamingState"], [_mobx.observable, 1, "allApplicationWindows"], [_mobx.observable, 1, "roomInfo"], [_mobx.observable, 1, "isShowMeetingDetailPortal"], [_mobx.observable, 1, "users"], [_mobx.observable, 1, "isPstnUser"], [_mobx.observable, 1, "isMuteAudio"], [_mobx.observable, 1, "hiddenShareActionNav"], [_mobx.observable, 1, "boardOwnerUser"], [_mobx.observable, 1, "meetingId"], [_mobx.observable, 1, "currentShareDisplayId"], [_mobx.computed, 3, "hasSecurityPermission"], [_mobx.computed, 3, "hasStartCloudRecordingPermission"], [_mobx.computed, 3, "hasStopLiveStreamingPermission"], [_mobx.computed, 3, "hasGetLiveStreamingUrlPermission"], [_mobx.computed, 3, "hasStartLiveStreamingPermission"], [_mobx.computed, 3, "hasAssignHostBeforeLeavingPermission"], [_mobx.computed, 3, "hasEndRoomPermission"], [_initControlBarDecs, 18, "initControlBar"], [_setControlBarWindowBoundsDecs, 18, "setControlBarWindowBounds"], [_updateCurrentShareContentDecs, 18, "updateCurrentShareContent"], [_setLocalUserRoleDecs, 18, "setLocalUserRole"], [_setShareWithAudioStateDecs, 18, "setShareWithAudioState"], [_createNewShareDecs, 18, "createNewShare"], [_handlerStopShareDecs, 18, "handlerStopShare"], [_setShareAudioProcessingChannelDecs, 18, "setShareAudioProcessingChannel"], [_handleMoreClickDecs, 18, "handleMoreClick"], [_decorator.bound, 2, "openLiveStreamingDialog"], [_pauseCloudRecordingDecs, 2, "pauseCloudRecording"], [_resumeCloudRecordingDecs, 2, "resumeCloudRecording"], [_stopCloudRecordingDecs, 2, "stopCloudRecording"], [_decorator.bound, 2, "startCloudRecording"], [_decorator.bound, 2, "getCoordinate"], [_showToastDecs, 18, "showToast"], [_setShowMeetingDetailPortalDecs, 18, "setShowMeetingDetailPortal"], [_setEnableWaitingRoomDecs, 18, "setEnableWaitingRoom"], [_sendLeaveDecs, 18, "sendLeave"], [_sendEndDecs, 18, "sendEnd"], [_keepPhoneAudioConnectionDecs, 18, "keepPhoneAudioConnection"], [_sendAssignDecs, 18, "sendAssign"], [_handleLeaveRoomDecs, 18, "handleLeaveRoom"], [_getCurrentSharingWorkAreaDecs, 18, "getCurrentSharingWorkArea"], [_handleRemoteUsersJoinedDecs, 18, "_handleRemoteUsersJoined"], [_handleRemoteUsersLeftDecs, 18, "_handleRemoteUsersLeft"], [_handleUserInfoUpdatedDecs, 18, "_handleUserInfoUpdated"]], []).e, 23);
 _init_leaveConfirmRef = _applyDecs$e[0];
 _init_shareWithAudio = _applyDecs$e[1];
 _init_shareAudioProcessingChannel = _applyDecs$e[2];
@@ -877,5 +894,6 @@ _init_isMuteAudio = _applyDecs$e[17];
 _init_hiddenShareActionNav = _applyDecs$e[18];
 _init_boardOwnerUser = _applyDecs$e[19];
 _init_meetingId = _applyDecs$e[20];
-_initProto = _applyDecs$e[21];
+_init_currentShareDisplayId = _applyDecs$e[21];
+_initProto = _applyDecs$e[22];
 var StoreContext = exports.StoreContext = /*#__PURE__*/(0, _react.createContext)(null);

package/lib/modules/control-bar/view.js

@@ -56,7 +56,8 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 var ControlBarView = exports.ControlBarView = (0, _mobxReact.observer)(function () {
   var _screenBounds$availTo;
   var _useContext = (0, _react.useContext)(_useElectron.DialogInstanceContext),
-    browserWindow = _useContext.browserWindow;
+    browserWindow = _useContext.browserWindow,
+    newRendererWindow = _useContext.newRendererWindow;
   var _useContext2 = (0, _react.useContext)(_store.StoreContext),
     setShareWithAudioState = _useContext2.setShareWithAudioState,
     shareWithAudio = _useContext2.shareWithAudio,
@@ -77,7 +78,8 @@ var ControlBarView = exports.ControlBarView = (0, _mobxReact.observer)(function
     isShowMeetingDetailPortal = _useContext2.isShowMeetingDetailPortal,
     setShowMeetingDetailPortal = _useContext2.setShowMeetingDetailPortal,
     setEnableWaitingRoom = _useContext2.setEnableWaitingRoom,
-    getCurrentSharingWorkArea = _useContext2.getCurrentSharingWorkArea;
+    getCurrentSharingWorkArea = _useContext2.getCurrentSharingWorkArea,
+    currentShareDisplayId = _useContext2.currentShareDisplayId;
   // 控制栏本身的高度
   var NAV_HEIGHT = 84;
   // 鼠标移开后自动隐藏的时间
@@ -205,14 +207,6 @@ var ControlBarView = exports.ControlBarView = (0, _mobxReact.observer)(function
         height: height
       });
     }
-    (0, _platform.isWindows)() && (0, _tools.handleCheckMouseOver)({
-      elem: rndRef.current,
-      browserWindow: browserWindow,
-      screenBounds: screenBounds,
-      callback: function callback(timerId) {
-        windowFocusTimerRef.current = timerId;
-      }
-    });
   }, [currentShareId]);
   (0, _react.useEffect)(function () {
     if (!moreVisible) {
@@ -222,6 +216,18 @@ var ControlBarView = exports.ControlBarView = (0, _mobxReact.observer)(function
       });
     }
   }, [moreVisible]);
+  (0, _react.useEffect)(function () {
+    var handleDisplayRemoved = function handleDisplayRemoved(event, display) {
+      if (display.id === currentShareDisplayId) {
+        handlerStopShare();
+        browserWindow.close();
+      }
+    };
+    window.runtime.screen.addListener('display-removed', handleDisplayRemoved);
+    return function () {
+      window.runtime.screen.removeListener('display-removed', handleDisplayRemoved);
+    };
+  }, [currentShareDisplayId]);
   var handleIgnoreMinimize = function handleIgnoreMinimize(event) {
     event.preventDefault();
     // browserWindow.restore();
@@ -235,6 +241,7 @@ var ControlBarView = exports.ControlBarView = (0, _mobxReact.observer)(function
       elem: rndRef.current,
       browserWindow: browserWindow,
       screenBounds: screenBounds,
+      newRendererWindow: newRendererWindow,
       callback: function callback(timerId) {
         windowFocusTimerRef.current = timerId;
       }

package/lib/modules/device-pretest/settings/virtual-background-setting.js

@@ -52,7 +52,7 @@ var VirtualBackgroundSetting = exports.VirtualBackgroundSetting = (0, _mobxReact
               }
             }), /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
               className: ns.e('virtual-none'),
-              children: transI18n('fmt_modules_tips_notapplicate')
+              children: transI18n('fmt_group_popup_breakout_room_label_none')
             })]
           })
         })

package/lib/modules/dialog/components/Interpreter/electron.js

@@ -5,19 +5,11 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.InterpreterElectronDialog = void 0;
-var _mobxReact = require("mobx-react");
-var _react = require("react");
-var _store = require("../../store");
-var _i18n = require("agora-ui-foundation/lib/i18n");
 var _constant = require("../../../../utilities/constant");
-var _windowHeader = require("agora-ui-foundation/lib/components/window-header");
 var _useElectron = require("../../hooks/useElectron");
-var _jsxRuntime = require("react/jsx-runtime");
 var config = {
-  frame: false,
   fullscreen: false,
   maximizable: false,
-  // titleBarStyle: 'hidden',
   trafficLightPosition: {
     x: 10,
     y: 60
@@ -28,26 +20,12 @@ var config = {
   minHeight: 300,
   maxWidth: 800
 };
-var InterpreterElectronDialog = exports.InterpreterElectronDialog = (0, _mobxReact.observer)(function (_ref) {
+var InterpreterElectronDialog = exports.InterpreterElectronDialog = function InterpreterElectronDialog(_ref) {
   var children = _ref.children;
-  var t = (0, _i18n.useI18n)();
-  var store = (0, _react.useContext)(_store.StoreContext);
-  var handleCloseClick = function handleCloseClick() {
-    store.closeInterpreterDialog();
-  };
   (0, _useElectron.useElectronDialog)({
     config: config,
     dialogKey: _constant.DialogKey.INTERPRETER,
-    children: /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
-      className: "fcr-simultaneous-interpretation-dialog-wrapper",
-      children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_windowHeader.FcrWindowHeader, {
-        showClose: true,
-        title: t('fmt_interpretation_setting_controller_option_simultaneous_interpretation'),
-        onClose: handleCloseClick,
-        type: _windowHeader.WindowType.WINDOW,
-        withWindowPopUpButton: false
-      }), children]
-    })
+    children: children
   });
   return null;
-});
+};

package/lib/modules/dialog/components/Interpreter/index.js

@@ -1,62 +1,33 @@
 "use strict";
 
 require("core-js/modules/es.object.define-property.js");
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = void 0;
 var _env = require("agora-foundation/lib/utilities/env");
 var _electron = require("./electron");
-var _mobxReact = require("mobx-react");
-var _react = require("react");
-var _reactRnd = require("react-rnd");
-var _windowHeader = require("agora-ui-foundation/lib/components/window-header");
 var _i18n = require("agora-ui-foundation/lib/i18n");
-var _store = require("../../store");
 require("./index.css");
+var _dialogContainer = _interopRequireDefault(require("../../../components/dialog-container"));
+var _constant = require("../../../../utilities/constant");
 var _jsxRuntime = require("react/jsx-runtime");
-var InterpreterDialog = (0, _mobxReact.observer)(function (_ref) {
+var InterpreterDialog = function InterpreterDialog(_ref) {
   var children = _ref.children;
   var t = (0, _i18n.useI18n)();
-  var store = (0, _react.useContext)(_store.StoreContext);
-  var containerRef = (0, _react.useRef)(null);
-  var windowWidth = window.innerWidth;
-  var windowHeight = window.innerHeight;
-  var width = 684;
-  var height = 438;
-  var x = windowWidth / 2 - width / 2;
+  var container = /*#__PURE__*/(0, _jsxRuntime.jsx)(_dialogContainer["default"], {
+    title: t('fmt_interpretation_setting_controller_option_simultaneous_interpretation'),
+    width: 684,
+    height: 438,
+    dialogKey: _constant.DialogKey.INTERPRETER,
+    children: children
+  });
   if ((0, _env.isElectron)()) {
     return /*#__PURE__*/(0, _jsxRuntime.jsx)(_electron.InterpreterElectronDialog, {
-      children: children
+      children: container
     });
   }
-  function handleCloseClick() {
-    store.closeInterpreterDialog();
-  }
-  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactRnd.Rnd, {
-    "default": {
-      x: x,
-      y: windowHeight / 2 - height / 2,
-      width: width,
-      height: height
-    },
-    ref: containerRef,
-    bounds: '.fcr-layout-content',
-    minWidth: 620,
-    minHeight: 300,
-    maxWidth: 800,
-    dragHandleClassName: "frc-window-header",
-    children: /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
-      className: "fcr-simultaneous-interpretation-dialog-wrapper",
-      children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_windowHeader.FcrWindowHeader, {
-        showClose: true,
-        title: t('fmt_interpretation_setting_controller_option_simultaneous_interpretation'),
-        onClose: handleCloseClick,
-        type: _windowHeader.WindowType.WINDOW,
-        withWindowPopUpButton: false
-        // otherActionsAfter={<UserQueue />}
-      }), children]
-    })
-  });
-});
+  return container;
+};
 var _default = exports["default"] = InterpreterDialog;

package/lib/modules/dialog/components/chat/electron.d.ts

@@ -1,4 +1,4 @@
 import { PropsWithChildren } from 'react';
-export declare const ChatElectronDialog: ({ children, chatAction }: PropsWithChildren<{
+export declare const ChatElectronDialog: ({ children, chatAction, }: PropsWithChildren<{
     chatAction: React.ReactNode;
 }>) => import("react/jsx-runtime").JSX.Element;

package/lib/modules/dialog/components/chat/electron.js

@@ -5,29 +5,22 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.ChatElectronDialog = void 0;
-var _mobxReact = require("mobx-react");
 var _constant = require("../../../../utilities/constant");
-var _ = require(".");
-var _platform = require("../../../../utilities/platform");
 var _useElectron = require("../../hooks/useElectron");
 var _jsxRuntime = require("react/jsx-runtime");
 var config = {
-  frame: false,
+  width: 800,
+  height: 600,
   fullscreen: false,
-  maximizable: false,
-  show: !(0, _platform.isWindows)(),
-  transparent: true
+  maximizable: false
 };
-var ChatElectronDialog = exports.ChatElectronDialog = (0, _mobxReact.observer)(function (_ref) {
+var ChatElectronDialog = exports.ChatElectronDialog = function ChatElectronDialog(_ref) {
   var children = _ref.children,
     chatAction = _ref.chatAction;
   (0, _useElectron.useElectronDialog)({
     config: config,
     dialogKey: _constant.DialogKey.CHAT,
-    children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_.ChatDialogContent, {
-      chatAction: chatAction,
-      children: children
-    })
+    children: children
   });
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {});
-});
+};

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

@@ -1,7 +1,4 @@
 import { PropsWithChildren } from 'react';
-export declare const ChatDialogContent: ({ children, chatAction, }: PropsWithChildren<{
-    chatAction: React.ReactNode;
-}>) => import("react/jsx-runtime").JSX.Element;
-export declare const ChatDialog: ({ children, chatAction }: PropsWithChildren<{
+export declare const ChatDialog: ({ children, chatAction, }: PropsWithChildren<{
     chatAction: React.ReactNode;
 }>) => import("react/jsx-runtime").JSX.Element;

package/lib/modules/dialog/components/chat/index.js

@@ -1,66 +1,60 @@
 "use strict";
 
 require("core-js/modules/es.object.define-property.js");
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.ChatDialogContent = exports.ChatDialog = void 0;
+exports.ChatDialog = void 0;
 var _env = require("agora-foundation/lib/utilities/env");
-var _mobxReact = require("mobx-react");
 var _react = require("react");
-var _reactRnd = require("react-rnd");
 var _store = require("../../store");
 var _i18n = require("agora-ui-foundation/lib/i18n");
-var _windowHeader = require("agora-ui-foundation/lib/components/window-header");
 var _electron = require("./electron");
 var _type = require("fcr-core/lib/room-control/chatroom-control/type");
+var _dialogContainer = _interopRequireDefault(require("../../../components/dialog-container"));
+var _constant = require("../../../../utilities/constant");
+var _tooltip = require("agora-ui-foundation/lib/components/tooltip");
+var _iconButton = require("agora-ui-foundation/lib/components/icon-button");
+var _type2 = require("agora-ui-foundation/lib/components/icon/type");
 var _jsxRuntime = require("react/jsx-runtime");
-var ChatDialogContent = exports.ChatDialogContent = (0, _mobxReact.observer)(function (_ref) {
+var ChatDialog = exports.ChatDialog = function ChatDialog(_ref) {
   var children = _ref.children,
     chatAction = _ref.chatAction;
   var _useContext = (0, _react.useContext)(_store.StoreContext),
     closeChatFromDialog = _useContext.closeChatFromDialog,
     moveChatFromDialogToAside = _useContext.moveChatFromDialogToAside,
-    chatRoomState = _useContext.chatRoomState;
+    chatRoomState = _useContext.chatRoomState,
+    waitingRoomState = _useContext.waitingRoomState;
   var transI18n = (0, _i18n.useI18n)();
-  return /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
-    className: "fcr-chat-dialog-wrapper",
-    children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_windowHeader.FcrWindowHeader, {
-      showClose: true,
-      rootClassName: 'chat-can-draggable',
-      title: chatRoomState === _type.FcrChatRoomConnectionState.Connected ? transI18n('fmt_chat_label_chat') : transI18n('fmt_aside_status_connecting'),
-      onTypeChange: moveChatFromDialogToAside,
-      onClose: closeChatFromDialog,
-      otherActions: chatAction,
-      type: _windowHeader.WindowType.WINDOW
-    }), children]
+  var container = /*#__PURE__*/(0, _jsxRuntime.jsx)(_dialogContainer["default"], {
+    title: chatRoomState === _type.FcrChatRoomConnectionState.Connected ? transI18n('fmt_chat_label_chat') : transI18n('fmt_aside_status_connecting'),
+    actions: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
+      children: [chatAction, /*#__PURE__*/(0, _jsxRuntime.jsx)(_tooltip.FcrToolTip, {
+        content: transI18n('fmt_uimanager_option_mergeview'),
+        mouseEnterDelay: 0,
+        trigger: "hover",
+        children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_iconButton.FcrIconButton, {
+          icon: _type2.FcrIconType.FCR_WINDOWPAGE_BIGGER,
+          onClick: moveChatFromDialogToAside,
+          className: "frc-window-header__icon fcr-no-drag",
+          iconColors: {
+            iconPrimary: 'var(--fcr_ui_scene_icontext1)'
+          }
+        })
+      })]
+    }),
+    width: 800,
+    height: waitingRoomState ? 630 : 600,
+    dialogKey: _constant.DialogKey.CHAT,
+    onClose: closeChatFromDialog,
+    children: children
   });
-});
-var ChatDialog = exports.ChatDialog = (0, _mobxReact.observer)(function (_ref2) {
-  var children = _ref2.children,
-    chatAction = _ref2.chatAction;
   if ((0, _env.isElectron)()) {
     return /*#__PURE__*/(0, _jsxRuntime.jsx)(_electron.ChatElectronDialog, {
       chatAction: chatAction,
-      children: children
+      children: container
     });
   }
-  var width = window.innerWidth;
-  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactRnd.Rnd, {
-    "default": {
-      width: 320,
-      height: 350,
-      x: width / 2 - 320 / 2,
-      y: 0
-    },
-    bounds: '.fcr-layout-content',
-    cancel: ".frc-window-header__operates",
-    minWidth: 320,
-    minHeight: 350,
-    dragHandleClassName: "chat-can-draggable",
-    children: /*#__PURE__*/(0, _jsxRuntime.jsx)(ChatDialogContent, {
-      chatAction: chatAction,
-      children: children
-    })
-  });
-});
+  return container;
+};

package/lib/modules/dialog/components/confirm/index.js

@@ -5,16 +5,13 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.ConfirmDialog = void 0;
-var _mobxReact = require("mobx-react");
 var _useElectron = require("../../hooks/useElectron");
 var _constant = require("../../../../utilities/constant");
 var _env = require("agora-foundation/lib/utilities/env");
 var _jsxRuntime = require("react/jsx-runtime");
-var ConfirmDialog = exports.ConfirmDialog = (0, _mobxReact.observer)(function (_ref) {
+var ConfirmDialog = exports.ConfirmDialog = function ConfirmDialog(_ref) {
   var children = _ref.children;
   var config = {
-    frame: false,
-    transparent: true,
     maximizable: false,
     backgroundColor: '#00000000',
     hiddenInMissionControl: true,
@@ -25,7 +22,8 @@ var ConfirmDialog = exports.ConfirmDialog = (0, _mobxReact.observer)(function (_
     scroll: false,
     alwaysOnTop: true,
     fullscreen: false,
-    resizable: false
+    resizable: false,
+    skipTaskbar: true
   };
   (0, _env.isElectron)() && (0, _useElectron.useElectronDialog)({
     config: config,
@@ -35,9 +33,10 @@ var ConfirmDialog = exports.ConfirmDialog = (0, _mobxReact.observer)(function (_
     scroll: false,
     alwaysOnTop: true,
     ignoreMouseEvents: true,
-    focus: true
+    focus: true,
+    hasCustomShadow: false
   });
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {
     children: !(0, _env.isElectron)() && children
   });
-});
+};

package/lib/modules/dialog/components/connection-gateway/electron.d.ts

@@ -1,5 +1,5 @@
 import { PropsWithChildren } from 'react';
 import { ParamsType } from '.';
-export declare const ConnectionGatewayElectronDialog: ({ children, params }: PropsWithChildren<{
+export declare const ConnectionGatewayElectronDialog: ({ children, params, }: PropsWithChildren<{
     params: ParamsType;
 }>) => null;

package/lib/modules/dialog/components/connection-gateway/electron.js

@@ -5,29 +5,21 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.ConnectionGatewayElectronDialog = void 0;
-var _mobxReact = require("mobx-react");
-var _react = require("react");
-var _store = require("../../store");
 var _constant = require("../../../../utilities/constant");
 var _useElectron = require("../../hooks/useElectron");
-var ConnectionGatewayElectronDialog = exports.ConnectionGatewayElectronDialog = (0, _mobxReact.observer)(function (_ref) {
+var ConnectionGatewayElectronDialog = exports.ConnectionGatewayElectronDialog = function ConnectionGatewayElectronDialog(_ref) {
   var children = _ref.children,
     params = _ref.params;
-  var store = (0, _react.useContext)(_store.StoreContext);
-  var height = store.currentDialogBounds.height;
-  var browserRef = (0, _react.useRef)();
   var config = {
-    modal: true,
-    frame: false,
+    maximizable: false,
+    minimizable: false,
+    fullscreenable: false,
     width: 400,
-    height: height,
+    height: 500,
     trafficLightPosition: {
       x: 0,
       y: 0
-    },
-    resizable: false,
-    transparent: true,
-    fullscreen: false
+    }
   };
   (0, _useElectron.useElectronDialog)({
     dialogKey: _constant.DialogKey.CONNECTION_GATEWAY,
@@ -35,20 +27,9 @@ var ConnectionGatewayElectronDialog = exports.ConnectionGatewayElectronDialog =
     children: children,
     onOpened: function onOpened(_ref2) {
       var browserWindow = _ref2.browserWindow;
-      browserRef.current = browserWindow;
-      browserWindow.setBounds({
-        height: params.type === 'phone' ? 500 : 350,
-        width: 400
-      });
+      browserWindow === null || browserWindow === void 0 || browserWindow.focus();
+      browserWindow === null || browserWindow === void 0 || browserWindow.setAlwaysOnTop(true);
     }
   });
-  (0, _react.useEffect)(function () {
-    var _browserRef$current;
-    if (!height) return;
-    (_browserRef$current = browserRef.current) === null || _browserRef$current === void 0 || _browserRef$current.setBounds({
-      width: 400,
-      height: height
-    }, true);
-  }, [height]);
   return null;
-});
+};

package/lib/modules/dialog/components/connection-gateway/index.d.ts

@@ -1,5 +1,4 @@
 import { FC } from 'react';
-import './index.css';
 export type ParamsType = {
     type: 'phone' | 'computer';
 };