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

package/lib/modules/video-window/popover-watcher.js

@@ -27,12 +27,14 @@ function usePopoverWatcher(_ref) {
     var dialogWrapper = rootDom;
     var body = dialogWrapper.ownerDocument.body;
     var popoverClassName = 'fcr-popover';
+    var isPopoverOpened = false;
     var observer = new MutationObserver(function (mutationsList) {
       var popover = body.querySelector(".".concat(popoverClassName));
       mutationsList.forEach(function (mutation) {
         if (mutation.type === 'childList') {
           mutation.removedNodes.forEach(function (node) {
             if (node.nodeType === Node.ELEMENT_NODE && node.classList.contains(popoverClassName)) {
+              isPopoverOpened = false;
               resetVideoWindowSize();
             }
           });
@@ -40,10 +42,21 @@ function usePopoverWatcher(_ref) {
             return;
           }
           mutation.addedNodes.forEach(function (node) {
-            if (node.nodeType === Node.ELEMENT_NODE && node.contains(popover)) {
+            if (node.nodeType === Node.ELEMENT_NODE && node.contains(popover) && !isPopoverOpened) {
+              isPopoverOpened = true;
               var width = popover.offsetWidth + dialogWrapper.offsetWidth - WIDTH_RIGHT_OFFSET;
               var height = Math.max(popover.offsetHeight + HEAD_HEIGHT_OFFSET, dialogWrapper.offsetHeight);
-              setVideoWindowSize(width, height);
+              var _setVideoWindowSize = setVideoWindowSize(width, height),
+                videoWidth = _setVideoWindowSize.width;
+              if (videoWidth < width) {
+                // 说明右侧的宽度不够放下 popover，此时 popover 会自动翻转到左侧。
+                // 需要把手动调整左侧的距离，使其贴靠在窗口的最右侧。
+
+                // popover 会自动计算并设置 style 的 left 值，此处如果直接设置 left 会被 popover 内覆盖。
+                // 所以通过设置 css 变量的方式传递给 fcr-video-window-diaolog-wrapper_popover-align-right 使用。
+                popover.style.setProperty('--video-window-popover-left', "".concat(videoWidth - popover.offsetWidth, "px"));
+                popover.id = 'fcr-video-window-diaolog-wrapper_popover-align-right';
+              }
             }
           });
         }

package/lib/modules/video-window/store.d.ts

@@ -62,8 +62,25 @@ export default class VideoWindowStore {
         width: number;
         height: number;
     }): void;
-    setVideoWindowSize(width: number, height: number): void;
+    /**
+     * @description 如果传入的宽度超过了允许的最大宽度, 则使用允许的最大宽度设置窗口宽度，以避免窗口超出显示器的边缘。
+     * @param width 期望设置的视频窗宽度
+     * @param height 视频窗高度
+     * @returns 实际设置的视频窗尺寸
+     */
+    setVideoWindowSize(width: number, height: number): {
+        width: number;
+        height: number;
+    };
     resetVideoWindowSize(): void;
+    /**
+     * 计算 video-window 窗口允许设置的最大宽度，窗口左上角距离屏幕右侧边缘的距离和当前的窗口内容宽度中，选择最大值作为允许的最大宽度（不能超过窗口最大化的宽度）
+     * @param videoWindowX 视频窗左上角 x 坐标
+     * @param videoWindowStyleWidth 视频窗内容的宽度
+     * @returns 允许设置的最大宽度
+     */
+    private _computedMaxAllowedWidth;
+    private _setVideoWindowDialogSize;
     private _onAudioVolumeUpdated;
     private _handleDialogOpen;
     private _handleDialogClose;

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

@@ -136,7 +136,7 @@ var VideoWindowStore = exports["default"] = /*#__PURE__*/function () {
       return _this.videoWindowPreviewType;
     }, function () {
       var size = _this.videoWindowStyleSize;
-      _this.setVideoWindowSize(size.width, size.height);
+      _this._setVideoWindowDialogSize(size.width, size.height);
     }), (0, _mobx.reaction)(function () {
       return _this.filterFoldList.length;
     }, function (length, prevLength) {
@@ -151,7 +151,7 @@ var VideoWindowStore = exports["default"] = /*#__PURE__*/function () {
         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._setVideoWindowDialogSize(width, size.height);
       }
     }));
     this._streamControl.addObserver({
@@ -410,21 +410,69 @@ var VideoWindowStore = exports["default"] = /*#__PURE__*/function () {
         this._videoWindowSmallTypeStyleSize = size;
       }
     }
+    /**
+     * @description 如果传入的宽度超过了允许的最大宽度, 则使用允许的最大宽度设置窗口宽度，以避免窗口超出显示器的边缘。
+     * @param width 期望设置的视频窗宽度
+     * @param height 视频窗高度
+     * @returns 实际设置的视频窗尺寸
+     */
   }, {
     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,
+      var _videoWindow$getBound = videoWindow.getBounds(),
+        videoWindowX = _videoWindow$getBound.x;
+      var videoWindowStyleWidth = this.videoWindowStyleSize.width;
+      var maxAllowedWidth = this._computedMaxAllowedWidth(videoWindowX, videoWindowStyleWidth);
+
+      // 在最大宽度限制内，使用期望的宽度
+      // 超出最大宽度限制，使用允许的最大宽度
+      var finalWidth = Math.min(maxAllowedWidth, width);
+      this._setVideoWindowDialogSize(finalWidth, height, videoWindow);
+      return {
+        width: finalWidth,
         height: height
-      });
+      };
     }
   }, {
     key: "resetVideoWindowSize",
     value: function resetVideoWindowSize() {
       var size = this.videoWindowStyleSize;
-      this.setVideoWindowSize(size.width, size.height);
+      this._setVideoWindowDialogSize(size.width, size.height);
+    }
+
+    /**
+     * 计算 video-window 窗口允许设置的最大宽度，窗口左上角距离屏幕右侧边缘的距离和当前的窗口内容宽度中，选择最大值作为允许的最大宽度（不能超过窗口最大化的宽度）
+     * @param videoWindowX 视频窗左上角 x 坐标
+     * @param videoWindowStyleWidth 视频窗内容的宽度
+     * @returns 允许设置的最大宽度
+     */
+  }, {
+    key: "_computedMaxAllowedWidth",
+    value: function _computedMaxAllowedWidth(videoWindowX, videoWindowStyleWidth) {
+      var sharingDisplayBounds = this._screenShareProvider.sharingDisplayBounds;
+      var displayX = sharingDisplayBounds.x,
+        displayWidth = sharingDisplayBounds.width;
+      var displayRightEdge = displayX + displayWidth;
+      var distanceToRightEdge = displayRightEdge - videoWindowX;
+
+      // 如果窗口左上角距离屏幕边缘的距离小于当前的窗口内容宽度，则使用当前窗口内容宽度作为允许的最大宽度，避免窗口收窄导致内容显示异常
+      var maxAllowedWidth = Math.max(distanceToRightEdge, videoWindowStyleWidth);
+
+      // 如果最大允许宽度超出了窗口最大化的宽度，则使用窗口最大化的宽度作为允许设置的宽度
+      return Math.min(maxAllowedWidth, _type.VideoWindowZoomMaxWidth);
+    }
+  }, {
+    key: "_setVideoWindowDialogSize",
+    value: function _setVideoWindowDialogSize(width, height, videoWindow) {
+      if (!videoWindow) {
+        videoWindow = this._windowProvider.getWindowById(_constant.FcrUIDialogKey.VIDEO_WINDOW);
+      }
+      this._isWindowApiResize = true;
+      (0, _videoWindow.setVideoWindowDialogSize)(videoWindow, {
+        width: width,
+        height: height
+      });
     }
   }, {
     key: "_onAudioVolumeUpdated",

package/lib/modules/whiteboard/store.js

@@ -231,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;
       }
     }
   }, {
@@ -361,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/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",

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

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;

package/lib/providers/board-share/bar-control/base.js

@@ -39,7 +39,6 @@ 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");
 require("core-js/modules/es.array.find.js");
-require("core-js/modules/es.array.includes.js");
 require("core-js/modules/es.array.iterator.js");
 require("core-js/modules/es.object.to-string.js");
 require("core-js/modules/es.string.iterator.js");
@@ -63,7 +62,7 @@ var _utils = require("../../../modules/whiteboard/utils");
 var _toolbar = require("../../../modules/components/toolbar");
 var _dayjs = _interopRequireDefault(require("dayjs"));
 var _FcrUIBoardControlShareProviderBase;
-var _initProto, _init_currentTheme, _init_sharingUserInfo, _init_backgroundColor, _init_hasWriteBoardPermission, _init_connectionState, _init_joinSuccess, _init_toolbarState, _setControlEnableDecs, _setSharingUserDecs, _setBackgroundColorDecs, _setWhiteboardToolDecs, _setThemeDecs, _setShowLoadingDecs, _setCommonColorsDecs, _setProgressDecs, _setJoinSuccessDecs, _handleDraftSavedDecs, _ref;
+var _initProto, _init__showLoading, _init_currentTheme, _init_sharingUserInfo, _init_backgroundColor, _init_hasWriteBoardPermission, _init_connectionState, _init_joinSuccess, _init_toolbarState, _setControlEnableDecs, _setSharingUserDecs, _setBackgroundColorDecs, _setWhiteboardToolDecs, _setThemeDecs, _setShowLoadingDecs, _setCommonColorsDecs, _setProgressDecs, _setJoinSuccessDecs, _handleDraftSavedDecs, _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; }
@@ -81,6 +80,7 @@ var _D = /*#__PURE__*/new WeakMap();
 var _E = /*#__PURE__*/new WeakMap();
 var _F = /*#__PURE__*/new WeakMap();
 var _G = /*#__PURE__*/new WeakMap();
