fcr-ui-scene 3.7.4 → 3.7.5

package/lib/modules/widget/index.js

@@ -3,8 +3,6 @@
 require("core-js/modules/es.symbol.js");
 require("core-js/modules/es.symbol.description.js");
 require("core-js/modules/es.symbol.to-primitive.js");
-require("core-js/modules/es.error.cause.js");
-require("core-js/modules/es.error.to-string.js");
 require("core-js/modules/es.array.is-array.js");
 require("core-js/modules/es.array.iterator.js");
 require("core-js/modules/es.array.push.js");
@@ -19,7 +17,6 @@ require("core-js/modules/es.object.get-own-property-descriptor.js");
 require("core-js/modules/es.object.to-string.js");
 require("core-js/modules/es.reflect.construct.js");
 require("core-js/modules/es.string.iterator.js");
-require("core-js/modules/es.weak-map.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");
@@ -36,8 +33,6 @@ 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");
-require("core-js/modules/esnext.weak-map.delete-all.js");
-require("core-js/modules/esnext.weak-map.emplace.js");
 require("core-js/modules/web.dom-collections.iterator.js");
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 var _typeof = require("@babel/runtime/helpers/typeof");
@@ -45,6 +40,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.WebWidgetUIModule = void 0;
+require("core-js/modules/es.error.cause.js");
+require("core-js/modules/es.error.to-string.js");
 require("core-js/modules/es.array.concat.js");
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
@@ -56,11 +53,13 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 var _decorator = require("agora-foundation/lib/decorator");
 var _base = require("../../base");
 var _view = require("./view");
-var _store = _interopRequireWildcard(require("./store"));
+var _store = require("./store.base");
+var _env = require("agora-foundation/lib/utilities/env");
+var _store2 = require("./store.electron");
+var _store3 = require("./store.browser");
 var _jsxRuntime = require("react/jsx-runtime");
 var _WebWidgetUIModule;
 var _initProto;
-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 _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; })(); }
 function _applyDecs(e, t, r, n, o, a) { function i(e, t, r) { return function (n, o) { return r && r(n), e[t].call(n, o); }; } function c(e, t) { for (var r = 0; r < e.length; r++) e[r].call(t); return t; } function s(e, t, r, n) { if ("function" != typeof e && (n || void 0 !== e)) throw new TypeError(t + " must " + (r || "be") + " a function" + (n ? "" : " or undefined")); return e; } function applyDec(e, t, r, n, o, a, c, u, l, f, p, d, h) { function m(e) { if (!h(e)) throw new TypeError("Attempted to access private element on non-instance"); } var y, v = t[0], g = t[3], b = !u; if (!b) { r || Array.isArray(v) || (v = [v]); var w = {}, S = [], A = 3 === o ? "get" : 4 === o || d ? "set" : "value"; f ? (p || d ? w = { get: _setFunctionName(function () { return g(this); }, n, "get"), set: function set(e) { t[4](this, e); } } : w[A] = g, p || _setFunctionName(w[A], n, 2 === o ? "" : A)) : p || (w = Object.getOwnPropertyDescriptor(e, n)); } for (var P = e, j = v.length - 1; j >= 0; j -= r ? 2 : 1) { var D = v[j], E = r ? v[j - 1] : void 0, I = {}, O = { kind: ["field", "accessor", "method", "getter", "setter", "class"][o], name: n, metadata: a, addInitializer: function (e, t) { if (e.v) throw Error("attempted to call addInitializer after decoration was finished"); s(t, "An initializer", "be", !0), c.push(t); }.bind(null, I) }; try { if (b) (y = s(D.call(E, P, O), "class decorators", "return")) && (P = y);else { var k, F; O["static"] = l, O["private"] = f, f ? 2 === o ? k = function k(e) { return m(e), w.value; } : (o < 4 && (k = i(w, "get", m)), 3 !== o && (F = i(w, "set", m))) : (k = function k(e) { return e[n]; }, (o < 2 || 4 === o) && (F = function F(e, t) { e[n] = t; })); var N = O.access = { has: f ? h.bind() : function (e) { return n in e; } }; if (k && (N.get = k), F && (N.set = F), P = D.call(E, d ? { get: w.get, set: w.set } : w[A], O), d) { if ("object" == _typeof(P) && P) (y = s(P.get, "accessor.get")) && (w.get = y), (y = s(P.set, "accessor.set")) && (w.set = y), (y = s(P.init, "accessor.init")) && S.push(y);else if (void 0 !== P) throw new TypeError("accessor decorators must return an object with get, set, or init properties or void 0"); } else s(P, (p ? "field" : "method") + " decorators", "return") && (p ? S.push(P) : w[A] = P); } } finally { I.v = !0; } } return (p || d) && u.push(function (e, t) { for (var r = S.length - 1; r >= 0; r--) t = S[r].call(e, t); return t; }), p || b || (f ? d ? u.push(i(w, "get"), i(w, "set")) : u.push(2 === o ? w[A] : i.call.bind(w[A])) : Object.defineProperty(e, n, w)), P; } function u(e, t) { return Object.defineProperty(e, Symbol.metadata || Symbol["for"]("Symbol.metadata"), { configurable: !0, enumerable: !0, value: t }); } if (arguments.length >= 6) var l = a[Symbol.metadata || Symbol["for"]("Symbol.metadata")]; var f = Object.create(null == l ? null : l), p = function (e, t, r, n) { var o, a, i = [], s = function s(t) { return _checkInRHS(t) === e; }, u = new Map(); function l(e) { e && i.push(c.bind(null, e)); } for (var f = 0; f < t.length; f++) { var p = t[f]; if (Array.isArray(p)) { var d = p[1], h = p[2], m = p.length > 3, y = 16 & d, v = !!(8 & d), g = 0 == (d &= 7), b = h + "/" + v; if (!g && !m) { var w = u.get(b); if (!0 === w || 3 === w && 4 !== d || 4 === w && 3 !== d) throw Error("Attempted to decorate a public method/accessor that has the same name as a previously decorated public method/accessor. This is not currently supported by the decorators plugin. Property name was: " + h); u.set(b, !(d > 2) || d); } applyDec(v ? e : e.prototype, p, y, m ? "#" + h : _toPropertyKey(h), d, n, v ? a = a || [] : o = o || [], i, v, m, g, 1 === d, v && m ? s : r); } } return l(o), l(a), i; }(e, t, o, f); return r.length || u(e, f), { e: p, get c() { var t = []; return r.length && [u(applyDec(e, [r], n, e.name, 5, f, t), f), c.bind(null, t, e)]; } }; }
