fcr-ui-scene 3.3.0 → 3.4.0

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

@@ -0,0 +1,109 @@
+"use strict";
+
+require("core-js/modules/es.object.define-property.js");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.DialogInstanceContext = void 0;
+exports.useElectronDialog = useElectronDialog;
+require("core-js/modules/es.array.includes.js");
+require("core-js/modules/es.string.includes.js");
+var _react = require("react");
+var _store = require("../store");
+var _dialogs = require("../dialogs");
+var _renderer = require("../../../utilities/renderer");
+var _reactDom = require("react-dom");
+var _jsxRuntime = require("react/jsx-runtime");
+var DialogInstanceContext = exports.DialogInstanceContext = /*#__PURE__*/(0, _react.createContext)(null);
+function useElectronDialog(props) {
+  var store = (0, _react.useContext)(_store.StoreContext);
+  var config = props.config,
+    dialogKey = props.dialogKey,
+    onClose = props.onClose,
+    scroll = props.scroll,
+    _props$focus = props.focus,
+    focus = _props$focus === void 0 ? true : _props$focus,
+    children = props.children,
+    ignoreMouseEvents = props.ignoreMouseEvents,
+    alwaysOnTop = props.alwaysOnTop,
+    fullScreen = props.fullScreen,
+    onOpened = props.onOpened,
+    onUnmounted = props.onUnmounted,
+    polyfills = props.polyfills;
+  var windowRef = (0, _react.useRef)();
+  (0, _react.useEffect)(function () {
+    var node;
+    window.runtime.openRendererWindow(dialogKey, function (dom, browserWindow, newRendererWindow) {
+      var _browserWindow$setBou2;
+      node = dom;
+      windowRef.current = browserWindow;
+      _dialogs.dialogWindows.set(dialogKey, browserWindow);
+      onOpened === null || onOpened === void 0 || onOpened({
+        browserWindow: browserWindow,
+        store: store
+      });
+      var mainAppWindowBounds = window.runtime.browserWindow.getBounds();
+      var thisWindowBounds = browserWindow.getBounds();
+      var nearDisplayBounds = window.runtime.screen.getDisplayNearestPoint(mainAppWindowBounds).bounds;
+      var isFullScreen = window.runtime.browserWindow.isFullScreen();
+      if (!isFullScreen && browserWindow) {
+        var _browserWindow$setBou;
+        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$setBou = browserWindow.setBounds) === null || _browserWindow$setBou === void 0 || _browserWindow$setBou.call(browserWindow, bounds);
+      } else {
+        browserWindow.setVisibleOnAllWorkspaces(true, {
+          visibleOnFullScreen: true,
+          skipTransformProcessType: true
+        });
+      }
+      fullScreen && (browserWindow === null || browserWindow === void 0 || (_browserWindow$setBou2 = browserWindow.setBounds) === null || _browserWindow$setBou2 === void 0 ? void 0 : _browserWindow$setBou2.call(browserWindow, {
+        x: nearDisplayBounds.x,
+        y: (0, _renderer.isWindows)() && polyfills !== null && polyfills !== void 0 && polyfills.includes('fix-toast-window-flash') ? -100 : nearDisplayBounds.y,
+        width: nearDisplayBounds.width,
+        height: (0, _renderer.isWindows)() && polyfills !== null && polyfills !== void 0 && polyfills.includes('fix-toast-window-flash') ? 0 : nearDisplayBounds.height
+      }));
+      if (ignoreMouseEvents) {
+        browserWindow.setIgnoreMouseEvents(true, typeof ignoreMouseEvents === 'boolean' ? {
+          forward: true
+        } : ignoreMouseEvents);
+      }
+      alwaysOnTop && browserWindow.setAlwaysOnTop(true);
+      if (!scroll) {
+        browserWindow.webContents.insertCSS("\n            ::-webkit-scrollbar {\n              display: none;\n            }\n          ");
+      }
+      focus && browserWindow.focus();
+      (0, _renderer.isWindows)() && browserWindow.show(); // 修复 windows 下打开白屏的问题
+
+      (0, _renderer.handleWillClose)(browserWindow, function () {
+        (0, _reactDom.unmountComponentAtNode)(node);
+        _dialogs.dialogWindows["delete"](dialogKey);
+        onClose === null || onClose === void 0 || onClose(store);
+      });
+      (0, _reactDom.render)(/*#__PURE__*/(0, _jsxRuntime.jsx)(_store.StoreContext.Provider, {
+        value: store,
+        children: /*#__PURE__*/(0, _jsxRuntime.jsx)(DialogInstanceContext.Provider, {
+          value: {
+            browserWindow: browserWindow,
+            newRendererWindow: newRendererWindow
+          },
+          children: typeof children === 'function' ? children(browserWindow) : children
+        })
+      }), dom);
+    }, config);
+    return function () {
+      node && (0, _reactDom.unmountComponentAtNode)(node);
+      window.runtime.closeRendererWindow(dialogKey);
+      if (windowRef.current && !windowRef.current.isDestroyed) {
+        windowRef.current.close();
+      }
+      onUnmounted === null || onUnmounted === void 0 || onUnmounted(store);
+    };
+  }, []);
+  return {
+    store: store,
+    browserWindow: windowRef.current
+  };
+}

