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

package/lib/electron/until.js

@@ -4,7 +4,7 @@ require("core-js/modules/es.object.define-property.js");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.windowHideErrorCode = exports.meetingLaunchProcessingErrorCode = exports.generaErrorCode = exports.closeWindowBeforeLaunchSuccessErrorCode = void 0;
+exports.windowHideErrorCode = exports.meetingLaunchProcessingErrorCode = exports.mainWindowHiddenOnLaunchSuccessErrorCode = exports.hangDetectionErrorCode = exports.generaErrorCode = exports.crashedErrorCode = exports.closeWindowBeforeLaunchSuccessErrorCode = void 0;
 // 错误代码枚举定义
 var ServiceErrorCode = /*#__PURE__*/function (ServiceErrorCode) {
   ServiceErrorCode[ServiceErrorCode["FcrUIScene"] = 800] = "FcrUIScene";
@@ -44,6 +44,12 @@ var DetailErrorCode = /*#__PURE__*/function (DetailErrorCode) {
   DetailErrorCode[DetailErrorCode["closeWindowBeforeLaunchSuccess"] = 83] = "closeWindowBeforeLaunchSuccess";
   // 会议启动中
   DetailErrorCode[DetailErrorCode["meetingLaunchProcessing"] = 84] = "meetingLaunchProcessing";
+  // 窗口在会议启动后隐藏
+  DetailErrorCode[DetailErrorCode["mainWindowHiddenAfterLaunchSuccess"] = 85] = "mainWindowHiddenAfterLaunchSuccess";
+  // 窗口崩溃
+  DetailErrorCode[DetailErrorCode["crashed"] = 86] = "crashed";
+  // 窗口无响应
+  DetailErrorCode[DetailErrorCode["hangDetection"] = 87] = "hangDetection";
   return DetailErrorCode;
 }(DetailErrorCode || {}); // 格式：ServiceErrorCode(3位) + UISceneErrorCode(3位) + DetailErrorCode(3位)
 var generaErrorCode = exports.generaErrorCode = function generaErrorCode(serviceCode, uiSceneCode, detailCode) {
@@ -51,4 +57,7 @@ var generaErrorCode = exports.generaErrorCode = function generaErrorCode(service
 };
 var windowHideErrorCode = exports.windowHideErrorCode = generaErrorCode(ServiceErrorCode.FcrUIScene, UISceneErrorCode.Creator, DetailErrorCode.mainWindowHidden);
 var closeWindowBeforeLaunchSuccessErrorCode = exports.closeWindowBeforeLaunchSuccessErrorCode = generaErrorCode(ServiceErrorCode.FcrUIScene, UISceneErrorCode.Creator, DetailErrorCode.closeWindowBeforeLaunchSuccess);
-var meetingLaunchProcessingErrorCode = exports.meetingLaunchProcessingErrorCode = generaErrorCode(ServiceErrorCode.FcrUIScene, UISceneErrorCode.Creator, DetailErrorCode.meetingLaunchProcessing);
+var meetingLaunchProcessingErrorCode = exports.meetingLaunchProcessingErrorCode = generaErrorCode(ServiceErrorCode.FcrUIScene, UISceneErrorCode.Creator, DetailErrorCode.meetingLaunchProcessing);
+var mainWindowHiddenOnLaunchSuccessErrorCode = exports.mainWindowHiddenOnLaunchSuccessErrorCode = generaErrorCode(ServiceErrorCode.FcrUIScene, UISceneErrorCode.Creator, DetailErrorCode.mainWindowHiddenAfterLaunchSuccess);
+var crashedErrorCode = exports.crashedErrorCode = generaErrorCode(ServiceErrorCode.FcrUIScene, UISceneErrorCode.Creator, DetailErrorCode.crashed);
+var hangDetectionErrorCode = exports.hangDetectionErrorCode = generaErrorCode(ServiceErrorCode.FcrUIScene, UISceneErrorCode.Creator, DetailErrorCode.hangDetection);

package/lib/fragments/annotation/store.js

@@ -195,6 +195,7 @@ var FragmentAnnotationStore = exports.FragmentAnnotationStore = /*#__PURE__*/fun
               this._cancelCurrentUpdateWindowSizeTimber('send-fragment-close');
               this.currentTool = 'curve';
               // TODO: window
+              this.logger.info('windows_index setAlwaysOnTop in annotation');
               // @ts-ignore
               window.runtime.browserWindow.setAlwaysOnTop(true, 'pop-up-menu');
               this.setIgnore(true);
@@ -370,6 +371,7 @@ var FragmentAnnotationStore = exports.FragmentAnnotationStore = /*#__PURE__*/fun
     key: "show",
     value: function show() {
       // TODO: window
+      this.logger.info('windows_index setAlwaysOnTop in annotation show');
       // @ts-ignore
       window.runtime.browserWindow.setAlwaysOnTop(true, 'pop-up-menu');
 

package/lib/modules/action-bar/components/item/index.js

@@ -108,6 +108,7 @@ var ActionBarItem = exports.ActionBarItem = function ActionBarItem(props) {
     }), props.submenu && /*#__PURE__*/(0, _jsxRuntime.jsx)(_popover.FcrPopover, {
       showArrow: false,
       overlayClassName: "fcr-action-bar--popover",
+      visible: props.submenu.active,
       onVisibleChange: props.submenu.onVisibleChange,
       trigger: "click",
       content: props.submenu.children,

package/lib/modules/action-bar/components/more/poppover-content.js

@@ -92,7 +92,7 @@ var ScreenShare = (0, _mobxReact.observer)(function (props) {
       type: _type2.FcrIconType.FCR_SCREENSHARING,
       size: 24
     }), /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
-      children: transI18n('fmt_screenshare_label_screenshare')
+      children: transI18n('fmt_screenshare_controlbar_security_list_participant_screenshare')
     })]
   });
 });

