fcr-ui-scene 3.7.2 → 3.7.3

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

@@ -46,14 +46,13 @@ var _stopLiveStreaming = require("./components/stop-live-streaming");
 var _cloudRecordingButtons = require("./components/cloud-recording-buttons");
 var _toast = require("agora-ui-foundation/lib/components/toast");
 var _platform = require("../../utilities/platform");
-var _type = require("fcr-core/lib/type");
 var _deviceControl = _interopRequireDefault(require("../components/device-control"));
 var _meetingDetails = require("./components/meeting-details");
 var _react2 = require("@use-gesture/react");
 var _useElectron = require("../dialog/hooks/useElectron");
 var _enums = require("./enums");
 var _constant = require("../../utilities/constant");
-var _type2 = require("../../type");
+var _type = require("../../type");
 var _annotationButton = require("./components/annotation-button");
 var _dialogUtils = require("../../utilities/dialog-utils");
 var _rendererEvent = require("../../utilities/renderer-event");
@@ -76,13 +75,7 @@ var ControlBarView = exports.ControlBarView = (0, _mobxReact.observer)(function
     setShareAudioProcessingChannel = _useContext2.setShareAudioProcessingChannel,
     createNewShare = _useContext2.createNewShare,
     currentShareId = _useContext2.currentShareId,
-    isSharingScreen = _useContext2.isSharingScreen,
     handleMoreClick = _useContext2.handleMoreClick,
-    liveStreamingState = _useContext2.liveStreamingState,
-    cloudRecordingState = _useContext2.cloudRecordingState,
-    hasStartCloudRecordingPermission = _useContext2.hasStartCloudRecordingPermission,
-    hasStopLiveStreamingPermission = _useContext2.hasStopLiveStreamingPermission,
-    hasAnnotationWritePermission = _useContext2.hasAnnotationWritePermission,
     hasSecurityPermission = _useContext2.hasSecurityPermission,
     isShowMeetingDetailPortal = _useContext2.isShowMeetingDetailPortal,
     setShowMeetingDetailPortal = _useContext2.setShowMeetingDetailPortal,
@@ -95,10 +88,11 @@ var ControlBarView = exports.ControlBarView = (0, _mobxReact.observer)(function
     showLockedRoomToast = _useContext2.showLockedRoomToast,
     checkedStateMap = _useContext2.checkedStateMap,
     setCheckedStateMap = _useContext2.setCheckedStateMap,
-    isAnnotationSupported = _useContext2.isAnnotationSupported,
     log = _useContext2.log,
-    fragmentEngineState = _useContext2.fragmentEngineState,
-    mousePosition = _useContext2.mousePosition;
+    mousePosition = _useContext2.mousePosition,
+    annotationButtonVisible = _useContext2.annotationButtonVisible,
+    liveStreamingButtonVisible = _useContext2.liveStreamingButtonVisible,
+    recordingButtonVisible = _useContext2.recordingButtonVisible;
   // 控制栏本身的高度
   var NAV_HEIGHT = 84;
   // 鼠标移开后自动隐藏的时间
@@ -396,54 +390,12 @@ var ControlBarView = exports.ControlBarView = (0, _mobxReact.observer)(function
       }
     }
   }, [mousePosition]);