package/lib/modules/dialog/index.css

@@ -1,6 +1,6 @@
 .dialog-container {
-  background: var(--fcr_mobile_ui_scene_color_popup_fill2);
-  border-radius: var(--fcr_cornerradius_m);
+  /* background: var(--fcr_mobile_ui_scene_color_popup_fill2);
+  border-radius: var(--fcr_cornerradius_m); */
 }
 /* .react-draggable {
   transition: all 0.3s;
@@ -45,6 +45,11 @@
   border-radius: var(--fcr_cornerradius_l);
 }
 
+.invite-dialog .frc-window-header {
+  height: 24px;
+  width: fit-content;
+}
+
 .fcr-confirm-dialog-wrapper {
   background: #fff;
 }

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

@@ -2,11 +2,11 @@ import React from 'react';
 import { UIModule } from '../../base';
 import { FcrUIEventStore } from '../../common/event-store';
 import { FcrSecurityStore } from '../../common/security-store';
-import { FcrUserInfo } from 'agora-edu-core/lib/type';
-import { FcrStreamControl, FcrUserControl } from 'agora-edu-core';
-import { ConfirmContentProps } from 'agora-ui-foundation/lib/components/confirm-content';
+import { FcrUserInfo } from 'fcr-core/lib/type';
+import { FcrStreamControl, FcrUserControl } from 'fcr-core';
 import { FcrDeviceStore } from '../../common/device-store';
-import { FcrChatRoomControl } from 'agora-edu-core/lib/room-control/chatroom-control/type';
+import { FcrChatRoomControl } from 'fcr-core/lib/room-control/chatroom-control/type';
+import { FcrRemoteVideoRenderManager } from '../../common/remote-renderer';
 export declare class DialogUIModule extends UIModule {
     private _dialogs;
     private _store;
@@ -18,12 +18,12 @@ export declare class DialogUIModule extends UIModule {
         chatRoomControl: FcrChatRoomControl;
         deviceStore: FcrDeviceStore;
         streamControl: FcrStreamControl;
+        remoteVideoRenderManager: FcrRemoteVideoRenderManager;
     });
     protected onUnload(): void;
     getComponent(): import("react/jsx-runtime").JSX.Element;
     addDialogs(dialogs: {
         key: string;
-        component: (params?: ConfirmContentProps) => React.JSX.Element;
+        component: (params?: any) => React.JSX.Element;
     }[]): void;
-    protected onProcessEvent(event: RendererCustomEvent): void;
 }

package/lib/modules/dialog/index.js

@@ -1,8 +1,13 @@
 "use strict";
 
 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.reflect.construct.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");
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -39,11 +44,11 @@ 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 = _interopRequireDefault(require("./store"));
+var _store = _interopRequireWildcard(require("./store"));
 var _view = require("./view");
-var _context = require("./context");
-var _constant = require("../../utilities/constant");
 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; }
 function _callSuper(t, o, e) { return o = (0, _getPrototypeOf2["default"])(o), (0, _possibleConstructorReturn2["default"])(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], (0, _getPrototypeOf2["default"])(t).constructor) : o.apply(t, e)); }
 function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
 var DialogUIModule = exports.DialogUIModule = /*#__PURE__*/function (_UIModule) {
@@ -64,7 +69,7 @@ var DialogUIModule = exports.DialogUIModule = /*#__PURE__*/function (_UIModule)
   }, {
     key: "getComponent",
     value: function getComponent() {
-      return /*#__PURE__*/(0, _jsxRuntime.jsx)(_context.StoreContext.Provider, {
+      return /*#__PURE__*/(0, _jsxRuntime.jsx)(_store.StoreContext.Provider, {
         value: this._store,
         children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_view.View, {
           dialogs: this._dialogs
@@ -79,19 +84,5 @@ var DialogUIModule = exports.DialogUIModule = /*#__PURE__*/function (_UIModule)
         _this2._dialogs.set(dialog.key, dialog.component);
       });
     }
-  }, {
-    key: "onProcessEvent",
-    value: function onProcessEvent(event) {
-      var action = event.action,
-        payload = event.payload;
-      switch (action) {
-        case _constant.RendererEventAction.START_SHARE_SCREEN:
-          var _ref = payload,
-            id = _ref.id,
-            type = _ref.type;
-          this._store.setCurrentShareId(id, type);
-          break;
-      }
-    }
   }]);
 }(_base.UIModule);

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