+var _H = /*#__PURE__*/new WeakMap();
 _ref = (_setControlEnableDecs = [_mobx.action, _mobx.action.bound], _setSharingUserDecs = [_mobx.action, _mobx.action.bound], _setBackgroundColorDecs = [_mobx.action, _mobx.action.bound], _setWhiteboardToolDecs = [_mobx.action, _mobx.action.bound], _setThemeDecs = [_mobx.action, _mobx.action.bound], _setShowLoadingDecs = [_mobx.action, _mobx.action.bound], _setCommonColorsDecs = [_mobx.action, _mobx.action.bound], _setProgressDecs = [_mobx.action, _mobx.action.bound], _setJoinSuccessDecs = [_mobx.action, _mobx.action.bound], _handleDraftSavedDecs = [_mobx.action, _mobx.action.bound], "logger");
 var FcrUIBoardControlShareProviderBase = exports.FcrUIBoardControlShareProviderBase = /*#__PURE__*/function () {
   function FcrUIBoardControlShareProviderBase(_privilegeProvider, _boardControl) {
@@ -88,15 +88,15 @@ var FcrUIBoardControlShareProviderBase = exports.FcrUIBoardControlShareProviderB
     (0, _defineProperty2["default"])(this, _ref, (_initProto(this), (0, _imports.createLogger)({
       prefix: 'WhiteboardControlStore'
     })));
-    (0, _defineProperty2["default"])(this, "_showLoading", true);
     (0, _defineProperty2["default"])(this, "_roomName", '');
-    _classPrivateFieldInitSpec(this, _A, _init_currentTheme(this, (0, _theme["default"])()[0]));
-    _classPrivateFieldInitSpec(this, _B, _init_sharingUserInfo(this, undefined));
-    _classPrivateFieldInitSpec(this, _C, _init_backgroundColor(this, '#ffffff'));
-    _classPrivateFieldInitSpec(this, _D, _init_hasWriteBoardPermission(this, false));
-    _classPrivateFieldInitSpec(this, _E, _init_connectionState(this, _type.FcrConnectionState.DISCONNECTED));
-    _classPrivateFieldInitSpec(this, _F, _init_joinSuccess(this, false));
-    _classPrivateFieldInitSpec(this, _G, _init_toolbarState(this, {
+    _classPrivateFieldInitSpec(this, _A, _init__showLoading(this, true));
+    _classPrivateFieldInitSpec(this, _B, _init_currentTheme(this, (0, _theme["default"])()[0]));
+    _classPrivateFieldInitSpec(this, _C, _init_sharingUserInfo(this, undefined));
+    _classPrivateFieldInitSpec(this, _D, _init_backgroundColor(this, '#ffffff'));
+    _classPrivateFieldInitSpec(this, _E, _init_hasWriteBoardPermission(this, false));
+    _classPrivateFieldInitSpec(this, _F, _init_connectionState(this, _type.FcrConnectionState.DISCONNECTED));
+    _classPrivateFieldInitSpec(this, _G, _init_joinSuccess(this, false));
+    _classPrivateFieldInitSpec(this, _H, _init_toolbarState(this, {
       controlEnable: false,
       currentTool: _enums.FcrBoardToolType.LASER_POINTER,
       currentStrokeWidth: 2,
@@ -121,7 +121,7 @@ var FcrUIBoardControlShareProviderBase = exports.FcrUIBoardControlShareProviderB
       return boardMainRoom;
     }
   }, {
-    key: "currentTheme",
+    key: "_showLoading",
     get: function get() {
       return _classPrivateFieldGet(_A, this);
     },
@@ -129,7 +129,7 @@ var FcrUIBoardControlShareProviderBase = exports.FcrUIBoardControlShareProviderB
       _classPrivateFieldSet(_A, this, v);
     }
   }, {
-    key: "sharingUserInfo",
+    key: "currentTheme",
     get: function get() {
       return _classPrivateFieldGet(_B, this);
     },
@@ -137,7 +137,7 @@ var FcrUIBoardControlShareProviderBase = exports.FcrUIBoardControlShareProviderB
       _classPrivateFieldSet(_B, this, v);
     }
   }, {
-    key: "backgroundColor",
+    key: "sharingUserInfo",
     get: function get() {
       return _classPrivateFieldGet(_C, this);
     },
@@ -145,7 +145,7 @@ var FcrUIBoardControlShareProviderBase = exports.FcrUIBoardControlShareProviderB
       _classPrivateFieldSet(_C, this, v);
     }
   }, {
-    key: "hasWriteBoardPermission",
+    key: "backgroundColor",
     get: function get() {
       return _classPrivateFieldGet(_D, this);
     },
@@ -153,7 +153,7 @@ var FcrUIBoardControlShareProviderBase = exports.FcrUIBoardControlShareProviderB
       _classPrivateFieldSet(_D, this, v);
     }
   }, {
-    key: "connectionState",
+    key: "hasWriteBoardPermission",
     get: function get() {
       return _classPrivateFieldGet(_E, this);
     },
@@ -161,7 +161,7 @@ var FcrUIBoardControlShareProviderBase = exports.FcrUIBoardControlShareProviderB
       _classPrivateFieldSet(_E, this, v);
     }
   }, {
-    key: "joinSuccess",
+    key: "connectionState",
     get: function get() {
       return _classPrivateFieldGet(_F, this);
     },
@@ -169,17 +169,25 @@ var FcrUIBoardControlShareProviderBase = exports.FcrUIBoardControlShareProviderB
       _classPrivateFieldSet(_F, this, v);
     }
   }, {
-    key: "toolbarState",
+    key: "joinSuccess",
     get: function get() {
       return _classPrivateFieldGet(_G, this);
     },
     set: function set(v) {
       _classPrivateFieldSet(_G, this, v);
     }
+  }, {
+    key: "toolbarState",
+    get: function get() {
+      return _classPrivateFieldGet(_H, this);
+    },
+    set: function set(v) {
+      _classPrivateFieldSet(_H, this, v);
+    }
   }, {
     key: "showLoading",
     get: function get() {
-      return [_type.FcrConnectionState.CONNECTING, _type.FcrConnectionState.RECONNECTING].includes(this.connectionState) && this._showLoading;
+      return this._showLoading;
     }
   }, {
     key: "canWriteBoard",
@@ -293,14 +301,15 @@ var FcrUIBoardControlShareProviderBase = exports.FcrUIBoardControlShareProviderB
   }]);
 }();
 _FcrUIBoardControlShareProviderBase = FcrUIBoardControlShareProviderBase;