package/lib/modules/action-bar/components/screen-share/index.browser.js

@@ -26,7 +26,7 @@ var ScreenShare = exports.ScreenShare = (0, _mobxReact.observer)(function (_ref)
     visibleMenu = _useState2[0],
     setMenuVisible = _useState2[1];
   var transI18n = (0, _i18n.useI18n)();
-  var title = transI18n('fmt_screenshare_label_screenshare');
+  var title = transI18n('fmt_screenshare_controlbar_security_list_participant_screenshare');
   (0, _react.useEffect)(function () {
     setMenuVisible(false);
   }, [hasStartScreenSharePermission]);
@@ -41,7 +41,9 @@ var ScreenShare = exports.ScreenShare = (0, _mobxReact.observer)(function (_ref)
       maxWidth: '370px',
       width: 'fit-content'
     },
-    content: /*#__PURE__*/(0, _jsxRuntime.jsx)(_submenu.SubMenu, {}),
+    content: /*#__PURE__*/(0, _jsxRuntime.jsx)(_submenu.SubMenu, {
+      setMenuVisible: setMenuVisible
+    }),
     children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_item.ActionBarItem, {
       active: visibleMenu,
       disabled: !hasStartScreenSharePermission,

package/lib/modules/action-bar/components/screen-share/index.electron.js

@@ -33,7 +33,9 @@ var ScreenShare = exports.ScreenShare = (0, _mobxReact.observer)(function (_ref)
     if ([_fcrCore.FcrUserRole.HOST, _fcrCore.FcrUserRole.COHOST].includes(localUserRole)) {
       return {
         active: visibleMenu,
-        children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_submenu.SubMenu, {}),
+        children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_submenu.SubMenu, {
+          setMenuVisible: setMenuVisible
+        }),
         onClick: function onClick() {
           setMenuVisible(true);
         },
@@ -47,7 +49,7 @@ var ScreenShare = exports.ScreenShare = (0, _mobxReact.observer)(function (_ref)
       return undefined;
     }
   }, [localUserRole, visibleMenu]);
-  var title = transI18n('fmt_screenshare_label_screenshare');
+  var title = transI18n('fmt_screenshare_controlbar_security_list_participant_screenshare');
   (0, _react.useEffect)(function () {
     setMenuVisible(false);
   }, [hasStartScreenSharePermission]);

package/lib/modules/action-bar/components/screen-share/submenu.d.ts

@@ -1 +1,5 @@
-export declare const SubMenu: () => import("react/jsx-runtime").JSX.Element;
+interface SubMenuProps {
+    setMenuVisible: (visible: boolean) => void;
+}
+export declare const SubMenu: ({ setMenuVisible }: SubMenuProps) => import("react/jsx-runtime").JSX.Element;
+export {};

package/lib/modules/action-bar/components/screen-share/submenu.js

@@ -36,13 +36,13 @@ var _truncate = _interopRequireDefault(require("lodash/truncate"));
 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 SubMenu = exports.SubMenu = (0, _mobxReact.observer)(function () {
+var SubMenu = exports.SubMenu = (0, _mobxReact.observer)(function (_ref) {
+  var setMenuVisible = _ref.setMenuVisible;
   var store = (0, _react.useContext)(_store.ActionBarContext);
   var setAllowScreenShare = store.setAllowScreenShare,
     localUserRole = store.localUserRole,
     openWhiteboard = store.openWhiteboard,
     closeWhiteboard = store.closeWhiteboard,
-    isBoardActive = store.isBoardActive,
     startScreenShare = store.startScreenShare,
     hasStopScreenSharePermission = store.hasStopScreenSharePermission,
     closeShareScreen = store.closeShareScreen,
@@ -55,17 +55,17 @@ var SubMenu = exports.SubMenu = (0, _mobxReact.observer)(function () {
   // TODO: 使用 memberSharedDataSource.isLocalUserHost
   var hasHostPermission = [_fcrCore.FcrUserRole.HOST, _fcrCore.FcrUserRole.COHOST].includes(localUserRole);
   var menus = [];
-  var boardOwnerUserName = isBoardActive ? store.boardOwnerUser.userName : '';
+  var boardOwnerUserName = store.isBoardActive ? store.boardOwnerUser.userName : '';
   var isSharingScreen = store.isLocalUserScreenSharing || store.isRemoteUserScreenSharing;
   var boardTitle;
   var boardMenuType;
   var isBoardMenuDisabled;
-  if (!isBoardActive) {
+  if (!store.isBoardActive) {
     boardTitle = t('fmt_screenshare_button_sharewhiteboard');
     boardMenuType = 'primary';
     isBoardMenuDisabled = false;
   } else if (store.isMeSharingBoard) {
-    boardTitle = t('fmt_screenshare_button_chosewhiteboard');
+    boardTitle = t('fmt_whiteboard_button_close');
     boardMenuType = 'danger';
     isBoardMenuDisabled = false;
   } else {
@@ -85,9 +85,10 @@ var SubMenu = exports.SubMenu = (0, _mobxReact.observer)(function () {
         iconPrimary: 'var(--fcr_ui_scene_icontext1)'
       }
     }),
-    title: isSharingScreen ? t('fmt_screenshare_tips_newsharing') : t('fmt_screenshare_label_screenshare'),
+    title: isSharingScreen ? t('fmt_screenshare_tips_newsharing') : t('fmt_screenshare_controlbar_security_list_participant_screenshare'),
     key: 'allow_attendee_title',
     onButtonClick: function onButtonClick() {
+      setMenuVisible(false);
       startScreenShare();
     }
   }, {
@@ -103,9 +104,11 @@ var SubMenu = exports.SubMenu = (0, _mobxReact.observer)(function () {
     key: 'allow_attendee_title',
     type: boardMenuType,
     onButtonClick: function onButtonClick() {
-      if (!isBoardActive) {
+      if (!store.isBoardActive) {
+        setMenuVisible(false);
         openWhiteboard();
       } else if (store.isMeSharingBoard) {
+        setMenuVisible(false);
         closeWhiteboard();
       } else {
         console.error('isBoardMenuDisabled: true, should not be clickable');
@@ -153,7 +156,7 @@ var SubMenu = exports.SubMenu = (0, _mobxReact.observer)(function () {
       shape: "rounded",
       block: true,
       children: t('fmt_screenshare_button_disableshare', {
-        reason1: isBoardActive ? (0, _truncate["default"])(boardOwnerUserName, {
+        reason1: store.isBoardActive ? (0, _truncate["default"])(boardOwnerUserName, {
           length: 8,
           separator: ' '
         }) : t('fmt_actionbar_screenshare_labels_others')
@@ -162,8 +165,8 @@ var SubMenu = exports.SubMenu = (0, _mobxReact.observer)(function () {
     key: 'enable_whiteboard',
     classNames: 'fcr-drop-menu-option-primary-no-hover',
     onButtonClick: function onButtonClick() {
-      // TODO: 主持人停用别人的共享后，应该把菜单关闭或者是更新菜单项
       closeWhiteboard();
+      setMenuVisible(false);
     }
   }];
   var shareScreenControlMenus = [{

package/lib/modules/audio-stream/index.js

@@ -151,8 +151,10 @@ var AudioStreamUIModule = exports.AudioStreamUIModule = /*#__PURE__*/function (_
         streams.forEach(function (stream) {
           if (stream.owner.userId !== _this._localUser.userId) {
             var isAudioPublished = stream.streamType === _fcrCore.FcrStreamType.AUDIO || stream.streamType === _fcrCore.FcrStreamType.BOTH;
-            var isAudioDeviceStarted = stream.audioSourceState === _fcrCore.FcrMediaSourceState.OPEN;
-            if (isAudioPublished && isAudioDeviceStarted) {
+
+            // const isAudioDeviceStarted = stream.audioSourceState === FcrMediaSourceState.OPEN;
+
+            if (isAudioPublished) {
               _this.logger.info('start play remote audio', stream.streamId);
               streamControl.startPlayRemoteAudioStream(stream.streamId);
             } else {

package/lib/modules/chat/index.css

@@ -107,3 +107,11 @@
 .fcr-line-message-container {
   width: 100%;
 }
+
+.fcr-chat-container-box-web {
+  height: 100%;
+}
+
+.fcr-chat-container-box-electron {
+  height: calc(100% - 46px);
+}

package/lib/modules/chat/view.js

@@ -50,6 +50,8 @@ var _fcrCore = require("fcr-core");
 var _types = require("./types");
 var _chatTabs = _interopRequireDefault(require("./components/chat-tabs"));
 var _browserApi = require("../../utilities/browser-api");
+var _classnames = _interopRequireDefault(require("classnames"));
+var _env = require("agora-foundation/lib/utilities/env");
 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; }
@@ -194,7 +196,11 @@ var Chat = exports.Chat = (0, _mobxReact.observer)(function (_ref) {
       }
     });
   };
-  return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
+  return /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
+    className: (0, _classnames["default"])({
+      'fcr-chat-container-box-web': !(0, _env.isElectron)(),
+      'fcr-chat-container-box-electron': (0, _env.isElectron)()
+    }),
     children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_chatTabs["default"], {}), /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
       style: _objectSpread({}, styles),
       children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_chatWrapper.ChatWrapper, {

package/lib/modules/components/control-bar/components/switch-theme/index.css

@@ -11,6 +11,8 @@
 .fcr-whiteboard-switch-theme-popover {
   max-width: 100%;
   width: 100%;
+  z-index: 1;
+  padding: 0;
 }
 .fcr-whiteboard-switch-theme-popover .fcr-tooltip-inner {
   border-radius: 0 !important;

package/lib/modules/components/control-bar/components/switch-theme/index.js

@@ -38,13 +38,11 @@ var WhiteboardSwitchTheme = function WhiteboardSwitchTheme(props) {
       width: '100%'
     },
     overlayOffset: 4,
-    showArrow: false
-    // getTooltipContainer={() => {
-    //   const target = document.getElementById('fcr-whiteboard-controlbar') as HTMLElement;
-    //   console.log({ target });
-    //   return target;
-    // }}
-    ,
+    showArrow: false,
+    getTooltipContainer: function getTooltipContainer() {
+      var target = document.getElementById('fcr-whiteboard-controlbar');
+      return target;
+    },
     visible: whiteboardVisible,
     content: /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
       className: "fcr-whiteboard-switch-theme",

package/lib/modules/components/control-bar/index.css

@@ -21,12 +21,10 @@
 }
 .fcr-whiteboard-controlbar-body {
   width: 100%;
-  height: 100%;
   /* display: flex;
   align-items: center;
   justify-content: center; */
   position: absolute;
-  top: 0;
   bottom: 0;
   background-color: #e5e7eb;
 }

package/lib/modules/components/control-bar/index.d.ts

@@ -20,6 +20,7 @@ type WhiteboardProps = {
     isSharingWithAudio?: boolean;
     ownerUserName: string;
     isMyBoard: boolean;
+    showControlBar?: boolean;
 };
 type PickRequired<T extends object, K extends keyof T> = Required<Pick<T, K>> & Omit<T, K>;
 type SharingType<T extends 'whiteboard' | 'screenshare' | undefined> = T extends 'whiteboard' ? WhiteboardProps : PickRequired<Partial<WhiteboardProps>, 'onZoomIn' | 'onZoomOut' | 'onAdaptive' | 'onOrigin' | 'isSharingWithAudio'>;

package/lib/modules/components/control-bar/index.js

@@ -21,9 +21,10 @@ var _i18n = require("agora-ui-foundation/lib/i18n");
 var _type2 = require("../../whiteboard/type");
 var _enums = require("fcr-core/lib/room-control/whiteboard-control/enums");
 require("./index.css");
+var _debounce = _interopRequireDefault(require("lodash/debounce"));
 var _jsxRuntime = require("react/jsx-runtime");
 var initWidth = 1920;
-var initHeight = 1220;
+var initHeight = 1080;
 var WhiteboardControlbar = exports.WhiteboardControlbar = function WhiteboardControlbar(props) {
   var transI18n = (0, _i18n.useI18n)();
   var onClose = props.onClose,
@@ -43,7 +44,9 @@ var WhiteboardControlbar = exports.WhiteboardControlbar = function WhiteboardCon
     onZoomOut = props.onZoomOut,
     onAdaptive = props.onAdaptive,
     onOrigin = props.onOrigin,
-    isSharingWithAudio = props.isSharingWithAudio;
+    isSharingWithAudio = props.isSharingWithAudio,
+    _props$showControlBar = props.showControlBar,
+    showControlBar = _props$showControlBar === void 0 ? true : _props$showControlBar;
   var boardRef = (0, _react.useRef)(undefined);
   var _useState = (0, _react.useState)(false),
     _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
@@ -81,16 +84,32 @@ var WhiteboardControlbar = exports.WhiteboardControlbar = function WhiteboardCon
   var cursor = (0, _react.useMemo)(function () {
     return _enums.FcrBoardToolType[currentTool || _enums.FcrBoardToolType.NONE].toLowerCase();
   }, [currentTool]);
+  var resetHeight = (0, _react.useCallback)(function () {
+    var _boardRef$current;
+    var height = ((_boardRef$current = boardRef.current) === null || _boardRef$current === void 0 ? void 0 : _boardRef$current.clientHeight) || 0;
+    setContianHeight(height);
+  }, []);
+  var resetHeightDebounce = (0, _react.useCallback)((0, _debounce["default"])(resetHeight, 100), []);
+  var ratio = (0, _react.useMemo)(function () {
+    var ratio = contianHeight / initHeight;
+    return ratio;
+  }, [contianHeight, initHeight]);
   (0, _react.useEffect)(function () {
+    window.addEventListener('resize', resetHeightDebounce);
     return function () {
-      return setLoading(false);
+      setLoading(false);
+      window.removeEventListener('resize', resetHeightDebounce);
+      if (boardRef.current) {
+        boardRef.current.removeEventListener('transitionend', resetHeight);
+      }
     };
   }, []);
   var handleBoardRef = function handleBoardRef(ref) {
-    var _boardRef$current;
     boardRef.current = ref;
-    var height = ((_boardRef$current = boardRef.current) === null || _boardRef$current === void 0 ? void 0 : _boardRef$current.clientHeight) || 0;
-    setContianHeight(height);
+    resetHeight();
+    if (boardRef.current) {
+      boardRef.current.addEventListener('transitionend', resetHeight);
+    }
   };
   var showEditButton = !controlEnabled && !isMyBoard && !isHost && isWhiteboard;
   var showChangeThemeButton = (canWriteBoard || isMyBoard || isHost) && setTheme && currentTheme;
@@ -102,16 +121,18 @@ var WhiteboardControlbar = exports.WhiteboardControlbar = function WhiteboardCon
     setIsMaxmum(false);
     setIsAdaptived(false);
     setIsOriginal(false);
-    var step = 3;
+    var max = 3;
+    var step = 0.5;
     if (oprate === _type2.WhiteboardControlbarEvents.ZOOMIN) {
       if (onZoomIn) {
         var result = onZoomIn();
         setIsMaxmum(!result);
         return;
       }
-      if (scaleValue < step) {
+      if (scaleValue < max) {
         setIsMaxmum(false);
-        setScaleValue(scaleValue + 1);
+        var zoomIn = scaleValue + step;
+        setScaleValue(zoomIn);
       } else {
         setIsMaxmum(true);
       }
@@ -123,7 +144,9 @@ var WhiteboardControlbar = exports.WhiteboardControlbar = function WhiteboardCon
         return;
       }
       if (scaleValue > 1) {
-        setScaleValue(scaleValue - 1);
+        var zoomOut = scaleValue - step;
+        var diff = zoomOut % step;
+        setScaleValue(diff === 0 ? zoomOut : zoomOut - diff);
       } else {
         setIsMinimum(true);
       }
@@ -134,8 +157,11 @@ var WhiteboardControlbar = exports.WhiteboardControlbar = function WhiteboardCon
         setIsOriginal(!_result2);
         return;
       }
+      // 如果容器高和画布原始高度的比值小于1，代表画布原始高比容器大，则设置放大倍率用 1 + 比率
+      // 如果容器高和画布原始告诉的比值大于1，代表容器比画布原始高度大，则设置放大倍率为原始高度和容器高度的比率
+      var origin = ratio < 1 ? 1 + ratio : initHeight / contianHeight;
       setIsOriginal(true);
-      setScaleValue(1);
+      setScaleValue(origin);
     }
     if (oprate === _type2.WhiteboardControlbarEvents.ADAPTIVE) {
       if (onAdaptive) {
@@ -144,15 +170,23 @@ var WhiteboardControlbar = exports.WhiteboardControlbar = function WhiteboardCon
         return;
       }
       setIsAdaptived(true);
-      setScaleValue(2);
+      setScaleValue(1);
     }
   }
   var width = (0, _react.useMemo)(function () {
+    if (scaleValue === ratio) return initWidth;
     return initWidth * (contianHeight / initHeight) * scaleValue;
   }, [contianHeight, scaleValue]);
   var height = (0, _react.useMemo)(function () {
+    if (scaleValue === ratio) return initHeight;
     return initHeight * (contianHeight / initHeight) * scaleValue;
   }, [contianHeight, scaleValue]);
+  var top = (0, _react.useMemo)(function () {
+    if (contianHeight > height) return (contianHeight - height) / 2;
+    if (height === contianHeight) return 0;
+    if (scaleValue === 1) return 0;
+    return "-".concat((height - contianHeight) / 2, "px");
+  }, [height, contianHeight, scaleValue]);
   var preventAction = (0, _react.useMemo)(function () {
     var prevent = true;
 
@@ -175,7 +209,7 @@ var WhiteboardControlbar = exports.WhiteboardControlbar = function WhiteboardCon
     style: {
       height: isWhiteboard ? '100%' : 'auto'
     },
-    children: [/*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
+    children: [showControlBar && /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
       className: "fcr-whiteboard-controlbar-header",
       children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
         className: "fcr-whiteboard-controlbar-left",
@@ -307,7 +341,9 @@ var WhiteboardControlbar = exports.WhiteboardControlbar = function WhiteboardCon
       className: "fcr-whiteboard-controlbar-body",
       ref: handleBoardRef,
       style: {
-        backgroundColor: '#e5e7eb'
+        backgroundColor: '#e5e7eb',
+        height: showControlBar ? 'calc(100% - 28px)' : '100%',
+        top: showControlBar ? '28px' : '0'
       },
       children: /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
         className: "fcr-whiteboard-controlbar-body-content",
@@ -317,7 +353,7 @@ var WhiteboardControlbar = exports.WhiteboardControlbar = function WhiteboardCon
           position: 'absolute',
           left: "-".concat(width / 2, "px"),
           marginLeft: '50%',
-          top: "-".concat((height - contianHeight) / 2, "px")
+          top: top
         },
         children: [onBoardDomLoaded && preventAction && /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
           className: "whiteboard-action-prevent"

package/lib/modules/components/leave-meeting/main-scene/store.d.ts

@@ -4,7 +4,10 @@ import { FcrPlatform } from 'fcr-core/lib/type';
 export default class LeaveMeetingStoreMain extends LeaveMeetingStoreBase {
     private _sharedMemberDataSource;
     private _abilityProvider;
+    private _memberDataSource;
     constructor(args: LeaveMeetingStoreArgs);
+    get localUserId(): string;
+    get localUserRole(): import("fcr-core/lib/type").FcrUserRole;
     get hostAvailibleRemoteUsers(): import("fcr-core/lib/type").FcrUserInfo[];
     get isPstnUser(): boolean;
     isHostSupportedByPlatform(platform: FcrPlatform): boolean;

package/lib/modules/components/leave-meeting/main-scene/store.js

@@ -73,10 +73,22 @@ var LeaveMeetingStoreMain = exports["default"] = /*#__PURE__*/function (_LeaveMe
     (0, _defineProperty2["default"])(_this, _ref, void _initProto(_this));
     _this._sharedMemberDataSource = args.objectManager.getObject(_objectManager.FcrUIObjectKeys.S_SHARED_MEMBER_DATA_SOURCE);
     _this._abilityProvider = args.objectManager.getObject(_objectManager.FcrUIObjectKeys.P_ABILITY_PROVIDER);
+    var memberDataSource = args.objectManager.getObject(_objectManager.FcrUIObjectKeys.S_SHARED_MEMBER_DATA_SOURCE);
+    _this._memberDataSource = memberDataSource;
     return _this;
   }
   (0, _inherits2["default"])(LeaveMeetingStoreMain, _LeaveMeetingStoreBas);
   return (0, _createClass2["default"])(LeaveMeetingStoreMain, [{
+    key: "localUserId",
+    get: function get() {
+      return this._memberDataSource.localUser.userId;
+    }
+  }, {
+    key: "localUserRole",
+    get: function get() {
+      return this._memberDataSource.localUserRole;
+    }
+  }, {
     key: "hostAvailibleRemoteUsers",
     get: function get() {
       var _this2 = this;

package/lib/modules/components/leave-meeting/store.base.d.ts

@@ -1,8 +1,9 @@
 import { FcrUserInfo, FcrUserRole, FcrPlatform } from 'fcr-core/lib/type';
+import { FcrUserControl } from 'fcr-core';
 import { LeaveMeetingStoreArgs } from './type';
 export declare abstract class LeaveMeetingStoreBase {
     private _roomControl;
-    private _userControl;
+    protected _userControl: FcrUserControl;
     private _streamControl;
     private _privilegeProvider;
     private _dialogProvider;
@@ -12,8 +13,8 @@ export declare abstract class LeaveMeetingStoreBase {
     accessor canAssign: boolean;
     accessor loading: boolean;
     get isLocked(): boolean;
-    get localUserId(): string;
-    get localUserRole(): FcrUserRole;
+    abstract get localUserId(): string;
+    abstract get localUserRole(): FcrUserRole;
     get hasAssignHostBeforeLeavingPermission(): boolean;
     get hasEndRoomPermission(): boolean;
     abstract get hostAvailibleRemoteUsers(): FcrUserInfo[];

package/lib/modules/components/leave-meeting/store.base.js

@@ -121,16 +121,6 @@ var LeaveMeetingStoreBase = exports.LeaveMeetingStoreBase = /*#__PURE__*/functio
     get: function get() {
       return this._privilegeProvider.isLockRoomEnabled();
     }
-  }, {
-    key: "localUserId",
-    get: function get() {
-      return this._userControl.getLocalUser().userId;
-    }
-  }, {
-    key: "localUserRole",
-    get: function get() {
-      return this._userControl.getLocalUser().userRole;
-    }
   }, {
     key: "hasAssignHostBeforeLeavingPermission",
     get: function get() {

package/lib/modules/components/leave-meeting/waiting-scene/store.d.ts

@@ -1,8 +1,12 @@
 import { LeaveMeetingStoreBase } from '../store.base';
 import { LeaveMeetingStoreArgs } from '../type';
-import { FcrPlatform } from 'fcr-core/lib/type';
+import { FcrPlatform, FcrUserRole } from 'fcr-core/lib/type';
 export default class LeaveMeetingStoreWaiting extends LeaveMeetingStoreBase {
+    private _localUserId;
+    private _localUserRole;
     constructor(args: LeaveMeetingStoreArgs);
+    get localUserId(): string;
+    get localUserRole(): FcrUserRole;
     get hostAvailibleRemoteUsers(): never[];
     get isPstnUser(): boolean;
     isHostSupportedByPlatform(platform: FcrPlatform): boolean;

package/lib/modules/components/leave-meeting/waiting-scene/store.js

@@ -48,6 +48,7 @@ var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/creat
 var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
 var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
 var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _mobx = require("mobx");
 var _store = require("../store.base");
 var _LeaveMeetingStoreWaiting;
@@ -59,17 +60,30 @@ 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 = (_isHostSupportedByPlatformDecs = [_mobx.action, _mobx.action.bound], "hostAvailibleRemoteUsers");
+_ref = (_isHostSupportedByPlatformDecs = [_mobx.action, _mobx.action.bound], "_localUserId");
 var LeaveMeetingStoreWaiting = exports["default"] = /*#__PURE__*/function (_LeaveMeetingStoreBas) {
   function LeaveMeetingStoreWaiting(args) {
     var _this;
     (0, _classCallCheck2["default"])(this, LeaveMeetingStoreWaiting);
-    _initProto(_this = _callSuper(this, LeaveMeetingStoreWaiting, [args]));
+    _this = _callSuper(this, LeaveMeetingStoreWaiting, [args]);
+    (0, _defineProperty2["default"])(_this, _ref, void _initProto(_this));
+    _this._localUserId = _this._userControl.getLocalUser().userId;
+    _this._localUserRole = _this._userControl.getLocalUser().userRole;
     return _this;
   }
   (0, _inherits2["default"])(LeaveMeetingStoreWaiting, _LeaveMeetingStoreBas);
   return (0, _createClass2["default"])(LeaveMeetingStoreWaiting, [{
-    key: _ref,
+    key: "localUserId",
+    get: function get() {
+      return this._localUserId;
+    }
+  }, {
+    key: "localUserRole",
+    get: function get() {
+      return this._localUserRole;
+    }
+  }, {
+    key: "hostAvailibleRemoteUsers",
     get: function get() {
       return [];
     }

package/lib/modules/components/member-window/components/member-actions/components/more-actions.js

@@ -111,8 +111,7 @@ var MoreActions = exports.MoreActions = (0, _mobxReact.observer)(function (_ref)
           boxShadow: 'var(--fcr_web_light_dropup_m)',
           borderRadius: 'var(--fcr_cornerradius_l)',
           minWidth: '210px',
-          maxWidth: '300px',
-          width: 'fit-content'
+          maxWidth: '300px'
         },
         overlayClassName: "member-window-actions__more-actions",
         mouseEnterDelay: 0,

package/lib/modules/components/member-window/components/video-player/components/local-video-player-with-zoom.js

@@ -20,14 +20,15 @@ var FcrUILocalCameraVideoPlayer = (0, _mobxReact.observer)(function (props) {
     cameraEnabled = _context$localVideoRe.cameraEnabled,
     cameraId = _context$localVideoRe.cameraId,
     startCameraPreview = _context$localVideoRe.startCameraPreview,
-    stopCameraPreview = _context$localVideoRe.stopCameraPreview;
+    stopCameraPreview = _context$localVideoRe.stopCameraPreview,
+    isLocalMirrorEnabled = _context$localVideoRe.isLocalMirrorEnabled;
   (0, _react.useEffect)(function () {
     var dom = divRef.current;
     if (dom && cameraEnabled) {
       isPreviewingRef.current = true;
       startCameraPreview(dom, {
         renderMode: renderMode,
-        isMirror: false
+        isMirror: isLocalMirrorEnabled
       });
     }
     return function () {
@@ -38,7 +39,7 @@ var FcrUILocalCameraVideoPlayer = (0, _mobxReact.observer)(function (props) {
         stopCameraPreview(dom);
       }
     };
-  }, [cameraEnabled, cameraId]);
+  }, [cameraEnabled, cameraId, isLocalMirrorEnabled]);
   return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
     className: "fcr-member-window-body fcr-member-window-body-video",
     ref: divRef