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

package/installer/mac/entitlements.mac.plist

@@ -12,5 +12,9 @@
     <true/>
     <key>com.apple.security.device.camera</key>
     <true/>
+    <key>com.apple.security.network.server</key>
+    <true />
+    <key>com.apple.security.network.client</key>
+    <true />
   </dict>
-</plist>
+</plist>

package/lib/base.d.ts

@@ -1,4 +1,6 @@
 import React from 'react';
+import { FcrUIObjectManager } from './object-manager';
+import { RendererCustomEvent } from './runtime';
 export interface FcrUINodeEvent {
     type: string;
     data: unknown;
@@ -8,7 +10,8 @@ export declare abstract class FcrUINode {
     protected rootNode: FcrUIRootNode;
     protected subNodes: FcrUINode[];
     protected isActive: boolean;
-    constructor(parentNode: FcrUINode, rootNode: FcrUIRootNode);
+    protected objectManager: FcrUIObjectManager;
+    constructor(parentNode: FcrUINode);
     addSubNode(node: FcrUINode): void;
     removeNode(node: FcrUINode): void;
     removeAllSubNodes(): void;
@@ -21,7 +24,16 @@ export declare abstract class FcrUINode {
     onNodeReceivedEvent(event: FcrUINodeEvent): void;
 }
 export declare abstract class FcrUIRootNode extends FcrUINode {
-    constructor();
+    constructor(objectManager: FcrUIObjectManager);
+    sendBroadcastEvent(event: FcrUINodeEvent): void;
+}
+export declare class FcrUIGlobalNode extends FcrUIRootNode {
+    private _containerDom;
+    private slots;
+    constructor(objectManager: FcrUIObjectManager);
+    addToSlot(slotName: string, dom: React.ReactNode): void;
+    unmount(): void;
+    mount(): void;
 }
 export declare abstract class FcrBaseUIScene extends FcrUIRootNode {
     protected logger: import("agora-foundation/lib/logger").Logger;
@@ -33,15 +45,12 @@ export declare abstract class FcrBaseUIScene extends FcrUIRootNode {
     private _handleUICrash;
     private _fallbackComponent;
 }
-export declare const registerDependency: (depName: string) => void;
 /**
  * UI Module
  */
 export declare abstract class UIModule extends FcrUINode {
-    protected readonly logger: import("agora-foundation/lib/logger").Logger;
-    constructor(parentNode: FcrUINode, rootNode: FcrUIRootNode);
+    constructor(parentNode: FcrUINode);
     nodeWillActive(): void;
     nodeWillInactive(): void;
-    getComponent(props?: unknown): null | React.JSX.Element | Promise<React.JSX.Element> | React.ReactNode;
     protected onProcessEvent(event: RendererCustomEvent): void;
 }

package/lib/base.js

@@ -9,75 +9,49 @@ require("core-js/modules/es.array.is-array.js");
 require("core-js/modules/es.date.to-primitive.js");
 require("core-js/modules/es.function.bind.js");
 require("core-js/modules/es.function.name.js");
-require("core-js/modules/es.map.js");
 require("core-js/modules/es.number.constructor.js");
 require("core-js/modules/es.object.create.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.reflect.construct.js");
 require("core-js/modules/esnext.function.metadata.js");
-require("core-js/modules/esnext.map.delete-all.js");
-require("core-js/modules/esnext.map.emplace.js");
-require("core-js/modules/esnext.map.every.js");
-require("core-js/modules/esnext.map.filter.js");
-require("core-js/modules/esnext.map.find.js");
-require("core-js/modules/esnext.map.find-key.js");
-require("core-js/modules/esnext.map.includes.js");
-require("core-js/modules/esnext.map.key-of.js");
-require("core-js/modules/esnext.map.map-keys.js");
-require("core-js/modules/esnext.map.map-values.js");
-require("core-js/modules/esnext.map.merge.js");
-require("core-js/modules/esnext.map.reduce.js");
-require("core-js/modules/esnext.map.some.js");
-require("core-js/modules/esnext.map.update.js");
 require("core-js/modules/esnext.symbol.metadata.js");
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.registerDependency = exports.UIModule = exports.FcrUIRootNode = exports.FcrUINode = exports.FcrBaseUIScene = void 0;
+exports.UIModule = exports.FcrUIRootNode = exports.FcrUINode = exports.FcrUIGlobalNode = exports.FcrBaseUIScene = void 0;
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _get2 = _interopRequireDefault(require("@babel/runtime/helpers/get"));
 require("core-js/modules/es.array.concat.js");
 require("core-js/modules/es.array.filter.js");
 require("core-js/modules/es.array.for-each.js");
+require("core-js/modules/es.array.from.js");
 require("core-js/modules/es.array.iterator.js");
 require("core-js/modules/es.array.map.js");
 require("core-js/modules/es.array.push.js");
+require("core-js/modules/es.map.js");
 require("core-js/modules/es.object.to-string.js");
-require("core-js/modules/es.reflect.get.js");
-require("core-js/modules/es.reflect.has.js");
-require("core-js/modules/es.reflect.set.js");
-require("core-js/modules/es.set.js");
 require("core-js/modules/es.string.iterator.js");
 require("core-js/modules/esnext.iterator.constructor.js");
 require("core-js/modules/esnext.iterator.filter.js");
 require("core-js/modules/esnext.iterator.for-each.js");
 require("core-js/modules/esnext.iterator.map.js");
-require("core-js/modules/esnext.set.add-all.js");
-require("core-js/modules/esnext.set.delete-all.js");
-require("core-js/modules/esnext.set.difference.v2.js");
-require("core-js/modules/esnext.set.difference.js");
-require("core-js/modules/esnext.set.every.js");
-require("core-js/modules/esnext.set.filter.js");
-require("core-js/modules/esnext.set.find.js");
-require("core-js/modules/esnext.set.intersection.v2.js");
-require("core-js/modules/esnext.set.intersection.js");
-require("core-js/modules/esnext.set.is-disjoint-from.v2.js");
-require("core-js/modules/esnext.set.is-disjoint-from.js");
-require("core-js/modules/esnext.set.is-subset-of.v2.js");
-require("core-js/modules/esnext.set.is-subset-of.js");
-require("core-js/modules/esnext.set.is-superset-of.v2.js");
-require("core-js/modules/esnext.set.is-superset-of.js");
-require("core-js/modules/esnext.set.join.js");
-require("core-js/modules/esnext.set.map.js");
-require("core-js/modules/esnext.set.reduce.js");
-require("core-js/modules/esnext.set.some.js");
-require("core-js/modules/esnext.set.symmetric-difference.v2.js");
-require("core-js/modules/esnext.set.symmetric-difference.js");
-require("core-js/modules/esnext.set.union.v2.js");
-require("core-js/modules/esnext.set.union.js");
+require("core-js/modules/esnext.map.delete-all.js");
+require("core-js/modules/esnext.map.emplace.js");
+require("core-js/modules/esnext.map.every.js");
+require("core-js/modules/esnext.map.filter.js");
+require("core-js/modules/esnext.map.find.js");
+require("core-js/modules/esnext.map.find-key.js");
+require("core-js/modules/esnext.map.includes.js");
+require("core-js/modules/esnext.map.key-of.js");
+require("core-js/modules/esnext.map.map-keys.js");
+require("core-js/modules/esnext.map.map-values.js");
+require("core-js/modules/esnext.map.merge.js");
+require("core-js/modules/esnext.map.reduce.js");
+require("core-js/modules/esnext.map.some.js");
+require("core-js/modules/esnext.map.update.js");
 require("core-js/modules/web.dom-collections.for-each.js");
 require("core-js/modules/web.dom-collections.iterator.js");
 var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
@@ -86,14 +60,14 @@ var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-var _logger = require("agora-foundation/lib/logger");
-var _logger2 = require("./utilities/logger");
-var _rendererEvent = require("./utilities/renderer-event");
-var _decorator = require("agora-foundation/lib/decorator");
 var _react = _interopRequireDefault(require("react"));
+var _decorator = require("agora-foundation/lib/decorator");
 var _reactErrorBoundary = require("react-error-boundary");
 var _env = require("agora-foundation/lib/utilities/env");
 var _crashFallback = require("agora-ui-foundation/lib/components/crash-fallback");
+var _objectManager = require("./object-manager");
+var _logger = require("./utilities/logger");
+var _reactDom = _interopRequireDefault(require("react-dom"));
 var _jsxRuntime = require("react/jsx-runtime");
 var _UIModule;
 var _initProto;
@@ -106,18 +80,28 @@ function _checkInRHS(e) { if (Object(e) !== e) throw TypeError("right-hand side
 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 FcrUINode = exports.FcrUINode = /*#__PURE__*/function () {
-  function FcrUINode(parentNode, rootNode) {
+  function FcrUINode(parentNode) {
     (0, _classCallCheck2["default"])(this, FcrUINode);
     (0, _defineProperty2["default"])(this, "subNodes", []);
     (0, _defineProperty2["default"])(this, "isActive", false);
-    this.parentNode = parentNode;
-    this.rootNode = rootNode;
+    if (parentNode) {
+      this.parentNode = parentNode;
+      this.rootNode = parentNode.rootNode;
+      this.objectManager = parentNode.objectManager;
+    } else {
+      this.parentNode = this;
+      this.rootNode = this;
+      // @ts-ignore
+      this.objectManager = null;
+    }
   }
   return (0, _createClass2["default"])(FcrUINode, [{
     key: "addSubNode",
     value: function addSubNode(node) {
       this.subNodes.push(node);
-      node.nodeWillActive();
+      if (this.isActive) {
+        node.nodeWillActive();
+      }
     }
   }, {
     key: "removeNode",
@@ -138,21 +122,24 @@ var FcrUINode = exports.FcrUINode = /*#__PURE__*/function () {
   }, {
     key: "nodeWillActive",
     value: function nodeWillActive() {
-      injectDependencies(this.rootNode, this);
-      this.isActive = true;
-      this.onNodeWillActive();
-      this.subNodes.forEach(function (subNode) {
-        subNode.nodeWillActive();
-      });
+      if (!this.isActive) {
+        this.isActive = true;
+        this.onNodeWillActive();
+        this.subNodes.forEach(function (subNode) {
+          subNode.nodeWillActive();
+        });
+      }
     }
   }, {
     key: "nodeWillInactive",
     value: function nodeWillInactive() {
-      this.isActive = false;
-      this.onNodeWillInactive();
-      this.subNodes.forEach(function (subNode) {
-        subNode.nodeWillInactive();
-      });
+      if (this.isActive) {
+        this.isActive = false;
+        this.onNodeWillInactive();
+        this.subNodes.forEach(function (subNode) {
+          subNode.nodeWillInactive();
+        });
+      }
     }
   }, {
     key: "sendBroadcastEvent",
@@ -178,43 +165,95 @@ var FcrUINode = exports.FcrUINode = /*#__PURE__*/function () {
     // sub class should override this method when needed
   }, {
     key: "onNodeReceivedEvent",
-    value: function onNodeReceivedEvent(event) {}
+    value: function onNodeReceivedEvent(event) {
+      this.subNodes.forEach(function (subNode) {
+        subNode.onNodeReceivedEvent(event);
+      });
+    }
   }]);
 }();
-var injectDependencies = function injectDependencies(rootNode, node) {
-  if (rootNode !== null) {
-    registeredDependencies.forEach(function (depName) {
-      if (Reflect.has(rootNode, depName)) {
-        Reflect.set(node, depName, Reflect.get(rootNode, depName));
-      }
-    });
-  }
-};
 var FcrUIRootNode = exports.FcrUIRootNode = /*#__PURE__*/function (_FcrUINode2) {
-  function FcrUIRootNode() {
+  function FcrUIRootNode(objectManager) {
+    var _this;
     (0, _classCallCheck2["default"])(this, FcrUIRootNode);
-    return _callSuper(this, FcrUIRootNode, [null, null]);
+    _this = _callSuper(this, FcrUIRootNode, [null]);
+    _this.rootNode = _this;
+    _this.parentNode = _this;
+    _this.objectManager = objectManager;
+    return _this;
   }
   (0, _inherits2["default"])(FcrUIRootNode, _FcrUINode2);
-  return (0, _createClass2["default"])(FcrUIRootNode);
+  return (0, _createClass2["default"])(FcrUIRootNode, [{
+    key: "sendBroadcastEvent",
+    value: function sendBroadcastEvent(event) {
+      this.subNodes.forEach(function (subNode) {
+        subNode.onNodeReceivedEvent(event);
+      });
+    }
+  }]);
 }(FcrUINode);
-var FcrBaseUIScene = exports.FcrBaseUIScene = /*#__PURE__*/function (_FcrUIRootNode) {
+var FcrUIGlobalNode = exports.FcrUIGlobalNode = /*#__PURE__*/function (_FcrUIRootNode) {
+  function FcrUIGlobalNode(objectManager) {
+    var _this2;
+    (0, _classCallCheck2["default"])(this, FcrUIGlobalNode);
+    _this2 = _callSuper(this, FcrUIGlobalNode, [objectManager]);
+    (0, _defineProperty2["default"])(_this2, "_containerDom", document.createElement('div'));
+    (0, _defineProperty2["default"])(_this2, "slots", new Map());
+    _this2.rootNode = _this2;
+    _this2.parentNode = _this2;
+    _this2.objectManager = objectManager;
+    _this2._containerDom.classList.add('fcr-ui-global-container-node');
+    return _this2;
+  }
+  (0, _inherits2["default"])(FcrUIGlobalNode, _FcrUIRootNode);
+  return (0, _createClass2["default"])(FcrUIGlobalNode, [{
+    key: "addToSlot",
+    value: function addToSlot(slotName, dom) {
+      this.slots.set(slotName, dom);
+    }
+  }, {
+    key: "unmount",
+    value: function unmount() {
+      _reactDom["default"].unmountComponentAtNode(this._containerDom);
+      if (document.body.contains(this._containerDom)) {
+        document.body.removeChild(this._containerDom);
+      }
+    }
+  }, {
+    key: "mount",
+    value: function mount() {
+      var content = Array.from(this.slots.values()).map(function (node, i) {
+        return /*#__PURE__*/(0, _jsxRuntime.jsx)(_react["default"].Fragment, {
+          children: node
+        }, i);
+      });
+      _reactDom["default"].render(/*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+        className: "fcr-ui-global-slots",
+        children: content
+      }), this._containerDom);
+      if (!document.body.contains(this._containerDom)) {
+        document.body.appendChild(this._containerDom);
+      }
+    }
+  }]);
+}(FcrUIRootNode);
+var FcrBaseUIScene = exports.FcrBaseUIScene = /*#__PURE__*/function (_FcrUIRootNode2) {
   function FcrBaseUIScene() {
-    var _this;
+    var _this3;
     (0, _classCallCheck2["default"])(this, FcrBaseUIScene);
     for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
       args[_key] = arguments[_key];
     }
-    _this = _callSuper(this, FcrBaseUIScene, [].concat(args));
-    (0, _defineProperty2["default"])(_this, "logger", (0, _logger.getLogger)());
-    (0, _defineProperty2["default"])(_this, "_fallbackComponent", function () {
+    _this3 = _callSuper(this, FcrBaseUIScene, [].concat(args));
+    (0, _defineProperty2["default"])(_this3, "logger", (0, _logger.getLogger)());
+    (0, _defineProperty2["default"])(_this3, "_fallbackComponent", function () {
       return /*#__PURE__*/(0, _jsxRuntime.jsx)(_crashFallback.FcrCrashFallback, {
-        handleFallback: _this._handleUICrash
+        handleFallback: _this3._handleUICrash
       });
     });
-    return _this;
+    return _this3;
   }
-  (0, _inherits2["default"])(FcrBaseUIScene, _FcrUIRootNode);
+  (0, _inherits2["default"])(FcrBaseUIScene, _FcrUIRootNode2);
   return (0, _createClass2["default"])(FcrBaseUIScene, [{
     key: "renderLayers",
     value: function renderLayers(layers) {
@@ -227,11 +266,11 @@ var FcrBaseUIScene = exports.FcrBaseUIScene = /*#__PURE__*/function (_FcrUIRootN
   }, {
     key: "renderWithErrorBoundary",
     value: function renderWithErrorBoundary(layoutComponent, spaceName) {
-      var _this2 = this;
+      var _this4 = this;
       return /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactErrorBoundary.ErrorBoundary, {
         FallbackComponent: this._fallbackComponent,
         onError: function onError(error, info) {
-          return _this2.logError(error, info, spaceName);
+          return _this4.logError(error, info, spaceName);
         },
         children: /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
           style: {
@@ -253,49 +292,42 @@ var FcrBaseUIScene = exports.FcrBaseUIScene = /*#__PURE__*/function (_FcrUIRootN
     key: "_handleUICrash",
     value: function _handleUICrash() {
       if ((0, _env.isElectron)()) {
-        window.runtime.quitApp();
+        var renderer = this.objectManager.getObject(_objectManager.FcrUIObjectKeys.RENDERER_WRAPPER);
+        renderer.quitApp();
       } else {
         window.location.reload();
       }
     }
   }]);
-}(FcrUIRootNode); // Provider registration
-var registeredDependencies = new Set();
-var registerDependency = exports.registerDependency = function registerDependency(depName) {
-  (0, _logger.getLogger)().info("registger dependency: ".concat(depName));
-  registeredDependencies.add(depName);
-};
-
+}(FcrUIRootNode);
 /**
  * UI Module
  */
 var UIModule = exports.UIModule = /*#__PURE__*/function (_FcrUINode3) {
-  function UIModule(parentNode, rootNode) {
-    var _this3;
+  function UIModule(parentNode) {
+    var _this5;
     (0, _classCallCheck2["default"])(this, UIModule);
-    _this3 = _callSuper(this, UIModule, [parentNode, rootNode]);
-    (0, _defineProperty2["default"])(_this3, "logger", (_initProto(_this3), (0, _logger2.createLogger)({
-      prefix: 'UIModule'
-    })));
-    return _this3;
+    _initProto(_this5 = _callSuper(this, UIModule, [parentNode]));
+    return _this5;
   }
   (0, _inherits2["default"])(UIModule, _FcrUINode3);
   return (0, _createClass2["default"])(UIModule, [{
     key: "nodeWillActive",
     value: function nodeWillActive() {
       _superPropGet(UIModule, "nodeWillActive", this, 3)([]);
-      (0, _rendererEvent.addEventListener)(this.onProcessEvent);
+      if ((0, _env.isElectron)()) {
+        var renderer = this.objectManager.getObject(_objectManager.FcrUIObjectKeys.RENDERER_WRAPPER);
+        renderer.addEventListener(this.onProcessEvent);
+      }
     }
   }, {
     key: "nodeWillInactive",
     value: function nodeWillInactive() {
       _superPropGet(UIModule, "nodeWillInactive", this, 3)([]);
-      (0, _rendererEvent.removeEventListener)(this.onProcessEvent);
-    }
-  }, {
-    key: "getComponent",
-    value: function getComponent(props) {
-      return null;
+      if ((0, _env.isElectron)()) {
+        var renderer = this.objectManager.getObject(_objectManager.FcrUIObjectKeys.RENDERER_WRAPPER);
+        renderer.removeEventListener(this.onProcessEvent);
+      }
     }
   }, {
     key: "onProcessEvent",

package/lib/{creator.d.ts → creator/index.d.ts}

@@ -1,22 +1,22 @@
-import { FcrUISceneCancelCallback, FcrUISceneConfig, FcrUISceneCreatorConfig, FcrUISceneFailureCallback, FcrUISceneSuccessCallback, FcrUISettingConfig, FcrUIWebWidgetConfig } from './type';
-import { FcrUIDefaultScene } from './ui-scene';
-import SettingStore from './modules/setting/store';
-export interface FcrObservableSettingStore {
-    value: SettingStore | null;
-}
+import { FcrUIScene, FcrUISceneCancelCallback, FcrUISceneConfig, FcrUISceneCreatorConfig, FcrUISceneFailureCallback, FcrUISceneSuccessCallback, FcrUISettingConfig, FcrUIWebWidgetConfig } from '../type';
+import { EventToastUIModule } from '../modules/event-toast';
+import { SettingUIModule } from '../modules/setting';
 export declare class FcrUISceneCreator {
     private _config;
-    accessor observableSettingStore: FcrObservableSettingStore;
     protected logger: import("agora-foundation/lib/logger").Logger;
-    private _userSettingStorageProvider;
     private _registeredWidgetConfigs;
+    private _providerInitializer;
     private _released;
     private _scene;
     private _microphoneKeepRecording;
     private _sceneObserver;
+    private _globalNode;
+    private _settingModule;
+    private _eventToastModule;
+    get settingModule(): SettingUIModule;
+    get eventToastModule(): EventToastUIModule;
     constructor(_config: FcrUISceneCreatorConfig);
-    private _initProviders;
-    launch(config: FcrUISceneConfig, onCancel: FcrUISceneCancelCallback, onSuccess: FcrUISceneSuccessCallback, onFailure: FcrUISceneFailureCallback, dom: HTMLElement): FcrUIDefaultScene;
+    launch(config: FcrUISceneConfig, onCancel: FcrUISceneCancelCallback, onSuccess: FcrUISceneSuccessCallback, onFailure: FcrUISceneFailureCallback, dom: HTMLElement): FcrUIScene;
     getSettingConfig(): FcrUISettingConfig;
     registerWidget(config: FcrUIWebWidgetConfig): void;
     unregisterWidget(widgetId: string): void;
@@ -26,11 +26,15 @@ export declare class FcrUISceneCreator {
     getDependencyVersions(): Record<string, string>;
     openSetting(): void;
     closeSetting(): void;
-    private _releaseProviders;
     release(): void;
+    private _setMeetingState;
     private _resetScene;
     private _precheckState;
     private _filterKeepRecordingValueFromParameters;
     private _setKeepRecordingValueFromParameters;
-    private _createSettingStore;
+    private _initDeviceConfig;
+    private _initGlobalModules;
+    private _initGlobalDialogs;
+    private _createEngineConfig;
+    private _createProviderInitializer;
 }