fcr-ui-scene 3.7.5 → 3.7.6

package/lib/modules/video-window/store.js

@@ -70,7 +70,7 @@ var _react = require("react");
 var _type3 = require("../../type");
 var _videoWindow = require("../dialog/dialogs/video-window");
 var _VideoWindowStore;
-var _initProto, _init_userVolumeMap, _init_wrapperHovering, _init_videoWindowPreviewType, _setVideoWindowPreviewTypeDecs, _setWrapperHoverDecs, _getAllowedOperationsDecs, _onAudioVolumeUpdatedDecs, _ref;
+var _initProto, _init__videoWindowSmallTypeStyleSize, _init_userVolumeMap, _init_wrapperHovering, _init_videoWindowPreviewType, _setVideoWindowPreviewTypeDecs, _setWrapperHoverDecs, _getAllowedOperationsDecs, _handleVideowWindowResizeDecs, _onAudioVolumeUpdatedDecs, _ref;
 function _classPrivateFieldInitSpec(e, t, a) { _checkPrivateRedeclaration(e, t), t.set(e, a); }
 function _checkPrivateRedeclaration(e, t) { if (t.has(e)) throw new TypeError("Cannot initialize the same private elements twice on an object"); }
 function _classPrivateFieldSet(s, a, r) { return s.set(_assertClassBrand(s, a), r), r; }