-
-  // useEffect(() => {
-  //   console.log('isReplaceScreen', isReplaceScreen);
-  //   return () => {
-  //     if (isReplaceScreen) {
-  //       const mainWindowVisible = window.runtime.browserWindow.isVisible();
-  //       log(
-  //         `[ControlBarView]:[screen-share]: control bar is destroying, main window is ${mainWindowVisible ? 'visible' : 'hidden'}, isReplaceScreen: ${isReplaceScreen}`,
-  //       );
-  //       // 当 control bar 卸载时，看看主窗口是否隐藏，如果隐藏，则显示主窗口
-  //       if (!mainWindowVisible) {
-  //         window.runtime.browserWindow.show();
-  //         log(
-  //           `[ControlBarView]:[screen-share]: main window is hiding at control bar destroyed, show main window`,
-  //         );
-  //       }
-  //       // 当 control bar 卸载时，看看 controlbar 的 window 是否仍然存在 ，如果存在则隐藏
-  //       if (browserWindow.isVisible()) {
-  //         browserWindow.hide();
-  //         log(
-  //           `[ControlBarView]:[screen-share]: control bar window is showing at control bar destroyed, hide control bar window`,
-  //         );
-  //       }
-  //     }
-  //   };
-  // }, [isReplaceScreen]);
-
-  // useEffect(() => {
-  //   return () => {
-  //     log(
-  //       `[ControlBarView]:[screen-share]: control bar is destroying, sharing state is ${isSharingScreen ? 'sharing' : 'not sharing'}`,
-  //     );
-  //     // 如果 controlbar 销毁后共享状态仍然进行，则再次尝试停止共享
-  //     if (isSharingScreen) {
-  //       handlerStopShare();
-  //     }
-  //   };
-  // }, [isSharingScreen]);
-
   (0, _react.useEffect)(function () {
     browserWindow.on('blur', handleBlur);
     return function () {
       browserWindow.off('blur', handleBlur);
     };
   }, [browserWindow]);
