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

package/lib/modules/components/toolbar/index.js

@@ -60,18 +60,14 @@ var WhiteboardToolbar = exports.WhiteboardToolbar = function WhiteboardToolbar(p
     onCaptureScreen = props.onCaptureScreen,
     setProgress = props.setProgress;
   var t = (0, _i18n.useI18n)();
-  var _useState = (0, _react.useState)(false),
+  var _useState = (0, _react.useState)('right'),
     _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
-    popoverVisible = _useState2[0],
-    setPopoverVisible = _useState2[1];
-  var _useState3 = (0, _react.useState)('right'),
+    placement = _useState2[0],
+    setPlacement = _useState2[1];
+  var _useState3 = (0, _react.useState)(-1),
     _useState4 = (0, _slicedToArray2["default"])(_useState3, 2),
-    placement = _useState4[0],
-    setPlacement = _useState4[1];
-  var _useState5 = (0, _react.useState)(-1),
-    _useState6 = (0, _slicedToArray2["default"])(_useState5, 2),
-    coverCount = _useState6[0],
-    setCoverCount = _useState6[1];
+    coverCount = _useState4[0],
+    setCoverCount = _useState4[1];
   var effects = [coverCount, currentTool, currentColor, currentShape, currentStrokeWidth, commonColors, undoSteps, redoSteps, placement];
   var needHiddenTools = (0, _react.useMemo)(function () {
     return [/*#__PURE__*/(0, _jsxRuntime.jsx)(_graphicTool.AnnotationGraphicTool, {
@@ -88,9 +84,6 @@ var WhiteboardToolbar = exports.WhiteboardToolbar = function WhiteboardToolbar(p
       direction: direction
     }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_item.AnnotationToolItem, {
       size: size,
-      onVisibleChange: function onVisibleChange() {
-        return setPopoverVisible(false);
-      },
       active: currentTool === _enums.FcrBoardToolType.TEXT,
       onClick: function onClick() {
         return setTool(_enums.FcrBoardToolType.TEXT);
@@ -101,9 +94,6 @@ var WhiteboardToolbar = exports.WhiteboardToolbar = function WhiteboardToolbar(p
       placement: placement
     }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_item.AnnotationToolItem, {
       size: size,
-      onVisibleChange: function onVisibleChange() {
-        return setPopoverVisible(false);
-      },
       active: currentTool === _enums.FcrBoardToolType.HAND,
       onClick: function onClick() {
         return setTool(_enums.FcrBoardToolType.HAND);
@@ -122,9 +112,6 @@ var WhiteboardToolbar = exports.WhiteboardToolbar = function WhiteboardToolbar(p
       direction: direction
     }) : /*#__PURE__*/(0, _jsxRuntime.jsx)(_item.AnnotationToolItem, {
       size: size,
-      onVisibleChange: function onVisibleChange() {
-        return setPopoverVisible(false);
-      },
       active: currentTool === _enums.FcrBoardToolType.ERASER,
       onClick: function onClick() {
         return setTool(_enums.FcrBoardToolType.ERASER);
@@ -134,8 +121,6 @@ var WhiteboardToolbar = exports.WhiteboardToolbar = function WhiteboardToolbar(p
       hideTitle: true,
       placement: placement
     }), (0, _env.isElectron)() && onCaptureScreen && commonColors && /*#__PURE__*/(0, _jsxRuntime.jsx)(_captureTool.AnnotationCaptureTool, {
-      popoverVisible: popoverVisible,
-      setPopoverVisible: setPopoverVisible,
       size: size,
       direction: direction,
       hideTitle: true,
@@ -143,9 +128,6 @@ var WhiteboardToolbar = exports.WhiteboardToolbar = function WhiteboardToolbar(p
       onClick: onCaptureScreen
     }), !commonColors && /*#__PURE__*/(0, _jsxRuntime.jsx)(_item.AnnotationToolItem, {
       size: size,
-      onVisibleChange: function onVisibleChange() {
-        return setPopoverVisible(false);
-      },
       onClick: clean,
       iconType: _type.FcrIconType.FCR_DELETE5,
       title: t('fmt_screenshare_whiteboard_button_empty'),

package/lib/modules/control-bar/components/cloud-recording-buttons.d.ts

@@ -1 +1,4 @@
+import { PropsWithChildren } from 'react';
+import { StopCloudRecordingProps } from '../../action-bar/type';
 export declare const CloudRecordingButtons: () => import("react/jsx-runtime").JSX.Element;
+export declare const StopCloudRecording: ({ stopCloudRecording, children }: PropsWithChildren<StopCloudRecordingProps>) => import("react/jsx-runtime").JSX.Element;

package/lib/modules/control-bar/components/cloud-recording-buttons.js

@@ -1,10 +1,12 @@
 "use strict";
 
 require("core-js/modules/es.object.define-property.js");
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.CloudRecordingButtons = void 0;
+exports.StopCloudRecording = exports.CloudRecordingButtons = void 0;
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _mobxReact = require("mobx-react");
 var _react = require("react");
 var _type = require("fcr-core/lib/type");
@@ -12,8 +14,10 @@ var _icon = require("agora-ui-foundation/lib/components/icon");
 var _type2 = require("agora-ui-foundation/lib/components/icon/type");
 var _tooltip = require("agora-ui-foundation/lib/components/tooltip");
 var _store = require("../store");
-var _stopRecordDialog = require("../../action-bar/components/record/stop-record-dialog");
 var _i18n = require("agora-ui-foundation/lib/i18n");
+var _boundaryDetector = require("./boundary-detector");
+var _popover = require("agora-ui-foundation/lib/components/popover");
+var _context = require("../context");
 var _jsxRuntime = require("react/jsx-runtime");
 var CloudRecordingButtons = exports.CloudRecordingButtons = (0, _mobxReact.observer)(function () {
   var _useContext = (0, _react.useContext)(_store.StoreContext),
@@ -50,7 +54,7 @@ var CloudRecordingButtons = exports.CloudRecordingButtons = (0, _mobxReact.obser
           }
         })
       })
-    }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_stopRecordDialog.StopCloudRecording, {
+    }), /*#__PURE__*/(0, _jsxRuntime.jsx)(StopCloudRecording, {
       stopCloudRecording: stopCloudRecording,
       children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_tooltip.FcrToolTip, {
         mouseEnterDelay: 0,
@@ -67,4 +71,62 @@ var CloudRecordingButtons = exports.CloudRecordingButtons = (0, _mobxReact.obser
       })
     })]
   });
+});
+
+// TODO: 删除重复的 StopCloudRecording 组件
+var StopCloudRecording = exports.StopCloudRecording = (0, _mobxReact.observer)(function (_ref) {
+  var stopCloudRecording = _ref.stopCloudRecording,
+    children = _ref.children;
+  var _useContext2 = (0, _react.useContext)(_store.StoreContext),
+    setPopoverArea = _useContext2.setPopoverArea;
+  var _useState = (0, _react.useState)(false),
+    _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
+    visible = _useState2[0],
+    setVisible = _useState2[1];
+  var transI18n = (0, _i18n.useI18n)();
+  var handleBoundariesChanged = (0, _react.useCallback)(function (boundaries) {
+    setPopoverArea(boundaries);
+  }, []);
+  var _useContext3 = (0, _react.useContext)(_context.ControlBarCalculationContext),
+    isShareActionNavHidden = _useContext3.isShareActionNavHidden;
+  (0, _react.useEffect)(function () {
+    if (isShareActionNavHidden) {
+      setVisible(false);
+      setPopoverArea({
+        x: 0,
+        y: 0,
+        width: 0,
+        height: 0
+      });
+    }
+  }, [isShareActionNavHidden]);
+  var content = /*#__PURE__*/(0, _jsxRuntime.jsx)(_boundaryDetector.BoundaryDetector, {
+    onBoundariesChanged: handleBoundariesChanged,
+    children: /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
+      className: "leave-container",
+      children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+        className: "leave-title",
+        children: transI18n('fmt_actionbar_record_tips_stoprecord')
+      }), /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+        className: "leave-confirm",
+        onClick: stopCloudRecording,
+        children: transI18n('fmt_actionbar_record_option_stoprecord')
+      }), /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+        className: "leave-cancel",
+        onClick: function onClick() {
+          return setVisible(false);
+        },
+        children: transI18n('fmt_security_buttons_cancel')
+      })]
+    })
+  });
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_popover.FcrPopover, {
+    showArrow: false,
+    overlayClassName: "fcr-stop-cloud-recording-popover",
+    visible: visible,
+    onVisibleChange: setVisible,
+    trigger: "click",
+    content: content,
+    children: children
+  });
 });

