fcr-ui-scene 3.5.1 → 3.6.1

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

@@ -0,0 +1,117 @@
+"use strict";
+
+require("core-js/modules/es.array.iterator.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.to-string.js");
+require("core-js/modules/es.string.iterator.js");
+require("core-js/modules/es.weak-map.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.iterator.js");
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+var _typeof = require("@babel/runtime/helpers/typeof");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = exports.DialogContainerStore = void 0;
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+var _react = _interopRequireWildcard(require("react"));
+var _mobxReact = require("mobx-react");
+var _react2 = require("@use-gesture/react");
+var _env = require("agora-foundation/lib/utilities/env");
+var _body = require("./component/body");
+var _jsxRuntime = require("react/jsx-runtime");
+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; }
+var DialogContainerStore = exports.DialogContainerStore = /*#__PURE__*/(0, _react.createContext)({});
+var DialogContainer = (0, _mobxReact.observer)(function (props) {
+  var width = props.width,
+    title = props.title,
+    onClose = props.onClose,
+    children = props.children,
+    dialogKey = props.dialogKey,
+    actions = props.actions,
+    closeInterception = props.closeInterception,
+    dialogId = props.dialogId,
+    autoHeight = props.autoHeight;
+  // const { closeDialogByKey, closeDilaogByDialogId } = useContext(StoreContext);
+
+  var handleClose = function handleClose() {
+    if (!(closeInterception !== null && closeInterception !== void 0 && closeInterception())) {
+      if (dialogId) {
+        // closeDilaogByDialogId(dialogId);
+      } else {
+        // closeDialogByKey(dialogKey);
+      }
+      onClose === null || onClose === void 0 || onClose();
+    }
+  };
+  var container = /*#__PURE__*/(0, _jsxRuntime.jsx)(_body.DialogContainerBody, {
+    title: title,
+    onClick: handleClose,
+    actions: actions,
+    autoHeight: autoHeight,
+    children: children
+  });
+  if ((0, _env.isElectron)()) return container;
+  var rndRef = (0, _react.useRef)(null);
+  var size = (0, _react.useMemo)(function () {
+    var _rndRef$current;
+    return {
+      width: width || 400,
+      height: props.height ? props.height : ((_rndRef$current = rndRef.current) === null || _rndRef$current === void 0 ? void 0 : _rndRef$current.getBoundingClientRect().height) || 160
+    };
+  }, [props.height]);
+  var windowWidth = window.innerWidth;
+  var height = window.innerHeight;
+  var x = windowWidth / 2 - size.width / 2;
+  var y = height / 2 - size.height / 2;
+  var windowBounds = {
+    x: x,
+    y: y,
+    width: window.innerWidth,
+    height: window.innerHeight
+  };
+  var _useState = (0, _react.useState)({
+      x: x,
+      y: y
+    }),
+    _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 x = bounds.x + dx;
+    var y = bounds.y + dy;
+    var maxX = windowBounds.width - size.width;
+    var maxY = windowBounds.height - size.height;
+    var coord = {
+      x: Math.max(0, Math.min(maxX, x)),
+      y: Math.max(0, Math.min(maxY, y))
+    };
+    setBounds(coord);
+  });
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+    style: {
+      width: size.width,
+      height: size.height,
+      left: "".concat(bounds.x, "px"),
+      top: "".concat(bounds.y, "px"),
+      position: 'absolute',
+      touchAction: 'none',
+      display: 'flex',
+      flexDirection: 'column',
+      zIndex: 10
+    },
+    children: /*#__PURE__*/(0, _jsxRuntime.jsx)(DialogContainerStore.Provider, {
+      value: {
+        bind: bind
+      },
+      children: container
+    })
+  });
+});
+var _default = exports["default"] = DialogContainer;

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

@@ -0,0 +1,4 @@
+import { FC, PropsWithChildren } from 'react';
+export declare const RenameDialog: FC<PropsWithChildren<{
+    title: string;
+}>>;

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