@@ -76,22 +75,31 @@ var WebWidgetUIModule = exports.WebWidgetUIModule = /*#__PURE__*/function (_UIMo
       args[_key] = arguments[_key];
     }
     _this = _callSuper(this, WebWidgetUIModule, [].concat(args));
-    (0, _defineProperty2["default"])(_this, "_store", void _initProto(_this));
+    (0, _defineProperty2["default"])(_this, "_store", (_initProto(_this), null));
     return _this;
   }
   (0, _inherits2["default"])(WebWidgetUIModule, _UIModule);
   return (0, _createClass2["default"])(WebWidgetUIModule, [{
+    key: "store",
+    get: function get() {
+      if (!this._store) {
+        throw new Error('WebWidgetStore is not initialized');
+      }
+      return this._store;
+    }
+  }, {
     key: "onNodeWillActive",
     value: function onNodeWillActive() {
-      this._store = new _store["default"]({
-        widgetProvider: this.widgetProvider
-      });
+      var objectManager = this.objectManager;
+      var args = {
+        objectManager: objectManager
+      };
+      this._store = (0, _env.isElectron)() ? new _store2.WebWidgetStore(args) : new _store3.WebWidgetStore(args);
     }
   }, {
     key: "nodeWillInactive",
     value: function nodeWillInactive() {
-      var _this$_store;
-      (_this$_store = this._store) === null || _this$_store === void 0 || _this$_store.release();
+      this.store.release();
     }
   }, {
     key: "getComponent",
@@ -99,7 +107,7 @@ var WebWidgetUIModule = exports.WebWidgetUIModule = /*#__PURE__*/function (_UIMo
       return /*#__PURE__*/(0, _jsxRuntime.jsx)(_store.StoreContext.Provider, {
         value: {
           widgetConfig: params,
-          store: this._store
+          store: this.store
         },
         children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_view.WebWidgetView, {})
       });

package/lib/modules/widget/sdk.js

@@ -122,7 +122,7 @@ var FcrUIWidgetSDKImpl = exports.FcrUIWidgetSDKImpl = /*#__PURE__*/function () {
           }
         } else {
           this.logger.debug('sendRequest + postMessage: ', params);
-          window.parent.postMessage(params, '*');
+          window.postMessage(params, '*');
         }
       } catch (error) {
         this.logger.error('Error sending request:', error);

package/lib/modules/widget/store.base.d.ts

@@ -0,0 +1,14 @@
+import { FcrUIWidgetProvider } from '../../providers/widget-provider';
+import { FcrUIWebWidgetConfig } from '../../type';
+import { WebWidgetStoreArgs } from './type';
+import { FcrUIManagedObject } from '../../object-manager';
+export declare abstract class WebWidgetStoreBase implements FcrUIManagedObject {
+    protected _widgetProvider: FcrUIWidgetProvider;
+    constructor({ objectManager }: WebWidgetStoreArgs);
+    get openedWidgets(): Map<string, import("./type").FcrUIWebWidget>;
+    release(): void;
+}
+export declare const StoreContext: import("react").Context<{
+    widgetConfig: FcrUIWebWidgetConfig;
+    store: WebWidgetStoreBase;
+}>;

package/lib/modules/widget/store.base.js

@@ -0,0 +1,30 @@
+"use strict";
+
+require("core-js/modules/es.object.define-property.js");
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.WebWidgetStoreBase = exports.StoreContext = void 0;
+var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
+var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
+var _react = require("react");
+var _objectManager = require("../../object-manager");
+var WebWidgetStoreBase = exports.WebWidgetStoreBase = /*#__PURE__*/function () {
+  function WebWidgetStoreBase(_ref) {
+    var objectManager = _ref.objectManager;
+    (0, _classCallCheck2["default"])(this, WebWidgetStoreBase);
+    var widgetProvider = objectManager.getObject(_objectManager.FcrUIObjectKeys.P_WIDGET_PROVIDER);
+    this._widgetProvider = widgetProvider;
+  }
+  return (0, _createClass2["default"])(WebWidgetStoreBase, [{
+    key: "openedWidgets",
+    get: function get() {
+      return this._widgetProvider.openedWidgets;
+    }
+  }, {
+    key: "release",
+    value: function release() {}
+  }]);
+}(); // #endregion
+var StoreContext = exports.StoreContext = /*#__PURE__*/(0, _react.createContext)(null);

package/lib/modules/widget/store.browser.d.ts

@@ -0,0 +1,5 @@
+import { WebWidgetStoreArgs } from './type';
+import { WebWidgetStoreBase } from './store.base';
+export declare class WebWidgetStore extends WebWidgetStoreBase {
+    constructor(args: WebWidgetStoreArgs);
+}

package/lib/modules/widget/store.browser.js

@@ -0,0 +1,25 @@
+"use strict";
+
+require("core-js/modules/es.object.define-property.js");
+require("core-js/modules/es.reflect.construct.js");
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.WebWidgetStore = void 0;
+var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
+var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
+var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
+var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
+var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
+var _store = require("./store.base");
+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 WebWidgetStore = exports.WebWidgetStore = /*#__PURE__*/function (_WebWidgetStoreBase) {
+  function WebWidgetStore(args) {
+    (0, _classCallCheck2["default"])(this, WebWidgetStore);
+    return _callSuper(this, WebWidgetStore, [args]);
+  }
+  (0, _inherits2["default"])(WebWidgetStore, _WebWidgetStoreBase);
+  return (0, _createClass2["default"])(WebWidgetStore);
+}(_store.WebWidgetStoreBase);

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

@@ -1,10 +1,13 @@
-import { FcrUIWidgetProvider } from '../../providers/widget-provider';
 import { FcrUIWebWidgetConfig } from '../../type';
-export default class WebWidgetStore {
+import { WebWidgetStoreArgs } from './type';
+export declare class WebWidgetStore {
     private _widgetProvider;
-    constructor({ widgetProvider }: {
-        widgetProvider: FcrUIWidgetProvider;
-    });
+    private _windowProvider;
+    private _window;
+    private _popupSize;
+    private _windowProviderObjectObserver;
+    private _windowProviderObserver;
+    constructor({ objectManager }: WebWidgetStoreArgs);
     get openedWidgets(): Map<string, import("./type").FcrUIWebWidget>;
     release(): void;
 }

package/lib/modules/widget/store.electron.d.ts

@@ -0,0 +1,11 @@
+import { WebWidgetStoreArgs } from './type';
+import { WebWidgetStoreBase } from './store.base';
+export declare class WebWidgetStore extends WebWidgetStoreBase {
+    private _windowProvider;
+    private _window;
+    private _popupSize;
+    private _windowProviderObjectObserver;
+    private _windowProviderObserver;
+    constructor(args: WebWidgetStoreArgs);
+    release(): void;
+}

package/lib/modules/widget/store.electron.js

@@ -0,0 +1,72 @@
+"use strict";
+
+require("core-js/modules/es.object.define-property.js");
+require("core-js/modules/es.reflect.construct.js");
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.WebWidgetStore = void 0;
+require("core-js/modules/es.error.cause.js");
+require("core-js/modules/es.error.to-string.js");
+var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
+var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
+var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
+var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
+var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _type = require("../../type");
+var _objectManager = require("../../object-manager");
+var _store = require("./store.base");
+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 WebWidgetStore = exports.WebWidgetStore = /*#__PURE__*/function (_WebWidgetStoreBase) {
+  function WebWidgetStore(args) {
+    var _this;
+    (0, _classCallCheck2["default"])(this, WebWidgetStore);
+    _this = _callSuper(this, WebWidgetStore, [args]);
+    (0, _defineProperty2["default"])(_this, "_window", null);
+    (0, _defineProperty2["default"])(_this, "_popupSize", null);
+    (0, _defineProperty2["default"])(_this, "_windowProviderObjectObserver", {
+      onReady: function onReady() {
+        if (_this._window && _this._popupSize) {
+          _this._window.setBounds({
+            width: _this._popupSize.width,
+            height: _this._popupSize.height
+          });
+        } else {
+          throw new Error('window or popupSize is not set');
+        }
+      }
+    });
+    (0, _defineProperty2["default"])(_this, "_windowProviderObserver", {
+      onWindowCreated: function onWindowCreated(key, id, window) {
+        var widgetConfig = _this._widgetProvider.registeredWidgetConfigs.get(id);
+        var isWebWidget = widgetConfig && widgetConfig.type === _type.FcrWidgetType.webWidget;
+        if (isWebWidget) {
+          if (_this._window) {
+            _this._window.removeObserver(_this._windowProviderObjectObserver);
+          }
+          _this._window = window;
+          _this._popupSize = widgetConfig.popupSize;
+          _this._window.addObserver(_this._windowProviderObjectObserver);
+        }
+      }
+    });
+    var objectManager = args.objectManager;
+    var windowProvider = objectManager.getObject(_objectManager.FcrUIObjectKeys.P_WINDOW_PROVIDER);
+    _this._windowProvider = windowProvider;
+    _this._windowProvider.addObserver(_this._windowProviderObserver);
+    return _this;
+  }
+  (0, _inherits2["default"])(WebWidgetStore, _WebWidgetStoreBase);
+  return (0, _createClass2["default"])(WebWidgetStore, [{
+    key: "release",
+    value: function release() {
+      this._windowProvider.removeObserver(this._windowProviderObserver);
+      if (this._window) {
+        this._window.removeObserver(this._windowProviderObjectObserver);
+      }
+    }
+  }]);
+}(_store.WebWidgetStoreBase);

package/lib/modules/widget/store.js

@@ -5,15 +5,53 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports["default"] = exports.StoreContext = void 0;
+exports.WebWidgetStore = exports.StoreContext = void 0;
+require("core-js/modules/es.error.cause.js");
+require("core-js/modules/es.error.to-string.js");
 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 _react = require("react");
-var WebWidgetStore = exports["default"] = /*#__PURE__*/function () {
+var _type = require("../../type");
+var _objectManager = require("../../object-manager");
+var WebWidgetStore = exports.WebWidgetStore = /*#__PURE__*/function () {
   function WebWidgetStore(_ref) {
-    var widgetProvider = _ref.widgetProvider;
+    var _this = this;
+    var objectManager = _ref.objectManager;
     (0, _classCallCheck2["default"])(this, WebWidgetStore);
+    (0, _defineProperty2["default"])(this, "_window", null);
+    (0, _defineProperty2["default"])(this, "_popupSize", null);
+    (0, _defineProperty2["default"])(this, "_windowProviderObjectObserver", {
+      onReady: function onReady() {
+        if (_this._window && _this._popupSize) {
+          _this._window.setBounds({
+            width: _this._popupSize.width,
+            height: _this._popupSize.height
+          });
+        } else {
+          throw new Error('window or popupSize is not set');
+        }
+      }
+    });
+    (0, _defineProperty2["default"])(this, "_windowProviderObserver", {
+      onWindowCreated: function onWindowCreated(key, id, window) {
+        var widgetConfig = _this._widgetProvider.registeredWidgetConfigs.get(id);
+        var isWebWidget = widgetConfig && widgetConfig.type === _type.FcrWidgetType.webWidget;
+        if (isWebWidget) {
+          if (_this._window) {
+            _this._window.removeObserver(_this._windowProviderObjectObserver);
+          }
+          _this._window = window;
+          _this._popupSize = widgetConfig.popupSize;
+          _this._window.addObserver(_this._windowProviderObjectObserver);
+        }
+      }
+    });
+    var widgetProvider = objectManager.getObject(_objectManager.FcrUIObjectKeys.P_WIDGET_PROVIDER);
+    var windowProvider = objectManager.getObject(_objectManager.FcrUIObjectKeys.P_WINDOW_PROVIDER);
     this._widgetProvider = widgetProvider;
+    this._windowProvider = windowProvider;
+    this._windowProvider.addObserver(this._windowProviderObserver);
   }
   return (0, _createClass2["default"])(WebWidgetStore, [{
     key: "openedWidgets",
@@ -22,7 +60,12 @@ var WebWidgetStore = exports["default"] = /*#__PURE__*/function () {
     }
   }, {
     key: "release",
-    value: function release() {}
+    value: function release() {
+      this._windowProvider.removeObserver(this._windowProviderObserver);
+      if (this._window) {
+        this._window.removeObserver(this._windowProviderObjectObserver);
+      }
+    }
   }]);
 }(); // #endregion
 var StoreContext = exports.StoreContext = /*#__PURE__*/(0, _react.createContext)(null);

package/lib/modules/widget/type.d.ts

@@ -1,12 +1,13 @@
 import type { FcrRoomInfo, FcrRoomSchedule, FcrRoomState, FcrUserInfo } from 'fcr-core/lib/type';
 import type { FcrUserJoinedEvent, FcrUserLeftEvent, FcrUserPageParams, FcrUserPageResponse, FcrUserUpdatedEvent } from 'fcr-core/lib/room-control/user-control/type';
 import type { FcrUIWebWidgetConfig } from '../../type';
+import { FcrUIObjectManager } from '../../object-manager';
 type MethodNames<T> = {
     [K in keyof T]: T[K] extends Function ? K : never;
 }[keyof T];
 export type FcrUIWebWidgetMethodName = MethodNames<FcrUIBaseWidget>;
 export type ID = string;
-export interface PopupSize {
+export interface FcrPopupSize {
     width: number;
     height: number;
 }
@@ -117,17 +118,13 @@ export interface FcrUIBaseWidget {
     removeObserver(observer: FcrUIWidgetObserver): void;
 }
 export interface FcrUIWebWidget extends FcrUIBaseWidget {
-    /**
-     * 保存承载widget试图的webview引用
-     */
-    webview: HTMLIFrameElement | null;
     /**
      * 实例化widget
      * 创建webview并注入FcrUIBaseWidget中的方法或者回调,命名空间FcrJSBridge
      * webview加载FcrUIWebWidgetConfig.url
-     * @param FcrUIWebWidgetConfig webWidget配置
+     * @param webview 承载widget试图的window引用
      */
-    init(config: FcrUIWebWidgetConfig, window: Window): void;
+    init(webview: Window): void;
     /**
      * 刷新webview
      */
@@ -153,4 +150,7 @@ export type Callback = {
     action: 'callback';
     payload: object;
 };
+export interface WebWidgetStoreArgs {
+    objectManager: FcrUIObjectManager;
+}
 export {};

package/lib/modules/widget/view.d.ts

@@ -1,2 +1,3 @@
 import { FC } from 'react';
+import './index.css';
 export declare const WebWidgetView: FC;

package/lib/modules/widget/view.js

@@ -6,22 +6,22 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.WebWidgetView = void 0;
+require("core-js/modules/es.error.cause.js");
+require("core-js/modules/es.error.to-string.js");
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = require("react");
 var _mobxReact = require("mobx-react");
-var _store = require("./store");
+var _store = require("./store.base");
 var _loadingWrapper = require("../interpreter/loading-wrapper");
-var _useElectron = require("../dialog/hooks/useElectron");
-var _env = require("agora-foundation/lib/utilities/env");
 var _type = require("../../type");
+require("./index.css");
 var _jsxRuntime = require("react/jsx-runtime");
 var WebWidgetView = exports.WebWidgetView = (0, _mobxReact.observer)(function () {
-  var _widgetConfig$popupSi, _widgetConfig$popupSi2;
   var _useContext = (0, _react.useContext)(_store.StoreContext),
     widgetConfig = _useContext.widgetConfig,
     store = _useContext.store;
+  var iframeRef = (0, _react.useRef)(null);
   var webWidget = store.openedWidgets.get(widgetConfig.id);
-  var dialogInstanceContext = (0, _react.useContext)(_useElectron.DialogInstanceContext);
   var _useState = (0, _react.useState)(true),
     _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
     loading = _useState2[0],
@@ -29,23 +29,24 @@ var WebWidgetView = exports.WebWidgetView = (0, _mobxReact.observer)(function ()
   if (widgetConfig.type === _type.FcrWidgetType.eventWidget) {
     return null;
   }
-  (0, _react.useEffect)(function () {
-    if (webWidget) {
-      webWidget.init(widgetConfig, (0, _env.isElectron)() ? dialogInstanceContext.newRendererWindow : window);
-      if (webWidget.webview) {
-        webWidget.webview.onload = function () {
-          setLoading(false);
-        };
-      }
+  var onLoad = function onLoad() {
+    var _iframeRef$current;
+    setLoading(false);
+    var window = (_iframeRef$current = iframeRef.current) === null || _iframeRef$current === void 0 ? void 0 : _iframeRef$current.contentWindow;
+    if (webWidget && window) {
+      webWidget.init(window);
+    } else {
+      throw new Error('widget webview is not initialized');
     }
-  }, [widgetConfig]);
+  };
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_loadingWrapper.LoadingWrapper, {
     loading: loading,
     children: /*#__PURE__*/(0, _jsxRuntime.jsx)("iframe", {
+      className: "fcr-widget-iframe",
+      ref: iframeRef,
       id: widgetConfig.id,
       src: widgetConfig.url,
-      width: (_widgetConfig$popupSi = widgetConfig.popupSize) === null || _widgetConfig$popupSi === void 0 ? void 0 : _widgetConfig$popupSi.width,
-      height: (_widgetConfig$popupSi2 = widgetConfig.popupSize) === null || _widgetConfig$popupSi2 === void 0 ? void 0 : _widgetConfig$popupSi2.height
+      onLoad: onLoad
     })
   });
 });

package/lib/modules/widget/web-widget.d.ts

@@ -1,5 +1,4 @@
 import { FcrBaseRoomControl } from 'fcr-core';
-import { FcrUIWebWidgetConfig } from '../../type';
 import { FcrUIWebWidget } from './type';
 import { FcrUserPageParams } from 'fcr-core/lib/room-control/user-control/type';
 import { FcrRoomState, FcrRoomInfo } from 'fcr-core/lib/type';
@@ -7,12 +6,12 @@ export declare class FcrUIWebWidgetImpl implements FcrUIWebWidget {
     protected logger: import("agora-foundation/lib/logger").Logger;
     private _userControl;
     private _roomControl;
-    private _currentWindow;
     private _userControlObserver;
     private _roomControlObserver;
-    accessor webview: HTMLIFrameElement | null;
+    private _webview;
+    private get webview();
     constructor(roomControl: FcrBaseRoomControl);
-    init(config: FcrUIWebWidgetConfig, currentWindow: Window): void;
+    init(webview: Window): void;
     reload(): void;
     release(): void;
     getRoomInfo(): FcrRoomInfo | undefined;
@@ -26,4 +25,5 @@ export declare class FcrUIWebWidgetImpl implements FcrUIWebWidget {
     removeObserver(): void;
     private _handleApiResponse;
     private _handleCallback;
+    private _removeMessageListener;
 }