fcr-ui-scene 3.7.2 → 3.7.4-rc.1

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

@@ -26,14 +26,15 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = exports.DialogContainerStore = void 0;
+require("core-js/modules/es.parse-int.js");
 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");
-var _react2 = require("@use-gesture/react");
 var _env = require("agora-foundation/lib/utilities/env");
 var _store = require("../../store");
 var _body = require("./component/body");
+var _reactRnd = require("react-rnd");
 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; }
@@ -41,6 +42,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 var DialogContainerStore = exports.DialogContainerStore = /*#__PURE__*/(0, _react.createContext)({});
 var DialogContainer = (0, _mobxReact.observer)(function (props) {
   var width = props.width,
+    height = props.height,
     title = props.title,
     onClose = props.onClose,
     children = props.children,
@@ -50,7 +52,11 @@ var DialogContainer = (0, _mobxReact.observer)(function (props) {
     dialogId = props.dialogId,
     autoHeight = props.autoHeight,
     closable = props.closable,
-    style = props.style;
+    style = props.style,
+    maxWidth = props.maxWidth,
+    maxHeight = props.maxHeight,
+    minWidth = props.minWidth,
+    minHeight = props.minHeight;
   var _ref = (0, _react.useContext)(_store.StoreContext) || {
       closeDialogByKey: onClose
     },
@@ -76,61 +82,78 @@ var DialogContainer = (0, _mobxReact.observer)(function (props) {
   });
   if ((0, _env.isElectron)()) return container;
   var rndRef = (0, _react.useRef)(null);
-  var size = (0, _react.useMemo)(function () {
-    var _rndRef$current;
+  var windowWidth = window.innerWidth;
+  var windowHeight = window.innerHeight;
+
+  // 应用尺寸限制的辅助函数
+  var constrainSize = function constrainSize(newSize) {
+    var constrainedWidth = newSize.width;
+    var constrainedHeight = newSize.height;
+
+    // 应用最小尺寸限制
+    if (minWidth && constrainedWidth < minWidth) {
+      constrainedWidth = minWidth;
+    }
+    if (minHeight && constrainedHeight < minHeight) {
+      constrainedHeight = minHeight;
+    }
+
+    // 应用最大尺寸限制
+    if (maxWidth && constrainedWidth > maxWidth) {
+      constrainedWidth = maxWidth;
+    }
+    if (maxHeight && constrainedHeight > maxHeight) {
+      constrainedHeight = maxHeight;
+    }
     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
+      width: constrainedWidth,
+      height: constrainedHeight
     };
-  }, [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)({
+      width: width || 400,
+      height: height || 160
+    }),
+    _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
+    size = _useState2[0],
+    updateSize = _useState2[1];
+  var x = windowWidth / 2 - size.width / 2;
+  var y = windowHeight / 2 - size.height / 2;
+  var _useState3 = (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 (_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;
-    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", {
+    _useState4 = (0, _slicedToArray2["default"])(_useState3, 2),
+    position = _useState4[0],
+    updatePosition = _useState4[1];
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactRnd.Rnd, {
     style: _objectSpread({
-      width: size.width,
-      height: size.height,
-      left: "".concat(bounds.x, "px"),
-      top: "".concat(bounds.y, "px"),
       position: 'absolute',
       touchAction: 'none',
       display: 'flex',
       flexDirection: 'column'
     }, style),
-    children: /*#__PURE__*/(0, _jsxRuntime.jsx)(DialogContainerStore.Provider, {
-      value: {
-        bind: bind
-      },
-      children: container
-    })
+    size: size,
+    position: position,
+    minWidth: minWidth,
+    minHeight: minHeight,
+    maxWidth: maxWidth,
+    maxHeight: maxHeight,
+    onDragStop: function onDragStop(e, d) {
+      updatePosition({
+        x: d.x,
+        y: d.y
+      });
+    },
+    onResizeStop: function onResizeStop(e, direction, ref, delta, position) {
+      var newSize = constrainSize({
+        width: parseInt(ref.style.width),
+        height: parseInt(ref.style.height)
+      });
+      updateSize(newSize);
+      updatePosition(position);
+    },
+    children: container
   });
 });
 var _default = exports["default"] = DialogContainer;

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

@@ -46,6 +46,10 @@ function NormalWindow(props) {
     title: title === false || title ? title : config.title,
     width: width || config.width,
     height: height || config.height,
+    maxWidth: config.maxWidth,
+    maxHeight: config.maxHeight,
+    minWidth: config.minWidth,
+    minHeight: config.minHeight,
     dialogKey: dialogKey,
     actions: actions,
     style: style,

package/lib/modules/dialog/dialogs/control-bar/index.d.ts

@@ -1,6 +1,7 @@
 import { ControlBarUIModule } from '../../../control-bar';
 import { PropsWithChildren } from 'react';
 import { CurrentShareBounds } from '../../../control-bar/types';
+export declare const title = "Control Bar";
 export declare const config: Electron.BrowserWindowConstructorOptions;
 export declare const ControlBarDialog: (props: PropsWithChildren<{
     module: ControlBarUIModule;

package/lib/modules/dialog/dialogs/control-bar/index.js

@@ -5,8 +5,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.setBounds = exports.config = exports.ControlBarDialog = void 0;
-require("core-js/modules/web.timers.js");
+exports.title = exports.setBounds = exports.config = exports.ControlBarDialog = void 0;
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _constant = require("../../../../utilities/constant");
@@ -17,6 +16,7 @@ var _store = require("../../store");
 var _platform = require("../../../../utilities/platform");
 var _mobxReact = require("mobx-react");
 var _env = require("agora-foundation/lib/utilities/env");
+var title = exports.title = 'Control Bar';
 var config = exports.config = {
   y: 0,
   x: 0,
@@ -27,7 +27,7 @@ var config = exports.config = {
   useContentSize: true,
   minimizable: false,
   resizable: false,
-  title: 'Control Bar',
+  title: title,
   type: 'panel',
   skipTaskbar: true
 };
@@ -36,7 +36,9 @@ var ControlBarDialog = exports.ControlBarDialog = (0, _mobxReact.observer)(funct
   var eventProvider = module.eventProvider;
   var _useContext = (0, _react.useContext)(_store.StoreContext),
     currentShareId = _useContext.currentShareId,
-    currentShareBounds = _useContext.currentShareBounds;
+    currentShareBounds = _useContext.currentShareBounds,
+    isMultiDisplayActive = _useContext.isMultiDisplayActive,
+    moveMainWindowToIndexLeastDisplay = _useContext.moveMainWindowToIndexLeastDisplay;
   var children = function children(browserWindow) {
     return module.getComponent({
       browserWindow: browserWindow
@@ -70,6 +72,11 @@ var ControlBarDialog = exports.ControlBarDialog = (0, _mobxReact.observer)(funct
         var browserWindow = _ref2.browserWindow;
         setBoundsWithNewAppWindows(browserWindow);
         if ((0, _env.isElectron)()) {
+          // 开启多屏模式时，不需要隐藏主窗口及显示悬浮视窗
+          if (isMultiDisplayActive) {
+            return;
+          }
+          window.runtime.browserWindow.hide();
           eventProvider === null || eventProvider === void 0 || eventProvider.sendEvent(_constant.FcrUIAction.OPEN_TOP_VIDEO_WINDOW);
         }
       }
@@ -77,57 +84,41 @@ var ControlBarDialog = exports.ControlBarDialog = (0, _mobxReact.observer)(funct
     browserWindow = _useElectronDialog.browserWindow;
   (0, _react.useEffect)(function () {
     setBoundsWithNewAppWindows(browserWindow);
+
+    // 多屏模式下， 如果屏幕共享和主窗口在同一个显示器，需要将主窗口移动到排序最小的显示器上
+    // 第一次发起共享和发起新的共享时，都需要判断是否需要移动主窗口
+    if (isMultiDisplayActive) {
+      moveMainWindowToIndexLeastDisplay();
+    }
   }, [currentShareId]);
   return null;
 });
 var setBounds = exports.setBounds = /*#__PURE__*/function () {
   var _ref3 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee2(currentShareBounds, browserWindow) {
-    var _getCurrentSharingWor, originWidth, originHeight, x, y, WINDOWS_SCREEN_BOUNDARY_WIDTH, width, height, firstBounds;
+    var _getCurrentSharingWor, originWidth, originHeight, x, y;
     return _regenerator["default"].wrap(function (_context2) {
       while (1) switch (_context2.prev = _context2.next) {
         case 0:
           _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
-                怀疑是在windows上BrowserWindow有一个边框，所以需要减去一定的宽度。
-                实验结果最低是4。这里减去10留一点buffer，防止其他操作系统的边框不一致。
-                */
-          WINDOWS_SCREEN_BOUNDARY_WIDTH = 10;
-          width = (0, _platform.isWindows)() ? originWidth - WINDOWS_SCREEN_BOUNDARY_WIDTH : originWidth;
-          height = originHeight; // 重新设置窗口大小
+          }), originWidth = _getCurrentSharingWor.width, originHeight = _getCurrentSharingWor.height, x = _getCurrentSharingWor.x, y = _getCurrentSharingWor.y; // // 重新设置窗口大小
           if ((0, _platform.isWindows)()) {
-            // 修复 windows 分辨率差别大的多显示器场景下的窗口缩放问题
-            browserWindow === null || browserWindow === void 0 || browserWindow.setBounds({
+            browserWindow.isMaximized() && browserWindow.unmaximize();
+            browserWindow.setBounds({
               x: x,
               y: y,
-              width: width,
-              height: height
+              width: 800,
+              height: 600
             });
-            firstBounds = browserWindow.getBounds();
+            browserWindow.maximize();
+          } else {
             browserWindow.setBounds({
-              x: firstBounds.x === 0 ? 0 : -firstBounds.x,
-              y: firstBounds.y === 0 ? 0 : -firstBounds.y,
-              width: width,
-              height: height
-            });
-          }
-          setTimeout(function () {
-            browserWindow === null || browserWindow === void 0 || browserWindow.setBounds({
               x: x,
               y: y,
               width: originWidth,
               height: originHeight
             });
-            browserWindow === null || browserWindow === void 0 || browserWindow.setMaximumSize(originWidth, originHeight);
-            browserWindow.focus();
-          }, 100);
-          setTimeout(function () {
-            browserWindow === null || browserWindow === void 0 || browserWindow.setBounds({
-              width: originWidth,
-              height: originHeight
-            });
-          }, 100);
+          }
         case 1:
         case "end":
           return _context2.stop();

package/lib/modules/dialog/dialogs/participant/components/title.js

@@ -13,7 +13,7 @@ var _jsxRuntime = require("react/jsx-runtime");
 var ParticipantTitle = exports.ParticipantTitle = (0, _mobxReact.observer)(function () {
   var store = (0, _react.useContext)(_store.StoreContext);
   var transI18n = (0, _i18n.useI18n)();
-  return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
+  return /*#__PURE__*/(0, _jsxRuntime.jsxs)("span", {
     children: [transI18n('fmt_participants_label_participants'), "(", store.participantCount, ")"]
   });
 });

package/lib/modules/dialog/dialogs/sub-window/index.d.ts

@@ -0,0 +1,2 @@
+import { PropsWithChildren } from 'react';
+export declare const SubWindowDialog: (props: PropsWithChildren<{}>) => null;

package/lib/modules/dialog/dialogs/sub-window/index.js

@@ -0,0 +1,102 @@
+"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/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.SubWindowDialog = void 0;
+require("core-js/modules/es.array.find.js");
+require("core-js/modules/es.object.to-string.js");
+require("core-js/modules/esnext.iterator.constructor.js");
+require("core-js/modules/esnext.iterator.find.js");
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _constant = require("../../../../utilities/constant");
+var _useElectron = require("../../hooks/useElectron");
+var _react = require("react");
+var _env = require("agora-foundation/lib/utilities/env");
+var _videoTrackRenderContext = require("../../../../utilities/video-track-render-context");
+var _store = require("../../store");
+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 defaultWindowOptions = {
+  height: 850,
+  width: 1360,
+  minWidth: 825,
+  minHeight: 600
+};
+var SubWindowDialog = exports.SubWindowDialog = function SubWindowDialog(props) {
+  var store = (0, _react.useContext)(_store.StoreContext);
+  var children = props.children;
+  (0, _env.isElectron)() && (0, _useElectron.useElectronDialog)({
+    dialogKey: _constant.FcrUIDialogKey.SUB_WINDOW,
+    config: _objectSpread(_objectSpread({}, defaultWindowOptions), {}, {
+      title: window.runtime.browserWindow.getTitle(),
+      closable: true,
+      frame: true,
+      transparent: false,
+      backgroundColor: '#ffffff',
+      trafficLightPosition: {
+        x: 10,
+        y: 10
+      },
+      show: false,
+      hasShadow: true
+    }),
+    children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_videoTrackRenderContext.FcrVideoTrackRenderContext.Provider, {
+      value: {
+        localVideoRenderProvider: store.localVideoRenderProvider,
+        remoteVideoRenderProvider: store.remoteVideoRenderManager
+      },
+      children: children
+    }),
+    hasCustomShadow: false,
+    onOpened: function onOpened(_ref) {
+      var browserWindow = _ref.browserWindow,
+        newRendererWindow = _ref.newRendererWindow;
+      // @ts-ignore
+      newRendererWindow.FcrUIMainWindowRenderer = window.FcrUIMainWindowRenderer;
+      // @ts-ignore
+      newRendererWindow.runtime = window.runtime;
+      var mainWindowBounds = window.runtime.browserWindow.getBounds();
+      var nearWindow = window.runtime.screen.getDisplayMatching(mainWindowBounds);
+      var subWindow = window.runtime.screen.getAllDisplays().find(function (display) {
+        return display.id !== nearWindow.id;
+      });
+      if (subWindow) {
+        var _subWindow$bounds = subWindow.bounds,
+          x = _subWindow$bounds.x,
+          y = _subWindow$bounds.y,
+          width = _subWindow$bounds.width,
+          height = _subWindow$bounds.height;
+        browserWindow.setBounds({
+          x: Math.floor(width / 2 - defaultWindowOptions.width / 2) + x,
+          y: Math.floor(height / 2 - defaultWindowOptions.height / 2) + y
+        });
+        browserWindow.maximize();
+        browserWindow.setTitle(window.runtime.browserWindow.getTitle());
+      }
+      // 退出房间后，被关闭窗口是隐藏而不是退出，所以在重新显示时需要重置状态
+      browserWindow.on('show', function () {
+        store.interceptClose = true;
+      });
+    },
+    beforeClose: function beforeClose() {
+      var interception = store.interceptClose;
+      return interception;
+    }
+  });
+  return null;
+};

package/lib/modules/dialog/dialogs/video-window/index.d.ts

@@ -1,2 +1,3 @@
 import { PropsWithChildren } from 'react';
+export declare const title = "Video Window";
 export declare const VideoWindowDialog: ({ children }: PropsWithChildren<{}>) => null;

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

@@ -13,7 +13,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.VideoWindowDialog = void 0;
+exports.title = exports.VideoWindowDialog = void 0;
 require("core-js/modules/es.array.concat.js");
 require("core-js/modules/es.array.for-each.js");
 require("core-js/modules/es.object.to-string.js");
@@ -40,6 +40,7 @@ function changeVideoWindowConfig(browserWindow) {
   browserWindow.setMinimumSize(resizeble ? _type.DefaultVideoWindowWidth : 0, resizeble ? _type.DefaultVideoWindowSmallTypeHeight : 0);
   browserWindow.setMaximumSize(resizeble ? _type.VideoWindowZoomMaxWidth : 0, resizeble ? _type.VideoWindowZoomMaxHeight : 0);
 }
+var title = exports.title = 'Video Window';
 var VideoWindowDialog = exports.VideoWindowDialog = (0, _mobxReact.observer)(function (_ref) {
   var children = _ref.children;
   var store = (0, _react.useContext)(_store.StoreContext);
@@ -54,21 +55,32 @@ var VideoWindowDialog = exports.VideoWindowDialog = (0, _mobxReact.observer)(fun
     }, [videoWindowBounds]),
     height = _useMemo.videoWindowHeight,
     type = _useMemo.videoWindowPreviewType;
-  var setCalcBounds = function setCalcBounds(x, y, width) {
+  var getBoundsPosition = function getBoundsPosition(x, y, width) {
     return {
       x: x + width - _type.DefaultVideoWindowWidth - 144,
-      y: y + 80,
-      width: _type.DefaultVideoWindowWidth,
-      height: _type.DefaultVideoWindowSmallTypeHeight
+      y: y + 80
     };
   };
-  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 = setCalcBounds(x, y, width);
+  var _useMemo2 = (0, _react.useMemo)(function () {
+      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 = _objectSpread(_objectSpread({}, getBoundsPosition(x, y, width)), {}, {
+        width: _type.DefaultVideoWindowWidth,
+        height: _type.DefaultVideoWindowSmallTypeHeight
+      });
+      return {
+        x: x,
+        y: y,
+        initalBounds: initalBounds
+      };
+    }, [currentShareBounds.height, currentShareBounds.width, currentShareBounds.x, currentShareBounds.y]),
+    x = _useMemo2.x,
+    y = _useMemo2.y,
+    initalBounds = _useMemo2.initalBounds;
   var config = _objectSpread(_objectSpread({
-    title: 'Video Window',
+    title: title,
     type: 'panel',
     frame: false,
     fullscreen: false,
@@ -121,24 +133,16 @@ var VideoWindowDialog = exports.VideoWindowDialog = (0, _mobxReact.observer)(fun
             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(setCalcBounds(_x, _y, _width));
-            store.log("[VideoWindowDialog]: [onOpened],  x: ".concat(_x, ", y: ").concat(_y, ", width: ").concat(_width));
+              width = _window$runtime$scree2.width;
+            browserWindow.setBounds(getBoundsPosition(_x, _y, width));
+            store.log("[VideoWindowDialog]: [onOpened],  x: ".concat(_x, ", y: ").concat(_y, ", width: ").concat(width));
           }
         }
         reCalculate();
         calculateRef.current = reCalculate;
-
-        // @ts-ignore
-        window.runtime.screen.addListener('display-metrics-changed', calculateRef.current);
+        window.runtime.screen.addListener('display-metrics-changed', reCalculate);
         window.runtime.screen.addListener('display-removed', reCalculate);
         window.runtime.screen.addListener('display-added', reCalculate);
-        // browserWindow.on(
-        //   'move',
-        //   debounce(() => {
-        //     popoverWatcher(browserWindow, newRendererWindow);
-        //   }, 100),
-        // );
         debounceRef.current = (0, _debounce["default"])(function (event, bounds) {
           setNewBounds(bounds);
           popoverWatcher(browserWindow, newRendererWindow);
@@ -154,8 +158,10 @@ var VideoWindowDialog = exports.VideoWindowDialog = (0, _mobxReact.observer)(fun
         if (!(browserWindow !== null && browserWindow !== void 0 && browserWindow.isDestroyed())) {
           // @ts-ignore
           browserWindow.removeListener('custom-resize', debounceRef.current);
-          // @ts-ignore
-          window.runtime.screen.removeListener('display-metrics-changed', calculateRef.current);
+          var listener = calculateRef.current;
+          window.runtime.screen.removeListener('display-metrics-changed', listener);
+          window.runtime.screen.removeListener('display-removed', listener);
+          window.runtime.screen.removeListener('display-added', listener);
           changeVideoWindowConfig(browserWindow);
           browserWindow.setResizable(false);
           browserWindow.setBounds(initalBounds);

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

@@ -19,7 +19,6 @@ var WhiteboardElectronDialog = exports.WhiteboardElectronDialog = (0, _mobxReact
       node = dom;
       if (browserWindow) {
         browserWindow.focus();
-        console.log('browserWindow', browserWindow);
         // if (newWindow) {
         //   const proxyHandler = {
         //     get(target: Window, prop: any) {

package/lib/modules/dialog/hooks/use-popover-watcher.js

@@ -27,7 +27,7 @@ function usePopoverWatcher(_ref) {
     var browserWindow = _ref2.browserWindow,
       newRendererWindow = _ref2.newRendererWindow;
     if (!newRendererWindow || !browserWindow) {
-      return console.log('newRendererWindow and browserWindow is not inital');
+      return;
     }
     if (observerRef.current) observerRef.current.disconnect();
     var body = newRendererWindow.document.body;
@@ -101,7 +101,6 @@ function calculateThreshold(browserWindow, body) {
   var nearDisplayBounds = nearDisplay.bounds;
   var middleThreshold = nearDisplayBounds.height / 2;
   var placement = bounds.y > middleThreshold ? 'top' : 'bottom';
-  console.log('custom moving', placement, bounds.y);
   (_body$querySelector = body.querySelector('#root')) === null || _body$querySelector === void 0 || _body$querySelector.setAttribute('style', "display: flex;align-items: ".concat(placement === 'top' ? 'flex-end' : 'flex-start'));
   return {
     placement: placement,

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

@@ -3,7 +3,20 @@ export declare const DialogInstanceContext: import("react").Context<{
     browserWindow: Electron.BrowserWindow;
     newRendererWindow: Window;
     resizable: boolean;
+    baseUrl: string;
     closeDialog: () => void;
+    /**
+     * @param continueClose - 继续关闭窗口的回调函数
+     */
+    continueClose: () => void;
+    /**
+     * 窗口关闭时是否已被拦截，此值只反应状态，不会影响继续关闭的逻辑
+     */
+    interceptedClose: boolean;
+    /**
+     * 重置被拦截状态
+     */
+    setInterceptedClose: (interceptedClose: boolean) => void;
 }>;
 export declare const shadowOffset: number;
 export declare const enterFullScreenHandler: () => void;