package/lib/modules/control-bar/store.js

@@ -149,13 +149,17 @@ var ControlBarStore = exports["default"] = /*#__PURE__*/function () {
       }
     });
     (0, _defineProperty2["default"])(this, "_mouseDetectObserver", {
-      onMouseEnterDetectArea: function onMouseEnterDetectArea() {
-        _this._controlBarWindow.setIgnoreMouseEvents(false);
+      onMouseEnterDetectArea: function onMouseEnterDetectArea(areaId) {
+        if (areaId === _struct.FcrUIDetectAreaID.ControlBar) {
+          _this._controlBarWindow.setIgnoreMouseEvents(false);
+        }
       },
-      onMouseLeaveDetectArea: function onMouseLeaveDetectArea() {
-        _this._controlBarWindow.setIgnoreMouseEvents(true, {
-          forward: true
-        });
+      onMouseLeaveDetectArea: function onMouseLeaveDetectArea(areaId) {
+        if (areaId === _struct.FcrUIDetectAreaID.ControlBar) {
+          _this._controlBarWindow.setIgnoreMouseEvents(true, {
+            forward: true
+          });
+        }
       }
     });
     (0, _defineProperty2["default"])(this, "_stateNavArea", {
@@ -622,6 +626,7 @@ var ControlBarStore = exports["default"] = /*#__PURE__*/function () {
       this._mainRoomControl.removeObserver(this._roomObserver);
       this._screenShareProvider.removeObserver(this._screenShareObserver);
       this._mouseDetectProvider.removeObserver(this._mouseDetectObserver);
+      this._mouseDetectProvider.deleteDetectArea(_struct.FcrUIDetectAreaID.ControlBar);
     }
   }, {
     key: "setStateNavArea",

package/lib/modules/dialog/components/dialog-container/component/body.d.ts

@@ -6,6 +6,7 @@ type DialogBodyProps = PropsWithChildren<{
     autoHeight: boolean;
     closable: boolean;
     onClose?: () => void;
+    hasSystemShadow?: boolean;
 }>;
 export declare const DialogContainerBody: FC<DialogBodyProps>;
 export {};

package/lib/modules/dialog/components/dialog-container/component/body.js

@@ -14,7 +14,8 @@ var DialogContainerBody = exports.DialogContainerBody = function DialogContainer
     children = _ref.children,
     onClose = _ref.onClose,
     autoHeight = _ref.autoHeight,
-    closable = _ref.closable;
+    closable = _ref.closable,
+    hasSystemShadow = _ref.hasSystemShadow;
   // const { bind } = useContext(DialogContainerStore);
 
   // const { resizable } = isElectron() ? useContext(DialogInstanceContext) : { resizable: false };
@@ -38,7 +39,7 @@ var DialogContainerBody = exports.DialogContainerBody = function DialogContainer
   } : {};
   var hasClose = closable;
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
-    className: "fcr-dialog-container ".concat(!resizable && 'fcr-dialog-container_shadow'),
+    className: "fcr-dialog-container ".concat(!hasSystemShadow && 'fcr-dialog-container_shadow'),
     onClick: function onClick(e) {
       return e.stopPropagation();
     },

package/lib/modules/dialog/components/dialog-container/index.css

@@ -92,7 +92,7 @@
   cursor: pointer;
   -webkit-app-region: no-drag;
   text-align: center;
-  line-height: 13px;
+  line-height: 14px;
 }
 
 .fcr-dialog-container-close span {

package/lib/modules/dialog/components/dialog-container/index.d.ts

@@ -17,6 +17,7 @@ type DialogContainerProps = PropsWithChildren<{
     maxHeight?: number;
     minWidth?: number;
     minHeight?: number;
+    hasSystemShadow?: boolean;
 }>;
 export declare const DialogContainer: FC<DialogContainerProps>;
 export {};

package/lib/modules/dialog/components/dialog-container/index.js

@@ -52,13 +52,15 @@ var DialogContainer = exports.DialogContainer = (0, _mobxReact.observer)(functio
     maxWidth = _ref.maxWidth,
     maxHeight = _ref.maxHeight,
     minWidth = _ref.minWidth,
-    minHeight = _ref.minHeight;
+    minHeight = _ref.minHeight,
+    hasSystemShadow = _ref.hasSystemShadow;
   var dialogBody = /*#__PURE__*/(0, _jsxRuntime.jsx)(_body.DialogContainerBody, {
     title: title,
     actions: actions,
     autoHeight: autoHeight !== null && autoHeight !== void 0 ? autoHeight : true,
     closable: closable !== null && closable !== void 0 ? closable : true,
     onClose: _onClose,
+    hasSystemShadow: hasSystemShadow,
     children: children
   });
   if ((0, _env.isElectron)()) return dialogBody;
@@ -107,6 +109,7 @@ var DialogContainer = exports.DialogContainer = (0, _mobxReact.observer)(functio
     };
   };
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactRnd.Rnd, {
+    dragHandleClassName: 'fcr-dialog-container-header',
     style: _objectSpread({
       position: 'absolute',
       touchAction: 'none',

package/lib/modules/dialog/components/normal-window/index.d.ts

@@ -17,6 +17,7 @@ type FcrUIDialogProps = {
     minHeight?: number;
     maxWidth?: number;
     maxHeight?: number;
+    hasSystemShadow?: boolean;
 };
 export declare const NormalWindow: FC<FcrUIDialogProps>;
 export {};

package/lib/modules/dialog/components/normal-window/index.js

@@ -26,7 +26,8 @@ var NormalWindow = exports.NormalWindow = (0, _mobxReact.observer)(function (_re
     minWidth = _ref.minWidth,
     minHeight = _ref.minHeight,
     maxWidth = _ref.maxWidth,
-    maxHeight = _ref.maxHeight;
+    maxHeight = _ref.maxHeight,
+    hasSystemShadow = _ref.hasSystemShadow;
   var _useContext = (0, _react.useContext)(_store.StoreContext),
     getDialogRootNode = _useContext.getDialogRootNode,
     handleDialogClose = _useContext.handleDialogClose;
@@ -46,6 +47,7 @@ var NormalWindow = exports.NormalWindow = (0, _mobxReact.observer)(function (_re
     maxWidth: maxWidth,
     maxHeight: maxHeight,
     autoHeight: autoHeight,
+    hasSystemShadow: hasSystemShadow,
     children: body
   });
   if ((0, _env.isElectron)()) {

package/lib/modules/dialog/dialogs/chat/index.js

@@ -57,7 +57,8 @@ var ChatDialog = exports.ChatDialog = (0, _mobxReact.observer)(function (_ref) {
       zIndex: 11
     },
     width: width,
-    height: height
+    height: height,
+    hasSystemShadow: true
   });
 });
 var windowConfig = exports.windowConfig = {

package/lib/modules/dialog/dialogs/control-bar-leave-meeting/index.js

@@ -17,7 +17,6 @@ var ControlBarLeaveMeetingDialog = exports.ControlBarLeaveMeetingDialog = functi
     height: 172
   };
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_normalWindow.NormalWindow, {
-    closable: false,
     dialogId: dialogId,
     dialogKey: dialogKey,
     width: config.width,

package/lib/modules/dialog/dialogs/end-meeting/index.d.ts

@@ -9,4 +9,5 @@ export declare const windowConfig: {
     fullscreen: false;
     maximizable: false;
     resizable: false;
+    alwaysOnTop: true;
 };

package/lib/modules/dialog/dialogs/end-meeting/index.js

@@ -50,5 +50,6 @@ var windowConfig = exports.windowConfig = {
   height: 340,
   fullscreen: false,
   maximizable: false,
-  resizable: false
+  resizable: false,
+  alwaysOnTop: true
 };

package/lib/modules/dialog/dialogs/participant/index.js

@@ -54,6 +54,7 @@ var ParticipantDialog = exports.ParticipantDialog = function ParticipantDialog(_
     minWidth: windowConfig.minWidth,
     minHeight: windowConfig.minHeight,
     maxWidth: windowConfig.maxWidth,
-    maxHeight: windowConfig.maxHeight
+    maxHeight: windowConfig.maxHeight,
+    hasSystemShadow: true
   });
 };

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

@@ -98,7 +98,7 @@ var LayoutStoreElectron = exports["default"] = /*#__PURE__*/function (_LayoutSto
         if (sharingBySelf && isSharingScreen) {
           _this._dialogProvider.closeDialog(_constant.FcrUIDialogKey.VIDEO_WINDOW);
           _this._multiDisplayProvider.showMainWindowInIndexLeastDisplay({
-            maximize: true
+            isMaximized: true
           });
         } else {
           _this._multiDisplayProvider.setMainWindowMaximize();

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

@@ -21,7 +21,6 @@ export declare class SecondaryWindowStore {
     private _diffScalcValue;
     private accessor _screenShareScalcValue;
     accessor isSharingWhiteboard: boolean;
-    accessor iframeLoaded: boolean;
     accessor interceptedClose: boolean;
     get secondaryWindowContentType(): "speaker" | "gallery" | "hidden" | "local-camera" | "remote-camera" | "sharing-screen" | "sharing-screen-with-annotation" | "sharing-whiteboard";
     get videoWindowData(): VideoWindowDataReturn<typeof this.secondaryWindowContentType>;

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

@@ -65,7 +65,7 @@ var _type2 = require("../layout/type");
 var _objectManager = require("../../object-manager");
 var _type3 = require("../../providers/dialog/type");
 var _SecondaryWindowStore;
-var _initProto, _init__screenShareScalcValue, _init_isSharingWhiteboard, _init_iframeLoaded, _init_interceptedClose;
+var _initProto, _init__screenShareScalcValue, _init_isSharingWhiteboard, _init_interceptedClose;
 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; }
@@ -79,7 +79,6 @@ 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();
-var _D = /*#__PURE__*/new WeakMap();
 var SecondaryWindowStore = exports.SecondaryWindowStore = /*#__PURE__*/function () {
   function SecondaryWindowStore(_ref) {
     var _this = this;
@@ -103,8 +102,7 @@ var SecondaryWindowStore = exports.SecondaryWindowStore = /*#__PURE__*/function
     (0, _defineProperty2["default"])(this, "_diffScalcValue", 0.5);
     _classPrivateFieldInitSpec(this, _A, _init__screenShareScalcValue(this, 1));
     _classPrivateFieldInitSpec(this, _B, _init_isSharingWhiteboard(this, false));
-    _classPrivateFieldInitSpec(this, _C, _init_iframeLoaded(this, false));
-    _classPrivateFieldInitSpec(this, _D, _init_interceptedClose(this, false));
+    _classPrivateFieldInitSpec(this, _C, _init_interceptedClose(this, false));
     (0, _defineProperty2["default"])(this, "_handleSecondaryWindowClosed", function (dialogKey) {
       if (dialogKey !== _constant.FcrUIDialogKey.SUB_WINDOW) {
         return false;
@@ -160,21 +158,13 @@ var SecondaryWindowStore = exports.SecondaryWindowStore = /*#__PURE__*/function
       _classPrivateFieldSet(_B, this, v);
     }
   }, {
-    key: "iframeLoaded",
+    key: "interceptedClose",
     get: function get() {
       return _classPrivateFieldGet(_C, this);
     },
     set: function set(v) {
       _classPrivateFieldSet(_C, this, v);
     }
-  }, {
-    key: "interceptedClose",
-    get: function get() {
-      return _classPrivateFieldGet(_D, this);
-    },
-    set: function set(v) {
-      _classPrivateFieldSet(_D, this, v);
-    }
   }, {
     key: "secondaryWindowContentType",
     get: function get() {
@@ -272,17 +262,17 @@ var SecondaryWindowStore = exports.SecondaryWindowStore = /*#__PURE__*/function
   }, {
     key: "connectionState",
     get: function get() {
-      return this._boardShareProvider.connectionState;
+      return this._boardShareProvider.boardBarControl.connectionState;
     }
   }, {
     key: "showLoading",
     get: function get() {
-      return this._boardShareProvider.loading;
+      return this._boardShareProvider.boardBarControl.showLoading;
     }
   }, {
     key: "joinSuccess",
     get: function get() {
-      return this._boardShareProvider.joined;
+      return this._boardShareProvider.boardBarControl.joinSuccess;
     }
   }, {
     key: "isMyBoard",
@@ -342,7 +332,6 @@ var SecondaryWindowStore = exports.SecondaryWindowStore = /*#__PURE__*/function
       iframe === null || iframe === void 0 || iframe.addEventListener('load', function () {
         iframe.style.width = '100%';
         iframe.style.height = '100%';
-        _this2.iframeLoaded = true;
         if (!iframe.contentWindow) {
           _this2.logger.error('Iframe has no contentWindow');
           return;
@@ -499,16 +488,14 @@ var SecondaryWindowStore = exports.SecondaryWindowStore = /*#__PURE__*/function
   }, {
     key: "_closeSecondaryWindow",
     value: function _closeSecondaryWindow() {
-      this.iframeLoaded = false;
       this._dialogProvider.closeDialog(_constant.FcrUIDialogKey.SUB_WINDOW);
     }
   }]);
 }();
 _SecondaryWindowStore = SecondaryWindowStore;
-var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_SecondaryWindowStore, [[_mobx.observable, 1, "_screenShareScalcValue"], [_mobx.observable, 1, "isSharingWhiteboard"], [_mobx.observable, 1, "iframeLoaded"], [_mobx.observable, 1, "interceptedClose"], [_mobx.computed, 3, "videoWindowData"], [_mobx.computed, 3, "isAspectRatioPreserved"], [_mobx.computed, 3, "scalValue"], [_decorator.bound, 2, "handleIframeLoad"], [_decorator.bound, 2, "zoomIn"], [_decorator.bound, 2, "zoomOut"], [_decorator.bound, 2, "fullContainer"], [_decorator.bound, 2, "setInterceptedClose"], [_decorator.bound, 2, "setScaleValue"], [_decorator.bound, 2, "setOriginScalc"], [_decorator.bound, 2, "setSpeakerViewSize"], [_decorator.bound, 2, "setWhiteboardTool"], [_decorator.bound, 2, "saveWhiteboardDraft"], [_decorator.bound, 2, "setProgress"], [_decorator.bound, 2, "setTheme"], [_decorator.bound, 2, "setControlEnable"], [_decorator.bound, 2, "setShowLoading"], [_decorator.bound, 2, "setCommonColors"], [_decorator.bound, 2, "log"]], []).e, 5);
+var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_SecondaryWindowStore, [[_mobx.observable, 1, "_screenShareScalcValue"], [_mobx.observable, 1, "isSharingWhiteboard"], [_mobx.observable, 1, "interceptedClose"], [_mobx.computed, 3, "videoWindowData"], [_mobx.computed, 3, "isAspectRatioPreserved"], [_mobx.computed, 3, "scalValue"], [_decorator.bound, 2, "handleIframeLoad"], [_decorator.bound, 2, "zoomIn"], [_decorator.bound, 2, "zoomOut"], [_decorator.bound, 2, "fullContainer"], [_decorator.bound, 2, "setInterceptedClose"], [_decorator.bound, 2, "setScaleValue"], [_decorator.bound, 2, "setOriginScalc"], [_decorator.bound, 2, "setSpeakerViewSize"], [_decorator.bound, 2, "setWhiteboardTool"], [_decorator.bound, 2, "saveWhiteboardDraft"], [_decorator.bound, 2, "setProgress"], [_decorator.bound, 2, "setTheme"], [_decorator.bound, 2, "setControlEnable"], [_decorator.bound, 2, "setShowLoading"], [_decorator.bound, 2, "setCommonColors"], [_decorator.bound, 2, "log"]], []).e, 4);
 _init__screenShareScalcValue = _applyDecs$e[0];
 _init_isSharingWhiteboard = _applyDecs$e[1];
-_init_iframeLoaded = _applyDecs$e[2];
-_init_interceptedClose = _applyDecs$e[3];
-_initProto = _applyDecs$e[4];
+_init_interceptedClose = _applyDecs$e[2];
+_initProto = _applyDecs$e[3];
 var SecondaryWindowStoreContext = exports.SecondaryWindowStoreContext = /*#__PURE__*/(0, _react.createContext)(null);

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

@@ -48,7 +48,6 @@ var SubWindowView = exports.SubWindowView = (0, _mobxReact.observer)(function (p
     isShowToolbar = store.isShowToolbar,
     isActive = store.isActive,
     baseUrl = store.baseUrl,
-    iframeLoaded = store.iframeLoaded,
     setOriginScalc = store.setOriginScalc,
     zoomIn = store.zoomIn,
     zoomOut = store.zoomOut,
@@ -105,7 +104,7 @@ var SubWindowView = exports.SubWindowView = (0, _mobxReact.observer)(function (p
   var content = null;
   if (isBoardShare) {
     content = /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
-      children: [showLoading && !iframeLoaded && /*#__PURE__*/(0, _jsxRuntime.jsx)(_loading.Loading, {
+      children: [showLoading && /*#__PURE__*/(0, _jsxRuntime.jsx)(_loading.Loading, {
         joined: joinSuccess,
         connectionState: connectionState,
         canOperate: canWriteBoard,
@@ -115,7 +114,7 @@ var SubWindowView = exports.SubWindowView = (0, _mobxReact.observer)(function (p
       }), toolbarState.progress > 0 && toolbarState.progress < 100 && /*#__PURE__*/(0, _jsxRuntime.jsx)(_progress["default"], {
         title: "".concat((0, _i18n.transI18n)('fmt_screenshare_whiteboard_tips_downloading'), "..."),
         progress: toolbarState.progress
-      }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_controlBar.WhiteboardControlbar, {
+      }), /*#__PURE__*/(0, _jsxRuntime.jsxs)(_controlBar.WhiteboardControlbar, {
         onClose: function onClose() {},
         onEnable: function onEnable(enable) {
           setControlEnable(enable);
@@ -128,7 +127,9 @@ var SubWindowView = exports.SubWindowView = (0, _mobxReact.observer)(function (p
         sharingType: 'whiteboard',
         ownerUserName: videoWindowData.userName,
         isMyBoard: isActive && store.isMyBoard,
-        children: /*#__PURE__*/(0, _jsxRuntime.jsx)("iframe", {
+        children: [!isShowToolbar && /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+          className: "whiteboard-action-prevent"
+        }), /*#__PURE__*/(0, _jsxRuntime.jsx)("iframe", {
           ref: handleIframeLoad,
           allow: "webview",
           src: "".concat(baseUrl, "/whiteboard.html?type=whiteboard"),
@@ -136,7 +137,7 @@ var SubWindowView = exports.SubWindowView = (0, _mobxReact.observer)(function (p
             width: '100vw',
             height: 'calc(100vh - 28px)'
           }
-        })
+        })]
       })]
     });
   } else {

package/lib/modules/setting/index.css

@@ -34,7 +34,6 @@
   width: 100%;
   min-width: 580px;
   height: 100%;
-  cursor: default;
 }
 
 .fcr-device-settings__nav {

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

@@ -1123,6 +1123,12 @@ var SettingStoreBase = exports.SettingStoreBase = /*#__PURE__*/function () {
       this._currentRoomControl = undefined;
       this._interpreterRoomControl = undefined;
       this._deviceProvider.removeObserver(this._deviceProviderObserver);
+      this.localAudioStreamMap.clear();
+      this.remoteAudioStreamMap.clear();
+      this.localVideoStreamMap.clear();
+      this.remoteVideoStreamMap.clear();
+      this._streamVolumeMap.clear();
+      this._streamInfoList.clear();
     }
   }, {
     key: "_onNetworkStatsUpdated",

package/lib/modules/setting/view.js

@@ -111,9 +111,6 @@ var DeviceSettingsView = exports.DeviceSettingsView = (0, _mobxReact.observer)(f
   }];
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
     className: ns.b(),
-    onMouseDown: function onMouseDown(e) {
-      return e.stopPropagation();
-    },
     children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
       className: ns.e('nav'),
       children: /*#__PURE__*/(0, _jsxRuntime.jsx)("ul", {

package/lib/modules/share-screen/store.electron.js

@@ -182,7 +182,7 @@ var ElectronShareScreenStore = exports["default"] = /*#__PURE__*/function (_Shar
   }, {
     key: "_interceptDialogClose",
     value: function _interceptDialogClose(dialogKey) {
-      if (dialogKey === _constant.FcrUIDialogKey.SHARE_SCREEN_CONTROL_BAR || dialogKey === _constant.FcrUIDialogKey.VIDEO_WINDOW) {
+      if (dialogKey === _constant.FcrUIDialogKey.SHARE_SCREEN_CONTROL_BAR) {
         return this._isSharing;
       }
       return false;

package/lib/modules/state-bar/layout-config.js

@@ -115,6 +115,12 @@ var LayoutConfig = exports.LayoutConfig = (0, _mobxReact.observer)(function (pro
         return _type.FcrIconType.FCR_TOPWINDOWS;
     }
   }, [layoutView]);
+  (0, _react.useEffect)(function () {
+    // 布局切换功能被禁用时，如果布局切换弹窗已经处于打开状态，则关闭弹窗
+    if (disable && isOpen) {
+      _setIsOpen(false);
+    }
+  }, [disable]);
   var handleSetLayoutView = function handleSetLayoutView(view) {
     _setIsOpen(false);
     toggleLayout(view);

package/lib/modules/state-bar/main-scene/store.base.d.ts

@@ -9,7 +9,9 @@ export declare abstract class StateBarMainSceneStoreBase extends StateBarStoreBa
     private _sharedVideoWindowDataSource;
     private _sharedMemberDataSource;
     private _abilityProvider;
+    private _screenShareProvider;
     constructor(args: StateBarStoreArgs);
+    get isSharingScreen(): boolean;
     get localUser(): import("fcr-core/lib/type").FcrUserInfo;
     get isUserHost(): boolean;
     get isRoomDetailSupported(): boolean;

package/lib/modules/state-bar/main-scene/store.base.js

@@ -76,10 +76,16 @@ var StateBarMainSceneStoreBase = exports.StateBarMainSceneStoreBase = /*#__PURE_
     _this._sharedMemberDataSource = args.objectManager.getObject(_objectManager.FcrUIObjectKeys.S_SHARED_MEMBER_DATA_SOURCE);
     _this._abilityProvider = args.objectManager.getObject(_objectManager.FcrUIObjectKeys.P_ABILITY_PROVIDER);
     _this._sharedVideoWindowDataSource = args.objectManager.getObject(_objectManager.FcrUIObjectKeys.S_SHARED_VIDEO_WINDOW_DATA_SOURCE);
+    _this._screenShareProvider = args.objectManager.getObject(_objectManager.FcrUIObjectKeys.P_SCREEN_SHARE_PROVIDER);
     return _this;
   }
   (0, _inherits2["default"])(StateBarMainSceneStoreBase, _StateBarStoreBase);
   return (0, _createClass2["default"])(StateBarMainSceneStoreBase, [{
+    key: "isSharingScreen",
+    get: function get() {
+      return this._screenShareProvider.isLocalUserScreenSharing || this._screenShareProvider.isRemoteUserScreenSharing;
+    }
+  }, {
     key: "localUser",
     get: function get() {
       return this._sharedMemberDataSource.localUser;

package/lib/modules/video-window/index.css

@@ -13,3 +13,9 @@
   border-radius: 0 !important;
   background: transparent !important;
 }
+
+/* 供 popover-watcher 使用 */
+#fcr-video-window-diaolog-wrapper_popover-align-right {
+  --video-window-popover-left: 0px;
+  left: var(--video-window-popover-left) !important;
+}

package/lib/modules/video-window/popover-watcher.d.ts

@@ -4,6 +4,9 @@
  */
 export declare function usePopoverWatcher({ rootDom, setVideoWindowSize, resetVideoWindowSize, }: {
     rootDom: HTMLElement | null;
-    setVideoWindowSize: (width: number, height: number) => void;
+    setVideoWindowSize: (width: number, height: number) => {
+        width: number;
+        height: number;
+    };
     resetVideoWindowSize: () => void;
 }): void;