-var _applyDecs$e = _applyDecs(_FcrUIBoardControlShareProviderBase, [[_mobx.observable, 1, "currentTheme"], [_mobx.observable, 1, "sharingUserInfo"], [_mobx.observable, 1, "backgroundColor"], [_mobx.observable, 1, "hasWriteBoardPermission"], [_mobx.observable, 1, "connectionState"], [_mobx.observable, 1, "joinSuccess"], [_mobx.observable, 1, "toolbarState"], [_mobx.computed, 3, "canWriteBoard"], [_setControlEnableDecs, 18, "setControlEnable"], [_setSharingUserDecs, 18, "setSharingUser"], [_setBackgroundColorDecs, 18, "setBackgroundColor"], [_setWhiteboardToolDecs, 18, "setWhiteboardTool"], [_setThemeDecs, 18, "setTheme"], [_setShowLoadingDecs, 18, "setShowLoading"], [_setCommonColorsDecs, 18, "setCommonColors"], [_imports.bound, 2, "saveDraft"], [_setProgressDecs, 18, "setProgress"], [_setJoinSuccessDecs, 18, "setJoinSuccess"], [_imports.bound, 2, "resetWhiteboardTool"], [_handleDraftSavedDecs, 18, "_handleDraftSaved"]], []).e;
-var _applyDecs$e2 = (0, _slicedToArray2["default"])(_applyDecs$e, 8);
-_init_currentTheme = _applyDecs$e2[0];
-_init_sharingUserInfo = _applyDecs$e2[1];
-_init_backgroundColor = _applyDecs$e2[2];
-_init_hasWriteBoardPermission = _applyDecs$e2[3];
-_init_connectionState = _applyDecs$e2[4];
-_init_joinSuccess = _applyDecs$e2[5];
-_init_toolbarState = _applyDecs$e2[6];
-_initProto = _applyDecs$e2[7];
+var _applyDecs$e = _applyDecs(_FcrUIBoardControlShareProviderBase, [[_mobx.observable, 1, "_showLoading"], [_mobx.observable, 1, "currentTheme"], [_mobx.observable, 1, "sharingUserInfo"], [_mobx.observable, 1, "backgroundColor"], [_mobx.observable, 1, "hasWriteBoardPermission"], [_mobx.observable, 1, "connectionState"], [_mobx.observable, 1, "joinSuccess"], [_mobx.observable, 1, "toolbarState"], [_mobx.computed, 3, "canWriteBoard"], [_setControlEnableDecs, 18, "setControlEnable"], [_setSharingUserDecs, 18, "setSharingUser"], [_setBackgroundColorDecs, 18, "setBackgroundColor"], [_setWhiteboardToolDecs, 18, "setWhiteboardTool"], [_setThemeDecs, 18, "setTheme"], [_setShowLoadingDecs, 18, "setShowLoading"], [_setCommonColorsDecs, 18, "setCommonColors"], [_imports.bound, 2, "saveDraft"], [_setProgressDecs, 18, "setProgress"], [_setJoinSuccessDecs, 18, "setJoinSuccess"], [_imports.bound, 2, "resetWhiteboardTool"], [_handleDraftSavedDecs, 18, "_handleDraftSaved"]], []).e;
+var _applyDecs$e2 = (0, _slicedToArray2["default"])(_applyDecs$e, 9);
+_init__showLoading = _applyDecs$e2[0];
+_init_currentTheme = _applyDecs$e2[1];
+_init_sharingUserInfo = _applyDecs$e2[2];
+_init_backgroundColor = _applyDecs$e2[3];
+_init_hasWriteBoardPermission = _applyDecs$e2[4];
+_init_connectionState = _applyDecs$e2[5];
+_init_joinSuccess = _applyDecs$e2[6];
+_init_toolbarState = _applyDecs$e2[7];
+_initProto = _applyDecs$e2[8];
 _applyDecs$e;

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