@@ -1,12 +1,13 @@
-import { FcrStreamControl, FcrUserControl } from 'agora-edu-core';
-import { FcrUserInfo } from 'agora-edu-core/lib/type';
+import { FcrStreamControl, FcrUserControl } from 'fcr-core';
+import { FcrUserInfo } from 'fcr-core/lib/type';
 import { FcrUIEventStore } from '../../common/event-store';
 import { FcrSecurityStore } from '../../common/security-store';
 import { DialogKey } from '../../utilities/constant';
 import { Rectangle } from 'electron';
 import { FcrDeviceStore } from '../../common/device-store';
 import { AgoraRtcScreenCaptureType } from 'agora-rte-sdk/lib/core/rtc/type';
-import { FcrChatRoomConnectionState, FcrChatRoomControl } from 'agora-edu-core/lib/room-control/chatroom-control/type';
+import { FcrChatRoomConnectionState, FcrChatRoomControl } from 'fcr-core/lib/room-control/chatroom-control/type';
+import { FcrRemoteVideoRenderManager } from '../../common/remote-renderer';
 export default class DialogStore {
     protected logger: import("agora-foundation/lib/logger").Logger;
     private _currentShareId;
@@ -17,6 +18,7 @@ export default class DialogStore {
     private _streamControl;
     private _userControl;
     private _deviceStore;
+    private _remoteVideoRenderManager;
     private _chatRoomControl;
     private _connnectBeforeCloseDetect;
     private _userObserver;
@@ -25,23 +27,19 @@ export default class DialogStore {
         dialogKey: string;
         dialogId: string;
     }[];
-    accessor connectorContainerBounds: Partial<Rectangle>;
     accessor payloadDialogs: Map<string, unknown>;
+    accessor confirmDialogs: Map<string, unknown>;
     accessor userCount: number;
     accessor participantElectronDialogContainer: HTMLElement | null;
     accessor chatRoomState: FcrChatRoomConnectionState;
-    accessor currentDialogBounds: {
-        x: number;
-        y: number;
-        width: number;
-        height: number;
-    };
+    accessor currentDialogBounds: Partial<Rectangle>;
     accessor videoWindowBounds: any;
     get participantCount(): number;
     get isManager(): boolean;
     get streamControl(): FcrStreamControl;
     get deviceStore(): FcrDeviceStore;
-    constructor({ uiEventStore, userInfo, securityStore, userControl, chatRoomControl, deviceStore, streamControl, }: {
+    get remoteVideoRenderManager(): FcrRemoteVideoRenderManager;
+    constructor({ uiEventStore, userInfo, userControl, chatRoomControl, deviceStore, streamControl, remoteVideoRenderManager, }: {
         uiEventStore: FcrUIEventStore;
         userInfo: FcrUserInfo;
         securityStore: FcrSecurityStore;
@@ -49,12 +47,14 @@ export default class DialogStore {
         chatRoomControl: FcrChatRoomControl;
         streamControl: FcrStreamControl;
         deviceStore: FcrDeviceStore;
+        remoteVideoRenderManager: FcrRemoteVideoRenderManager;
     });
     setParticipantElectronDialogContainer(dom: HTMLElement | null): void;
     setVideoWindowBounds(payload: any): void;
-    closeDeviceSettingFromDialog(): void;
+    closeDialogByKey(dialogKey: DialogKey): void;
+    closeInterpreterDialog(): void;
     setCurrentShareId(id: string, type: AgoraRtcScreenCaptureType): void;
-    setWorkArea(): Promise<{
+    getSharingWorkArea(): Promise<{
         x: number;
         y: number;
         width: number;
@@ -62,15 +62,13 @@ export default class DialogStore {
         displayId: number;
         availTop: number;
     } | undefined>;
-    closeConfirmDialog(): void;
+    closeSystemPreferenceDialog(): void;
     closeChatFromDialog(): void;
     closeWhiteboardDialog(): void;
     closeDialogChat(): void;
     moveChatFromDialogToAside(): void;
-    closeParticipantFromDialog(): void;
     closeLiveStreamingDialog(): void;
     closeConnectionDialog(isUserClose?: boolean): void;
-    closeShareScreenDialog(): void;
     closeInviteDialog(): void;
     moveParticipantFromDialogToAside(): void;
     moveToMainRoomAllMember(isOperate: boolean): void;
@@ -78,9 +76,9 @@ export default class DialogStore {
     closeRemoveAdmitWaitingRoomDialog(dialogKey: DialogKey): void;
     release(): void;
     resizeVideoWindow(width: number, height: number): void;
-    setConnecorContainerBounds(payload: Partial<Rectangle>): void;
-    private _calculateDialogPosition;
+    private _setDialogBounds;
     private _handleDialogEvent;
     private _handleConnectionUpdated;
     private _hanleAllUserCountUpdated;
 }
+export declare const StoreContext: import("react").Context<DialogStore>;