fcr-ui-scene 3.6.4 → 3.7.0

package/lib/modules/dialog/components/dialog-container/index.js

@@ -1,13 +1,24 @@
 "use strict";
 
+require("core-js/modules/es.symbol.js");
+require("core-js/modules/es.array.filter.js");
+require("core-js/modules/es.array.for-each.js");
 require("core-js/modules/es.array.iterator.js");
+require("core-js/modules/es.array.push.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/es.object.to-string.js");
 require("core-js/modules/es.string.iterator.js");
 require("core-js/modules/es.weak-map.js");
+require("core-js/modules/esnext.iterator.constructor.js");
+require("core-js/modules/esnext.iterator.filter.js");
+require("core-js/modules/esnext.iterator.for-each.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 _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 var _typeof = require("@babel/runtime/helpers/typeof");
@@ -15,6 +26,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = exports.DialogContainerStore = void 0;
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = _interopRequireWildcard(require("react"));
 var _mobxReact = require("mobx-react");
@@ -24,6 +36,8 @@ var _store = require("../../store");
 var _body = require("./component/body");
 var _jsxRuntime = require("react/jsx-runtime");
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, "default": e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
+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; }
 var DialogContainerStore = exports.DialogContainerStore = /*#__PURE__*/(0, _react.createContext)({});
 var DialogContainer = (0, _mobxReact.observer)(function (props) {
   var width = props.width,
@@ -35,10 +49,13 @@ var DialogContainer = (0, _mobxReact.observer)(function (props) {
     closeInterception = props.closeInterception,
     dialogId = props.dialogId,
     autoHeight = props.autoHeight,
-    closable = props.closable;
-  var _useContext = (0, _react.useContext)(_store.StoreContext),
-    closeDialogByKey = _useContext.closeDialogByKey,
-    closeDilaogByDialogId = _useContext.closeDilaogByDialogId;
+    closable = props.closable,
+    style = props.style;
+  var _ref = (0, _react.useContext)(_store.StoreContext) || {
+      closeDialogByKey: onClose
+    },
+    closeDialogByKey = _ref.closeDialogByKey,
+    closeDilaogByDialogId = _ref.closeDilaogByDialogId;
   var handleClose = function handleClose() {
     if (!(closeInterception !== null && closeInterception !== void 0 && closeInterception())) {
       if (dialogId) {
@@ -83,10 +100,10 @@ var DialogContainer = (0, _mobxReact.observer)(function (props) {
     _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
     bounds = _useState2[0],
     setBounds = _useState2[1];
-  var bind = (0, _react2.useDrag)(function (_ref) {
-    var _ref$delta = (0, _slicedToArray2["default"])(_ref.delta, 2),
-      dx = _ref$delta[0],
-      dy = _ref$delta[1];
+  var bind = (0, _react2.useDrag)(function (_ref2) {
+    var _ref2$delta = (0, _slicedToArray2["default"])(_ref2.delta, 2),
+      dx = _ref2$delta[0],
+      dy = _ref2$delta[1];
     var x = bounds.x + dx;
     var y = bounds.y + dy;
     var maxX = windowBounds.width - size.width;
@@ -98,7 +115,7 @@ var DialogContainer = (0, _mobxReact.observer)(function (props) {
     setBounds(coord);
   });
   return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
-    style: {
+    style: _objectSpread({
       width: size.width,
       height: size.height,
       left: "".concat(bounds.x, "px"),
@@ -107,7 +124,7 @@ var DialogContainer = (0, _mobxReact.observer)(function (props) {
       touchAction: 'none',
       display: 'flex',
       flexDirection: 'column'
-    },
+    }, style),
     children: /*#__PURE__*/(0, _jsxRuntime.jsx)(DialogContainerStore.Provider, {
       value: {
         bind: bind

package/lib/modules/dialog/components/host-area-container/index.js

@@ -30,7 +30,7 @@ var _react2 = require("react");
 var _useElectron = require("../../hooks/useElectron");
 var _env = require("agora-foundation/lib/utilities/env");
 var _constant = require("../../../../utilities/constant");
-var _tools = require("../../../../utilities/tools");
+var _dialogUtils = require("../../../../utilities/dialog-utils");
 var _store = require("../../store");
 var _platform = require("../../../../utilities/platform");
 var _jsxRuntime = require("react/jsx-runtime");
@@ -63,7 +63,7 @@ var HotAreaContainer = exports.HotAreaContainer = function HotAreaContainer(prop
     setNavCurrentPosition = _useState2[1];
   var rndRef = (0, _react2.useRef)(null);
   var _ref2 = (0, _react2.useMemo)(function () {
-      return (0, _tools.followCorrectDisplay)({
+      return (0, _dialogUtils.followCorrectDisplay)({
         dialogKey: _constant.FcrUIDialogKey.ANNOTATION_TOOL
       });
     }, []) || {
@@ -154,7 +154,7 @@ var HotAreaContainer = exports.HotAreaContainer = function HotAreaContainer(prop
       browserWindow === null || browserWindow === void 0 || browserWindow.setBounds(screenBounds);
     } else {
       recordShareBounds.clear();
-      screenBounds = (0, _tools.getCurrentSharingWorkArea)({
+      screenBounds = (0, _dialogUtils.getCurrentSharingWorkArea)({
         currentShareBounds: currentShareBounds
       });
       recordShareBounds.set(currentShareBounds, screenBounds);
@@ -164,7 +164,7 @@ var HotAreaContainer = exports.HotAreaContainer = function HotAreaContainer(prop
   function checkMouseOver() {
     if (windowFocusTimerRef.current) clearInterval(windowFocusTimerRef.current);
     var screenBounds = getScreenBounds();
-    browserWindow && newRendererWindow && (0, _tools.handleCheckMouseOver)({
+    browserWindow && newRendererWindow && (0, _dialogUtils.handleCheckMouseOver)({
       elem: rndRef.current,
       browserWindow: browserWindow,
       screenBounds: screenBounds,

package/lib/modules/dialog/components/normal-window/index.d.ts

@@ -0,0 +1,19 @@
+import { FcrUIDialogKey } from '../../../../utilities/constant';
+import { PropsWithChildren } from 'react';
+import { FcrUIDialogHooksConfig, FcrUIDialogOnCloseProps, FcrUIDialogOnOpenedProps } from '../../type';
+export default function NormalWindow(props: PropsWithChildren<{
+    title?: string | React.ReactNode;
+    dialogKey: FcrUIDialogKey;
+    width?: number;
+    height?: number;
+    config: Electron.BrowserWindowConstructorOptions;
+    hooksConfig?: FcrUIDialogHooksConfig;
+    onOpened?: (props: FcrUIDialogOnOpenedProps) => void;
+    onClose?: (props?: FcrUIDialogOnCloseProps) => void;
+    closable?: boolean;
+    onlyElectron?: boolean;
+    actions?: React.ReactNode;
+    closeInterception?: () => boolean;
+    style?: React.CSSProperties;
+    autoHeight?: boolean;
+}>): import("react/jsx-runtime").JSX.Element;

package/lib/modules/dialog/components/normal-window/index.js

@@ -0,0 +1,69 @@
+"use strict";
+
+require("core-js/modules/es.symbol.js");
+require("core-js/modules/es.array.filter.js");
+require("core-js/modules/es.array.for-each.js");
+require("core-js/modules/es.array.push.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/es.object.to-string.js");
+require("core-js/modules/esnext.iterator.constructor.js");
+require("core-js/modules/esnext.iterator.filter.js");
+require("core-js/modules/esnext.iterator.for-each.js");
+require("core-js/modules/web.dom-collections.for-each.js");
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = NormalWindow;
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _dialogContainer = _interopRequireDefault(require("../dialog-container"));
+var _env = require("agora-foundation/lib/utilities/env");
+var _useElectron = require("../../hooks/useElectron");
+var _jsxRuntime = require("react/jsx-runtime");
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2["default"])(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function NormalWindow(props) {
+  var title = props.title,
+    children = props.children,
+    dialogKey = props.dialogKey,
+    width = props.width,
+    height = props.height,
+    config = props.config,
+    onOpened = props.onOpened,
+    onClose = props.onClose,
+    hooksConfig = props.hooksConfig,
+    actions = props.actions,
+    style = props.style,
+    closeInterception = props.closeInterception,
+    closable = props.closable,
+    autoHeight = props.autoHeight,
+    onlyElectron = props.onlyElectron;
+  var container = /*#__PURE__*/(0, _jsxRuntime.jsx)(_dialogContainer["default"], {
+    title: title === false || title ? title : config.title,
+    width: width || config.width,
+    height: height || config.height,
+    dialogKey: dialogKey,
+    actions: actions,
+    style: style,
+    onClose: onClose,
+    closable: closable,
+    autoHeight: autoHeight,
+    closeInterception: closeInterception,
+    children: children
+  });
+  if ((0, _env.isElectron)()) {
+    (0, _useElectron.useElectronDialog)(_objectSpread({
+      config: config,
+      dialogKey: dialogKey,
+      children: onlyElectron ? children : container,
+      onOpened: onOpened,
+      onClose: onClose
+    }, hooksConfig));
+    return /*#__PURE__*/(0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {});
+  }
+  return props.onlyElectron ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {}) : container;
+}

package/lib/modules/dialog/{components → dialogs}/annotation-tool/index.js

@@ -1,14 +1,15 @@
 "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.title = exports.config = exports.AnnotationBarDialog = void 0;
 var _constant = require("../../../../utilities/constant");
-var _useElectron = require("../../hooks/useElectron");
 var _mobxReact = require("mobx-react");
-var _hostAreaContainer = require("../host-area-container");
+var _hostAreaContainer = require("../../components/host-area-container");
+var _normalWindow = _interopRequireDefault(require("../../components/normal-window"));
 var _jsxRuntime = require("react/jsx-runtime");
 var title = exports.title = 'Annotation tool bar';
 var config = exports.config = {
@@ -26,28 +27,29 @@ var config = exports.config = {
   skipTaskbar: true,
   width: 800,
   height: 100,
-  movable: false
+  movable: false,
+  transparent: true
+};
+var hooksConfig = {
+  hasCustomShadow: false,
+  disableShortcutClose: true,
+  alwaysOnTop: 'screen-saver',
+  fullScreen: true,
+  ignoreMouseEvents: true
 };
 var AnnotationBarDialog = exports.AnnotationBarDialog = (0, _mobxReact.observer)(function (props) {
   var children = props.children;
-  (0, _useElectron.useElectronDialog)({
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_normalWindow["default"], {
+    title: title,
     dialogKey: _constant.FcrUIDialogKey.ANNOTATION_TOOL,
     config: config,
+    hooksConfig: hooksConfig,
+    onlyElectron: true,
     children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_hostAreaContainer.HotAreaContainer, {
       width: 800,
       height: 90,
       dialogKey: _constant.FcrUIDialogKey.ANNOTATION_TOOL,
       children: children
-    }),
-    hasCustomShadow: false,
-    disableShortcutClose: true,
-    alwaysOnTop: 'screen-saver',
-    fullScreen: true,
-    ignoreMouseEvents: true,
-    onOpened: function onOpened(_ref) {
-      var browserWindow = _ref.browserWindow,
-        newRendererWindow = _ref.newRendererWindow;
-    }
+    })
   });
-  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {});
 });

package/lib/modules/dialog/dialogs/chat/components/actions.d.ts

@@ -0,0 +1 @@
+export declare const ChatActions: () => import("react/jsx-runtime").JSX.Element | null;

package/lib/modules/dialog/dialogs/chat/components/actions.js

@@ -0,0 +1,33 @@
+"use strict";
+
+require("core-js/modules/es.object.define-property.js");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.ChatActions = void 0;
+var _mobxReact = require("mobx-react");
+var _react = require("react");
+var _store = require("../../../store");
+var _tooltip = require("agora-ui-foundation/lib/components/tooltip");
+var _i18n = require("agora-ui-foundation/lib/i18n");
+var _iconButton = require("agora-ui-foundation/lib/components/icon-button");
+var _type = require("agora-ui-foundation/lib/components/icon/type");
+var _jsxRuntime = require("react/jsx-runtime");
+var ChatActions = exports.ChatActions = (0, _mobxReact.observer)(function () {
+  var transI18n = (0, _i18n.useI18n)();
+  var store = (0, _react.useContext)(_store.StoreContext);
+  var result = store.isSharingScreen && store.isSharingScreenOwner ? null : /*#__PURE__*/(0, _jsxRuntime.jsx)(_tooltip.FcrToolTip, {
+    content: transI18n('fmt_uimanager_option_mergeview'),
+    mouseEnterDelay: 0,
+    trigger: "hover",
+    children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_iconButton.FcrIconButton, {
+      icon: _type.FcrIconType.FCR_WINDOWPAGE_BIGGER,
+      onClick: store.moveChatFromDialogToAside,
+      className: "frc-window-header__icon fcr-no-drag",
+      iconColors: {
+        iconPrimary: 'var(--fcr_ui_scene_icontext1)'
+      }
+    })
+  });
+  return result;
+});

package/lib/modules/dialog/{components → dialogs}/chat/index.d.ts

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

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

@@ -0,0 +1,59 @@
+"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.ChatDialog = void 0;
+var _env = require("agora-foundation/lib/utilities/env");
+var _react = require("react");
+var _store = require("../../store");
+var _i18n = require("agora-ui-foundation/lib/i18n");
+var _type = require("fcr-core/lib/room-control/chatroom-control/type");
+var _constant = require("../../../../utilities/constant");
+var _mobxReact = require("mobx-react");
+var _normalWindow = _interopRequireDefault(require("../../components/normal-window"));
+var _actions = require("./components/actions");
+var _jsxRuntime = require("react/jsx-runtime");
+var ChatDialog = exports.ChatDialog = (0, _mobxReact.observer)(function (props) {
+  var store = (0, _react.useContext)(_store.StoreContext);
+  var transI18n = (0, _i18n.useI18n)();
+  var config = {
+    width: 800,
+    height: 600,
+    minWidth: 400,
+    minHeight: 400,
+    maxWidth: 1100,
+    maxHeight: 900,
+    fullscreen: false,
+    maximizable: false,
+    title: transI18n('fmt_chat_window_title'),
+    resizable: true,
+    hasShadow: true
+  };
+  var hooksConfig = {
+    hasCustomShadow: false
+  };
+  var children = props.children,
+    chatAction = props.chatAction;
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_normalWindow["default"], {
+    title: store.chatRoomState === _type.FcrChatRoomConnectionState.Connected ? transI18n('fmt_chat_label_chat') : transI18n('fmt_aside_status_connecting'),
+    dialogKey: _constant.FcrUIDialogKey.CHAT,
+    config: config,
+    hooksConfig: hooksConfig,
+    actions: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
+      children: [chatAction, /*#__PURE__*/(0, _jsxRuntime.jsx)(_store.StoreContext.Provider, {
+        value: store,
+        children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_actions.ChatActions, {})
+      })]
+    }),
+    style: {
+      zIndex: 11
+    },
+    width: (0, _env.isElectron)() ? 800 : 520 // APAAS-10264 聊天在 web 下宽度改成520
+    ,
+    height: store.waitingRoomState ? 630 : 600,
+    children: children
+  });
+});

package/lib/modules/dialog/dialogs/confirm-leave-meeting/index.d.ts

@@ -0,0 +1,6 @@
+import { FC } from 'react';
+export declare const ConfirmLeaveMeetingDialog: FC<{
+    title: string;
+    onOk: () => void;
+    onCancel: () => void;
+}>;

package/lib/modules/dialog/{components → dialogs}/confirm-leave-meeting/index.js

@@ -8,22 +8,28 @@ Object.defineProperty(exports, "__esModule", {
 exports.ConfirmLeaveMeetingDialog = void 0;
 var _i18n = require("agora-ui-foundation/lib/i18n");
 var _constant = require("../../../../utilities/constant");
-var _useElectron = require("../../hooks/useElectron");
-var _env = require("agora-foundation/lib/utilities/env");
-var _dialogContainer = _interopRequireDefault(require("../dialog-container"));
 var _button = require("agora-ui-foundation/lib/components/button");
+var _normalWindow = _interopRequireDefault(require("../../components/normal-window"));
 var _jsxRuntime = require("react/jsx-runtime");
 var ConfirmLeaveMeetingDialog = exports.ConfirmLeaveMeetingDialog = function ConfirmLeaveMeetingDialog(_ref) {
   var title = _ref.title,
     onOk = _ref.onOk,
     onCancel = _ref.onCancel;
   var t = (0, _i18n.useI18n)();
-  var container = /*#__PURE__*/(0, _jsxRuntime.jsx)(_dialogContainer["default"], {
-    dialogKey: _constant.FcrUIDialogKey.LEAVE_MEETING,
+  var config = {
+    fullscreen: false,
+    maximizable: false,
     width: 255,
-    height: 138,
-    closable: false,
+    height: 158,
+    title: t('fmt_actionbar_labels_endmeeting'),
+    resizable: false
+  };
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_normalWindow["default"], {
+    title: false,
     autoHeight: true,
+    dialogKey: _constant.FcrUIDialogKey.LEAVE_MEETING,
+    closable: false,
+    config: config,
     children: /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
       className: "fcr-confirm-content-footer fcr-button-flex-column fcr-confirm-content-footer__center",
       style: {
@@ -53,34 +59,4 @@ var ConfirmLeaveMeetingDialog = exports.ConfirmLeaveMeetingDialog = function Con
       })]
     })
   });
-  if ((0, _env.isElectron)()) {
-    return /*#__PURE__*/(0, _jsxRuntime.jsx)(ConfirmLeaveMeetingElectronDialog, {
-      title: title,
-      children: container
-    });
-  }
-  return container;
-};
-var ConfirmLeaveMeetingElectronDialog = function ConfirmLeaveMeetingElectronDialog(_ref2) {
-  var children = _ref2.children,
-    title = _ref2.title;
-  var transI18n = (0, _i18n.useI18n)();
-  var config = {
-    fullscreen: false,
-    maximizable: false,
-    width: 255,
-    height: 158,
-    title: transI18n('fmt_actionbar_labels_endmeeting'),
-    resizable: false
-  };
-  (0, _useElectron.useElectronDialog)({
-    dialogKey: _constant.FcrUIDialogKey.LEAVE_MEETING,
-    config: config,
-    onClose: function onClose(_ref3) {
-      var store = _ref3.store;
-      store.closeDialogByKey(_constant.FcrUIDialogKey.LEAVE_MEETING);
-    },
-    children: children
-  });
-  return null;
 };

package/lib/modules/dialog/{components → dialogs}/connection-gateway/index.js

@@ -6,13 +6,12 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.ConnectionGatewayDialog = void 0;
-var _env = require("agora-foundation/lib/utilities/env");
 var _react = require("react");
-var _electron = require("./electron");
-var _dialogContainer = _interopRequireDefault(require("../dialog-container"));
 var _constant = require("../../../../utilities/constant");
 var _tabs = require("./tabs");
 var _store = require("../../store");
+var _normalWindow = _interopRequireDefault(require("../../components/normal-window"));
+var _i18n = require("agora-ui-foundation/lib/i18n");
 var _jsxRuntime = require("react/jsx-runtime");
 var ConnectionGatewayDialog = exports.ConnectionGatewayDialog = function ConnectionGatewayDialog(_ref) {
   var children = _ref.children,
@@ -22,26 +21,34 @@ var ConnectionGatewayDialog = exports.ConnectionGatewayDialog = function Connect
     } : _ref$params,
     computerChildren = _ref.computerChildren,
     phoneChildren = _ref.phoneChildren;
+  var transI18n = (0, _i18n.useI18n)();
   var _useContext = (0, _react.useContext)(_store.StoreContext),
     closeConnectionDialog = _useContext.closeConnectionDialog;
-  var container = /*#__PURE__*/(0, _jsxRuntime.jsx)(_dialogContainer["default"], {
+  var config = {
+    maximizable: false,
+    minimizable: false,
+    fullscreenable: false,
     width: 400,
+    height: 500,
+    trafficLightPosition: {
+      x: 0,
+      y: 0
+    },
+    title: transI18n('fmt_toolbar_label_connectaudio'),
+    resizable: false
+  };
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_normalWindow["default"], {
+    title: false,
+    dialogKey: _constant.FcrUIDialogKey.CONNECTION_GATEWAY,
+    config: config,
     height: params.type === 'phone' ? 500 : 350,
     closeInterception: function closeInterception() {
       return closeConnectionDialog();
     },
-    dialogKey: _constant.FcrUIDialogKey.CONNECTION_GATEWAY,
     children: children ? children : /*#__PURE__*/(0, _jsxRuntime.jsx)(_tabs.GatewayConnectorTabs, {
       type: params.type,
       computerChildren: computerChildren,
       phoneChildren: phoneChildren
     })
   });
-  if ((0, _env.isElectron)()) {
-    return /*#__PURE__*/(0, _jsxRuntime.jsx)(_electron.ConnectionGatewayElectronDialog, {
-      params: params,
-      children: container
-    });
-  }
-  return container;
 };

package/lib/modules/dialog/{components → dialogs}/control-bar/index.js

@@ -10,7 +10,7 @@ require("core-js/modules/web.timers.js");
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _constant = require("../../../../utilities/constant");
-var _tools = require("../../../../utilities/tools");
+var _dialogUtils = require("../../../../utilities/dialog-utils");
 var _useElectron = require("../../hooks/useElectron");
 var _react = require("react");
 var _store = require("../../store");
@@ -86,7 +86,7 @@ var setBounds = exports.setBounds = /*#__PURE__*/function () {
     return _regenerator["default"].wrap(function (_context2) {
       while (1) switch (_context2.prev = _context2.next) {
         case 0:
-          _getCurrentSharingWor = (0, _tools.getCurrentSharingWorkArea)({
+          _getCurrentSharingWor = (0, _dialogUtils.getCurrentSharingWorkArea)({
             currentShareBounds: currentShareBounds
           }), originWidth = _getCurrentSharingWor.width, originHeight = _getCurrentSharingWor.height, x = _getCurrentSharingWor.x, y = _getCurrentSharingWor.y;
           /* 使用window.screen.availWidth在windows上会黑屏，详见jira:APAAS-5732

package/lib/modules/dialog/{components → dialogs}/device-setting/index.js

@@ -7,28 +7,35 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports["default"] = void 0;
 var _env = require("agora-foundation/lib/utilities/env");
-var _electron = require("./electron");
 var _i18n = require("agora-ui-foundation/lib/i18n");
 require("./index.css");
 var _constant = require("../../../../utilities/constant");
-var _dialogContainer = _interopRequireDefault(require("../dialog-container"));
+var _normalWindow = _interopRequireDefault(require("../../components/normal-window"));
 var _jsxRuntime = require("react/jsx-runtime");
 var DeviceSettingDialog = function DeviceSettingDialog(_ref) {
   var children = _ref.children;
-  var t = (0, _i18n.useI18n)();
-  var height = (0, _env.isElectron)() ? 556 : 600;
-  var container = /*#__PURE__*/(0, _jsxRuntime.jsx)(_dialogContainer["default"], {
-    title: t('fmt_modules_labels_devicesettings'),
+  var transI18n = (0, _i18n.useI18n)();
+  var config = {
+    fullscreen: false,
+    maximizable: false,
+    trafficLightPosition: {
+      x: 10,
+      y: 60
+    },
     width: 580,
-    height: height,
+    height: 600,
+    minWidth: 580,
+    minHeight: 600,
+    maxWidth: 670,
+    maxHeight: 800,
+    title: transI18n('fmt_modules_labels_devicesettings'),
+    resizable: false
+  };
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_normalWindow["default"], {
     dialogKey: _constant.FcrUIDialogKey.DEVICE_SETTINGS,
+    config: config,
+    height: (0, _env.isElectron)() ? 556 : 600,
     children: children
   });
-  if ((0, _env.isElectron)()) {
-    return /*#__PURE__*/(0, _jsxRuntime.jsx)(_electron.DeviceSettingElectronDialog, {
-      children: container
-    });
-  }
-  return container;
 };
 var _default = exports["default"] = DeviceSettingDialog;

package/lib/modules/dialog/dialogs/end-meeting/index.d.ts

@@ -0,0 +1,12 @@
+import { PropsWithChildren } from 'react';
+export type EndMeetingDialogContentProps = {
+    title: string;
+    desc: string;
+    imgSrc: string;
+    btnTxt: string;
+    key: string;
+    onConfirm: () => void;
+};
+export declare const EndMeetingDialog: ({ params, }: PropsWithChildren<{
+    params: EndMeetingDialogContentProps;
+}>) => import("react/jsx-runtime").JSX.Element;

package/lib/modules/dialog/dialogs/end-meeting/index.js

@@ -0,0 +1,45 @@
+"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.EndMeetingDialog = void 0;
+var _normalWindow = _interopRequireDefault(require("../../components/normal-window"));
+var _constant = require("../../../../utilities/constant");
+var _comfirmDialog = require("agora-ui-foundation/lib/components/comfirm-dialog");
+var _jsxRuntime = require("react/jsx-runtime");
+var EndMeetingDialog = exports.EndMeetingDialog = function EndMeetingDialog(_ref) {
+  var params = _ref.params;
+  var title = params.title,
+    desc = params.desc,
+    imgSrc = params.imgSrc,
+    btnTxt = params.btnTxt,
+    key = params.key,
+    onConfirm = params.onConfirm;
+  var config = {
+    width: 330,
+    height: 340,
+    fullscreen: false,
+    maximizable: false,
+    resizable: false
+  };
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_normalWindow["default"], {
+    title: '',
+    closable: false,
+    dialogKey: _constant.FcrUIDialogKey.END_MEETING,
+    config: config,
+    width: 330,
+    height: 340,
+    children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_comfirmDialog.LoginConfirmDialog, {
+      id: key,
+      title: title,
+      desc: desc,
+      imgSrc: imgSrc,
+      showImg: true,
+      btnTxt: btnTxt,
+      onConfirm: onConfirm
+    })
+  });
+};