@@ -0,0 +1,72 @@
+"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.RenameDialog = void 0;
+require("core-js/modules/web.timers.js");
+var _i18n = require("agora-ui-foundation/lib/i18n");
+var _env = require("agora-foundation/lib/utilities/env");
+var _constant = require("../../../../utilities/constant");
+var _useElectron = require("../../hooks/useElectron");
+var _dialogContainer = _interopRequireDefault(require("../dialog-container"));
+var _platform = require("../../../../utilities/platform");
+var _jsxRuntime = require("react/jsx-runtime");
+var RenameDialog = exports.RenameDialog = function RenameDialog(_ref) {
+  var children = _ref.children,
+    title = _ref.title;
+  var container = /*#__PURE__*/(0, _jsxRuntime.jsx)(_dialogContainer["default"], {
+    title: title,
+    dialogKey: _constant.FcrUIDialogKey.RENAME,
+    width: 320,
+    height: 168,
+    autoHeight: true,
+    children: /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+      className: "fcr-rename-dialog-content",
+      children: children
+    })
+  });
+  if ((0, _env.isElectron)()) {
+    return /*#__PURE__*/(0, _jsxRuntime.jsx)(RenameElectronDialog, {
+      title: title,
+      children: container
+    });
+  }
+  return container;
+};
+var RenameElectronDialog = function RenameElectronDialog(_ref2) {
+  var children = _ref2.children,
+    title = _ref2.title;
+  var transI18n = (0, _i18n.useI18n)();
+  var config = {
+    fullscreen: false,
+    maximizable: false,
+    width: 320,
+    height: 168,
+    title: transI18n('fmt_additional_option_rename_in_meeting'),
+    resizable: false
+  };
+  (0, _useElectron.useElectronDialog)({
+    dialogKey: _constant.FcrUIDialogKey.RENAME,
+    config: config,
+    onClose: function onClose(_ref3) {
+      var store = _ref3.store;
+      store.closeDialogByKey(_constant.FcrUIDialogKey.RENAME);
+    },
+    onOpened: function onOpened(_ref4) {
+      var browserWindow = _ref4.browserWindow;
+      if (browserWindow) {
+        setTimeout(function () {
+          browserWindow.show();
+          browserWindow.focus();
+          browserWindow.setAlwaysOnTop(true, (0, _platform.isWindows)() ? 'pop-up-menu' : 'torn-off-menu');
+          browserWindow.moveTop();
+        }, 800);
+      }
+    },
+    children: children
+  });
+  return null;
+};

package/lib/modules/dialog/components/share-screen-selection/index.js