@@ -8,8 +8,8 @@ import { FcrUIBoardControlShareProviderBase } from './base';
 export declare class FcrUIBoardControlShareProviderImpl extends FcrUIBoardControlShareProviderBase {
     private readonly _fcrUIMainWindowRenderer;
     protected logger: import("agora-foundation/lib/logger").Logger;
-    private _mainWindowRenderer;
     private _disposers;
+    private _isDualDisplayMode;
     private _toolbarStateObserver;
     get toolbarStateObserver(): FcrUIMainWindowRendererObserver;
     constructor(privilegeProvider: FcrUIPrivilegeProvider, boardControl: FcrPrivilegedWhiteboardControl, _fcrUIMainWindowRenderer: FcrUIMainWindowRenderer);

package/lib/providers/board-share/bar-control/electron.js

@@ -80,6 +80,7 @@ var FcrUIBoardControlShareProviderImpl = exports.FcrUIBoardControlShareProviderI
       prefix: 'WhiteboardControlStore'
     })));
     (0, _defineProperty2["default"])(_this, "_disposers", []);
+    (0, _defineProperty2["default"])(_this, "_isDualDisplayMode", false);
     (0, _defineProperty2["default"])(_this, "_toolbarStateObserver", {
       onUndoStepsUpdated: function onUndoStepsUpdated(steps) {
         _this.toolbarState.undoSteps = steps;
@@ -113,32 +114,32 @@ var FcrUIBoardControlShareProviderImpl = exports.FcrUIBoardControlShareProviderI
     key: "setBackgroundColor",
     value: function setBackgroundColor(color) {
       _superPropGet(FcrUIBoardControlShareProviderImpl, "setBackgroundColor", this, 3)([color]);
-      if (this._mainWindowRenderer) {
-        this._mainWindowRenderer.notifyObservers('onBackgroundColorUpdated', color);
+      if (this._isDualDisplayMode) {
+        this._fcrUIMainWindowRenderer.notifyObservers('onBackgroundColorUpdated', color);
       }
     }
   }, {
     key: "setWhiteboardTool",
     value: function setWhiteboardTool(tool) {
       this.logger.info("[shared-whiteboard-data-source]: setWhiteboardTool ".concat(tool));
-      if (this._mainWindowRenderer) {
-        this._mainWindowRenderer.notifyObservers('onWhiteboardToolSelected', tool);
+      if (this._isDualDisplayMode) {
+        this._fcrUIMainWindowRenderer.notifyObservers('onWhiteboardToolSelected', tool);
       }
       _superPropGet(FcrUIBoardControlShareProviderImpl, "setWhiteboardTool", this, 3)([tool]);
     }
   }, {
     key: "setTheme",
     value: function setTheme(theme) {
-      if (this._mainWindowRenderer) {
-        this._mainWindowRenderer.notifyObservers('onBackgroundColorUpdated', theme.background);
+      if (this._isDualDisplayMode) {
+        this._fcrUIMainWindowRenderer.notifyObservers('onBackgroundColorUpdated', theme.background);
       }
       _superPropGet(FcrUIBoardControlShareProviderImpl, "setTheme", this, 3)([theme]);
     }
   }, {
     key: "saveDraft",
     value: function saveDraft() {
-      if (this._mainWindowRenderer) {
-        this._mainWindowRenderer.notifyObservers('onSaveDraft');
+      if (this._isDualDisplayMode) {
+        this._fcrUIMainWindowRenderer.notifyObservers('onSaveDraft');
       } else {
         _superPropGet(FcrUIBoardControlShareProviderImpl, "saveDraft", this, 3)([]);
       }
@@ -146,15 +147,15 @@ var FcrUIBoardControlShareProviderImpl = exports.FcrUIBoardControlShareProviderI
   }, {
     key: "inActive",
     value: function inActive() {
-      if (this._mainWindowRenderer) {
-        this._mainWindowRenderer.notifyObservers('onWhiteboardInActive');
+      if (this._isDualDisplayMode) {
+        this._fcrUIMainWindowRenderer.notifyObservers('onWhiteboardInActive');
       }
     }
   }, {
     key: "release",
     value: function release() {
-      if (this._mainWindowRenderer) {
-        this._mainWindowRenderer.removeObserver(this._toolbarStateObserver);
+      if (this._isDualDisplayMode) {
+        this._fcrUIMainWindowRenderer.removeObserver(this._toolbarStateObserver);
       }
       _superPropGet(FcrUIBoardControlShareProviderImpl, "release", this, 3)([]);
     }
@@ -162,16 +163,18 @@ var FcrUIBoardControlShareProviderImpl = exports.FcrUIBoardControlShareProviderI
     key: "setIsDualDisplayMode",
     value: function setIsDualDisplayMode(isDualDisplayMode) {
       var _this2 = this;
+      this._isDualDisplayMode = isDualDisplayMode;
       if (isDualDisplayMode) {
-        this._mainWindowRenderer = this._fcrUIMainWindowRenderer;
+        this._fcrUIMainWindowRenderer.addObserver(this._toolbarStateObserver);
         this._disposers.push((0, _mobx.reaction)(function () {
           return _this2.canWriteBoard;
         }, function (canWrite) {
-          var _this2$_mainWindowRen;
-          (_this2$_mainWindowRen = _this2._mainWindowRenderer) === null || _this2$_mainWindowRen === void 0 || _this2$_mainWindowRen.notifyObservers('onPermissionUpdated', canWrite);
+          _this2._fcrUIMainWindowRenderer.notifyObservers('onPermissionUpdated', canWrite);
         }));
       } else {
-        this._mainWindowRenderer = undefined;
+        this.setShowLoading(true);
+        this.setJoinSuccess(false);
+        this._fcrUIMainWindowRenderer.removeObserver(this._toolbarStateObserver);
         this._disposers.forEach(function (disposer) {
           return disposer();
         });

package/lib/providers/board-share/provider.browser.d.ts

@@ -5,6 +5,7 @@ export declare class FcrUIBoardShareProviderImpl extends FcrUIBoardShareProvider
     private readonly _objectManager;
     private _boardBarControl;
     private _boardControlObserver;
+    private _boardMainWindowObserver;
     get boardBarControl(): FcrUIBoardBarControl;
     constructor(_objectManager: FcrUIObjectManager);
     setIsDualDisplayMode(): void;
@@ -12,4 +13,6 @@ export declare class FcrUIBoardShareProviderImpl extends FcrUIBoardShareProvider
     release(): void;
     private _handleStateUpdated;
     private _resetWhiteboardTool;
+    private _handleRedoStateUpdated;
+    private _handleUndoStateUpdated;
 }

package/lib/providers/board-share/provider.browser.js

@@ -59,7 +59,7 @@ var _mobx = require("mobx");
 var _decorator = require("agora-foundation/lib/decorator");
 var _enums = require("fcr-core/lib/room-control/whiteboard-control/enums");
 var _FcrUIBoardShareProviderImpl;
-var _initProto, _handleStateUpdatedDecs, _ref;
+var _initProto, _handleStateUpdatedDecs, _handleRedoStateUpdatedDecs, _handleUndoStateUpdatedDecs, _ref;
 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 _superPropGet(t, o, e, r) { var p = (0, _get2["default"])((0, _getPrototypeOf2["default"])(1 & r ? t.prototype : t), o, e); return 2 & r && "function" == typeof p ? function (t) { return p.apply(e, t); } : p; }
@@ -68,7 +68,7 @@ function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol"
 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; }
-_ref = (_handleStateUpdatedDecs = [_mobx.action, _mobx.action.bound], "_boardBarControl");
+_ref = (_handleStateUpdatedDecs = [_mobx.action, _mobx.action.bound], _handleRedoStateUpdatedDecs = [_mobx.action, _mobx.action.bound], _handleUndoStateUpdatedDecs = [_mobx.action, _mobx.action.bound], "_boardBarControl");
 var FcrUIBoardShareProviderImpl = exports.FcrUIBoardShareProviderImpl = /*#__PURE__*/function (_FcrUIBoardShareProvi) {
   function FcrUIBoardShareProviderImpl(_objectManager) {
     var _this;
@@ -78,6 +78,10 @@ var FcrUIBoardShareProviderImpl = exports.FcrUIBoardShareProviderImpl = /*#__PUR
     (0, _defineProperty2["default"])(_this, "_boardControlObserver", {
       onConnectionStateUpdated: _this._handleStateUpdated
     });
+    (0, _defineProperty2["default"])(_this, "_boardMainWindowObserver", {
+      onRedoStateUpdated: _this._handleRedoStateUpdated,
+      onUndoStateUpdated: _this._handleUndoStateUpdated
+    });
     _this._objectManager = _objectManager;
     _this._boardControl.addObserver(_this._boardControlObserver);
     var privilegeProvider = _this._objectManager.getObject(_objectManager2.FcrUIObjectKeys.P_PRIVILEGE_PROVIDER);
@@ -115,7 +119,11 @@ var FcrUIBoardShareProviderImpl = exports.FcrUIBoardShareProviderImpl = /*#__PUR
   }, {
     key: "_handleStateUpdated",
     value: function _handleStateUpdated(state) {
+      if (this.joined) {
+        this.boardMainWindow.removeObserver(this._boardMainWindowObserver);
+      }
       if (state === _type.FcrConnectionState.CONNECTED) {
+        this.boardMainWindow.addObserver(this._boardMainWindowObserver);
         setTimeout(this._resetWhiteboardTool);
       }
     }
@@ -127,10 +135,20 @@ var FcrUIBoardShareProviderImpl = exports.FcrUIBoardShareProviderImpl = /*#__PUR
       this.boardMainWindow.setStrokeColor(this._boardBarControl.currentTheme.colors[2]);
       this.boardBarControl.resetWhiteboardTool();
     }
+  }, {
+    key: "_handleRedoStateUpdated",
+    value: function _handleRedoStateUpdated(enable) {
+      this._boardBarControl.toolbarState.undoSteps = enable;
+    }
+  }, {
+    key: "_handleUndoStateUpdated",
+    value: function _handleUndoStateUpdated(enable) {
+      this._boardBarControl.toolbarState.redoSteps = enable;
+    }
   }]);
 }(_provider.FcrUIBoardShareProviderBase);
 _FcrUIBoardShareProviderImpl = FcrUIBoardShareProviderImpl;
-var _applyDecs$e = _applyDecs(_FcrUIBoardShareProviderImpl, [[_handleStateUpdatedDecs, 18, "_handleStateUpdated"], [_decorator.bound, 2, "_resetWhiteboardTool"]], [], 0, void 0, _provider.FcrUIBoardShareProviderBase).e;
+var _applyDecs$e = _applyDecs(_FcrUIBoardShareProviderImpl, [[_handleStateUpdatedDecs, 18, "_handleStateUpdated"], [_decorator.bound, 2, "_resetWhiteboardTool"], [_handleRedoStateUpdatedDecs, 18, "_handleRedoStateUpdated"], [_handleUndoStateUpdatedDecs, 18, "_handleUndoStateUpdated"]], [], 0, void 0, _provider.FcrUIBoardShareProviderBase).e;
 var _applyDecs$e2 = (0, _slicedToArray2["default"])(_applyDecs$e, 1);
 _initProto = _applyDecs$e2[0];
 _applyDecs$e;

package/lib/providers/device-provider.js

@@ -1428,7 +1428,11 @@ var FcrUIDeviceProviderImpl = exports.FcrUIDeviceProviderImpl = /*#__PURE__*/fun
         var startSelectedSpeakerTest = function startSelectedSpeakerTest() {
           var _this7$soundEffectLis, _this7$soundEffectLis2;
           var soundUrl = (0, _env.isElectron)() ? (_this7$soundEffectLis = _this7.soundEffectList.get('speaker_test')) === null || _this7$soundEffectLis === void 0 ? void 0 : _this7$soundEffectLis.md5Url : (_this7$soundEffectLis2 = _this7.soundEffectList.get('speaker_test')) === null || _this7$soundEffectLis2 === void 0 ? void 0 : _this7$soundEffectLis2.url;
-          _this7._mediaControl.startSelectedSpeakerTest(soundUrl || '', _this7._volumeIndicationInterval);
+          if (!soundUrl) {
+            _this7.logger.error('speaker_test soundUrl is not set');
+            return;
+          }
+          _this7._mediaControl.startSelectedSpeakerTest(soundUrl, _this7._volumeIndicationInterval);
         };
         startSelectedSpeakerTest();
         var sleep = 3000;

package/lib/providers/dialog/provider.electron.js

@@ -126,6 +126,9 @@ var FcrUIElectronDialogProviderImpl = exports.FcrUIElectronDialogProviderImpl =
         this.logger.warn("dialog ".concat(dialogKey, "(").concat(dialogId, ") is already opened"));
         var _window = this._windowProvider.getWindowById(dialogKey, dialogId);
         _window.show(showOptions);
+        if (params !== null && params !== void 0 && params.alwaysOnTop) {
+          _window.setAlwaysOnTop(true, 'pop-up-menu');
+        }
         return;
       }
       var dialogIds = this.dialogKeyMap.get(dialogKey);
@@ -238,6 +241,9 @@ var FcrUIElectronDialogProviderImpl = exports.FcrUIElectronDialogProviderImpl =
       window.addObserver(windowObserver);
       window.setPreventClose(true);
       window.show(showOptions);
+      if (params !== null && params !== void 0 && params.alwaysOnTop) {
+        window.setAlwaysOnTop(true, 'pop-up-menu');
+      }
       this.observable.notifyObservers('onDialogOpen', dialogKey, dialogId, params);
     }
   }, {

package/lib/providers/mouse-detect/provider.d.ts

@@ -11,6 +11,9 @@ export declare class FcrUIMouseDetectProviderImpl implements FcrUIManagedObject,
     private _isInDetectArea;
     private _task;
     private _detectionOffset;
+    private _isDebug;
+    private _displayId;
+    private _debugWindowObserver;
     constructor(objectManager: FcrUIObjectManager);
     setDisplayId(displayId: number): void;
     setDetectArea(areaId: FcrUIDetectAreaID, areaList: FcrUI.FcrUIRectangle[]): void;
@@ -21,4 +24,6 @@ export declare class FcrUIMouseDetectProviderImpl implements FcrUIManagedObject,
     removeObserver(observer: FcrUIMouseDetectObserver): void;
     release(): void;
     private _detect;
+    private _debug;
+    private _setDebugWindowOffset;
 }