fcr-ui-scene 3.7.4 → 3.7.6

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

@@ -1,102 +1,38 @@
 "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");
+exports.windowConfig = exports.SubWindowDialog = void 0;
 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 = {
+var _mobxReact = require("mobx-react");
+var _reactDom = require("react-dom");
+var _store = require("../../store.base");
+var title = 'Sub Window';
+var SubWindowDialog = exports.SubWindowDialog = (0, _mobxReact.observer)(function (props) {
+  var dialogKey = props.dialogKey,
+    dialogId = props.dialogId,
+    children = props.children;
+  var _useContext = (0, _react.useContext)(_store.StoreContext),
+    getDialogRootNode = _useContext.getDialogRootNode;
+  var dialogRoot = getDialogRootNode(dialogKey, dialogId);
+  return /*#__PURE__*/(0, _reactDom.createPortal)(children, dialogRoot);
+});
+var windowConfig = exports.windowConfig = {
   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;
+  minHeight: 600,
+  title: title,
+  closable: true,
+  frame: true,
+  transparent: false,
+  backgroundColor: '#ffffff',
+  trafficLightPosition: {
+    x: 10,
+    y: 10
+  },
+  show: false,
+  hasShadow: true
 };

package/lib/modules/dialog/dialogs/system-preference/electron.js

@@ -5,8 +5,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = void 0;
-var _useElectron = require("../../hooks/useElectron");
-var _constant = require("../../../../utilities/constant");
 var DialogContent = function DialogContent(_ref) {
   var children = _ref.children,
     params = _ref.params;
@@ -20,20 +18,21 @@ var DialogContent = function DialogContent(_ref) {
     maxWidth: 620,
     maxHeight: 700
   };
-  (0, _useElectron.useElectronDialog)({
-    dialogKey: _constant.FcrUIDialogKey.SYSTEM_PREFERENCE,
-    config: config,
-    children: children,
-    hasCustomShadow: true,
-    alwaysOnTop: true,
-    onOpened: function onOpened(_ref2) {
-      var setBounds = _ref2.setBounds;
-      setBounds({
-        width: 320,
-        height: (params === null || params === void 0 ? void 0 : params.height) || 355
-      });
-    }
-  });
+  // TODO:
+  // useElectronDialog({
+  //   dialogKey: FcrUIDialogKey.SYSTEM_PREFERENCE,
+  //   config,
+  //   children,
+  //   hasCustomShadow: true,
+  //   alwaysOnTop: true,
+  //   onOpened: ({ setBounds }) => {
+  //     setBounds({
+  //       width: 320,
+  //       height: params?.height || 355,
+  //     });
+  //   },
+  // });
+
   return null;
 };
 var _default = exports["default"] = DialogContent;

package/lib/modules/dialog/dialogs/system-preference/index.css

@@ -7,9 +7,9 @@
   background-color: white;
   width: 100%;
   height: 100%;
-  border-radius: var(--fcr_cornerradius_xxxl);
+  /* border-radius: var(--fcr_cornerradius_xxxl);
   box-shadow: 0 0 15px #00000033;
-  border: 1px solid var(--fcr_ui_scene_line1);
+  border: 1px solid var(--fcr_ui_scene_line1); */
 }
 
 .fcr-system-preference-dialog img {

package/lib/modules/dialog/dialogs/system-preference/index.d.ts

@@ -1,6 +1,7 @@
 import { PropsWithChildren } from 'react';
 import { ButtonStyleType } from 'agora-ui-foundation/lib/components/button';
 import './index.css';
+import { FcrUIDialogProps } from '../../type';
 export type SystemPreferenceDialogContentProps = {
     title: string;
     desc: string;
@@ -11,10 +12,36 @@ export type SystemPreferenceDialogContentProps = {
         withClose: boolean;
         styleType: ButtonStyleType;
     }[];
+    dialogId: string;
 };
-export declare const SystemPreferenceDialog: ({ params, }: PropsWithChildren<{
-    params: SystemPreferenceDialogContentProps & {
-        width: number;
-        height: number;
+type SystemPreferenceDialogProps = PropsWithChildren<FcrUIDialogProps>;
+export declare const SystemPreferenceDialog: ({ dialogKey, dialogId, params, }: SystemPreferenceDialogProps) => import("react/jsx-runtime").JSX.Element;
+export declare const windowConfig: {
+    frame: false;
+    maximizable: false;
+    minimizable: false;
+    fullscreenable: false;
+    trafficLightPosition: {
+        x: number;
+        y: number;
     };
-}>) => import("react/jsx-runtime").JSX.Element;
+    resizable: false;
+    width: number;
+    height: number;
+};
+export declare const revokeHostWindowConfig: {
+    frame: false;
+    maximizable: false;
+    minimizable: false;
+    fullscreenable: false;
+    trafficLightPosition: {
+        x: number;
+        y: number;
+    };
+    resizable: false;
+    width: number;
+    height: number;
+};
+export declare const REVOKE_HOST_HEIGHT = 390;
+export declare const REVOKE_HOST_WIDTH = 320;
+export {};

package/lib/modules/dialog/dialogs/system-preference/index.js

@@ -16,24 +16,21 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.SystemPreferenceDialog = void 0;
+exports.windowConfig = exports.revokeHostWindowConfig = exports.SystemPreferenceDialog = exports.REVOKE_HOST_WIDTH = exports.REVOKE_HOST_HEIGHT = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 require("core-js/modules/es.array.map.js");
 require("core-js/modules/es.object.to-string.js");
 require("core-js/modules/esnext.iterator.constructor.js");
 require("core-js/modules/esnext.iterator.map.js");
 var _react = require("react");
-var _store = require("../../store");
-var _reactRnd = require("react-rnd");
-var _electron = _interopRequireDefault(require("./electron"));
-var _platform = require("../../../../utilities/platform");
+var _store = require("../../store.base");
 var _i18n = require("agora-ui-foundation/lib/i18n");
 var _button = require("agora-ui-foundation/lib/components/button");
-var _env = require("agora-foundation/lib/utilities/env");
 require("./index.css");
 var _bg = _interopRequireDefault(require("./assets/bg1.png"));
 var _bg2 = _interopRequireDefault(require("./assets/bg2.png"));
 var _fcr_png_host = _interopRequireDefault(require("./assets/fcr_png_host.png"));
+var _normalWindow = require("../../components/normal-window");
 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; }
@@ -48,7 +45,7 @@ var SystemPreferenceDialogContent = function SystemPreferenceDialogContent(props
     _props$buttons = props.buttons,
     buttons = _props$buttons === void 0 ? [] : _props$buttons;
   var _useContext = (0, _react.useContext)(_store.StoreContext),
-    closeSystemPreferenceDialog = _useContext.closeSystemPreferenceDialog;
+    handleDialogClose = _useContext.handleDialogClose;
   var images = {
     host: _fcr_png_host["default"],
     video: _bg["default"],
@@ -75,7 +72,9 @@ var SystemPreferenceDialogContent = function SystemPreferenceDialogContent(props
           shape: "rounded",
           onClick: function onClick() {
             var _button$onClick;
-            button.withClose && closeSystemPreferenceDialog();
+            if (button.withClose) {
+              handleDialogClose(props.dialogId);
+            }
             (_button$onClick = button.onClick) === null || _button$onClick === void 0 || _button$onClick.call(button);
           },
           children: button.text
@@ -85,44 +84,54 @@ var SystemPreferenceDialogContent = function SystemPreferenceDialogContent(props
   });
 };
 var SystemPreferenceDialog = exports.SystemPreferenceDialog = function SystemPreferenceDialog(_ref) {
-  var params = _ref.params;
-  var store = (0, _react.useContext)(_store.StoreContext);
-  var containerWidth = window.innerWidth;
-  var containerHeight = window.innerHeight;
-  var _ref2 = (0, _env.isElectron)() ? window.runtime.browserWindow.getBounds() : {
-      x: document.body.offsetLeft,
-      y: document.body.offsetTop
-    },
-    offsetX = _ref2.x,
-    offsetY = _ref2.y;
-  var width = (params === null || params === void 0 ? void 0 : params.width) || 320;
-  var height = (params === null || params === void 0 ? void 0 : params.height) || 387;
-  var x = containerWidth / 2 - width / 2 + ((0, _platform.isWindows)() ? offsetX : 0);
-  var y = containerHeight / 2 - height / 2 + ((0, _platform.isWindows)() ? offsetY : 0);
-  if ((0, _env.isElectron)()) {
-    return /*#__PURE__*/(0, _jsxRuntime.jsx)(_electron["default"], {
-      params: _objectSpread(_objectSpread({}, params), {}, {
-        x: x,
-        y: y
-      }),
-      children: /*#__PURE__*/(0, _jsxRuntime.jsx)(SystemPreferenceDialogContent, _objectSpread({}, params))
+  var dialogKey = _ref.dialogKey,
+    dialogId = _ref.dialogId,
+    params = _ref.params;
+  var body = /*#__PURE__*/(0, _jsxRuntime.jsx)(SystemPreferenceDialogContent, _objectSpread(_objectSpread({}, params), {}, {
+    dialogId: dialogId
+  }));
+  if (params) {
+    return /*#__PURE__*/(0, _jsxRuntime.jsx)(_normalWindow.NormalWindow, {
+      closable: false,
+      width: params.width,
+      height: params.height,
+      dialogKey: dialogKey,
+      dialogId: dialogId,
+      body: body
     });
   }
-  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_store.StoreContext.Provider, {
-    value: store,
-    children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactRnd.Rnd, {
-      "default": {
-        x: x,
-        y: y,
-        width: width,
-        height: height
-      },
-      maxHeight: 700,
-      maxWidth: width,
-      minWidth: width,
-      minHeight: height,
-      bounds: '.fcr-system-preference-dialog',
-      children: /*#__PURE__*/(0, _jsxRuntime.jsx)(SystemPreferenceDialogContent, _objectSpread({}, params))
-    })
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_normalWindow.NormalWindow, {
+    closable: false,
+    dialogKey: dialogKey,
+    dialogId: dialogId,
+    body: body
   });
-};
+};
+var windowConfig = exports.windowConfig = {
+  frame: false,
+  maximizable: false,
+  minimizable: false,
+  fullscreenable: false,
+  trafficLightPosition: {
+    x: 0,
+    y: 0
+  },
+  resizable: false,
+  width: 320,
+  height: 387
+};
+var revokeHostWindowConfig = exports.revokeHostWindowConfig = {
+  frame: false,
+  maximizable: false,
+  minimizable: false,
+  fullscreenable: false,
+  trafficLightPosition: {
+    x: 0,
+    y: 0
+  },
+  resizable: false,
+  width: 320,
+  height: 390
+};
+var REVOKE_HOST_HEIGHT = exports.REVOKE_HOST_HEIGHT = 390;
+var REVOKE_HOST_WIDTH = exports.REVOKE_HOST_WIDTH = 320;

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

@@ -1,3 +1,21 @@
-import { PropsWithChildren } from 'react';
-declare const ToastDialog: ({ children }: PropsWithChildren<{}>) => import("react/jsx-runtime").JSX.Element;
-export default ToastDialog;
+import { FC, PropsWithChildren } from 'react';
+import { FcrUIDialogProps } from '../../type';
+export declare const windowConfig: {
+    maximizable: false;
+    minimizable: false;
+    backgroundColor: string;
+    transparent: true;
+    hiddenInMissionControl: true;
+    hasShadow: false;
+    useContentSize: true;
+    title: string;
+    focusable: false;
+    alwaysOnTop: true;
+    fullscreen: false;
+    frame: false;
+    show: true;
+    skipTaskbar: true;
+};
+type ToastDialogProps = PropsWithChildren<FcrUIDialogProps>;
+export declare const ToastDialog: FC<ToastDialogProps>;
+export {};

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

@@ -4,55 +4,32 @@ require("core-js/modules/es.object.define-property.js");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports["default"] = void 0;
-require("core-js/modules/web.timers.js");
-var _constant = require("../../../../utilities/constant");
-var _useElectron = require("../../hooks/useElectron");
-var _env = require("agora-foundation/lib/utilities/env");
-var _jsxRuntime = require("react/jsx-runtime");
-var config = {
+exports.windowConfig = exports.ToastDialog = void 0;
+var _react = require("react");
+var _reactDom = require("react-dom");
+var _store = require("../../store.base");
+var windowConfig = exports.windowConfig = {
   maximizable: false,
+  minimizable: false,
   backgroundColor: '#00000000',
+  transparent: true,
   hiddenInMissionControl: true,
   hasShadow: false,
   useContentSize: true,
-  minimizable: false,
   title: 'Toast',
   focusable: false,
-  scroll: false,
   alwaysOnTop: true,
   fullscreen: false,
-  show: false,
-  height: 0,
+  frame: false,
+  show: true,
   skipTaskbar: true
 };
-var ToastElectron = function ToastElectron(_ref) {
-  var children = _ref.children;
-  (0, _useElectron.useElectronDialog)({
-    dialogKey: _constant.FcrUIDialogKey.SHOW_TOAST,
-    config: config,
-    children: children,
-    ignoreMouseEvents: true,
-    fullScreen: true,
-    scroll: false,
-    alwaysOnTop: true,
-    polyfills: ['fix-toast-window-flash'],
-    onOpened: function onOpened(_ref2) {
-      var browserWindow = _ref2.browserWindow;
-      setTimeout(function () {
-        browserWindow.show();
-      }, 500);
-    },
-    hasCustomShadow: false
-  });
-  return null;
-};
-var ToastDialog = function ToastDialog(_ref3) {
-  var children = _ref3.children;
-  return (0, _env.isElectron)() ? /*#__PURE__*/(0, _jsxRuntime.jsx)(ToastElectron, {
-    children: children
-  }) : /*#__PURE__*/(0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {
-    children: children
-  });
-};
-var _default = exports["default"] = ToastDialog;
+var ToastDialog = exports.ToastDialog = /*#__PURE__*/(0, _react.memo)(function (_ref) {
+  var dialogId = _ref.dialogId,
+    dialogKey = _ref.dialogKey,
+    children = _ref.children;
+  var _useContext = (0, _react.useContext)(_store.StoreContext),
+    getDialogRootNode = _useContext.getDialogRootNode;
+  var dialogRoot = getDialogRootNode(dialogKey, dialogId);
+  return /*#__PURE__*/(0, _reactDom.createPortal)(children, dialogRoot);
+});

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

@@ -1,3 +1,30 @@
 import { PropsWithChildren } from 'react';
-export declare const title = "Video Window";
-export declare const VideoWindowDialog: ({ children }: PropsWithChildren<{}>) => null;
+import { FcrUIDialogProps } from '../../type';
+import { FcrUIWindow } from '../../../../providers/window/type';
+type VideoWindowDialogProps = PropsWithChildren<FcrUIDialogProps>;
+export declare const VideoWindowDialog: ({ dialogKey, dialogId, children }: VideoWindowDialogProps) => import("react").ReactPortal;
+export declare const windowConfig: {
+    title: string;
+    type: string;
+    frame: false;
+    fullscreen: false;
+    maximizable: false;
+    width: number;
+    height: number;
+    minWidth: number;
+    minHeight: number;
+    maxWidth: number;
+    maxHeight: number;
+    transparent: true;
+    alwaysOnTop: true;
+    hasShadow: false;
+    resizable: true;
+    skipTaskbar: true;
+};
+export declare const setVideoWindowDialogPosition: (screenSharingBounds: FcrUI.FcrUIRectangle, videoWindow: FcrUIWindow) => void;
+/** 使用默认宽度 246 */
+export declare const setVideoWindowDialogSize: (videoWindow: FcrUIWindow, { width, height }: {
+    width?: number;
+    height: number;
+}) => void;
+export {};