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

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

@@ -12,15 +12,18 @@ export default abstract class WhitebaordStoreBase implements FcrUIManagedObject
     protected _boardView: HTMLElement | null;
     protected _whiteboardProvider: FcrUIBoardShareProvider;
     private _memberSharedDataSource;
+    private _sharedConfigDataSource;
     private _roomProvider;
     private _roomControl;
     private _userControl;
     private _ownerUserTemp;
     private _dialogProvider;
     private _messageProvider;
+    private _videoWindowSharedDataSource;
     private _whiteboardProviderObserver;
     protected accessor _isMounted: boolean;
     accessor boardContainer: HTMLDivElement | undefined;
+    get isNotInGridLayout(): boolean;
     get loading(): boolean;
     get connectionState(): FcrConnectionState;
     get joined(): boolean;

package/lib/modules/whiteboard/store.js

@@ -66,6 +66,8 @@ var _libs = require("../components/toolbar/components/graphic-tool/graphic-panel
 var _struct = require("../../providers/board-share/struct");
 var _i18n = require("agora-ui-foundation/lib/i18n");
 var _type3 = require("agora-ui-foundation/lib/components/icon/type");
+var _type4 = require("../layout/type");
+var _sharedStorage = require("../../utilities/shared-storage");
 var _WhitebaordStoreBase;
 var _initProto, _init__isMounted, _init_boardContainer, _setBoardContainerDomDecs, _ref;
 function _classPrivateFieldInitSpec(e, t, a) { _checkPrivateRedeclaration(e, t), t.set(e, a); }
@@ -104,8 +106,12 @@ var WhitebaordStoreBase = exports["default"] = /*#__PURE__*/function () {
     this._memberSharedDataSource = objectManager.getObject(_objectManager.FcrUIObjectKeys.S_SHARED_MEMBER_DATA_SOURCE);
     this._dialogProvider = objectManager.getObject(_objectManager.FcrUIObjectKeys.P_DIALOG_PROVIDER);
     this._messageProvider = objectManager.getObject(_objectManager.FcrUIObjectKeys.P_MESSAGE_PROVIDER);
+    this._videoWindowSharedDataSource = objectManager.getObject(_objectManager.FcrUIObjectKeys.S_SHARED_VIDEO_WINDOW_DATA_SOURCE);
+    this._sharedConfigDataSource = objectManager.getObject(_objectManager.FcrUIObjectKeys.S_SHARED_CONFIG_DATA_SOURCE);
     this._roomControl = this._roomProvider.currentRoomControl;
     this._userControl = this._roomControl.getUserControl();
+    (0, _sharedStorage.setAnnotationNickName)(this.localUser.userName);
+    (0, _sharedStorage.setAnnotationRtmAppId)(this._sharedConfigDataSource.creatorConfig.appId);
     this._whiteboardProvider.addObserver(this._whiteboardProviderObserver);
     this._disposers.push((0, _mobx.reaction)(function () {
       return _this.connectionState;
@@ -131,6 +137,11 @@ var WhitebaordStoreBase = exports["default"] = /*#__PURE__*/function () {
     set: function set(v) {
       _classPrivateFieldSet(_B, this, v);
     }
+  }, {
+    key: "isNotInGridLayout",
+    get: function get() {
+      return this._videoWindowSharedDataSource.layoutType === _type4.FcrUIVideoWindowLayoutType.Speaker;
+    }
   }, {
     key: "loading",
     get: function get() {
@@ -220,10 +231,27 @@ var WhitebaordStoreBase = exports["default"] = /*#__PURE__*/function () {
     key: "setBoardContainerDom",
     value: function setBoardContainerDom(boardDom) {
       if (boardDom) {
-        this.logger.info("set board container dom: ".concat(boardDom));
+        if (this.boardContainer === boardDom) {
+          this.logger.warn("set board container dom: container is the same, ignore");
+          return;
+        }
+        this.logger.info("set board container dom: container is mounted");
         this.boardContainer = boardDom;
+        if (this._isMounted) {
+          this.logger.error("set board container dom: container is already mounted");
+          return;
+        }
+
+        // 切换布局和 pin 时，白板会在 Carousel 和 Gallery 两个组件内切换显示
+        // 原先的白板容器会被销毁，新的白板容器会重新创建
+        // 这里需要重新挂载白板视图到新的容器内
+        if (this._boardView) {
+          this._mount(this._boardView);
+        }
       } else {
-        this.logger.warn("set board container dom is not ready");
+        this.logger.info("set board container dom: container is unmounted");
+        this._isMounted = false;
+        this.boardContainer = undefined;
       }
     }
   }, {
@@ -350,6 +378,7 @@ var WhitebaordStoreBase = exports["default"] = /*#__PURE__*/function () {
       var reason = data.reason,
         operatorUser = data.operatorUser;
       this._unmount();
+      this._boardView = null;
       var stopByOther = reason === _struct.FcrUIBoardShareStopReason.STOPPED_BY_OTHER;
       var normalStop = reason === _struct.FcrUIBoardShareStopReason.NORMAL_STOP;
       var operatorIsNotMe = (operatorUser === null || operatorUser === void 0 ? void 0 : operatorUser.userId) !== this.localUser.userId;

package/lib/modules/whiteboard/view.js

@@ -14,9 +14,13 @@ var _store = require("./store");
 var _react = require("react");
 var _loading = require("../components/control-bar/components/loading");
 require("./style.css");
+var _boardContext = _interopRequireDefault(require("../../shared-context/board-context"));
+var _type = require("../layout/type");
 var _jsxRuntime = require("react/jsx-runtime");
 var Whiteboard = exports.Whiteboard = (0, _mobxReact.observer)(function () {
   var store = (0, _react.useContext)(_store.WhiteboardStoreContext);
+  var _useContext = (0, _react.useContext)(_boardContext["default"]),
+    videoWindowLayoutType = _useContext.videoWindowLayoutType;
   var _useState = (0, _react.useState)(true),
     _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
     showLoading = _useState2[0],
@@ -32,6 +36,7 @@ var Whiteboard = exports.Whiteboard = (0, _mobxReact.observer)(function () {
     isActive = store.isActive,
     canWriteBoard = store.canWriteBoard,
     isShowToolbar = store.isShowToolbar,
+    isNotInGridLayout = store.isNotInGridLayout,
     setBoardContainerDom = store.setBoardContainerDom,
     setWhiteboardTool = store.setWhiteboardTool,
     setStrokeWidth = store.setStrokeWidth,
@@ -55,6 +60,9 @@ var Whiteboard = exports.Whiteboard = (0, _mobxReact.observer)(function () {
     themeColors = toolbarState.themeColors,
     commonColors = toolbarState.commonColors,
     controlEnable = toolbarState.controlEnable;
+
+  // TODO: 移除 WhiteboardStoreContext 内的 isNotInGridLayout， 在 CommonVideoRenderer 内通过 BoardContext 传递进来
+  var isMainWindow = isNotInGridLayout && videoWindowLayoutType === _type.FcrUILayoutType.GALLERY;
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
     children: [showLoading && loading && /*#__PURE__*/(0, _jsxRuntime.jsx)(_loading.Loading, {
       joined: joined,
@@ -63,7 +71,7 @@ var Whiteboard = exports.Whiteboard = (0, _mobxReact.observer)(function () {
       handleClose: function handleClose() {
         setShowLoading(false);
       }
-    }), isMounted && boardContainer && /*#__PURE__*/(0, _jsxRuntime.jsx)(_toolbar.WhiteboardToolbar, {
+    }), isMounted && boardContainer && isMainWindow && /*#__PURE__*/(0, _jsxRuntime.jsx)(_toolbar.WhiteboardToolbar, {
       direction: "vertical",
       show: isShowToolbar,
       currentStrokeWidth: currentStrokeWidth,
@@ -87,6 +95,7 @@ var Whiteboard = exports.Whiteboard = (0, _mobxReact.observer)(function () {
       onSave: onSaveDraft,
       onCaptureScreen: captureScreen
     }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_controlBar.WhiteboardControlbar, {
+      showControlBar: isMainWindow,
       onClose: handleClose,
       onEnable: setControlEnable,
       canWriteBoard: canWriteBoard,

package/lib/modules/widget/sdk.js

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

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

@@ -5,6 +5,7 @@ import { FcrUIManagedObject } from '../../object-manager';
 export declare abstract class WebWidgetStoreBase implements FcrUIManagedObject {
     protected _widgetProvider: FcrUIWidgetProvider;
     constructor({ objectManager }: WebWidgetStoreArgs);
+    abstract getWidgetDialogWindow(dialogId: string): Window;
     get openedWidgets(): Map<string, import("./type").FcrUIWebWidget>;
     release(): void;
 }

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

@@ -2,4 +2,5 @@ import { WebWidgetStoreArgs } from './type';
 import { WebWidgetStoreBase } from './store.base';
 export declare class WebWidgetStore extends WebWidgetStoreBase {
     constructor(args: WebWidgetStoreArgs);
+    getWidgetDialogWindow(dialogId: string): Window;
 }

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

@@ -1,25 +1,81 @@
 "use strict";
 
+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");
+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.object.to-string.js");
 require("core-js/modules/es.reflect.construct.js");
+require("core-js/modules/es.string.iterator.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");
+require("core-js/modules/web.dom-collections.iterator.js");
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.WebWidgetStore = void 0;
-var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 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 _store = require("./store.base");
+var _bound = require("agora-foundation/lib/decorator/bound");
+var _WebWidgetStore;
+var _initProto;
 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)]; } }; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+function _setFunctionName(e, t, n) { "symbol" == _typeof(t) && (t = (t = t.description) ? "[" + t + "]" : ""); try { Object.defineProperty(e, "name", { configurable: !0, value: n ? n + " " + t : t }); } catch (e) {} return e; }
+function _checkInRHS(e) { if (Object(e) !== e) throw TypeError("right-hand side of 'in' should be an object, got " + (null !== e ? _typeof(e) : "null")); return e; }
 var WebWidgetStore = exports.WebWidgetStore = /*#__PURE__*/function (_WebWidgetStoreBase) {
   function WebWidgetStore(args) {
+    var _this;
     (0, _classCallCheck2["default"])(this, WebWidgetStore);
-    return _callSuper(this, WebWidgetStore, [args]);
+    _initProto(_this = _callSuper(this, WebWidgetStore, [args]));
+    return _this;
   }
   (0, _inherits2["default"])(WebWidgetStore, _WebWidgetStoreBase);
-  return (0, _createClass2["default"])(WebWidgetStore);
-}(_store.WebWidgetStoreBase);
+  return (0, _createClass2["default"])(WebWidgetStore, [{
+    key: "getWidgetDialogWindow",
+    value: function getWidgetDialogWindow(dialogId) {
+      return window;
+    }
+  }]);
+}(_store.WebWidgetStoreBase);
+_WebWidgetStore = WebWidgetStore;
+var _applyDecs$e = _applyDecs(_WebWidgetStore, [[_bound.bound, 2, "getWidgetDialogWindow"]], [], 0, void 0, _store.WebWidgetStoreBase).e;
+var _applyDecs$e2 = (0, _slicedToArray2["default"])(_applyDecs$e, 1);
+_initProto = _applyDecs$e2[0];
+_applyDecs$e;

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

@@ -7,5 +7,6 @@ export declare class WebWidgetStore extends WebWidgetStoreBase {
     private _windowProviderObjectObserver;
     private _windowProviderObserver;
     constructor(args: WebWidgetStoreArgs);
+    getWidgetDialogWindow(dialogId: string): Window;
     release(): void;
 }

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

@@ -1,14 +1,48 @@
 "use strict";
 
+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.array.is-array.js");
+require("core-js/modules/es.array.iterator.js");
+require("core-js/modules/es.array.push.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.object.to-string.js");
 require("core-js/modules/es.reflect.construct.js");
+require("core-js/modules/es.string.iterator.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");
+require("core-js/modules/web.dom-collections.iterator.js");
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+var _typeof = require("@babel/runtime/helpers/typeof");
 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 _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
@@ -18,13 +52,24 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 var _type = require("../../type");
 var _objectManager = require("../../object-manager");
 var _store = require("./store.base");
+var _widget = require("../dialog/dialogs/widget");
+var _constant = require("../../utilities/constant");
+var _bound = require("agora-foundation/lib/decorator/bound");
+var _WebWidgetStore;
+var _initProto;
 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)]; } }; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+function _setFunctionName(e, t, n) { "symbol" == _typeof(t) && (t = (t = t.description) ? "[" + t + "]" : ""); try { Object.defineProperty(e, "name", { configurable: !0, value: n ? n + " " + t : t }); } catch (e) {} return e; }
+function _checkInRHS(e) { if (Object(e) !== e) throw TypeError("right-hand side of 'in' should be an object, got " + (null !== e ? _typeof(e) : "null")); return e; }
 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, "_windowProvider", void _initProto(_this));
     (0, _defineProperty2["default"])(_this, "_window", null);
     (0, _defineProperty2["default"])(_this, "_popupSize", null);
     (0, _defineProperty2["default"])(_this, "_windowProviderObjectObserver", {
@@ -32,7 +77,7 @@ var WebWidgetStore = exports.WebWidgetStore = /*#__PURE__*/function (_WebWidgetS
         if (_this._window && _this._popupSize) {
           _this._window.setBounds({
             width: _this._popupSize.width,
-            height: _this._popupSize.height
+            height: _this._popupSize.height + _widget.TITLE_BAR_HEIGHT //TODO 46 is the height of the title bar
           });
         } else {
           throw new Error('window or popupSize is not set');
@@ -61,6 +106,13 @@ var WebWidgetStore = exports.WebWidgetStore = /*#__PURE__*/function (_WebWidgetS
   }
   (0, _inherits2["default"])(WebWidgetStore, _WebWidgetStoreBase);
   return (0, _createClass2["default"])(WebWidgetStore, [{
+    key: "getWidgetDialogWindow",
+    value: function getWidgetDialogWindow(dialogId) {
+      var window = this._windowProvider.getWindowById(_constant.FcrUIDialogKey.WIDGET, dialogId);
+      // @ts-ignore
+      return window._rendererWindow;
+    }
+  }, {
     key: "release",
     value: function release() {
       this._windowProvider.removeObserver(this._windowProviderObserver);
@@ -69,4 +121,9 @@ var WebWidgetStore = exports.WebWidgetStore = /*#__PURE__*/function (_WebWidgetS
       }
     }
   }]);
-}(_store.WebWidgetStoreBase);
+}(_store.WebWidgetStoreBase);
+_WebWidgetStore = WebWidgetStore;
+var _applyDecs$e = _applyDecs(_WebWidgetStore, [[_bound.bound, 2, "getWidgetDialogWindow"]], [], 0, void 0, _store.WebWidgetStoreBase).e;
+var _applyDecs$e2 = (0, _slicedToArray2["default"])(_applyDecs$e, 1);
+_initProto = _applyDecs$e2[0];
+_applyDecs$e;

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

@@ -122,9 +122,10 @@ export interface FcrUIWebWidget extends FcrUIBaseWidget {
      * 实例化widget
      * 创建webview并注入FcrUIBaseWidget中的方法或者回调,命名空间FcrJSBridge
      * webview加载FcrUIWebWidgetConfig.url
-     * @param webview 承载widget试图的window引用
+     * @param webview 承载内嵌iframe的window引用
+     * @param dialogWindow 承载widgetDialog的window引用
      */
-    init(webview: Window): void;
+    init(webview: Window, dialogWindow: Window): void;
     /**
      * 刷新webview
      */

package/lib/modules/widget/view.js

@@ -32,9 +32,10 @@ var WebWidgetView = exports.WebWidgetView = (0, _mobxReact.observer)(function ()
   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);
+    var webview = (_iframeRef$current = iframeRef.current) === null || _iframeRef$current === void 0 ? void 0 : _iframeRef$current.contentWindow;
+    if (webWidget && webview) {
+      var dialogWindow = store.getWidgetDialogWindow(widgetConfig.id);
+      webWidget.init(webview, dialogWindow);
     } else {
       throw new Error('widget webview is not initialized');
     }
@@ -46,7 +47,11 @@ var WebWidgetView = exports.WebWidgetView = (0, _mobxReact.observer)(function ()
       ref: iframeRef,
       id: widgetConfig.id,
       src: widgetConfig.url,
-      onLoad: onLoad
+      onLoad: onLoad,
+      style: {
+        width: widgetConfig.popupSize.width,
+        height: widgetConfig.popupSize.height
+      }
     })
   });
 });

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

@@ -9,9 +9,10 @@ export declare class FcrUIWebWidgetImpl implements FcrUIWebWidget {
     private _userControlObserver;
     private _roomControlObserver;
     private _webview;
+    private _dialogWindow;
     private get webview();
     constructor(roomControl: FcrBaseRoomControl);
-    init(webview: Window): void;
+    init(webview: Window, dialogWindow: Window): void;
     reload(): void;
     release(): void;
     getRoomInfo(): FcrRoomInfo | undefined;

package/lib/modules/widget/web-widget.js

@@ -84,6 +84,7 @@ var FcrUIWebWidgetImpl = exports.FcrUIWebWidgetImpl = /*#__PURE__*/function () {
       }
     });
     (0, _defineProperty2["default"])(this, "_webview", null);
+    (0, _defineProperty2["default"])(this, "_dialogWindow", null);
     this._roomControl = roomControl;
     this._userControl = this._roomControl.getUserControl();
     this.addObserver();
@@ -98,10 +99,11 @@ var FcrUIWebWidgetImpl = exports.FcrUIWebWidgetImpl = /*#__PURE__*/function () {
     }
   }, {
     key: "init",
-    value: function init(webview) {
+    value: function init(webview, dialogWindow) {
       this._removeMessageListener();
       this._webview = webview;
-      this._webview.addEventListener('message', this._handleApiResponse);
+      this._dialogWindow = dialogWindow;
+      this._dialogWindow.addEventListener('message', this._handleApiResponse);
     }
   }, {
     key: "reload",
@@ -210,9 +212,9 @@ var FcrUIWebWidgetImpl = exports.FcrUIWebWidgetImpl = /*#__PURE__*/function () {
   }, {
     key: "_removeMessageListener",
     value: function _removeMessageListener() {
-      if (this._webview) {
-        this._webview.removeEventListener('message', this._handleApiResponse);
-        this._webview = null;
+      if (this._dialogWindow) {
+        this._dialogWindow.removeEventListener('message', this._handleApiResponse);
+        this._dialogWindow = null;
       }
     }
   }]);

package/lib/object-manager.d.ts

@@ -44,7 +44,6 @@ export declare enum FcrUIObjectKeys {
     P_MULTI_DISPLAY_PROVIDER = "multiDisplayProvider",
     P_WAITING_ROOM_CONTROL_PROVIDER = "waitingRoomControlProvider",
     P_CURRENT_ROOM_CONTROL_PROVIDER = "currentRoomControlProvider",
-    P_CONNECTION_PROVIDER = "connectionProvider",
     P_SESSION_PROVIDER = "sessionProvider",
     P_PHONE_AUDIO_CONNECTOR_PROVIDER = "phoneAudioConnectorProvider",
     P_ANNOTATION_PROVIDER = "annotationProvider",
@@ -78,5 +77,6 @@ export declare enum FcrUIObjectKeys {
     S_SHARED_WHITEBOARD_DATA_SOURCE = "sharedWhiteboardDataSource",
     S_SHARED_CHAT_DATA_SOURCE = "sharedChatDataSource",
     S_SHARED_ANNOTATION_DATA_SOURCE = "sharedAnnotationDataSource",
-    S_SHARED_APPLIST_DATA_SOURCE = "sharedApplistDataSource"
+    S_SHARED_APPLIST_DATA_SOURCE = "sharedApplistDataSource",
+    S_SHARED_WIDGET_DATA_SOURCE = "sharedWidgetDataSource"
 }

package/lib/object-manager.js

@@ -160,7 +160,6 @@ var FcrUIObjectKeys = exports.FcrUIObjectKeys = /*#__PURE__*/function (FcrUIObje
   FcrUIObjectKeys["P_MULTI_DISPLAY_PROVIDER"] = "multiDisplayProvider";
   FcrUIObjectKeys["P_WAITING_ROOM_CONTROL_PROVIDER"] = "waitingRoomControlProvider";
   FcrUIObjectKeys["P_CURRENT_ROOM_CONTROL_PROVIDER"] = "currentRoomControlProvider";
-  FcrUIObjectKeys["P_CONNECTION_PROVIDER"] = "connectionProvider";
   FcrUIObjectKeys["P_SESSION_PROVIDER"] = "sessionProvider";
   FcrUIObjectKeys["P_PHONE_AUDIO_CONNECTOR_PROVIDER"] = "phoneAudioConnectorProvider";
   FcrUIObjectKeys["P_ANNOTATION_PROVIDER"] = "annotationProvider";
@@ -195,5 +194,6 @@ var FcrUIObjectKeys = exports.FcrUIObjectKeys = /*#__PURE__*/function (FcrUIObje
   FcrUIObjectKeys["S_SHARED_CHAT_DATA_SOURCE"] = "sharedChatDataSource";
   FcrUIObjectKeys["S_SHARED_ANNOTATION_DATA_SOURCE"] = "sharedAnnotationDataSource";
   FcrUIObjectKeys["S_SHARED_APPLIST_DATA_SOURCE"] = "sharedApplistDataSource";
+  FcrUIObjectKeys["S_SHARED_WIDGET_DATA_SOURCE"] = "sharedWidgetDataSource";
   return FcrUIObjectKeys;
 }({});

package/lib/providers/board-share/bar-control/base.d.ts

@@ -11,9 +11,9 @@ export declare abstract class FcrUIBoardControlShareProviderBase implements FcrU
     private readonly _privilegeProvider;
     private readonly _boardControl;
     protected logger: import("agora-foundation/lib/logger").Logger;
-    private _showLoading;
     private _roomName;
     private get _boardMainRoom();
+    private accessor _showLoading;
     accessor currentTheme: Required<WhiteboardThemeType>;
     accessor sharingUserInfo: FcrUserInfo | undefined;
     accessor backgroundColor: string;