fcr-ui-scene 3.8.2 → 3.9.0-alpha

package/lib-es/modules/participant/store.browser.js

@@ -85,9 +85,9 @@ var ParticipantStore = /*#__PURE__*/function (_ParticipantStoreBase) {
     }
   }, {
     key: "_openChangeNameDialog",
-    value: function _openChangeNameDialog(userId) {
+    value: function _openChangeNameDialog(userId, roomType) {
       this._renamingUserId = userId;
-      var user = this.userMap.get(this._renamingUserId);
+      var user = this._getUserMapByRoomType(roomType).get(this._renamingUserId);
       if (!user) {
         this.logger.error('User not found', {
           userId: userId

package/lib-es/modules/participant/store.electron.js

@@ -83,9 +83,9 @@ var ParticipantStore = /*#__PURE__*/function (_ParticipantStoreBase) {
     }
   }, {
     key: "_openChangeNameDialog",
-    value: function _openChangeNameDialog(userId) {
+    value: function _openChangeNameDialog(userId, roomType) {
       this._renamingUserId = userId;
-      var user = this.userMap.get(this._renamingUserId);
+      var user = this._getUserMapByRoomType(roomType).get(this._renamingUserId);
       if (!user) {
         this.logger.error('User not found', {
           userId: userId

package/lib-es/modules/pc-audio-connect/waiting-scene/index.js

@@ -54,7 +54,12 @@ export var PcAudioConnectionUIModule = /*#__PURE__*/function (_UIModule) {
     value: function getComponent() {
       return /*#__PURE__*/_jsx(StoreContext.Provider, {
         value: this.store,
-        children: /*#__PURE__*/_jsx(View, {})
+        children: /*#__PURE__*/_jsx("div", {
+          style: {
+            width: '400px'
+          },
+          children: /*#__PURE__*/_jsx(View, {})
+        })
       });
     }
   }]);

package/lib-es/modules/phone-audio-connect/store.js

@@ -70,7 +70,7 @@ import { action, computed, observable, reaction } from 'mobx';
 import { createContext } from 'react';
 import { bound } from 'agora-foundation/lib/decorator';
 import isEqual from 'lodash/isEqual';
-import { storage } from '../../utilities/tools';
+import { storage } from 'agora-foundation/lib/utilities/tools';
 import { FcrUIDialogKey, FcrUIHighlightElement } from '../../utilities/constant';
 import { ConnectorRegion } from './enums';
 import { FcrUIObjectKeys } from '../../object-manager';

package/lib-es/modules/phone-audio-connect/view.js

@@ -15,7 +15,7 @@ import { ConnectionRemember } from './components/remeber';
 import { useContext, useEffect, useState } from 'react';
 import { StoreContext } from './store';
 import { FcrRoomConnectorSessionReason, FcrRoomConnectorSessionState } from 'fcr-core/lib/room-control/room-connector-control/type';
-import { isPhoneNumber } from '../../utilities/regex';
+import { isPhoneNumber } from 'agora-foundation/lib/utilities/regex';
 import './index.css';
 import { useI18n } from 'agora-ui-foundation/lib/i18n';
 import { FcrUIConnectType } from '../../type';

package/lib-es/modules/secondary-window/index.js

@@ -1,10 +1,12 @@
 import "core-js/modules/es.reflect.construct.js";
+import _get from "@babel/runtime/helpers/get";
 import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
 import _createClass from "@babel/runtime/helpers/createClass";
 import _possibleConstructorReturn from "@babel/runtime/helpers/possibleConstructorReturn";
 import _getPrototypeOf from "@babel/runtime/helpers/getPrototypeOf";
 import _inherits from "@babel/runtime/helpers/inherits";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
+function _superPropGet(t, o, e, r) { var p = _get(_getPrototypeOf(1 & r ? t.prototype : t), o, e); return 2 & r && "function" == typeof p ? function (t) { return p.apply(e, t); } : p; }
 import "core-js/modules/es.error.cause.js";
 import "core-js/modules/es.error.to-string.js";
 import "core-js/modules/es.array.concat.js";
@@ -18,6 +20,7 @@ import { LeaveMeetingStoreContext } from '../components/leave-meeting/store.base
 import LeaveMeetingStoreMain from '../components/leave-meeting/main-scene/store';
 import { isElectron } from 'agora-foundation/lib/utilities/env';
 import { FcrUIGlobalNodeEventType } from '../../type';
+import { createLogger, generateLogObserver } from '../../utilities/logger';
 import { jsx as _jsx } from "react/jsx-runtime";
 export var FcrUISecondaryWindowModule = /*#__PURE__*/function (_UIModule) {
   function FcrUISecondaryWindowModule() {
@@ -90,13 +93,20 @@ export var FcrUISecondaryWindowModule = /*#__PURE__*/function (_UIModule) {
     }
   }]);
 }(UIModule);
-export var FcrUIMainWindowRendererImpl = /*#__PURE__*/function () {
+export var FcrUIMainWindowRendererImpl = /*#__PURE__*/function (_ref) {
   function FcrUIMainWindowRendererImpl() {
+    var _this2;
     _classCallCheck(this, FcrUIMainWindowRendererImpl);
-    _defineProperty(this, "_observers", new AgoraObservable());
-    _defineProperty(this, "_backgroundColor", '#ffffff');
-    _defineProperty(this, "_hasWriteBoardPermission", false);
+    _this2 = _callSuper(this, FcrUIMainWindowRendererImpl);
+    _defineProperty(_this2, "logger", createLogger({
+      prefix: 'FcrUIMainWindowRendererImpl'
+    }));
+    _defineProperty(_this2, "_backgroundColor", '#ffffff');
+    _defineProperty(_this2, "_hasWriteBoardPermission", false);
+    _this2.addObserver(generateLogObserver(_this2.logger, ['onConnectionStateUpdated', 'onViewportSizeUpdated', 'onBackgroundColorUpdated', 'onDraftSaved', 'onPermissionUpdated', 'onRedoStateUpdated', 'onUndoStateUpdated', 'onWhiteboardStrokeColorChanged', 'onWhiteboardStrokeWidthChanged', 'onWhiteboardToolSelected']));
+    return _this2;
   }
+  _inherits(FcrUIMainWindowRendererImpl, _ref);
   return _createClass(FcrUIMainWindowRendererImpl, [{
     key: "ownerUser",
     get: function get() {
@@ -112,36 +122,52 @@ export var FcrUIMainWindowRendererImpl = /*#__PURE__*/function () {
     get: function get() {
       return this._hasWriteBoardPermission;
     }
+  }, {
+    key: "toolPayload",
+    get: function get() {
+      return this._toolPayload;
+    }
+  }, {
+    key: "strokeColor",
+    get: function get() {
+      return this._strokeColor;
+    }
+  }, {
+    key: "strokeWidth",
+    get: function get() {
+      return this._strokeWidth;
+    }
   }, {
     key: "notifyObservers",
-    value: function notifyObservers(event, args) {
+    value: function notifyObservers(event) {
+      for (var _len2 = arguments.length, args = new Array(_len2 > 1 ? _len2 - 1 : 0), _key2 = 1; _key2 < _len2; _key2++) {
+        args[_key2 - 1] = arguments[_key2];
+      }
       switch (event) {
-        case 'onSharingUserUpdated':
-          this._ownerUser = args;
-          break;
         case 'onBackgroundColorUpdated':
-          this._backgroundColor = args;
+          this._backgroundColor = args[0];
           break;
         case 'onPermissionUpdated':
-          this._hasWriteBoardPermission = args;
+          this._hasWriteBoardPermission = args[0];
+          break;
+        case 'onWhiteboardToolSelected':
+          this._toolPayload = args[0];
+          break;
+        case 'onWhiteboardStrokeColorChanged':
+          this._strokeColor = args[0];
+          break;
+        case 'onWhiteboardStrokeWidthChanged':
+          this._strokeWidth = args[0];
           break;
       }
-      this._observers.notifyObservers(event, args);
-    }
-  }, {
-    key: "addObserver",
-    value: function addObserver(observer) {
-      this._observers.addObserver(observer);
-    }
-  }, {
-    key: "removeObserver",
-    value: function removeObserver(observer) {
-      this._observers.removeObserver(observer);
+
+      // @ts-expect-error
+      _superPropGet(FcrUIMainWindowRendererImpl, "notifyObservers", this, 3)([event].concat(args));
     }
   }, {
-    key: "removeAllObservers",
-    value: function removeAllObservers() {
-      this._observers.removeAllObservers();
+    key: "release",
+    value: function release() {
+      this.removeAllObservers();
     }
   }]);
-}();
+}(AgoraObservable);

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

@@ -60,7 +60,7 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
 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; }
 import { createContext } from 'react';
-import { FcrUIDisplayDistributionContentType } from './type';
+import { FcrUIDisplayDistributionContentType, WhiteboardToolAction } from './type';
 import { bound } from 'agora-foundation/lib/decorator';
 import { createLogger } from '../../utilities/logger';
 import { FcrUIDialogKey } from '../../utilities/constant';
@@ -115,6 +115,8 @@ export var SecondaryWindowStore = /*#__PURE__*/function () {
     this._dialogProvider = objectManager.getObject(FcrUIObjectKeys.P_DIALOG_PROVIDER);
     this._windowProvider = objectManager.getObject(FcrUIObjectKeys.P_WINDOW_PROVIDER);
     this._renderer = objectManager.getObject(FcrUIObjectKeys.RENDERER_WRAPPER);
+    this._annotationProvider = objectManager.getObject(FcrUIObjectKeys.P_ANNOTATION_PROVIDER);
+    this._privilegeProvider = objectManager.getObject(FcrUIObjectKeys.P_PRIVILEGE_PROVIDER);
     var localVideoRenderProvider = objectManager.getObject(FcrUIObjectKeys.P_LOCAL_VIDEO_RENDER_PROVIDER);
     var remoteVideoRenderProvider = objectManager.getObject(FcrUIObjectKeys.P_REMOTE_VIDEO_RENDER_PROVIDER);
     this._videoRenderContext = {
@@ -240,6 +242,12 @@ export var SecondaryWindowStore = /*#__PURE__*/function () {
   }, {
     key: "canWriteBoard",
     get: function get() {
+      if (this.secondaryWindowContentType === FcrUIDisplayDistributionContentType.SHARING_WHITEBOARD) {
+        return this._boardShareProvider.canWriteBoard;
+      }
+      if (this.secondaryWindowContentType === FcrUIDisplayDistributionContentType.SHARING_SCREEN_WITH_ANNOTATION) {
+        return this._privilegeProvider.hasAnnotationWritePermission();
+      }
       return this._boardShareProvider.canWriteBoard;
     }
   }, {
@@ -284,12 +292,6 @@ export var SecondaryWindowStore = /*#__PURE__*/function () {
       var _this$videoWindowData2;
       return ((_this$videoWindowData2 = this.videoWindowData) === null || _this$videoWindowData2 === void 0 ? void 0 : _this$videoWindowData2.type) === FcrUIWindowType.BOARD;
     }
-  }, {
-    key: "annotationHasStart",
-    get: function get() {
-      // return this._sharedAnnotationDataSource.annotationHasStart;
-      return false;
-    }
   }, {
     key: "isShowToolbar",
     get: function get() {
@@ -310,6 +312,11 @@ export var SecondaryWindowStore = /*#__PURE__*/function () {
     get: function get() {
       return this._renderer.getBaseUrl();
     }
+  }, {
+    key: "isAnnotationOpened",
+    get: function get() {
+      return this._annotationProvider.isAnnotationOpened;
+    }
   }, {
     key: "getContent",
     value: function getContent() {}
@@ -386,7 +393,31 @@ export var SecondaryWindowStore = /*#__PURE__*/function () {
   }, {
     key: "setWhiteboardTool",
     value: function setWhiteboardTool(tool) {
-      this._boardShareProvider.boardBarControl.setWhiteboardTool(tool);
+      if (tool.action === WhiteboardToolAction.TOOL) {
+        this._boardShareProvider.boardBarControl.setWhiteboardTool({
+          tool: tool.tool
+        });
+      } else if (tool.action === WhiteboardToolAction.SHAPE) {
+        this._boardShareProvider.boardBarControl.setWhiteboardTool({
+          shape: tool.tool
+        });
+      } else if (tool.action === WhiteboardToolAction.WIDTH) {
+        this._boardShareProvider.boardBarControl.setWhiteboardStrokeWidth(tool.tool);
+      } else if (tool.action === WhiteboardToolAction.COLOR) {
+        this._boardShareProvider.boardBarControl.setWhiteboardStrokeColor(tool.tool);
+      } else if (tool.action === WhiteboardToolAction.CLEAR) {
+        this._boardShareProvider.boardBarControl.setWhiteboardTool({
+          action: WhiteboardToolAction.CLEAR
+        });
+      } else if (tool.action === WhiteboardToolAction.UNDO) {
+        this._boardShareProvider.boardBarControl.setWhiteboardTool({
+          action: WhiteboardToolAction.UNDO
+        });
+      } else if (tool.action === WhiteboardToolAction.REDO) {
+        this._boardShareProvider.boardBarControl.setWhiteboardTool({
+          action: WhiteboardToolAction.REDO
+        });
+      }
     }
   }, {
     key: "saveWhiteboardDraft",
@@ -494,7 +525,7 @@ export var SecondaryWindowStore = /*#__PURE__*/function () {
   }]);
 }();
 _SecondaryWindowStore = SecondaryWindowStore;
-var _applyDecs$e = _slicedToArray(_applyDecs(_SecondaryWindowStore, [[observable, 1, "_screenShareScalcValue"], [observable, 1, "isSharingWhiteboard"], [observable, 1, "interceptedClose"], [computed, 3, "videoWindowData"], [computed, 3, "isAspectRatioPreserved"], [computed, 3, "scalValue"], [bound, 2, "handleIframeLoad"], [bound, 2, "zoomIn"], [bound, 2, "zoomOut"], [bound, 2, "fullContainer"], [bound, 2, "setInterceptedClose"], [bound, 2, "setScaleValue"], [bound, 2, "setOriginScalc"], [bound, 2, "setSpeakerViewSize"], [bound, 2, "setWhiteboardTool"], [bound, 2, "saveWhiteboardDraft"], [bound, 2, "setProgress"], [bound, 2, "setTheme"], [bound, 2, "setControlEnable"], [bound, 2, "setShowLoading"], [bound, 2, "setCommonColors"], [bound, 2, "log"]], []).e, 4);
+var _applyDecs$e = _slicedToArray(_applyDecs(_SecondaryWindowStore, [[observable, 1, "_screenShareScalcValue"], [observable, 1, "isSharingWhiteboard"], [observable, 1, "interceptedClose"], [computed, 3, "videoWindowData"], [computed, 3, "isAspectRatioPreserved"], [computed, 3, "scalValue"], [computed, 3, "canWriteBoard"], [bound, 2, "handleIframeLoad"], [bound, 2, "zoomIn"], [bound, 2, "zoomOut"], [bound, 2, "fullContainer"], [bound, 2, "setInterceptedClose"], [bound, 2, "setScaleValue"], [bound, 2, "setOriginScalc"], [bound, 2, "setSpeakerViewSize"], [bound, 2, "setWhiteboardTool"], [bound, 2, "saveWhiteboardDraft"], [bound, 2, "setProgress"], [bound, 2, "setTheme"], [bound, 2, "setControlEnable"], [bound, 2, "setShowLoading"], [bound, 2, "setCommonColors"], [bound, 2, "log"]], []).e, 4);
 _init__screenShareScalcValue = _applyDecs$e[0];
 _init_isSharingWhiteboard = _applyDecs$e[1];
 _init_interceptedClose = _applyDecs$e[2];

package/lib-es/modules/secondary-window/type.js

@@ -20,6 +20,7 @@ export var WhiteboardToolAction = /*#__PURE__*/function (WhiteboardToolAction) {
   WhiteboardToolAction["CLEAR"] = "clear";
   WhiteboardToolAction["UNDO"] = "undo";
   WhiteboardToolAction["REDO"] = "redo";
+  // to be deprecated
   WhiteboardToolAction["SHAPE"] = "shape";
   WhiteboardToolAction["COLOR"] = "color";
   WhiteboardToolAction["WIDTH"] = "width";

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

@@ -7,7 +7,7 @@ import { useContext, useEffect, useLayoutEffect, useRef } from 'react';
 import { SecondaryWindowStoreContext } from './store';
 import { FcrVideoRenderMode, FcrVideoStreamType } from 'fcr-core/lib/type';
 import { MemberWindow } from '../components/member-window';
-import { WhiteboardControlbar } from '../components/control-bar';
+import { ScreenShareControlbar, WhiteboardControlbar } from '../components/control-bar';
 import { Loading } from '../components/control-bar/components/loading';
 import { WhiteboardToolbar } from '../components/toolbar';
 import { FcrBoardToolType } from 'fcr-core';
@@ -32,7 +32,6 @@ export var SubWindowView = observer(function (props) {
     showLoading = store.showLoading,
     isScreenShare = store.isScreenShare,
     isBoardShare = store.isBoardShare,
-    annotationHasStart = store.annotationHasStart,
     isZoomMinimum = store.isZoomMinimum,
     isZoomMaxmum = store.isZoomMaxmum,
     isCurrentOriginal = store.isCurrentOriginal,
@@ -56,7 +55,8 @@ export var SubWindowView = observer(function (props) {
     setSpeakerViewSize = store.setSpeakerViewSize,
     interceptedClose = store.interceptedClose,
     setInterceptedClose = store.setInterceptedClose,
-    videoRenderContext = store.videoRenderContext;
+    videoRenderContext = store.videoRenderContext,
+    isAnnotationOpened = store.isAnnotationOpened;
   var videoWindowContainer = useRef(null);
   useEffect(function () {
     if (!interceptedClose) return;
@@ -89,10 +89,17 @@ export var SubWindowView = observer(function (props) {
       setSpeakerViewSize(width, height);
     }
   }, [secondaryWindowContentType]);
+  useEffect(function () {
+    if (canWriteBoard === false && toolbarState.controlEnable) {
+      setControlEnable(false);
+    }
+  }, [canWriteBoard]);
   if (!videoWindowData) {
     return null;
   }
   var content = null;
+  var showEnterBoardEdit = isAnnotationOpened ? !toolbarState.controlEnable : false;
+  var showExitBoardEdit = isAnnotationOpened ? toolbarState.controlEnable : false;
   if (isBoardShare) {
     content = /*#__PURE__*/_jsxs(_Fragment, {
       children: [showLoading && /*#__PURE__*/_jsx(Loading, {
@@ -115,7 +122,6 @@ export var SubWindowView = observer(function (props) {
         controlEnabled: toolbarState.controlEnable,
         isHost: isHost,
         currentTheme: currentTheme,
-        sharingType: 'whiteboard',
         ownerUserName: videoWindowData.userName,
         isMyBoard: isActive && store.isMyBoard,
         children: [!isShowToolbar && /*#__PURE__*/_jsx("div", {
@@ -123,7 +129,7 @@ export var SubWindowView = observer(function (props) {
         }), /*#__PURE__*/_jsx("iframe", {
           ref: handleIframeLoad,
           allow: "webview",
-          src: "".concat(baseUrl, "/whiteboard.html?type=whiteboard"),
+          src: "".concat(baseUrl, "/whiteboard.html"),
           style: {
             width: '100vw',
             height: 'calc(100vh - 28px)'
@@ -132,12 +138,11 @@ export var SubWindowView = observer(function (props) {
       })]
     });
   } else {
-    content = /*#__PURE__*/_jsxs(_Fragment, {
-      children: [/*#__PURE__*/_jsxs(FcrVideoTrackRenderContext.Provider, {
+    content = /*#__PURE__*/_jsx(_Fragment, {
+      children: /*#__PURE__*/_jsxs(FcrVideoTrackRenderContext.Provider, {
         value: videoRenderContext,
-        children: [isScreenShare && /*#__PURE__*/_jsx(WhiteboardControlbar, {
+        children: [isScreenShare && /*#__PURE__*/_jsx(ScreenShareControlbar, {
           ownerUserName: videoWindowData.userName,
-          sharingType: 'annotation',
           onZoomIn: function onZoomIn() {
             zoomIn();
             return isZoomMaxmum;
@@ -154,54 +159,50 @@ export var SubWindowView = observer(function (props) {
             setOriginScalc();
             return isCurrentOriginal;
           },
-          isSharingAudio: videoWindowData.hasLoopbackSharing && videoWindowData.hasMicrophoneAudioStream
-        }), /*#__PURE__*/_jsx(MemberWindow, {
-          onRemovePin: function onRemovePin() {},
-          canShowSpeakerSpotlight: true,
-          width: Infinity,
-          height: Infinity,
-          videoRenderMode: FcrVideoRenderMode.FIT,
-          videoStreamType: FcrVideoStreamType.HIGH_STREAM,
-          windowData: videoWindowData,
-          showAvatar: true,
-          isVideoSuspended: false,
-          enableZoom: true,
-          scalcValue: scalValue,
-          onScaleChange: setScaleValue
+          isSharingAudio: videoWindowData.hasLoopbackSharing && videoWindowData.hasMicrophoneAudioStream,
+          canWriteBoard: canWriteBoard,
+          isHost: isHost,
+          isMyBoard: isActive && store.isMyBoard,
+          onEnable: setControlEnable,
+          controlEnabled: toolbarState.controlEnable,
+          showEnterBoardEdit: showEnterBoardEdit,
+          showExitBoardEdit: showExitBoardEdit
+        }), /*#__PURE__*/_jsxs("div", {
+          style: {
+            height: isScreenShare ? 'calc(100% - 28px)' : '100%',
+            position: 'relative'
+          },
+          children: [/*#__PURE__*/_jsx(MemberWindow, {
+            onRemovePin: function onRemovePin() {},
+            canShowSpeakerSpotlight: true,
+            width: Infinity,
+            height: Infinity,
+            videoRenderMode: FcrVideoRenderMode.FIT,
+            videoStreamType: FcrVideoStreamType.HIGH_STREAM,
+            windowData: videoWindowData,
+            showAvatar: true,
+            isVideoSuspended: false,
+            enableZoom: true,
+            scalcValue: scalValue,
+            onScaleChange: setScaleValue
+          }), secondaryWindowContentType === FcrUIDisplayDistributionContentType.SHARING_SCREEN_WITH_ANNOTATION && isAnnotationOpened && /*#__PURE__*/_jsx("iframe", {
+            ref: handleIframeLoad,
+            allow: "webview",
+            src: "".concat(baseUrl, "/annotation.html"),
+            style: {
+              width: '100%',
+              height: '100%',
+              position: 'absolute',
+              top: 0,
+              left: 0,
+              background: 'transparent',
+              zIndex: 10
+            }
+          }), !isShowToolbar && /*#__PURE__*/_jsx("div", {
+            className: "annotation-action-prevent"
+          })]
         })]
-      }), secondaryWindowContentType === FcrUIDisplayDistributionContentType.SHARING_SCREEN_WITH_ANNOTATION && annotationHasStart && /*#__PURE__*/_jsx("iframe", {
-        ref: handleIframeLoad,
-        allow: "webview",
-        src: "".concat(baseUrl, "/whiteboard.html?type=annotation"),
-        style: {
-          width: '100%',
-          height: '100%',
-          position: 'absolute',
-          top: 0,
-          left: 0,
-          background: 'transparent',
-          zIndex: 10
-        }
-      }), !isShowToolbar && /*#__PURE__*/_jsx("div", {
-        className: "annotation-action-prevent"
-      }), isScreenShare && /*#__PURE__*/_jsx("div", {
-        style: {
-          width: '100%',
-          position: 'absolute',
-          top: '-28px'
-        },
-        children: renderScreenShareControl({
-          isZoomMinimum: isZoomMinimum,
-          isZoomMaxmum: isZoomMaxmum,
-          isCurrentOriginal: isCurrentOriginal,
-          isAspectRatioPreserved: isAspectRatioPreserved,
-          setOriginScalc: setOriginScalc,
-          zoomIn: zoomIn,
-          zoomOut: zoomOut,
-          fullContainer: fullContainer,
-          isShowToolbarToggle: !showLoading && joinSuccess && canWriteBoard
-        })
-      })]
+      })
     });
   }
   return /*#__PURE__*/_jsxs("div", {
@@ -209,15 +210,15 @@ export var SubWindowView = observer(function (props) {
     className: "sub-window-view",
     style: {
       width: '100%',
-      height: isScreenShare ? 'calc(100% - 28px)' : '100%',
+      height: '100%',
       position: 'relative',
-      top: isScreenShare ? 28 : 0
+      top: 0
     },
     children: [interceptedClose && /*#__PURE__*/_jsx(LeaveMeetingPortal, {
       setPopoverOpened: function setPopoverOpened() {
         return setInterceptedClose(false);
       }
-    }), content, (isBoardShare || annotationHasStart) && /*#__PURE__*/_jsx(WhiteboardToolbar, {
+    }), content, (isBoardShare || isAnnotationOpened) && /*#__PURE__*/_jsx(WhiteboardToolbar, {
       offsetTop: 28,
       direction: "vertical",
       container: videoWindowContainer.current || undefined,

package/lib-es/modules/setting/audio-settings/audio-settings.js

@@ -38,7 +38,7 @@ import { isElectron } from 'agora-foundation/lib/utilities/env';
 import { FcrUIAiDenoiseLevel } from '../../../type';
 import { HelpQuestionIcon } from '../view';
 import './index.css';
-import { useNamespace } from '../../../utilities/useNamespace';
+import { useNamespace } from 'agora-ui-foundation/lib/utilities/use-namespace';
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 export var AudioSettings = observer(function () {
   var _setting$noiseReduce;
@@ -78,7 +78,7 @@ export var AudioSettings = observer(function () {
   var noiseReduceOptions = useMemo(function () {
     return [{
       label: t('fmt_premeeting_setting_label_turn_off'),
-      value: FcrUIAiDenoiseLevel.CLOSE
+      value: FcrUIAiDenoiseLevel.NONE
     }, {
       label: t('fmt_setting_option_3alow'),
       addition: t('fmt_internalsetting_tips_backgroundsound'),

package/lib-es/modules/setting/audio-whiteList/audio-device-adaptation.js

@@ -22,7 +22,7 @@ export var AUDIO_DEVICE_WHITE_LIST_CONFIG = {
   whiteListConfig: {
     audioEchoCancellation: false,
     audioAgc: false,
-    noiseReduce: 4
+    noiseReduce: FcrUIAiDenoiseLevel.NONE
   }
 };
 
@@ -46,7 +46,7 @@ export var DEVICE_SPECIFIC_CONFIGS = {
     config: {
       audioEchoCancellation: true,
       audioAgc: true,
-      noiseReduce: FcrUIAiDenoiseLevel.LOW
+      noiseReduce: FcrUIAiDenoiseLevel.HIGH
     }
   }
 };

package/lib-es/modules/setting/audio-whiteList/audio-whiteList-manager.js

@@ -82,7 +82,7 @@ var DEFAULT_DEVICE_ID = 'default_device_id';
 // Default values for non-white list devices
 var DEFAULT_AUDIO_AGC = false;
 var DEFAULT_AUDIO_ECHO_CANCELLATION = true;
-var DEFAULT_NOISE_REDUCE_LEVEL = FcrUIAiDenoiseLevel.LOW;
+var DEFAULT_NOISE_REDUCE_LEVEL = FcrUIAiDenoiseLevel.HIGH;
 
 /**
  * The manager delegates device operations and settings management to the implementing class

package/lib-es/modules/setting/caption_and_transcribing/index.js

@@ -3,7 +3,7 @@ import { useI18n } from 'agora-ui-foundation/lib/i18n';
 import { observer } from 'mobx-react';
 import { StoreContext } from '../store.base';
 import { FcrCheckbox } from 'agora-ui-foundation/lib/components/checkbox';
-import { useNamespace } from '../../../utilities/useNamespace';
+import { useNamespace } from 'agora-ui-foundation/lib/utilities/use-namespace';
 import { FcrSteps } from '../../components/caption-menu/steps';
 import { FcrAvatar } from 'agora-ui-foundation/lib/components/avatar';
 import { FcrSelect } from 'agora-ui-foundation/lib/components/select';

package/lib-es/modules/setting/general-settings/general-settings.js

@@ -3,7 +3,7 @@ import "core-js/modules/es.array.map.js";
 import "core-js/modules/es.array.push.js";
 import "core-js/modules/es.object.to-string.js";
 import { useContext } from 'react';
-import { transI18n, useI18n } from 'agora-ui-foundation/lib/i18n';
+import { useI18n } from 'agora-ui-foundation/lib/i18n';
 import './index.css';
 import { observer } from 'mobx-react';
 import { StoreContext } from '../store.base';
@@ -11,8 +11,9 @@ import { FcrCheckbox } from 'agora-ui-foundation/lib/components/checkbox';
 import { FcrRadio, FcrRadioGroup } from 'agora-ui-foundation/lib/components/radio';
 import { changeLanguage } from 'agora-ui-foundation/lib/i18n';
 import { HelpQuestionIcon } from '../view';
-import { useNamespace } from '../../../utilities/useNamespace';
+import { useNamespace } from 'agora-ui-foundation/lib/utilities/use-namespace';
 import { isElectron } from 'agora-foundation/lib/utilities/env';
+import { FcrUIToastKey } from '../../../modules/toast-manager/type';
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 export var Section = observer(function (_ref) {
   var children = _ref.children,
@@ -67,9 +68,8 @@ export var GeneralSettings = observer(function () {
         shouldHideMyVideo: v
       });
       if (v) {
-        messageProvider.showToast({
-          message: transI18n('fmt_internalsetting_other_hide_me_toast'),
-          type: 'info'
+        messageProvider.showToastByKey({
+          key: FcrUIToastKey.FMT_INTERNALSSETTING_OTHER_HIDE_ME_TOAST
         });
       }
     }

package/lib-es/modules/setting/index.css

@@ -31,9 +31,8 @@
 .fcr-device-settings {
   border-top: 1px solid var(--fcr_ui_scene_line1);
   display: flex;
-  width: 100%;
-  min-width: 580px;
-  height: 100%;
+  width: 580px;
+  height: calc(560px - 46px);
 }
 
 .fcr-device-settings__nav {

package/lib-es/modules/setting/index.js

@@ -74,20 +74,14 @@ export var SettingUIModule = /*#__PURE__*/function (_UIModule) {
     _defineProperty(_this, "_store", (_initProto(_this), null));
     _defineProperty(_this, "_roomProvider", null);
     _defineProperty(_this, "_roomObserver", {
-      onRoomClosed: function onRoomClosed() {
-        _this.store.handleExitRoom();
-      },
-      onExitRoom: function onExitRoom() {
+      onExitMeeting: function onExitMeeting() {
         _this.store.handleExitRoom();
       },
       onRoutingChanged: function onRoutingChanged(roomControl) {
         var _roomControl$getRoomI;
         var roomType = (_roomControl$getRoomI = roomControl.getRoomInfo()) === null || _roomControl$getRoomI === void 0 ? void 0 : _roomControl$getRoomI.roomType;
-        _this.store.handleExitRoom(true);
+        _this.store.handleExitRoom(false);
         _this.store.handleJoinRoom(roomType);
-      },
-      onLocalUserKickedOut: function onLocalUserKickedOut() {
-        _this.store.handleExitRoom();
       }
     });
     return _this;
@@ -129,8 +123,7 @@ export var SettingUIModule = /*#__PURE__*/function (_UIModule) {
     }
   }, {
     key: "getComponent",
-    value: function getComponent(params) {
-      this.store.setDialogConfig(params);
+    value: function getComponent() {
       return /*#__PURE__*/_jsx(StoreContext.Provider, {
         value: this.store,
         children: /*#__PURE__*/_jsx(DeviceSettingsView, {})

package/lib-es/modules/setting/minutes-settings/minutes-settings.js

@@ -8,7 +8,7 @@ import { observer } from 'mobx-react';
 import { FcrIcon } from 'agora-ui-foundation/lib/components/icon';
 import { FcrIconType } from 'agora-ui-foundation/lib/components/icon/type';
 import './index.css';
-import { useNamespace } from '../../../utilities/useNamespace';
+import { useNamespace } from 'agora-ui-foundation/lib/utilities/use-namespace';
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 export var MinutesSettings = observer(function () {
   var ns = useNamespace('minutes-settings');

package/lib-es/modules/setting/state/index.js

@@ -35,7 +35,7 @@ import { FcrIconType } from 'agora-ui-foundation/lib/components/icon/type';
 import classNames from 'classnames';
 import { FcrUIHighlightElement } from '../../../utilities/constant';
 import { isElectron } from 'agora-foundation/lib/utilities/env';
-import { useNamespace } from '../../../utilities/useNamespace';
+import { useNamespace } from 'agora-ui-foundation/lib/utilities/use-namespace';
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 var formatSize = function formatSize(kbytes) {
   var mb = kbytes / 1024;

package/lib-es/modules/setting/storage-settings/storage-settings.js

@@ -5,7 +5,7 @@ import { observer } from 'mobx-react';
 import { useCallback, useContext } from 'react';
 import { StoreContext } from '../store.base';
 import './index.css';
-import { useNamespace } from '../../../utilities/useNamespace';
+import { useNamespace } from 'agora-ui-foundation/lib/utilities/use-namespace';
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 export var StorageSettings = observer(function () {
   var ns = useNamespace('device-settings-storage');