-  (0, _react.useEffect)(function () {
-    log("[ControlBarView]: render check => \n      hasAnnotationWritePermission: ".concat(hasAnnotationWritePermission, ", \n      fragmentEngineState: ").concat(fragmentEngineState, ", \n      isAnnotationSupported: ").concat(isAnnotationSupported()));
-  }, [hasAnnotationWritePermission, fragmentEngineState]);
   return currentShareId ? /*#__PURE__*/(0, _jsxRuntime.jsx)("div", _objectSpread(_objectSpread({}, bind()), {}, {
     style: {
       width: 'fit-content',
@@ -516,8 +468,8 @@ var ControlBarView = exports.ControlBarView = (0, _mobxReact.observer)(function
               }
             }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_shareScreenButton.ShareScreenButton, {
               onCreateNewShareButtonClick: createNewShare
-            }), hasAnnotationWritePermission && isAnnotationSupported() && fragmentEngineState === _type.FcrConnectionState.CONNECTED && /*#__PURE__*/(0, _jsxRuntime.jsx)(_annotationButton.AnnotationButton, {}), hasStopLiveStreamingPermission && liveStreamingState === _type.FcrLiveStreamingState.STARTED && /*#__PURE__*/(0, _jsxRuntime.jsx)(_stopLiveStreaming.StopLiveStreamingButton, {}), hasStartCloudRecordingPermission && cloudRecordingState !== _type.FcrRecordingState.Stopped && /*#__PURE__*/(0, _jsxRuntime.jsx)(_cloudRecordingButtons.CloudRecordingButtons, {}), /*#__PURE__*/(0, _jsxRuntime.jsx)(_badge.FcrBadge, {
-              count: newMessageCount[_type2.FcrUIRoomType.MAIN_ROOM] || 0,
+            }), annotationButtonVisible && /*#__PURE__*/(0, _jsxRuntime.jsx)(_annotationButton.AnnotationButton, {}), liveStreamingButtonVisible && /*#__PURE__*/(0, _jsxRuntime.jsx)(_stopLiveStreaming.StopLiveStreamingButton, {}), recordingButtonVisible && /*#__PURE__*/(0, _jsxRuntime.jsx)(_cloudRecordingButtons.CloudRecordingButtons, {}), /*#__PURE__*/(0, _jsxRuntime.jsx)(_badge.FcrBadge, {
+              count: newMessageCount[_type.FcrUIRoomType.MAIN_ROOM] || 0,
               children: /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
                 onClick: function onClick(e) {
                   return e.stopPropagation();

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,7 +5,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.setBounds = exports.config = exports.ControlBarDialog = void 0;
+exports.title = exports.setBounds = exports.config = exports.ControlBarDialog = void 0;
 require("core-js/modules/web.timers.js");
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
@@ -17,6 +17,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 +28,7 @@ var config = exports.config = {
   useContentSize: true,
   minimizable: false,
   resizable: false,
-  title: 'Control Bar',
+  title: title,
   type: 'panel',
   skipTaskbar: true
 };
@@ -36,7 +37,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 +73,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,6 +85,12 @@ var ControlBarDialog = exports.ControlBarDialog = (0, _mobxReact.observer)(funct
     browserWindow = _useElectronDialog.browserWindow;
   (0, _react.useEffect)(function () {
     setBoundsWithNewAppWindows(browserWindow);
+
+    // 多屏模式下， 如果屏幕共享和主窗口在同一个显示器，需要将主窗口移动到排序最小的显示器上
+    // 第一次发起共享和发起新的共享时，都需要判断是否需要移动主窗口
+    if (isMultiDisplayActive) {
+      moveMainWindowToIndexLeastDisplay();
+    }
   }, [currentShareId]);
   return null;
 });

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,98 @@
+"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());
+      }
+    },
+    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);
@@ -68,7 +69,7 @@ var VideoWindowDialog = exports.VideoWindowDialog = (0, _mobxReact.observer)(fun
     width = _window$runtime$scree.width;
   var initalBounds = setCalcBounds(x, y, width);
   var config = _objectSpread(_objectSpread({
-    title: 'Video Window',
+    title: title,
     type: 'panel',
     frame: false,
     fullscreen: false,

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;

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

@@ -15,6 +15,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.shadowOffset = exports.leaveFullScreenHandler = exports.enterFullScreenHandler = exports.DialogInstanceContext = void 0;
 exports.useElectronDialog = useElectronDialog;
+var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 require("core-js/modules/es.array.concat.js");
@@ -23,9 +25,11 @@ require("core-js/modules/es.array.includes.js");
 require("core-js/modules/es.date.to-json.js");
 require("core-js/modules/es.json.stringify.js");
 require("core-js/modules/es.object.to-string.js");
+require("core-js/modules/es.promise.js");
 require("core-js/modules/es.string.includes.js");
 require("core-js/modules/esnext.iterator.constructor.js");
 require("core-js/modules/esnext.iterator.for-each.js");
+require("core-js/modules/esnext.promise.with-resolvers.js");
 require("core-js/modules/web.dom-collections.for-each.js");
 var _react = require("react");
 var _store = require("../store");
@@ -34,6 +38,7 @@ var _reactDom = require("react-dom");
 var _levelConfig = require("../level-config");
 var _dialogUtils = require("../../../utilities/dialog-utils");
 var _constant = require("../../../utilities/constant");
+var _mobx = require("mobx");
 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; }
@@ -68,7 +73,8 @@ function useElectronDialog(props) {
     _props$hasCustomShado = props.hasCustomShadow,
     hasCustomShadow = _props$hasCustomShado === void 0 ? true : _props$hasCustomShado,
     _props$disableShortcu = props.disableShortcutClose,
-    disableShortcutClose = _props$disableShortcu === void 0 ? false : _props$disableShortcu;
+    disableShortcutClose = _props$disableShortcu === void 0 ? false : _props$disableShortcu,
+    beforeClose = props.beforeClose;
   var dialogIdOrKey = dialogId || dialogKey;
   var windowRef = (0, _react.useRef)();
   var newRendernerWindowRef = (0, _react.useRef)();
@@ -89,7 +95,7 @@ function useElectronDialog(props) {
   });
   (0, _react.useEffect)(function () {
     var node;
-    window.runtime.openRendererWindow(dialogIdOrKey, function (dom, browserWindow, newRendererWindow) {
+    window.runtime.openRendererWindow(dialogIdOrKey, function (dom, browserWindow, newRendererWindow, baseUrl) {
       node = dom;
       windowRef.current = browserWindow;
       newRendernerWindowRef.current = newRendererWindow;
@@ -170,7 +176,11 @@ function useElectronDialog(props) {
       }
       focus && browserWindow.focus();
       store === null || store === void 0 || store.log("[useElectronDialog][dialog]: dialog ".concat(dialogIdOrKey, " focused"));
-      (0, _renderer.handleWillClose)(browserWindow, function () {
+      var _Promise$withResolver = Promise.withResolvers(),
+        promise = _Promise$withResolver.promise,
+        resolve = _Promise$withResolver.resolve;
+      function continueClose() {
+        store === null || store === void 0 || store.log("[useElectronDialog][dialog]: continueClose");
         (0, _reactDom.unmountComponentAtNode)(node);
         if (dialogId) {
           store.closeDilaogByDialogId(dialogId);
@@ -180,20 +190,60 @@ function useElectronDialog(props) {
         }
         onClose === null || onClose === void 0 || onClose({
           store: store,
-          browserWindow: browserWindow
+          browserWindow: browserWindow,
+          newRendererWindow: newRendererWindow
         });
+        return true;
+      }
+      var dialogInstanceValue = (0, _mobx.observable)({
+        browserWindow: browserWindow,
+        newRendererWindow: newRendererWindow,
+        resizable: !!customConfigs.resizable,
+        baseUrl: baseUrl,
+        closeDialog: function closeDialog() {
+          dialogId ? store.closeDilaogByDialogId(dialogId) : store.closeDialogByKey(dialogKey);
+        },
+        continueClose: function continueClose() {
+          return resolve(false);
+        },
+        interceptedClose: false,
+        setInterceptedClose: function setInterceptedClose(interceptedClose) {
+          dialogInstanceValue.interceptedClose = interceptedClose;
+        }
       });
+      (0, _renderer.handleWillClose)(browserWindow, /*#__PURE__*/(0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee() {
+        var interception;
+        return _regenerator["default"].wrap(function (_context) {
+          while (1) switch (_context.prev = _context.next) {
+            case 0:
+              interception = (beforeClose === null || beforeClose === void 0 ? void 0 : beforeClose({
+                store: store,
+                browserWindow: browserWindow,
+                newRendererWindow: newRendererWindow,
+                continueClose: function continueClose() {
+                  return resolve(false);
+                }
+              })) || false;
+              dialogInstanceValue.setInterceptedClose(interception);
+              if (!interception) {
+                _context.next = 1;
+                break;
+              }
+              _context.next = 1;
+              return promise;
+            case 1:
+              continueClose();
+              return _context.abrupt("return", false);
+            case 2:
+            case "end":
+              return _context.stop();
+          }
+        }, _callee);
+      })));
       (0, _reactDom.render)(/*#__PURE__*/(0, _jsxRuntime.jsx)(_store.StoreContext.Provider, {
         value: store,
         children: /*#__PURE__*/(0, _jsxRuntime.jsx)(DialogInstanceContext.Provider, {
-          value: {
-            browserWindow: browserWindow,
-            newRendererWindow: newRendererWindow,
-            resizable: !!customConfigs.resizable,
-            closeDialog: function closeDialog() {
-              return dialogId ? store.closeDilaogByDialogId(dialogId) : store.closeDialogByKey(dialogKey);
-            }
-          },
+          value: dialogInstanceValue,
           children: typeof children === 'function' ? children(browserWindow) : children
         })
       }), dom);

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

@@ -3,7 +3,7 @@ import { FcrUIDeviceProvider } from '../../providers/device-provider';
 import { FcrStreamControl, FcrUserControl } from 'fcr-core';
 import { FcrChatRoomControl } from 'fcr-core/lib/room-control/chatroom-control/type';
 import { FcrUIEventProvider } from '../../providers/event-provider';
-import { FcrUICurrentRoomControlProvider, FcrUIMainRoomControlProvider, FcrUIWaitingRoomControlProvider } from '../../providers/room-provider';
+import { FcrUICurrentRoomControlProvider, FcrUIMainRoomControlProvider, FcrUIRoomProvider, FcrUIWaitingRoomControlProvider } from '../../providers/room-provider';
 import { FcrUISharedLayoutDataSource } from '../../shared-data-source/layout-data';
 import { FcrUILocalVideoRenderProvider, FcrUIRemoteVideoRenderProvider } from '../../providers/renderer-provider';
 import { FcrUIPrivilegeProvider } from '../../providers/privilege-provider';
@@ -13,10 +13,11 @@ import { FcrUIAbilityProviderImpl } from '../../providers/ability-provider';
 import { FcrUIDialogInfo } from './type';
 import { FcrUIWidgetProvider } from '../../providers/widget-provider';
 import { FcrUIChatProvider } from '../../providers/chat-provider';
-import { FcrUIScreenShareProvider } from '../../providers/screen-share-provider';
 import { FcrUIScreenShareSharedDataSource } from '../../shared-data-source/screen-share-data';
 import { FcrUISharedConfirmDataSource } from '../../shared-data-source/confirm-data';
 import { FcrUIAnnotationProvider } from '../../providers/annotation-provider';
+import { FcrUIMultiDisplayProvider } from '../../providers/multi-display-provider';
+import { FcrUISharedSettingDataSource } from '../../shared-data-source/setting';
 export declare class DialogUIModule extends UIModule {
     private _dialogsByKey;
     private _store?;
@@ -35,12 +36,14 @@ export declare class DialogUIModule extends UIModule {
     mainRoomControlProvider?: FcrUIMainRoomControlProvider;
     waitingRoomControlProvider?: FcrUIWaitingRoomControlProvider;
     widgetProvider?: FcrUIWidgetProvider;
-    screenShareProvider: FcrUIScreenShareProvider;
     sharedScreenShareSharedDataSource: FcrUIScreenShareSharedDataSource;
     sharedConfirmDataSource: FcrUISharedConfirmDataSource;
     chatProvider?: FcrUIChatProvider;
     abilityProvider?: FcrUIAbilityProviderImpl;
     annotationProvider?: FcrUIAnnotationProvider;
+    multiDisplayProvider?: FcrUIMultiDisplayProvider;
+    roomProvider?: FcrUIRoomProvider;
+    sharedSettingDataSource?: FcrUISharedSettingDataSource;
     onNodeWillActive(): void;
     onNodeWillInactive(): void;
     getComponent(): import("react/jsx-runtime").JSX.Element;

package/lib/modules/dialog/index.js

@@ -68,7 +68,7 @@ var DialogUIModule = exports.DialogUIModule = /*#__PURE__*/function (_UIModule)
       var _this$currentRoomCont, _this$currentRoomCont2;
       this.streamControl = (_this$currentRoomCont = this.currentRoomControlProvider) === null || _this$currentRoomCont === void 0 ? void 0 : _this$currentRoomCont.currentRoomControl.getStreamControl();
       this.userControl = (_this$currentRoomCont2 = this.currentRoomControlProvider) === null || _this$currentRoomCont2 === void 0 ? void 0 : _this$currentRoomCont2.currentRoomControl.getUserControl();
-      if (this.userControl && this.deviceProvider && this.streamControl && this.remoteVideoRenderProvider && this.eventProvider && this.localVideoRenderProvider && this.sharedLayoutDataSource && this.dialogProvider && this.phoneAudioConnectorProvider && this.widgetProvider && this.chatProvider && this.abilityProvider && this.sharedConfirmDataSource && this.annotationProvider) {
+      if (this.userControl && this.deviceProvider && this.streamControl && this.remoteVideoRenderProvider && this.eventProvider && this.localVideoRenderProvider && this.sharedLayoutDataSource && this.dialogProvider && this.phoneAudioConnectorProvider && this.widgetProvider && this.chatProvider && this.abilityProvider && this.sharedConfirmDataSource && this.annotationProvider && this.roomProvider && this.sharedSettingDataSource) {
         var _this$currentRoomCont3, _this$mainRoomControl, _this$waitingRoomCont;
         this._store = new _store["default"]({
           userControl: this.userControl,
@@ -85,10 +85,12 @@ var DialogUIModule = exports.DialogUIModule = /*#__PURE__*/function (_UIModule)
           widgetProvider: this.widgetProvider,
           chatProvider: this.chatProvider,
           abilityProvider: this.abilityProvider,
-          screenShareProvider: this.screenShareProvider,
           sharedScreenShareSharedDataSource: this.sharedScreenShareSharedDataSource,
           sharedConfirmDataSource: this.sharedConfirmDataSource,
-          annotationProvider: this.annotationProvider
+          annotationProvider: this.annotationProvider,
+          multiDisplayProvider: this.multiDisplayProvider,
+          roomProvider: this.roomProvider,
+          sharedSettingDataSource: this.sharedSettingDataSource
         });
       }
     }