@@ -84,7 +84,8 @@ function _checkInRHS(e) { if (Object(e) !== e) throw TypeError("right-hand side
 var _A = /*#__PURE__*/new WeakMap();
 var _B = /*#__PURE__*/new WeakMap();
 var _C = /*#__PURE__*/new WeakMap();
-_ref = (_setVideoWindowPreviewTypeDecs = [_mobx.action, _mobx.action.bound], _setWrapperHoverDecs = [_mobx.action, _mobx.action.bound], _getAllowedOperationsDecs = [_mobx.action, _mobx.action.bound], _onAudioVolumeUpdatedDecs = [_mobx.action, _mobx.action.bound], "_subscriptions");
+var _D = /*#__PURE__*/new WeakMap();
+_ref = (_setVideoWindowPreviewTypeDecs = [_mobx.action, _mobx.action.bound], _setWrapperHoverDecs = [_mobx.action, _mobx.action.bound], _getAllowedOperationsDecs = [_mobx.action, _mobx.action.bound], _handleVideowWindowResizeDecs = [_mobx.action, _mobx.action.bound], _onAudioVolumeUpdatedDecs = [_mobx.action, _mobx.action.bound], "_subscriptions");
 var VideoWindowStore = exports["default"] = /*#__PURE__*/function () {
   function VideoWindowStore(_ref2) {
     var _this = this;
@@ -92,20 +93,18 @@ var VideoWindowStore = exports["default"] = /*#__PURE__*/function () {
     (0, _classCallCheck2["default"])(this, VideoWindowStore);
     (0, _defineProperty2["default"])(this, _ref, (_initProto(this), []));
     (0, _defineProperty2["default"])(this, "_dialogObserver", {
-      onDialogOpen: function onDialogOpen(dialogKey) {
-        return _this._handleDialogSwitch(dialogKey, true);
-      },
-      onDialogClose: function onDialogClose(dialogKey) {
-        return _this._handleDialogSwitch(dialogKey, false);
-      }
-    });
-    (0, _defineProperty2["default"])(this, "_sharedVideoWindowDataSourceObserver", {
-      onFoldListAdded: this._handleFoldListUpdated,
-      onFoldListRemoved: this._handleFoldListUpdated
+      onDialogOpen: this._handleDialogOpen,
+      onDialogClose: this._handleDialogClose
     });
-    _classPrivateFieldInitSpec(this, _A, _init_userVolumeMap(this, new Map()));
-    _classPrivateFieldInitSpec(this, _B, _init_wrapperHovering(this, false));
-    _classPrivateFieldInitSpec(this, _C, _init_videoWindowPreviewType(this, _type.FcrVideoWindowPreviewType.SMALL));
+    (0, _defineProperty2["default"])(this, "_windowOpened", false);
+    (0, _defineProperty2["default"])(this, "_isWindowApiResize", false);
+    _classPrivateFieldInitSpec(this, _A, _init__videoWindowSmallTypeStyleSize(this, {
+      width: _type.DefaultVideoWindowWidth,
+      height: _type.DefaultVideoWindowSmallTypeHeight
+    }));
+    _classPrivateFieldInitSpec(this, _B, _init_userVolumeMap(this, new Map()));
+    _classPrivateFieldInitSpec(this, _C, _init_wrapperHovering(this, false));
+    _classPrivateFieldInitSpec(this, _D, _init_videoWindowPreviewType(this, _type.FcrVideoWindowPreviewType.SMALL));
     // Get all required objects from objectManager
     this._eventProvider = objectManager.getObject(_objectManager.FcrUIObjectKeys.P_EVENT_PROVIDER);
     this._deviceStore = objectManager.getObject(_objectManager.FcrUIObjectKeys.P_DEVICE_PROVIDER);
@@ -133,6 +132,27 @@ var VideoWindowStore = exports["default"] = /*#__PURE__*/function () {
       (0, _mobx.runInAction)(function () {
         _this.userVolumeMap.set('0', volume);
       });
+    }), (0, _mobx.reaction)(function () {
+      return _this.videoWindowPreviewType;
+    }, function () {
+      var size = _this.videoWindowStyleSize;
+      _this.setVideoWindowSize(size.width, size.height);
+    }), (0, _mobx.reaction)(function () {
+      return _this.filterFoldList.length;
+    }, function (length, prevLength) {
+      if (!_this._windowOpened) return;
+      var isList = _this.videoWindowPreviewType === _type.FcrVideoWindowPreviewType.LIST;
+      if (length === 1 && isList) {
+        _this.setVideoWindowPreviewType(_type.FcrVideoWindowPreviewType.SMALL);
+        return;
+      }
+      if (isList && length !== prevLength) {
+        var size = _this.videoWindowStyleSize;
+        var videoWindow = _this._windowProvider.getWindowById(_constant.FcrUIDialogKey.VIDEO_WINDOW);
+        var bounds = videoWindow.getBounds();
+        var width = Math.max(bounds.width, size.width);
+        _this.setVideoWindowSize(width, size.height);
+      }
     }));
     this._streamControl.addObserver({
       onStreamVolumeIndicationUpdated: this._onAudioVolumeUpdated
@@ -140,7 +160,7 @@ var VideoWindowStore = exports["default"] = /*#__PURE__*/function () {
     this._dialogProvider.addObserver(this._dialogObserver);
   }
   return (0, _createClass2["default"])(VideoWindowStore, [{
-    key: "userVolumeMap",
+    key: "_videoWindowSmallTypeStyleSize",
     get: function get() {
       return _classPrivateFieldGet(_A, this);
     },
@@ -148,7 +168,7 @@ var VideoWindowStore = exports["default"] = /*#__PURE__*/function () {
       _classPrivateFieldSet(_A, this, v);
     }
   }, {
-    key: "wrapperHovering",
+    key: "userVolumeMap",
     get: function get() {
       return _classPrivateFieldGet(_B, this);
     },
@@ -156,13 +176,21 @@ var VideoWindowStore = exports["default"] = /*#__PURE__*/function () {
       _classPrivateFieldSet(_B, this, v);
     }
   }, {
-    key: "videoWindowPreviewType",
+    key: "wrapperHovering",
     get: function get() {
       return _classPrivateFieldGet(_C, this);
     },
     set: function set(v) {
       _classPrivateFieldSet(_C, this, v);
     }
+  }, {
+    key: "videoWindowPreviewType",
+    get: function get() {
+      return _classPrivateFieldGet(_D, this);
+    },
+    set: function set(v) {
+      _classPrivateFieldSet(_D, this, v);
+    }
   }, {
     key: "foldList",
     get: function get() {
@@ -228,11 +256,6 @@ var VideoWindowStore = exports["default"] = /*#__PURE__*/function () {
     get: function get() {
       return this._sharedInterpreterDataSource.isInterpreterEnabled;
     }
-  }, {
-    key: "shouldHaveListView",
-    get: function get() {
-      return this.filterFoldList.length > 1;
-    }
   }, {
     key: "localUserRole",
     get: function get() {
@@ -248,6 +271,19 @@ var VideoWindowStore = exports["default"] = /*#__PURE__*/function () {
     get: function get() {
       return this._deviceStore.cameraEnabled;
     }
+  }, {
+    key: "videoWindowStyleSize",
+    get: function get() {
+      if (this.videoWindowPreviewType === _type.FcrVideoWindowPreviewType.SMALL) {
+        return this._videoWindowSmallTypeStyleSize;
+      } else {
+        var height = this.computedVideoWindowHeight();
+        return {
+          width: _type.DefaultVideoWindowWidth,
+          height: height
+        };
+      }
+    }
   }, {
     key: "setVideoOrientation",
     value: function setVideoOrientation() {
@@ -263,7 +299,6 @@ var VideoWindowStore = exports["default"] = /*#__PURE__*/function () {
         onStreamVolumeIndicationUpdated: this._onAudioVolumeUpdated
       });
       this._dialogProvider.removeObserver(this._dialogObserver);
-      this._sharedVideoWindowDataSource.removeObserver(this._sharedVideoWindowDataSourceObserver);
     }
   }, {
     key: "removePin",
@@ -348,9 +383,11 @@ var VideoWindowStore = exports["default"] = /*#__PURE__*/function () {
         return;
       }
       this.videoWindowPreviewType = type;
-      this._updateWindowProperties({
-        updateResizable: true
-      });
+      var videoWindow = this._windowProvider.getWindowById(_constant.FcrUIDialogKey.VIDEO_WINDOW);
+      var resizable = type === _type.FcrVideoWindowPreviewType.SMALL;
+      videoWindow.setResizable(resizable);
+      videoWindow.setAspectRatio(resizable ? _type.VideoWindowRadio : 0);
+      videoWindow.setMinimumSize(_type.DefaultVideoWindowWidth, resizable ? _type.DefaultVideoWindowSmallTypeHeight : _type.DefaultVideoWindowHeight);
     }
   }, {
     key: "setWrapperHover",
@@ -363,22 +400,31 @@ var VideoWindowStore = exports["default"] = /*#__PURE__*/function () {
       return this._privilegeProvider.getAllowedOperations(targetRole, isSelf);
     }
   }, {
-    key: "_updateWindowProperties",
-    value: function _updateWindowProperties() {
-      var _ref3 = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {
-          updateResizable: false
-        },
-        _ref3$updateResizable = _ref3.updateResizable,
-        updateResizable = _ref3$updateResizable === void 0 ? false : _ref3$updateResizable;
-      var height = this.computedVideoWindowHeight();
-      var videoWindow = this._windowProvider.getWindowById(_constant.FcrUIDialogKey.VIDEO_WINDOW);
-      if (updateResizable) {
-        var resizable = this.videoWindowPreviewType === _type.FcrVideoWindowPreviewType.SMALL;
-        videoWindow.setResizable(resizable);
-        videoWindow.setAspectRatio(resizable ? _type.VideoWindowRadio : 0);
-        videoWindow.setMinimumSize(_type.DefaultVideoWindowWidth, resizable ? _type.DefaultVideoWindowSmallTypeHeight : _type.DefaultVideoWindowHeight);
+    key: "handleVideowWindowResize",
+    value: function handleVideowWindowResize(size) {
+      if (this._isWindowApiResize) {
+        this._isWindowApiResize = false;
+        return;
+      }
+      if (this.videoWindowPreviewType === _type.FcrVideoWindowPreviewType.SMALL) {
+        this._videoWindowSmallTypeStyleSize = size;
       }
-      (0, _videoWindow.setVideoWindowDialogSize)(videoWindow, height);
+    }
+  }, {
+    key: "setVideoWindowSize",
+    value: function setVideoWindowSize(width, height) {
+      var videoWindow = this._windowProvider.getWindowById(_constant.FcrUIDialogKey.VIDEO_WINDOW);
+      this._isWindowApiResize = true;
+      (0, _videoWindow.setVideoWindowDialogSize)(videoWindow, {
+        width: width,
+        height: height
+      });
+    }
+  }, {
+    key: "resetVideoWindowSize",
+    value: function resetVideoWindowSize() {
+      var size = this.videoWindowStyleSize;
+      this.setVideoWindowSize(size.width, size.height);
     }
   }, {
     key: "_onAudioVolumeUpdated",
@@ -386,33 +432,32 @@ var VideoWindowStore = exports["default"] = /*#__PURE__*/function () {
       this.userVolumeMap.set(streamId, Math.floor(volume / 255 * 100));
     }
   }, {
-    key: "_handleFoldListUpdated",
-    value: function _handleFoldListUpdated() {
-      // 没有远端可以看了，如果当前在list模式，切换到small模式
-      if (!this.shouldHaveListView && this.videoWindowPreviewType === _type.FcrVideoWindowPreviewType.LIST) {
-        this.setVideoWindowPreviewType(_type.FcrVideoWindowPreviewType.SMALL);
-      } else {
-        this._updateWindowProperties();
-      }
+    key: "_handleDialogOpen",
+    value: function _handleDialogOpen(dialogKey) {
+      if (dialogKey !== _constant.FcrUIDialogKey.VIDEO_WINDOW) return;
+      this._windowOpened = true;
     }
   }, {
-    key: "_handleDialogSwitch",
-    value: function _handleDialogSwitch(dialogKey, open) {
+    key: "_handleDialogClose",
+    value: function _handleDialogClose(dialogKey) {
+      var _this4 = this;
       if (dialogKey !== _constant.FcrUIDialogKey.VIDEO_WINDOW) return;
-      if (open) {
-        this._sharedVideoWindowDataSource.addObserver(this._sharedVideoWindowDataSourceObserver);
-        this._updateWindowProperties();
-      } else {
-        this._sharedVideoWindowDataSource.removeObserver(this._sharedVideoWindowDataSourceObserver);
-        this.setVideoWindowPreviewType(_type.FcrVideoWindowPreviewType.SMALL);
-      }
+      this._windowOpened = false;
+      (0, _mobx.runInAction)(function () {
+        _this4._videoWindowSmallTypeStyleSize = {
+          width: _type.DefaultVideoWindowWidth,
+          height: _type.DefaultVideoWindowSmallTypeHeight
+        };
+        _this4.setVideoWindowPreviewType(_type.FcrVideoWindowPreviewType.SMALL);
+      });
     }
   }]);
 }();
 _VideoWindowStore = VideoWindowStore;
-var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_VideoWindowStore, [[_mobx.observable, 1, "userVolumeMap"], [_mobx.observable, 1, "wrapperHovering"], [_mobx.observable, 1, "videoWindowPreviewType"], [_mobx.computed, 3, "foldListRenderData"], [_mobx.computed, 3, "spotlightStreamId"], [_mobx.computed, 3, "findSpotlightUser"], [_mobx.computed, 3, "hasPinnedStream"], [_mobx.computed, 3, "shouldHaveListView"], [_decorator.bound, 2, "setVideoOrientation"], [_decorator.bound, 2, "removePin"], [_decorator.bound, 2, "addPin"], [_decorator.bound, 2, "sendParticipantEvent"], [_decorator.bound, 2, "muteAudio"], [_decorator.bound, 2, "computedVideoWindowHeight"], [_decorator.bound, 2, "openPrivateChat"], [_decorator.bound, 2, "openRenameDialog"], [_decorator.bound, 2, "hasMutePermission"], [_decorator.bound, 2, "hasUnmutePermission"], [_decorator.bound, 2, "hasRequestStartAudioPermission"], [_setVideoWindowPreviewTypeDecs, 18, "setVideoWindowPreviewType"], [_setWrapperHoverDecs, 18, "setWrapperHover"], [_getAllowedOperationsDecs, 18, "getAllowedOperations"], [_decorator.bound, 2, "_updateWindowProperties"], [_onAudioVolumeUpdatedDecs, 18, "_onAudioVolumeUpdated"], [_decorator.bound, 2, "_handleFoldListUpdated"]], []).e, 4);
-_init_userVolumeMap = _applyDecs$e[0];
-_init_wrapperHovering = _applyDecs$e[1];
-_init_videoWindowPreviewType = _applyDecs$e[2];
-_initProto = _applyDecs$e[3];
+var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_VideoWindowStore, [[_mobx.observable, 1, "_videoWindowSmallTypeStyleSize"], [_mobx.observable, 1, "userVolumeMap"], [_mobx.observable, 1, "wrapperHovering"], [_mobx.observable, 1, "videoWindowPreviewType"], [_mobx.computed, 3, "foldListRenderData"], [_mobx.computed, 3, "spotlightStreamId"], [_mobx.computed, 3, "findSpotlightUser"], [_mobx.computed, 3, "hasPinnedStream"], [_mobx.computed, 3, "videoWindowStyleSize"], [_decorator.bound, 2, "setVideoOrientation"], [_decorator.bound, 2, "removePin"], [_decorator.bound, 2, "addPin"], [_decorator.bound, 2, "sendParticipantEvent"], [_decorator.bound, 2, "muteAudio"], [_decorator.bound, 2, "computedVideoWindowHeight"], [_decorator.bound, 2, "openPrivateChat"], [_decorator.bound, 2, "openRenameDialog"], [_decorator.bound, 2, "hasMutePermission"], [_decorator.bound, 2, "hasUnmutePermission"], [_decorator.bound, 2, "hasRequestStartAudioPermission"], [_setVideoWindowPreviewTypeDecs, 18, "setVideoWindowPreviewType"], [_setWrapperHoverDecs, 18, "setWrapperHover"], [_getAllowedOperationsDecs, 18, "getAllowedOperations"], [_handleVideowWindowResizeDecs, 18, "handleVideowWindowResize"], [_decorator.bound, 2, "setVideoWindowSize"], [_decorator.bound, 2, "resetVideoWindowSize"], [_onAudioVolumeUpdatedDecs, 18, "_onAudioVolumeUpdated"], [_decorator.bound, 2, "_handleDialogOpen"], [_decorator.bound, 2, "_handleDialogClose"]], []).e, 5);
+_init__videoWindowSmallTypeStyleSize = _applyDecs$e[0];
+_init_userVolumeMap = _applyDecs$e[1];
+_init_wrapperHovering = _applyDecs$e[2];
+_init_videoWindowPreviewType = _applyDecs$e[3];
+_initProto = _applyDecs$e[4];
 var StoreContext = exports.StoreContext = /*#__PURE__*/(0, _react.createContext)(null);

package/lib/modules/video-window/view.js

@@ -1,12 +1,26 @@
 "use strict";
 
+require("core-js/modules/es.symbol.js");
+require("core-js/modules/es.array.filter.js");
+require("core-js/modules/es.array.for-each.js");
+require("core-js/modules/es.array.push.js");
+require("core-js/modules/es.object.define-properties.js");
 require("core-js/modules/es.object.define-property.js");
+require("core-js/modules/es.object.get-own-property-descriptor.js");
+require("core-js/modules/es.object.get-own-property-descriptors.js");
+require("core-js/modules/es.object.keys.js");
+require("core-js/modules/es.object.to-string.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/web.dom-collections.for-each.js");
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.View = void 0;
 require("core-js/modules/web.timers.js");
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _mobxReact = require("mobx-react");
 var _react = require("react");
@@ -15,8 +29,11 @@ var _store = require("./store");
 var _topControl = _interopRequireDefault(require("./components/topControl"));
 var _speaking = _interopRequireDefault(require("./components/speaking"));
 require("./index.css");
+var _popoverWatcher = require("./popover-watcher");
 var _videoTrackRenderContext = require("../../shared-context/video-track-render-context");
 var _jsxRuntime = require("react/jsx-runtime");
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2["default"])(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var View = exports.View = (0, _mobxReact.observer)(function () {
   var divRef = (0, _react.useRef)(null);
   var _useState = (0, _react.useState)(false),
@@ -25,7 +42,11 @@ var View = exports.View = (0, _mobxReact.observer)(function () {
     setIsHover = _useState2[1];
   var _useContext = (0, _react.useContext)(_store.StoreContext),
     setWrapperHover = _useContext.setWrapperHover,
-    videoRenderContext = _useContext.videoRenderContext;
+    videoRenderContext = _useContext.videoRenderContext,
+    setVideoWindowSize = _useContext.setVideoWindowSize,
+    resetVideoWindowSize = _useContext.resetVideoWindowSize,
+    videoWindowStyleSize = _useContext.videoWindowStyleSize,
+    handleVideowWindowResize = _useContext.handleVideowWindowResize;
   (0, _react.useEffect)(function () {
     if (!isHover) {
       var timer = setTimeout(function () {
@@ -38,8 +59,36 @@ var View = exports.View = (0, _mobxReact.observer)(function () {
       setWrapperHover(true);
     }
   }, [isHover]);
+  (0, _react.useEffect)(function () {
+    if (divRef.current === null) return;
+    var ownerDocument = divRef.current.ownerDocument;
+    var defaultView = ownerDocument.defaultView;
+    var body = ownerDocument.body;
+    var onResize = function onResize() {
+      handleVideowWindowResize({
+        width: body.offsetWidth,
+        height: body.offsetHeight
+      });
+    };
+    if (defaultView) {
+      defaultView.addEventListener('resize', onResize);
+    } else {
+      console.error('dialogWrapper.ownerDocument.defaultView is null');
+    }
+    return function () {
+      if (defaultView) {
+        defaultView.removeEventListener('resize', onResize);
+      }
+    };
+  }, [divRef.current]);
+  (0, _popoverWatcher.usePopoverWatcher)({
+    rootDom: divRef.current,
+    setVideoWindowSize: setVideoWindowSize,
+    resetVideoWindowSize: resetVideoWindowSize
+  });
   return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
     ref: divRef,
+    style: _objectSpread({}, videoWindowStyleSize),
     onMouseEnter: function onMouseEnter() {
       setIsHover(true);
     },

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

@@ -6,5 +6,5 @@ export declare class FcrWhiteboardUIModule extends UIModule {
     get store(): WhitebaordStoreBase;
     onNodeWillActive(): void;
     onNodeWillInactive(): void;
-    getComponent(dom?: Element | null): React.ReactNode;
+    getComponent(): React.ReactNode;
 }

package/lib/modules/whiteboard/index.js

@@ -65,7 +65,7 @@ var FcrWhiteboardUIModule = exports.FcrWhiteboardUIModule = /*#__PURE__*/functio
     }
   }, {
     key: "getComponent",
-    value: function getComponent(dom) {
+    value: function getComponent() {
       return /*#__PURE__*/(0, _jsxRuntime.jsx)(_store.WhiteboardStoreContext.Provider, {
         value: this.store,
         children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_view.Whiteboard, {})

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() {

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;
 }