@@ -12,8 +12,7 @@ var _useElectron = require("../../hooks/useElectron");
 var _dialogContainer = _interopRequireDefault(require("../dialog-container"));
 var _jsxRuntime = require("react/jsx-runtime");
 var ShareScreenSelectronDialog = exports.ShareScreenSelectronDialog = function ShareScreenSelectronDialog(props) {
-  var children = props.children,
-    config = props.params;
+  var children = props.children;
   var transI18n = (0, _i18n.useI18n)();
   (0, _useElectron.useElectronDialog)({
     dialogKey: _constant.FcrUIDialogKey.SHARE_SCREEN,

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

@@ -56,16 +56,19 @@ var VideoWindowDialog = exports.VideoWindowDialog = (0, _mobxReact.observer)(fun
     }, [videoWindowBounds]),
     height = _useMemo.videoWindowHeight,
     type = _useMemo.videoWindowPreviewType;
+  var setCalcBounds = function setCalcBounds(x, y, width) {
+    return {
+      x: x + width - _type.DefaultVideoWindowWidth - 144,
+      y: y + 80,
+      width: _type.DefaultVideoWindowWidth,
+      height: _type.DefaultVideoWindowSmallTypeHeight
+    };
+  };
   var _window$runtime$scree = window.runtime.screen.getDisplayNearestPoint(currentShareBounds).bounds,
     x = _window$runtime$scree.x,
     y = _window$runtime$scree.y,
     width = _window$runtime$scree.width;
-  var initalBounds = {
-    x: x + width - _type.DefaultVideoWindowWidth - 144,
-    y: y + 80,
-    width: _type.DefaultVideoWindowWidth,
-    height: _type.DefaultVideoWindowSmallTypeHeight
-  };
+  var initalBounds = setCalcBounds(x, y, width);
   var config = _objectSpread(_objectSpread({
     title: 'Video Window',
     type: 'panel',
@@ -102,7 +105,7 @@ var VideoWindowDialog = exports.VideoWindowDialog = (0, _mobxReact.observer)(fun
       dialogKey: _constant.FcrUIDialogKey.VIDEO_WINDOW,
       config: config,
       hasCustomShadow: false,
-      alwaysOnTop: 'screen-saver',
+      alwaysOnTop: _useElectron.diffPlatformTopLevelLayer,
       disableShortcutClose: true,
       children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_videoTrackRenderContext.FcrVideoTrackRenderContext.Provider, {
         value: {
@@ -116,18 +119,14 @@ var VideoWindowDialog = exports.VideoWindowDialog = (0, _mobxReact.observer)(fun
           newRendererWindow = _ref2.newRendererWindow;
         browserWindow.setBounds(initalBounds);
         function reCalculate() {
-          var currentShareBounds = store.getCurrentSharingScreenBounds();
-          var _window$runtime$scree2 = window.runtime.screen.getDisplayNearestPoint(currentShareBounds).bounds,
+          var shareBounds = store.recordCurrentSharingScreenBounds();
+          var _window$runtime$scree2 = window.runtime.screen.getDisplayNearestPoint(shareBounds).bounds,
             x = _window$runtime$scree2.x,
             y = _window$runtime$scree2.y,
             width = _window$runtime$scree2.width;
-          browserWindow.setBounds({
-            x: x + width - _type.DefaultVideoWindowWidth - 144,
-            y: y + 80,
-            width: _type.DefaultVideoWindowWidth,
-            height: _type.DefaultVideoWindowSmallTypeHeight
-          });
+          browserWindow.setBounds(setCalcBounds(x, y, width));
         }
+        reCalculate();
         calculateRef.current = reCalculate;
 
         // @ts-ignore
@@ -163,6 +162,9 @@ var VideoWindowDialog = exports.VideoWindowDialog = (0, _mobxReact.observer)(fun
     }),
     browserWindow = _useElectronDialog.browserWindow,
     newRendererWindow = _useElectronDialog.newRendererWindow;
+  (0, _react.useEffect)(function () {
+    if (calculateRef.current) calculateRef.current();
+  }, [currentShareBounds]);
   (0, _react.useEffect)(function () {
     if (!browserWindow) return;
     var x = initalBounds.x,
@@ -178,7 +180,7 @@ var VideoWindowDialog = exports.VideoWindowDialog = (0, _mobxReact.observer)(fun
     resetSize(type, true);
     newRendererWindow && popoverWatcher(browserWindow, newRendererWindow);
     changeVideoWindowConfig(browserWindow, type === _type.FcrVideoWindowPreviewType.SMALL);
-  }, [height, type, newBounds]);
+  }, [height, type, newBounds, currentShareBounds]);
   function resetSize(type, withStyle) {
     var _wrapperDomRef$curren, _wrapperDomRef$curren2;
     if (!browserWindow) return;

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

@@ -1,5 +1,6 @@
 import { PropsWithChildren } from 'react';
 import { FcrUIWebWidgetConfig } from '../../../../type';
-export declare const WidgetElectronDialog: ({ children, params, }: PropsWithChildren<{
+export declare const WidgetElectronDialog: ({ children, params, dialogId, }: PropsWithChildren<{
     params: FcrUIWebWidgetConfig;
+    dialogId: string;
 }>) => null;

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

@@ -11,7 +11,8 @@ var _useElectron = require("../../hooks/useElectron");
 var WidgetElectronDialog = exports.WidgetElectronDialog = function WidgetElectronDialog(_ref) {
   var _params$popupSize, _params$popupSize2;
   var children = _ref.children,
-    params = _ref.params;
+    params = _ref.params,
+    dialogId = _ref.dialogId;
   var width = (_params$popupSize = params.popupSize) !== null && _params$popupSize !== void 0 && _params$popupSize.width ? params.popupSize.width + 2 : undefined;
   var height = (_params$popupSize2 = params.popupSize) !== null && _params$popupSize2 !== void 0 && _params$popupSize2.height ? params.popupSize.height + 76 : undefined;
   var config = {
@@ -29,7 +30,7 @@ var WidgetElectronDialog = exports.WidgetElectronDialog = function WidgetElectro
   (0, _useElectron.useElectronDialogByDialogId)({
     config: config,
     dialogKey: _constant.FcrUIDialogKey.WIDGET,
-    dialogId: params.id,
+    dialogId: dialogId,
     children: children,
     hasCustomShadow: false
   });

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

@@ -1,6 +1,7 @@
 import { PropsWithChildren } from 'react';
 import { FcrUIWebWidgetConfig } from '../../../../type';
-declare const WidgetDialog: ({ children, params, }: PropsWithChildren<{
+declare const WidgetDialog: ({ children, params, dialogId, }: PropsWithChildren<{
     params: FcrUIWebWidgetConfig;
+    dialogId: string;
 }>) => import("react/jsx-runtime").JSX.Element;
 export default WidgetDialog;

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

@@ -9,19 +9,16 @@ exports["default"] = void 0;
 require("core-js/modules/es.function.name.js");
 var _env = require("agora-foundation/lib/utilities/env");
 var _electron = require("./electron");
-var _react = require("react");
 var _i18n = require("agora-ui-foundation/lib/i18n");
 var _dialogContainer = _interopRequireDefault(require("../dialog-container"));
 var _constant = require("../../../../utilities/constant");
-var _store = require("../../store");
 var _jsxRuntime = require("react/jsx-runtime");
 var WidgetDialog = function WidgetDialog(_ref) {
   var _params$popupSize, _params$popupSize2;
   var children = _ref.children,
-    params = _ref.params;
+    params = _ref.params,
+    dialogId = _ref.dialogId;
   var t = (0, _i18n.useI18n)();
-  var _useContext = (0, _react.useContext)(_store.StoreContext),
-    widgetDialogIds = _useContext.widgetDialogIds;
   var width = (_params$popupSize = params.popupSize) !== null && _params$popupSize !== void 0 && _params$popupSize.width ? params.popupSize.width + 2 : undefined;
   var height = (_params$popupSize2 = params.popupSize) !== null && _params$popupSize2 !== void 0 && _params$popupSize2.height ? params.popupSize.height + 46 : undefined;
   var container = /*#__PURE__*/(0, _jsxRuntime.jsx)(_dialogContainer["default"], {
@@ -29,12 +26,13 @@ var WidgetDialog = function WidgetDialog(_ref) {
     width: width,
     height: height,
     dialogKey: _constant.FcrUIDialogKey.WIDGET,
-    dialogId: widgetDialogIds.get(params.id),
+    dialogId: dialogId,
     children: children
   });
   if ((0, _env.isElectron)()) {
     return /*#__PURE__*/(0, _jsxRuntime.jsx)(_electron.WidgetElectronDialog, {
       params: params,
+      dialogId: dialogId,
       children: container
     });
   }

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

@@ -1,2 +1,3 @@
 import { FcrUIDialogKey } from '../../utilities/constant';
 export declare let dialogWindows: Map<FcrUIDialogKey, Electron.BrowserWindow>;
+export declare let dialogIdWindows: Map<string, Electron.BrowserWindow>;

package/lib/modules/dialog/dialogs.js

@@ -4,7 +4,7 @@ require("core-js/modules/es.object.define-property.js");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.dialogWindows = void 0;
+exports.dialogWindows = exports.dialogIdWindows = void 0;
 require("core-js/modules/es.array.iterator.js");
 require("core-js/modules/es.map.js");
 require("core-js/modules/es.object.to-string.js");
@@ -24,4 +24,5 @@ require("core-js/modules/esnext.map.reduce.js");
 require("core-js/modules/esnext.map.some.js");
 require("core-js/modules/esnext.map.update.js");
 require("core-js/modules/web.dom-collections.iterator.js");
-var dialogWindows = exports.dialogWindows = new Map();
+var dialogWindows = exports.dialogWindows = new Map();
+var dialogIdWindows = exports.dialogIdWindows = new Map();

package/lib/modules/dialog/hooks/useElectron.d.ts

@@ -5,6 +5,8 @@ export declare const DialogInstanceContext: import("react").Context<{
     resizable: boolean;
 }>;
 export declare const shadowOffset: number;
+export declare const diffPlatformHighLevelLayer: string;
+export declare const diffPlatformTopLevelLayer: string;
 export declare function useElectronDialog(props: FcrUIDialogHooksProps): {
     store: import("../store").default;
     browserWindow: Electron.BrowserWindow | undefined;

package/lib/modules/dialog/hooks/useElectron.js

@@ -14,7 +14,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.shadowOffset = exports.DialogInstanceContext = void 0;
+exports.shadowOffset = exports.diffPlatformTopLevelLayer = exports.diffPlatformHighLevelLayer = exports.DialogInstanceContext = void 0;
 exports.useElectronDialog = useElectronDialog;
 exports.useElectronDialogByDialogId = useElectronDialogByDialogId;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
@@ -33,15 +33,18 @@ var _store = require("../store");
 var _dialogs = require("../dialogs");
 var _renderer = require("../../../utilities/renderer");
 var _reactDom = require("react-dom");
-var _constant = require("../../../utilities/constant");
+var _tools = require("../../../utilities/tools");
 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; }
 var DialogInstanceContext = exports.DialogInstanceContext = /*#__PURE__*/(0, _react.createContext)(null);
 var shadowOffset = exports.shadowOffset = 15 + 15;
+// windows 平台对层级支持的不完整，初始化时，如果低于 pup-up-menu 层级将不起作用，因此做此区分
+var diffPlatformHighLevelLayer = exports.diffPlatformHighLevelLayer = (0, _renderer.isWindows)() ? 'pop-up-menu' : 'torn-off-menu';
+var diffPlatformTopLevelLayer = exports.diffPlatformTopLevelLayer = (0, _renderer.isWindows)() ? 'screen-saver' : 'modal-panel';
 var enterFullScreenHandler = function enterFullScreenHandler() {
   _dialogs.dialogWindows.forEach(function (win, k) {
-    !_store.TOP_LEVEL_DIALOG_LAYER.includes(k) && win.setAlwaysOnTop(true, 'pop-up-menu');
+    !_store.TOP_LEVEL_DIALOG_LAYER.includes(k) && win.setAlwaysOnTop(true, diffPlatformHighLevelLayer);
   });
 };
 var leaveFullScreenHandler = function leaveFullScreenHandler() {
@@ -64,7 +67,6 @@ function useElectronDialog(props) {
     fullScreen = props.fullScreen,
     onOpened = props.onOpened,
     onUnmounted = props.onUnmounted,
-    polyfills = props.polyfills,
     _props$hasCustomShado = props.hasCustomShadow,
     hasCustomShadow = _props$hasCustomShado === void 0 ? true : _props$hasCustomShado,
     _props$disableShortcu = props.disableShortcutClose,
@@ -89,53 +91,15 @@ function useElectronDialog(props) {
   (0, _react.useEffect)(function () {
     var node;
     window.runtime.openRendererWindow(dialogKey, function (dom, browserWindow, newRendererWindow) {
-      var _controlbar$isVisible;
       node = dom;
       windowRef.current = browserWindow;
       newRendernerWindowRef.current = newRendererWindow;
       _dialogs.dialogWindows.set(dialogKey, browserWindow);
-      var thisWindowBounds = browserWindow.getBounds();
-      var mainAppWindowBounds = window.runtime.browserWindow.getBounds();
-      var nearDisplayBounds = window.runtime.screen.getDisplayNearestPoint(mainAppWindowBounds).bounds;
-      var controlbar = _dialogs.dialogWindows.get(_constant.FcrUIDialogKey.CONTROL_BAR);
-      if (controlbar && controlbar !== null && controlbar !== void 0 && (_controlbar$isVisible = controlbar.isVisible) !== null && _controlbar$isVisible !== void 0 && _controlbar$isVisible.call(controlbar)) {
-        // 因为打开过的窗口在关闭时是用的 hide 方法，因此只判断 controlbar 是否存在会在关闭 controlbar 时失效，导致窗口依然跟随 controlbar 最后所在屏幕打开，所以要再判断一下 isVisible 状态
-        // 当屏幕共享时会打开 control bar，此时弹窗相对于 control bar 展示
-        var nearDisplay = window.runtime.screen.getDisplayNearestPoint(controlbar.getBounds());
-        var _nearDisplayBounds = nearDisplay.bounds;
-        var _thisWindowBounds = browserWindow.getBounds();
-        var centerBounds = {
-          x: Math.floor(_nearDisplayBounds.x + (_nearDisplayBounds.width - _thisWindowBounds.width) / 2),
-          y: Math.floor(_nearDisplayBounds.y + (_nearDisplayBounds.height - _thisWindowBounds.height) / 2)
-        };
-        // resizeble 为 true 的窗口在切换不同分辨率属性的显示器时，会有打开尺寸失真的情况出现，所以暂存一下其原始值，在更改坐标之后还原
-        var resizeble = browserWindow.isResizable();
-        browserWindow.setResizable(false);
-        browserWindow.setBounds(centerBounds);
-        browserWindow.setResizable(resizeble);
-      } else if (fullScreen) {
-        var _browserWindow$setBou;
-        // 当窗口的自定义设置为全屏时，让弹窗追随主窗口所在的屏幕展示
-        // 目前 fullScreen 的配置主要用于 toast 和 confirm，在应用启动时会直接初始化这两个 dialog，如果未设置 fullScreen，它们因为没有宽高将无法展示
-        var x = nearDisplayBounds.x,
-          y = nearDisplayBounds.y,
-          width = nearDisplayBounds.width,
-          height = nearDisplayBounds.height;
-        browserWindow === null || browserWindow === void 0 || (_browserWindow$setBou = browserWindow.setBounds) === null || _browserWindow$setBou === void 0 || _browserWindow$setBou.call(browserWindow, {
-          x: x,
-          y: y,
-          width: width,
-          height: height
-        });
-      } else {
-        var _browserWindow$setBou2;
-        // 如果窗口未设置全屏模式，那么新打开的弹窗相对于主窗口弹窗的水平垂直居中显示
-        var bounds = {
-          x: Math.floor(mainAppWindowBounds.x + (mainAppWindowBounds.width - thisWindowBounds.width) / 2),
-          y: Math.floor(mainAppWindowBounds.y + (mainAppWindowBounds.height - thisWindowBounds.height) / 2)
-        };
-        browserWindow === null || browserWindow === void 0 || (_browserWindow$setBou2 = browserWindow.setBounds) === null || _browserWindow$setBou2 === void 0 || _browserWindow$setBou2.call(browserWindow, bounds);
-      }
+      var _ref = (0, _tools.followCorrectDisplay)({
+          browserWindow: browserWindow,
+          alwaysFollowScreen: fullScreen
+        }),
+        nearDisplayBounds = _ref.nearDisplayBounds;
 
       // 设置所有窗口为所有工作区可见
       browserWindow.setVisibleOnAllWorkspaces(true, {
@@ -173,8 +137,10 @@ function useElectronDialog(props) {
           forward: true
         } : ignoreMouseEvents);
       }
-      browserWindow.setAlwaysOnTop(typeof alwaysOnTop === 'boolean' ? alwaysOnTop : typeof alwaysOnTop === 'string', typeof alwaysOnTop === 'string' ? alwaysOnTop : 'pop-up-menu');
-      _store.HIGH_LEVEL_DIALOG_LAYER.includes(dialogKey) && browserWindow.setAlwaysOnTop(true, 'pop-up-menu');
+      browserWindow.setAlwaysOnTop(typeof alwaysOnTop === 'boolean' ? alwaysOnTop : typeof alwaysOnTop === 'string', typeof alwaysOnTop === 'string' ? alwaysOnTop : diffPlatformHighLevelLayer);
+      if (_store.HIGH_LEVEL_DIALOG_LAYER.includes(dialogKey)) {
+        browserWindow.setAlwaysOnTop(true, diffPlatformHighLevelLayer);
+      }
       if (!scroll) {
         browserWindow.webContents.insertCSS("\n            ::-webkit-scrollbar {\n              display: none;\n            }\n            #root {\n              padding: ".concat(hasCustomShadow ? shadowOffset / 2 : 0, "px;\n              display: ").concat(hasCustomShadow ? 'flex' : 'block', ";\n              align-items: center;\n            }\n          "));
       }
@@ -219,10 +185,6 @@ function useElectronDialog(props) {
         window.runtime.browserWindow.removeListener('leave-full-screen', leaveFullScreenHandler);
       }
       window.runtime.closeRendererWindow(dialogKey);
-      if (windowRef.current && !windowRef.current.isDestroyed()) {
-        windowRef.current.hide();
-        windowRef.current.close();
-      }
       onUnmounted === null || onUnmounted === void 0 || onUnmounted(store);
     };
   }, []);
@@ -247,7 +209,6 @@ function useElectronDialogByDialogId(props) {
     fullScreen = props.fullScreen,
     onOpened = props.onOpened,
     onUnmounted = props.onUnmounted,
-    polyfills = props.polyfills,
     _props$hasCustomShado2 = props.hasCustomShadow,
     hasCustomShadow = _props$hasCustomShado2 === void 0 ? true : _props$hasCustomShado2,
     _props$disableShortcu2 = props.disableShortcutClose,
@@ -273,51 +234,15 @@ function useElectronDialogByDialogId(props) {
   (0, _react.useEffect)(function () {
     var node;
     window.runtime.openRendererWindow(winUniqueId, function (dom, browserWindow, newRendererWindow) {
-      var _controlbar$isVisible2;
       node = dom;
       windowRef.current = browserWindow;
       newRendernerWindowRef.current = newRendererWindow;
-      var thisWindowBounds = browserWindow.getBounds();
-      var mainAppWindowBounds = window.runtime.browserWindow.getBounds();
-      var nearDisplayBounds = window.runtime.screen.getDisplayNearestPoint(mainAppWindowBounds).bounds;
-      var controlbar = _dialogs.dialogWindows.get(_constant.FcrUIDialogKey.CONTROL_BAR);
-      if (controlbar && controlbar !== null && controlbar !== void 0 && (_controlbar$isVisible2 = controlbar.isVisible) !== null && _controlbar$isVisible2 !== void 0 && _controlbar$isVisible2.call(controlbar)) {
-        // 因为打开过的窗口在关闭时是用的 hide 方法，因此只判断 controlbar 是否存在会在关闭 controlbar 时失效，导致窗口依然跟随 controlbar 最后所在屏幕打开，所以要再判断一下 isVisible 状态
-        // 当屏幕共享时会打开 control bar，此时弹窗相对于 control bar 展示
-        var nearDisplay = window.runtime.screen.getDisplayNearestPoint(controlbar.getBounds());
-        var _nearDisplayBounds2 = nearDisplay.bounds;
-        var _thisWindowBounds2 = browserWindow.getBounds();
-        var centerBounds = {
-          x: Math.floor(_nearDisplayBounds2.x + (_nearDisplayBounds2.width - _thisWindowBounds2.width) / 2),
-          y: Math.floor(_nearDisplayBounds2.y + (_nearDisplayBounds2.height - _thisWindowBounds2.height) / 2)
-        };
-        // resizeble 为 true 的窗口在切换不同分辨率属性的显示器时，会有打开尺寸失真的情况出现，所以暂存一下其原始值，在更改坐标之后还原
-        var resizeble = browserWindow.isResizable();
-        browserWindow.setResizable(false);
-        browserWindow.setBounds(centerBounds);
-        browserWindow.setResizable(resizeble);
-      } else if (fullScreen) {
-        var _browserWindow$setBou3;
-        // 当窗口的自定义设置为全屏时，让弹窗追随主窗口所在的屏幕展示
-        var x = nearDisplayBounds.x,
-          y = nearDisplayBounds.y,
-          width = nearDisplayBounds.width,
-          height = nearDisplayBounds.height;
-        browserWindow === null || browserWindow === void 0 || (_browserWindow$setBou3 = browserWindow.setBounds) === null || _browserWindow$setBou3 === void 0 || _browserWindow$setBou3.call(browserWindow, {
-          x: x,
-          y: y,
-          width: width,
-          height: height
-        });
-      } else {
-        var _browserWindow$setBou4;
-        // 如果主窗口不是全屏模式，那么新打开的弹窗相对于主窗口弹窗的水平垂直居中显示
-        var bounds = {
-          x: Math.floor(mainAppWindowBounds.x + (mainAppWindowBounds.width - thisWindowBounds.width) / 2),
-          y: Math.floor(mainAppWindowBounds.y + (mainAppWindowBounds.height - thisWindowBounds.height) / 2)
-        };
-        browserWindow === null || browserWindow === void 0 || (_browserWindow$setBou4 = browserWindow.setBounds) === null || _browserWindow$setBou4 === void 0 || _browserWindow$setBou4.call(browserWindow, bounds);
-      }
+      _dialogs.dialogIdWindows.set(winUniqueId, browserWindow);
+      var _ref2 = (0, _tools.followCorrectDisplay)({
+          browserWindow: browserWindow,
+          alwaysFollowScreen: fullScreen
+        }),
+        nearDisplayBounds = _ref2.nearDisplayBounds;
 
       // 设置所有窗口为所有工作区可见
       browserWindow.setVisibleOnAllWorkspaces(true, {
@@ -346,7 +271,7 @@ function useElectronDialogByDialogId(props) {
           forward: true
         } : ignoreMouseEvents);
       }
-      browserWindow.setAlwaysOnTop(typeof alwaysOnTop === 'boolean' ? alwaysOnTop : typeof alwaysOnTop === 'string', typeof alwaysOnTop === 'string' ? alwaysOnTop : 'pop-up-menu');
+      browserWindow.setAlwaysOnTop(typeof alwaysOnTop === 'boolean' ? alwaysOnTop : typeof alwaysOnTop === 'string', typeof alwaysOnTop === 'string' ? alwaysOnTop : diffPlatformHighLevelLayer);
       if (!scroll) {
         browserWindow.webContents.insertCSS("\n            ::-webkit-scrollbar {\n              display: none;\n            }\n            #root {\n              padding: ".concat(hasCustomShadow ? shadowOffset / 2 : 0, "px;\n              display: ").concat(hasCustomShadow ? 'flex' : 'block', ";\n              align-items: center;\n            }\n          "));
       }
@@ -390,10 +315,6 @@ function useElectronDialogByDialogId(props) {
         window.runtime.browserWindow.removeListener('leave-full-screen', leaveFullScreenHandler);
       }
       window.runtime.closeRendererWindow(winUniqueId);
-      if (windowRef.current && !windowRef.current.isDestroyed()) {
-        windowRef.current.hide();
-        windowRef.current.close();
-      }
       onUnmounted === null || onUnmounted === void 0 || onUnmounted(store);
     };
   }, []);

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

@@ -15,6 +15,7 @@ import { CurrentShareScreenTypes } from '../share-screen/types';
 import { FcrUIDialogInfo } from './type';
 import { FcrUIWidgetProvider } from '../../providers/widget-provider';
 import { FcrUIChatProvider } from '../../providers/chat-provider';
+import { FcrUIScreenShareProvider } from '../../providers/screen-share-provider';
 export declare class DialogUIModule extends UIModule {
     private _dialogsByKey;
     private _store?;
@@ -33,6 +34,7 @@ export declare class DialogUIModule extends UIModule {
     mainRoomControlProvider?: FcrUIMainRoomControlProvider;
     waitingRoomControlProvider?: FcrUIWaitingRoomControlProvider;
     widgetProvider?: FcrUIWidgetProvider;
+    screenShareProvider: FcrUIScreenShareProvider;
     chatProvider?: FcrUIChatProvider;
     abilityProvider?: FcrUIAbilityProviderImpl;
     onNodeWillActive(): void;

package/lib/modules/dialog/index.js

@@ -52,7 +52,6 @@ var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime
 var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
 var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-var _react = _interopRequireDefault(require("react"));
 var _base = require("../../base");
 var _store = _interopRequireWildcard(require("./store"));
 var _view = require("./view");
@@ -99,7 +98,8 @@ var DialogUIModule = exports.DialogUIModule = /*#__PURE__*/function (_UIModule)
           dialogsByKey: this._dialogsByKey,
           widgetProvider: this.widgetProvider,
           chatProvider: this.chatProvider,
-          abilityProvider: this.abilityProvider
+          abilityProvider: this.abilityProvider,
+          screenShareProvider: this.screenShareProvider
         });
         this.eventProvider.addObserver({
           onEvent: this.onUiEvent.bind(this)