fcr-ui-scene 3.6.4-rc.1 → 3.7.0

package/lib/modules/share-screen/view.js

@@ -15,13 +15,13 @@ require("./index.css");
 var _jsxRuntime = require("react/jsx-runtime");
 var View = exports.View = (0, _mobxReact.observer)(function () {
   var _useContext = (0, _react.useContext)(_store.StoreContext),
-    screenSharingState = _useContext.screenSharingState,
+    localUserScreenSharingState = _useContext.localUserScreenSharingState,
     handleStopShare = _useContext.handleStopShare,
     startRenderSharePreview = _useContext.startRenderSharePreview;
   return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
     className: "share-screen",
     children: /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
-      children: screenSharingState === _fcrCore.FcrMediaSourceState.OPEN && !(0, _env.isElectron)() && /*#__PURE__*/(0, _jsxRuntime.jsx)(_shareStateBar.ShareStateBar, {
+      children: localUserScreenSharingState === _fcrCore.FcrMediaSourceState.OPEN && !(0, _env.isElectron)() && /*#__PURE__*/(0, _jsxRuntime.jsx)(_shareStateBar.ShareStateBar, {
         ref: function ref(dom) {
           return startRenderSharePreview(dom);
         },

package/lib/modules/state-bar/index.js

@@ -42,13 +42,12 @@ var StateBarUIModule = exports.StateBarUIModule = /*#__PURE__*/function (_UIModu
     // privilegeProvider?: FcrUIPrivilegeProvider;
 
     function onNodeWillActive() {
-      var _this$currentRoomCont, _this$currentRoomCont2, _this$mainRoomControl, _this$waitingRoomCont, _this$sharedConfigDat, _this$sharedConfigDat2;
+      var _this$currentRoomCont, _this$currentRoomCont2, _this$mainRoomControl, _this$waitingRoomCont, _this$sharedConfigDat;
       this._store = new _store["default"]({
         roomControl: (_this$currentRoomCont = this.currentRoomControlProvider) === null || _this$currentRoomCont === void 0 ? void 0 : _this$currentRoomCont.currentRoomControl,
         uiEventStore: this.eventProvider,
         securityStore: ((_this$currentRoomCont2 = this.currentRoomControlProvider) === null || _this$currentRoomCont2 === void 0 || (_this$currentRoomCont2 = _this$currentRoomCont2.currentRoomControl.getRoomInfo()) === null || _this$currentRoomCont2 === void 0 ? void 0 : _this$currentRoomCont2.roomType) === _type.FcrRoomType.Mainroom ? (_this$mainRoomControl = this.mainRoomControlProvider) === null || _this$mainRoomControl === void 0 ? void 0 : _this$mainRoomControl.privilegeProvider : (_this$waitingRoomCont = this.waitingRoomControlProvider) === null || _this$waitingRoomCont === void 0 ? void 0 : _this$waitingRoomCont.privilegeProvider,
-        config: (_this$sharedConfigDat = this.sharedConfigDataSource) === null || _this$sharedConfigDat === void 0 ? void 0 : _this$sharedConfigDat.sceneConfig,
-        parameters: (_this$sharedConfigDat2 = this.sharedConfigDataSource) === null || _this$sharedConfigDat2 === void 0 || (_this$sharedConfigDat2 = _this$sharedConfigDat2.creatorConfig) === null || _this$sharedConfigDat2 === void 0 ? void 0 : _this$sharedConfigDat2.parameters,
+        parameters: (_this$sharedConfigDat = this.sharedConfigDataSource) === null || _this$sharedConfigDat === void 0 || (_this$sharedConfigDat = _this$sharedConfigDat.creatorConfig) === null || _this$sharedConfigDat === void 0 ? void 0 : _this$sharedConfigDat.parameters,
         sharedLayoutDataSource: this.sharedLayoutDataSource,
         roomProvider: this.roomProvider,
         sharedVideoWindowDataSource: this.sharedVideoWindowDataSource,

package/lib/modules/state-bar/layout-config.d.ts

@@ -1,6 +1,4 @@
 import './index.css';
-interface LayoutConfigProps {
+export declare const LayoutConfig: (props: {
     disable: boolean;
-}
-export declare const LayoutConfig: (props: LayoutConfigProps) => import("react/jsx-runtime").JSX.Element;
-export {};
+}) => import("react/jsx-runtime").JSX.Element;

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

@@ -97,7 +97,8 @@ var LayoutConfig = exports.LayoutConfig = (0, _mobxReact.observer)(function (pro
     layoutSize = _useContext2.layoutSize,
     layoutView = _useContext2.layoutView,
     toggleLayoutBarLock = _useContext2.toggleLayoutBarLock,
-    galleryWidth = _useContext2.galleryWidth;
+    galleryWidth = _useContext2.galleryWidth,
+    toastCannotToggleLayoutWhenSharing = _useContext2.toastCannotToggleLayoutWhenSharing;
   var disable = props.disable;
   var _useState = (0, _react.useState)(false),
     _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
@@ -118,11 +119,11 @@ var LayoutConfig = exports.LayoutConfig = (0, _mobxReact.observer)(function (pro
     toggleLayout(view);
   };
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_tooltip.FcrToolTip, {
-    disable: disable,
+    disable: disable || isOpen,
     trigger: "hover",
     placement: 'bottom',
     mouseEnterDelay: 0,
-    content: t('fmt_uimanager_labels_Switchview'),
+    content: t('fmt_statusbar_label_switchlayout'),
     children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_popover.FcrPopover, {
       showArrow: false,
       trigger: "click",
@@ -138,8 +139,12 @@ var LayoutConfig = exports.LayoutConfig = (0, _mobxReact.observer)(function (pro
       }),
       visible: isOpen,
       onVisibleChange: function onVisibleChange(visible) {
-        _setIsOpen(visible);
-        toggleLayoutBarLock(visible);
+        if (!disable) {
+          _setIsOpen(visible);
+          toggleLayoutBarLock(visible);
+        } else {
+          toastCannotToggleLayoutWhenSharing();
+        }
       },
       placement: "bottomRight",
       overlayClassName: ns.e('popover'),

package/lib/modules/state-bar/live-streaming-state.js

@@ -24,7 +24,6 @@ var _i18n = require("agora-ui-foundation/lib/i18n");
 var _jsxRuntime = require("react/jsx-runtime");
 var LiveStreamingState = exports.LiveStreamingState = (0, _mobxReact.observer)(function () {
   var _useContext = (0, _react.useContext)(_store.StoreContext),
-    isUserHost = _useContext.isUserHost,
     liveStreamingPlayUrl = _useContext.liveStreamingPlayUrl,
     stopLiveStreamingDialog = _useContext.stopLiveStreamingDialog,
     hasStopLiveStreamingPermission = _useContext.hasStopLiveStreamingPermission,

package/lib/modules/state-bar/store.d.ts

@@ -1,7 +1,7 @@
-import { FcrRecordingState, FcrRoomInfo, FcrRoomSchedule, FcrUserInfo } from 'fcr-core/lib/type';
+import { FcrRecordingState, FcrRoomInfo } from 'fcr-core/lib/type';
 import { FcrUIEventProvider } from '../../providers/event-provider';
 import { DeviceSettingDialogConfig } from '../setting/store';
-import { FcrUINotificationContentType, FcrUINotificationParams, FcrUISceneConfig, FcrUIToastParams } from '../../type';
+import { FcrUINotificationContentType, FcrUINotificationParams, FcrUIToastParams } from '../../type';
 import { FcrMainRoomControl, FcrWaitingRoomControl } from 'fcr-core/lib/room-control/type';
 import { FcrUIPrivilegeProvider } from '../../providers/privilege-provider';
 import { FcrUISharedLayoutDataSource } from '../../shared-data-source/layout-data';
@@ -24,7 +24,6 @@ export default class StateBarStore {
     private _roomControl;
     private _uiEventStore;
     private _securityStore;
-    private _config;
     private _roomProvider;
     private _sharedLayoutDataSource;
     private _sharedVideoWindowDataSource;
@@ -37,6 +36,7 @@ export default class StateBarStore {
     private _abilityProvider;
     private _annotationProvider;
     private _dialogProvider;
+    private _isMainRoom;
     accessor networkStatus: NetworkStatus;
     accessor roomInfo: FcrRoomInfo | undefined;
     accessor isLiveStreaming: boolean;
@@ -52,7 +52,7 @@ export default class StateBarStore {
     accessor asideOpenedItem: Set<string>;
     accessor cloudRecordingState: FcrRecordingState;
     get annotationHasStart(): boolean;
-    get localUser(): FcrUserInfo;
+    get localUser(): import("fcr-core/lib/type").FcrUserInfo;
     get isUserHost(): boolean;
     get shouldShowMeetingTime(): boolean;
     get isMainRoom(): boolean;
@@ -70,11 +70,10 @@ export default class StateBarStore {
     get asideLayout(): import("../../type").FcrUIUpdateAsideParams;
     get isRoomDetailSupported(): boolean;
     get roomDetailCopyText(): string;
-    constructor({ roomControl, uiEventStore, securityStore, config, parameters, sharedLayoutDataSource, roomProvider, sharedVideoWindowDataSource, messageProvider, sharedMemberDataSource, localStorageProvider, abilityProvider, sharedMeetingTimeDataSource, annotationProvider, dialogProvider, sharedScreenShareSharedDataSource, }: {
+    constructor({ roomControl, uiEventStore, securityStore, parameters, sharedLayoutDataSource, roomProvider, sharedVideoWindowDataSource, messageProvider, sharedMemberDataSource, localStorageProvider, abilityProvider, sharedMeetingTimeDataSource, annotationProvider, dialogProvider, sharedScreenShareSharedDataSource, }: {
         roomControl: FcrMainRoomControl | FcrWaitingRoomControl;
         uiEventStore: FcrUIEventProvider;
         securityStore: FcrUIPrivilegeProvider;
-        config: FcrUISceneConfig;
         parameters?: Record<string, unknown>;
         sharedLayoutDataSource: FcrUISharedLayoutDataSource;
         roomProvider: FcrUIRoomProvider;
@@ -90,7 +89,7 @@ export default class StateBarStore {
     });
     get roomId(): string | undefined;
     get meetingId(): string | undefined;
-    get scheduleInfo(): FcrRoomSchedule | undefined;
+    get scheduleInfo(): import("fcr-core/lib/type").FcrRoomSchedule | undefined;
     isLockRoomEnabled(): boolean;
     setNetworkStatus(networkStatus: NetworkStatus): void;
     setRoomInfo(roomInfo: FcrRoomInfo | undefined): void;
@@ -108,6 +107,7 @@ export default class StateBarStore {
     showToast(params: FcrUIToastParams): void;
     showNotification(params: FcrUINotificationParams): void;
     closeNotification(key: FcrUINotificationContentType): void;
+    toastCannotToggleLayoutWhenSharing(): void;
     private _onNetworkQualityUpdated;
     private _uiEvents;
     private _setBrowserWidth;

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

@@ -115,11 +115,11 @@ var _J = /*#__PURE__*/new WeakMap();
 _ref = (_setNetworkStatusDecs = [_mobx.action, _mobx.action.bound], _setRoomInfoDecs = [_mobx.action, _mobx.action.bound], _stopLiveStreamingDialogDecs = [_mobx.action, _mobx.action.bound], _uiEventsDecs = [_mobx.action, _mobx.action.bound], _setBrowserWidthDecs = [_mobx.action, _mobx.action.bound], _onNetworkStatsUpdatedDecs = [_mobx.action, _mobx.action.bound], _onLiveStreamingStateUpdatedDecs = [_mobx.action, _mobx.action.bound], "logger");
 var StateBarStore = exports["default"] = /*#__PURE__*/function () {
   function StateBarStore(_ref2) {
-    var _this = this;
+    var _this$_roomControl$ge,
+      _this = this;
     var roomControl = _ref2.roomControl,
       uiEventStore = _ref2.uiEventStore,
       securityStore = _ref2.securityStore,
-      config = _ref2.config,
       parameters = _ref2.parameters,
       sharedLayoutDataSource = _ref2.sharedLayoutDataSource,
       roomProvider = _ref2.roomProvider,
@@ -159,7 +159,6 @@ var StateBarStore = exports["default"] = /*#__PURE__*/function () {
     // @observable accessor layoutSize: number;
     // @observable accessor layoutView: 'speaker' | 'gallery' = 'gallery';
     _classPrivateFieldInitSpec(this, _J, _init_cloudRecordingState(this, _type.FcrRecordingState.Stopped));
-    this._config = config;
     this._roomControl = roomControl;
     this._uiEventStore = uiEventStore;
     this._securityStore = securityStore;
@@ -170,6 +169,7 @@ var StateBarStore = exports["default"] = /*#__PURE__*/function () {
     if (this.isLiveStreaming) {
       this.liveStreamingPlayUrl = this._roomControl.getLiveStreamingConfig().pullStreamingUrl;
     }
+    this._isMainRoom = ((_this$_roomControl$ge = this._roomControl.getRoomInfo()) === null || _this$_roomControl$ge === void 0 ? void 0 : _this$_roomControl$ge.roomType) === _type2.FcrRoomType.Mainroom;
     this._sharedLayoutDataSource = sharedLayoutDataSource;
     this._sharedVideoWindowDataSource = sharedVideoWindowDataSource;
     this._sharedMeetingTimeDataSource = sharedMeetingTimeDataSource;
@@ -320,8 +320,7 @@ var StateBarStore = exports["default"] = /*#__PURE__*/function () {
   }, {
     key: "isMainRoom",
     get: function get() {
-      var _this$_roomControl$ge;
-      return ((_this$_roomControl$ge = this._roomControl.getRoomInfo()) === null || _this$_roomControl$ge === void 0 ? void 0 : _this$_roomControl$ge.roomType) === _type2.FcrRoomType.Mainroom;
+      return this._isMainRoom;
     }
   }, {
     key: "hasStartCloudRecordingPermission",
@@ -361,8 +360,8 @@ var StateBarStore = exports["default"] = /*#__PURE__*/function () {
   }, {
     key: "password",
     get: function get() {
-      var _this$_roomControl$ge2;
-      return (_this$_roomControl$ge2 = this._roomControl.getRoomInfo()) === null || _this$_roomControl$ge2 === void 0 ? void 0 : _this$_roomControl$ge2.password;
+      var _this$roomInfo;
+      return (_this$roomInfo = this.roomInfo) === null || _this$roomInfo === void 0 ? void 0 : _this$roomInfo.password;
     }
   }, {
     key: "isSharingScreen",
@@ -494,13 +493,8 @@ var StateBarStore = exports["default"] = /*#__PURE__*/function () {
   }, {
     key: "getShareLink",
     value: function getShareLink() {
-      var _this$roomInfo, _this$roomInfo2, _this$localUser, _this$roomInfo3;
-      var info = {
-        roomId: (_this$roomInfo = this.roomInfo) === null || _this$roomInfo === void 0 ? void 0 : _this$roomInfo.roomId,
-        roomName: (_this$roomInfo2 = this.roomInfo) === null || _this$roomInfo2 === void 0 ? void 0 : _this$roomInfo2.roomName,
-        userName: (_this$localUser = this.localUser) === null || _this$localUser === void 0 ? void 0 : _this$localUser.userName
-      };
-      var baseLink = "".concat((_this$roomInfo3 = this.roomInfo) === null || _this$roomInfo3 === void 0 ? void 0 : _this$roomInfo3.inviteLink);
+      var _this$roomInfo2;
+      var baseLink = "".concat((_this$roomInfo2 = this.roomInfo) === null || _this$roomInfo2 === void 0 ? void 0 : _this$roomInfo2.inviteLink);
       return baseLink;
     }
   }, {
@@ -518,6 +512,14 @@ var StateBarStore = exports["default"] = /*#__PURE__*/function () {
     value: function closeNotification(key) {
       this._messageProvider.closeNotification(key);
     }
+  }, {
+    key: "toastCannotToggleLayoutWhenSharing",
+    value: function toastCannotToggleLayoutWhenSharing() {
+      this._messageProvider.showToast({
+        type: 'normal',
+        message: (0, _i18n.transI18n)('fmt_statusbar_hover_unable_switch_grid_view')
+      });
+    }
   }, {
     key: "_onNetworkQualityUpdated",
     value: function _onNetworkQualityUpdated(_roomId, event) {
@@ -640,7 +642,7 @@ var StateBarStore = exports["default"] = /*#__PURE__*/function () {
   }]);
 }();
 _StateBarStore = StateBarStore;
-var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_StateBarStore, [[_mobx.observable, 1, "networkStatus"], [_mobx.observable, 1, "roomInfo"], [_mobx.observable, 1, "isLiveStreaming"], [_mobx.observable, 1, "liveStreamingPlayUrl"], [_mobx.observable, 1, "galleryWidth"], [_mobx.observable, 1, "browserWidth"], [_mobx.observable, 1, "networkStats"], [_mobx.observable, 1, "attendeeCount"], [_mobx.observable, 1, "asideOpenedItem"], [_mobx.observable, 1, "cloudRecordingState"], [_mobx.computed, 3, "localUser"], [_mobx.computed, 3, "shouldShowMeetingTime"], [_mobx.computed, 3, "isMainRoom"], [_mobx.computed, 3, "hasStartCloudRecordingPermission"], [_mobx.computed, 3, "hasStopLiveStreamingPermission"], [_mobx.computed, 3, "hasGetLiveStreamingLinkPermission"], [_mobx.computed, 3, "totalHourText"], [_mobx.computed, 3, "totalMinuteText"], [_mobx.computed, 3, "meetingTimeStatus"], [_mobx.computed, 3, "meetingTime"], [_mobx.computed, 3, "password"], [_mobx.computed, 3, "roomId"], [_mobx.computed, 3, "meetingId"], [_mobx.computed, 3, "scheduleInfo"], [_decorator.bound, 2, "isLockRoomEnabled"], [_setNetworkStatusDecs, 18, "setNetworkStatus"], [_setRoomInfoDecs, 18, "setRoomInfo"], [_decorator.bound, 2, "openDeviceSettingDialog"], [_stopLiveStreamingDialogDecs, 18, "stopLiveStreamingDialog"], [_decorator.bound, 2, "startCloudRecording"], [_decorator.bound, 2, "pauseCloudRecording"], [_decorator.bound, 2, "resumeCloudRecording"], [_decorator.bound, 2, "stopCloudRecording"], [_decorator.bound, 2, "getShareLink"], [_decorator.bound, 2, "showToast"], [_decorator.bound, 2, "showNotification"], [_decorator.bound, 2, "closeNotification"], [_uiEventsDecs, 18, "_uiEvents"], [_setBrowserWidthDecs, 18, "_setBrowserWidth"], [_onNetworkStatsUpdatedDecs, 18, "_onNetworkStatsUpdated"], [_onLiveStreamingStateUpdatedDecs, 18, "_onLiveStreamingStateUpdated"], [_decorator.bound, 2, "getLocalMeetingTime"]], []).e, 11);
+var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_StateBarStore, [[_mobx.observable, 1, "networkStatus"], [_mobx.observable, 1, "roomInfo"], [_mobx.observable, 1, "isLiveStreaming"], [_mobx.observable, 1, "liveStreamingPlayUrl"], [_mobx.observable, 1, "galleryWidth"], [_mobx.observable, 1, "browserWidth"], [_mobx.observable, 1, "networkStats"], [_mobx.observable, 1, "attendeeCount"], [_mobx.observable, 1, "asideOpenedItem"], [_mobx.observable, 1, "cloudRecordingState"], [_mobx.computed, 3, "localUser"], [_mobx.computed, 3, "shouldShowMeetingTime"], [_mobx.computed, 3, "isMainRoom"], [_mobx.computed, 3, "hasStartCloudRecordingPermission"], [_mobx.computed, 3, "hasStopLiveStreamingPermission"], [_mobx.computed, 3, "hasGetLiveStreamingLinkPermission"], [_mobx.computed, 3, "totalHourText"], [_mobx.computed, 3, "totalMinuteText"], [_mobx.computed, 3, "meetingTimeStatus"], [_mobx.computed, 3, "meetingTime"], [_mobx.computed, 3, "password"], [_mobx.computed, 3, "roomId"], [_mobx.computed, 3, "meetingId"], [_mobx.computed, 3, "scheduleInfo"], [_decorator.bound, 2, "isLockRoomEnabled"], [_setNetworkStatusDecs, 18, "setNetworkStatus"], [_setRoomInfoDecs, 18, "setRoomInfo"], [_decorator.bound, 2, "openDeviceSettingDialog"], [_stopLiveStreamingDialogDecs, 18, "stopLiveStreamingDialog"], [_decorator.bound, 2, "startCloudRecording"], [_decorator.bound, 2, "pauseCloudRecording"], [_decorator.bound, 2, "resumeCloudRecording"], [_decorator.bound, 2, "stopCloudRecording"], [_decorator.bound, 2, "getShareLink"], [_decorator.bound, 2, "showToast"], [_decorator.bound, 2, "showNotification"], [_decorator.bound, 2, "closeNotification"], [_decorator.bound, 2, "toastCannotToggleLayoutWhenSharing"], [_uiEventsDecs, 18, "_uiEvents"], [_setBrowserWidthDecs, 18, "_setBrowserWidth"], [_onNetworkStatsUpdatedDecs, 18, "_onNetworkStatsUpdated"], [_onLiveStreamingStateUpdatedDecs, 18, "_onLiveStreamingStateUpdated"], [_decorator.bound, 2, "getLocalMeetingTime"]], []).e, 11);
 _init_networkStatus = _applyDecs$e[0];
 _init_roomInfo = _applyDecs$e[1];
 _init_isLiveStreaming = _applyDecs$e[2];

package/lib/modules/state-bar/view.js

@@ -44,6 +44,8 @@ var MyFcrToolTip = exports.MyFcrToolTip = function MyFcrToolTip(props) {
     content: props.content,
     trigger: "hover",
     placement: props.placement || 'bottom',
+    isArrowAndTargetCenter: true,
+    disable: props.disable,
     mouseEnterDelay: 0,
     children: props.children
   });
@@ -59,7 +61,6 @@ var View = exports.View = (0, _mobxReact.observer)(function () {
     cloudRecordingState = _useContext.cloudRecordingState,
     isLiveStreaming = _useContext.isLiveStreaming,
     attendeeCount = _useContext.attendeeCount,
-    toggleLayoutBarLock = _useContext.toggleLayoutBarLock,
     galleryWidth = _useContext.galleryWidth,
     isMainRoom = _useContext.isMainRoom,
     meetingId = _useContext.meetingId,
@@ -155,19 +156,17 @@ var View = exports.View = (0, _mobxReact.observer)(function () {
         })
       }), /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
         className: ns.e('meeting-info'),
-        children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(MyFcrToolTip, {
-          content: 'Show Network Details',
-          children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_popover.FcrPopover, {
-            showArrow: false,
-            trigger: "click",
-            content: /*#__PURE__*/(0, _jsxRuntime.jsx)(_meetingNetworkState.MeetingNetworkState, {}),
-            placement: "bottom",
-            onVisibleChange: setIsNetworkDetailVisible,
-            overlayClassName: ns.e('popover'),
-            children: /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
-              className: "".concat(ns.e('info-network'), " ").concat(isNetworkDetailVisible ? 'active' : ''),
-              children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_networkQuality.NetworkQuality, {})
-            })
+        children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_popover.FcrPopover, {
+          showArrow: false,
+          trigger: "hover",
+          content: /*#__PURE__*/(0, _jsxRuntime.jsx)(_meetingNetworkState.MeetingNetworkState, {}),
+          placement: "bottom",
+          mouseEnterDelay: 0,
+          onVisibleChange: setIsNetworkDetailVisible,
+          overlayClassName: ns.e('popover'),
+          children: /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+            className: "".concat(ns.e('info-network'), " ").concat(isNetworkDetailVisible ? 'active' : ''),
+            children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_networkQuality.NetworkQuality, {})
           })
         }), isRoomDetailSupported && /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
           children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("img", {
@@ -210,15 +209,12 @@ var View = exports.View = (0, _mobxReact.observer)(function () {
       children: [isRecording && /*#__PURE__*/(0, _jsxRuntime.jsx)(_recording.Recording, {}), isMainRoom && shouldShowMeetingTime && /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
         className: ns.e('time'),
         children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_meetingTime.MeetingTime, {})
-      }), attendeeCount > 1 && /*#__PURE__*/(0, _jsxRuntime.jsx)(MyFcrToolTip, {
-        content: isSharingScreen ? t('fmt_statusbar_hover_unable_switch_grid_view') : t('fmt_statusbar_label_switchlayout'),
-        children: /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
-          className: (0, _classnames["default"])(ns.e('layout'), {
-            'fcr-state-bar_layout_disable': isSharingScreen
-          }),
-          children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_layoutConfig.LayoutConfig, {
-            disable: isSharingScreen
-          })
+      }), attendeeCount > 1 && /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+        className: (0, _classnames["default"])(ns.e('layout'), {
+          'fcr-state-bar_layout_disable': isSharingScreen
+        }),
+        children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_layoutConfig.LayoutConfig, {
+          disable: isSharingScreen
         })
       }), /*#__PURE__*/(0, _jsxRuntime.jsx)(MyFcrToolTip, {
         placement: "bottom",

package/lib/modules/video-window/components/members/index.js

@@ -32,7 +32,6 @@ var Members = exports.Members = (0, _mobxReact.observer)(function () {
     videoWindowCurrentHeight = _useContext.videoWindowCurrentHeight,
     foldListRenderData = _useContext.foldListRenderData,
     removePin = _useContext.removePin,
-    addPin = _useContext.addPin,
     sendParticipantEvent = _useContext.sendParticipantEvent,
     muteAudio = _useContext.muteAudio,
     openPrivateChat = _useContext.openPrivateChat,
@@ -49,6 +48,7 @@ var Members = exports.Members = (0, _mobxReact.observer)(function () {
     openRenameDialog = _useContext.openRenameDialog,
     userVolumeMap = _useContext.userVolumeMap;
   var ref = (0, _react.useRef)(null);
+  var onScaleChange = (0, _react.useCallback)(function (scale) {}, []);
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
     className: (0, _classnames["default"])('fcr-video-window-members', {
       'fcr-video-window-members_mediapreview': _type.FcrVideoWindowPreviewType.SMALL === videoWindowPreviewType,
@@ -105,7 +105,8 @@ var Members = exports.Members = (0, _mobxReact.observer)(function () {
           windowData: windowData,
           showAvatar: true,
           isVideoSuspended: false,
-          scalcValue: 1
+          scalcValue: 1,
+          onScaleChange: onScaleChange
         })
       }, windowData.windowId);
     }), /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {

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

@@ -85,9 +85,6 @@ var VideoWindowUIModule = exports.VideoWindowUIModule = /*#__PURE__*/function (_
     key: "onUiEvent",
     value: function onUiEvent(event, payload) {
       switch (event) {
-        case _constant.FcrUIAction.STOP_SHARE_SCREEN:
-          this._store.closeVideoWindow();
-          break;
         case _constant.FcrUIAction.CLOSE_VIDEO_WINDOW:
           this._store.closeVideoWindow();
           break;

package/lib/modules/waiting-room-layout/index.css

@@ -3,7 +3,7 @@
   flex-direction: column;
   justify-content: flex-start;
   align-items: center;
-  background: linear-gradient(112deg, #faedff 1.3%, #e6f8fc 98.11%);
+  background: var(--fcr_waiting_room_bg);
   height: calc(100% - 34px);
 }
 
@@ -51,7 +51,7 @@
   box-shadow: 0px 4px 10px rgba(0, 0, 0, 0.1);
   align-items: center;
   width: 70%;
-  background-color: white;
+  background-color: var(--fcr_mobile_ui_scene_fill1);
   min-width: 702px;
 }
 
@@ -76,7 +76,7 @@
   position: absolute;
   left: 10px;
   bottom: 10px;
-  background: white;
+  background: var(--fcr_ui_scene_view_toast);
   border-radius: var(--fcr_cornerradius_xs);
   padding: 5px 10px;
   z-index: 100;

package/lib/modules/waiting-room-layout/index.js

@@ -23,10 +23,10 @@ var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime
 var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
 var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
 var _base = require("../../base");
-var _toast = _interopRequireDefault(require("../dialog/components/toast"));
+var _toast = _interopRequireDefault(require("../dialog/dialogs/toast"));
 var _store = _interopRequireWildcard(require("./store"));
 var _view = _interopRequireDefault(require("./view"));
-var _confirm = require("../dialog/components/confirm");
+var _confirm = require("../dialog/dialogs/confirm");
 var _jsxRuntime = require("react/jsx-runtime");
 var _excluded = ["globalToast", "confirm"];
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, "default": e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }

package/lib/modules/waiting-room-layout/view.js

@@ -62,6 +62,7 @@ var View = (0, _mobxReact.observer)(function () {
           children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_localVideoPlayer.LocalVideoPlayer, {
             isLocalMirrorEnabled: false,
             userName: localUser.userName,
+            avatarImage: localUser.avatar,
             showSlider: false,
             cameraDeviceId: cameraDeviceId,
             showCameraPreview: cameraEnabled,

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

@@ -63,7 +63,7 @@ var WhiteboardControlbar = exports.WhiteboardControlbar = (0, _mobxReact.observe
           className: "whiteboard-controlbar-item",
           onClick: onZoomout,
           children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_icon.FcrIcon, {
-            type: _type.FcrIconType.FCR_ZOOMOUT,
+            type: _type.FcrIconType.FCR_ZOOMIN,
             size: 22,
             colors: {
               iconPrimary: isMinimum ? 'gray' : 'var(--fcr_ui_scene_icontext1)'
@@ -76,7 +76,7 @@ var WhiteboardControlbar = exports.WhiteboardControlbar = (0, _mobxReact.observe
           className: "whiteboard-controlbar-item",
           onClick: onZoomin,
           children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_icon.FcrIcon, {
-            type: _type.FcrIconType.FCR_ZOOMIN,
+            type: _type.FcrIconType.FCR_ZOOMOUT,
             size: 22,
             colors: {
               iconPrimary: isMaxmum ? 'gray' : 'var(--fcr_ui_scene_icontext1)'

package/lib/modules/whiteboard/components/control-bar/store.d.ts

@@ -3,6 +3,7 @@ import { FcrUserInfo } from 'fcr-core/lib/type';
 import { FcrStreamControl, FcrUserControl } from 'fcr-core';
 import { FcrUIPrivilegeProvider } from '../../../../providers/privilege-provider';
 import { FcrUIAnnotationProvider } from '../../../../providers/annotation-provider';
+import { FcrUISharedAnnotationSource } from '../../../../shared-data-source/annotation-data';
 export declare class WhiteboardControlBarStore {
     accessor ownerUser: FcrUserInfo | undefined;
     accessor currentUser: FcrUserInfo | undefined;
@@ -18,12 +19,14 @@ export declare class WhiteboardControlBarStore {
     private _userControl;
     private _securityStore;
     private _annotationProvider;
-    constructor({ uiEventStore, userControl, securityStore, annotationProvider, }: {
+    private _sharedAnnotationDataSource;
+    constructor({ uiEventStore, userControl, securityStore, annotationProvider, sharedAnnotationDataSource, }: {
         uiEventStore: FcrUIEventProvider;
         streamControl: FcrStreamControl;
         userControl: FcrUserControl;
         securityStore: FcrUIPrivilegeProvider;
         annotationProvider: FcrUIAnnotationProvider;
+        sharedAnnotationDataSource: FcrUISharedAnnotationSource;
     });
     get annotationHasStart(): boolean;
     get canWriteBoard(): boolean;

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

@@ -84,7 +84,8 @@ var WhiteboardControlBarStore = exports.WhiteboardControlBarStore = /*#__PURE__*
     var uiEventStore = _ref2.uiEventStore,
       userControl = _ref2.userControl,
       securityStore = _ref2.securityStore,
-      annotationProvider = _ref2.annotationProvider;
+      annotationProvider = _ref2.annotationProvider,
+      sharedAnnotationDataSource = _ref2.sharedAnnotationDataSource;
     (0, _classCallCheck2["default"])(this, WhiteboardControlBarStore);
     _classPrivateFieldInitSpec(this, _A, (_initProto(this), _init_ownerUser(this, undefined)));
     _classPrivateFieldInitSpec(this, _B, _init_currentUser(this, undefined));
@@ -101,6 +102,7 @@ var WhiteboardControlBarStore = exports.WhiteboardControlBarStore = /*#__PURE__*
     this.currentUser = userControl.getLocalUser();
     this._securityStore = securityStore;
     this._annotationProvider = annotationProvider;
+    this._sharedAnnotationDataSource = sharedAnnotationDataSource;
     this.isHost = [_type2.FcrUserRole.HOST, _type2.FcrUserRole.COHOST].includes((_userControl$getLocal = userControl.getLocalUser()) === null || _userControl$getLocal === void 0 ? void 0 : _userControl$getLocal.userRole);
     uiEventStore.addObserver({
       onEvent: function onEvent(action, payload) {
@@ -212,7 +214,7 @@ var WhiteboardControlBarStore = exports.WhiteboardControlBarStore = /*#__PURE__*
   }, {
     key: "annotationHasStart",
     get: function get() {
-      return this._annotationProvider.annotationHasStart;
+      return this._sharedAnnotationDataSource.annotationHasStart;
     }
   }, {
     key: "canWriteBoard",

package/lib/modules/whiteboard/components/toolbar/components/pen-picker.js

@@ -107,16 +107,16 @@ var PenPickerPanel = (0, _mobxReact.observer)(function () {
     setIsHover(false);
   };
   var weights = [{
-    value: 2,
+    value: 3,
     icon: isCurve ? _type2.FcrIconType.FCR_PENSIZE : _type2.FcrIconType.FCR_PENSIZE_STRAIGHT
   }, {
-    value: 4,
+    value: 5,
     icon: isCurve ? _type2.FcrIconType.FCR_PENSIZE : _type2.FcrIconType.FCR_PENSIZE_STRAIGHT
   }, {
-    value: 5,
+    value: 7,
     icon: isCurve ? _type2.FcrIconType.FCR_PENSIZE : _type2.FcrIconType.FCR_PENSIZE_STRAIGHT
   }, {
-    value: 6,
+    value: 10,
     icon: isCurve ? _type2.FcrIconType.FCR_PENSIZE : _type2.FcrIconType.FCR_PENSIZE_STRAIGHT
   }];
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {

package/lib/modules/whiteboard/components/toolbar/hooks/index.d.ts

@@ -12,17 +12,3 @@ export declare const useVisibleTools: (diraction?: "horizontal") => {
     showColorCount: number;
     isShinked: boolean;
 };
-export declare const useAnnotationVisibleTools: (diraction?: "horizontal") => {
-    mainTools: {
-        renderItem: ({ offset }?: {
-            offset?: number;
-        }) => import("react/jsx-runtime").JSX.Element;
-    }[];
-    additionTools: {
-        renderItem: ({ offset }?: {
-            offset?: number;
-        }) => import("react/jsx-runtime").JSX.Element;
-    }[];
-    showColorCount: number;
-    isShinked: boolean;
-};