fcr-ui-scene 3.6.2 → 3.6.3

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

@@ -43,7 +43,9 @@ require("core-js/modules/es.array.for-each.js");
 require("core-js/modules/es.array.includes.js");
 require("core-js/modules/es.array.iterator.js");
 require("core-js/modules/es.array.push.js");
+require("core-js/modules/es.date.to-json.js");
 require("core-js/modules/es.function.bind.js");
+require("core-js/modules/es.json.stringify.js");
 require("core-js/modules/es.object.to-string.js");
 require("core-js/modules/es.promise.js");
 require("core-js/modules/es.string.iterator.js");
@@ -183,7 +185,19 @@ var ShareScreenStore = exports["default"] = /*#__PURE__*/function () {
           duration: 3000
         });
       }
+    }), (0, _mobx.reaction)(function () {
+      return _this.connectionState;
+    }, function (val) {
+      var needCloseState = val === _fcrCore.FcrConnectionState.ABORTED || val === _fcrCore.FcrConnectionState.DISCONNECTED;
+      _this.logger.info("[screen-share]: connection state changed to ".concat(val, ", need close state: ").concat(needCloseState));
+      if (needCloseState) {
+        _this.handleStopShare();
+      }
     }));
+    if ((0, _env.isElectron)()) {
+      window.runtime.browserWindow.addListener('show', this._handleBrowserShow);
+      window.runtime.browserWindow.addListener('hide', this._hendleBrowserHide);
+    }
   }
   return (0, _createClass2["default"])(ShareScreenStore, [{
     key: "boardOwnerUser",
@@ -293,6 +307,16 @@ var ShareScreenStore = exports["default"] = /*#__PURE__*/function () {
     get: function get() {
       return this._sharedScreenShareSharedDataSource.currentShareId;
     }
+  }, {
+    key: "_screenShareInfoForLog",
+    get: function get() {
+      return "Screen Share Info : ".concat(JSON.stringify({
+        isSharingScreen: this.screenSharingState,
+        currentShareId: this.currentShareId,
+        currentShareType: this.currentShareType,
+        currentShareBounds: this.currentSelectionBounds
+      }));
+    }
   }, {
     key: "_handleOnScreenCaptureStopped",
     value: function _handleOnScreenCaptureStopped() {
@@ -366,6 +390,10 @@ var ShareScreenStore = exports["default"] = /*#__PURE__*/function () {
       this._boardControl.removeObserver(this._boardObserver);
       this._roomProvider.removeObserver(this._roomObserver);
       this._removeEventListeners();
+      if ((0, _env.isElectron)()) {
+        window.runtime.browserWindow.removeListener('show', this._handleBrowserShow);
+        window.runtime.browserWindow.removeListener('hide', this._hendleBrowserHide);
+      }
     }
   }, {
     key: "openRelaunchTipsDialog",
@@ -450,6 +478,7 @@ var ShareScreenStore = exports["default"] = /*#__PURE__*/function () {
         var audioProcessingChannel,
           bounds,
           electronBounds,
+          hasValidShare,
           _args3 = arguments;
         return _regenerator["default"].wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
@@ -479,63 +508,48 @@ var ShareScreenStore = exports["default"] = /*#__PURE__*/function () {
             case 11:
               electronBounds = (0, _env.isElectron)() ? window.runtime.screen.getDisplayNearestPoint(bounds) : null;
               this._sharedScreenShareSharedDataSource.setCurrentSelectionBounds((electronBounds === null || electronBounds === void 0 ? void 0 : electronBounds.bounds) || bounds);
-              if (!(this.screenSharingState === _fcrCore.FcrMediaSourceState.OPEN)) {
-                _context3.next = 17;
-                break;
-              }
-              this._handleReplaceScreen(id, type, withAudio, audioProcessingChannel, bounds);
-              this._setShareLock(false);
-              return _context3.abrupt("return");
-            case 17:
-              this._annotationProvider.setCurrentShareInfo({
+              this.logger.info("[screen-share][handleStartShare]: currentShareInfo: ".concat(JSON.stringify({
                 id: id,
                 type: type,
                 bounds: bounds
-              });
-              this._annotationProvider.setBoundsToAnnotationWindow({
+              })));
+              this._annotationProvider.setCurrentShareInfo({
                 id: id,
                 type: type,
                 bounds: bounds
               });
-              this._eventProvider.sendEvent(_constant.FcrUIAction.SET_CURRENT_SHARE_SCREEN, {
+              this._annotationProvider.setBoundsToAnnotationWindow({
                 id: id,
                 type: type,
                 bounds: bounds
               });
-              _context3.t0 = this.supportEnumScreen;
-              if (!_context3.t0) {
-                _context3.next = 25;
+              if (!(this.screenSharingState === _fcrCore.FcrMediaSourceState.OPEN)) {
+                _context3.next = 19;
                 break;
               }
-              _context3.next = 24;
+              this._handleReplaceScreen(id, type, withAudio, audioProcessingChannel, bounds);
+              return _context3.abrupt("return");
+            case 19:
+              _context3.next = 21;
               return this._validateShareStart(id, type);
-            case 24:
-              _context3.t0 = !_context3.sent;
-            case 25:
-              if (!_context3.t0) {
-                _context3.next = 27;
+            case 21:
+              hasValidShare = _context3.sent;
+              if (!(!this._hasScreenSharePermission() || this.supportEnumScreen && !hasValidShare)) {
+                _context3.next = 24;
                 break;
               }
               return _context3.abrupt("return");
-            case 27:
+            case 24:
               if (!this.shareLock) {
-                _context3.next = 29;
+                _context3.next = 26;
                 break;
               }
               return _context3.abrupt("return", this._showToast((0, _i18n.transI18n)('fmt_screenshare_tips_enablecollection'), 'error'));
-            case 29:
-              this._setShareLock(true);
+            case 26:
               this._sharedScreenShareSharedDataSource.setCurrentShareIdInfos(id, type, bounds);
-              if (this._hasScreenSharePermission()) {
-                _context3.next = 34;
-                break;
-              }
-              this._setShareLock(false);
-              return _context3.abrupt("return");
-            case 34:
-              this._initControlbar();
               this._screenShareProvider.startShareScreen(id, type, withAudio, false);
-            case 36:
+              this._initControlbar();
+            case 29:
             case "end":
               return _context3.stop();
           }
@@ -621,14 +635,6 @@ var ShareScreenStore = exports["default"] = /*#__PURE__*/function () {
   }, {
     key: "_handleOnScreenShareReplaceBegin",
     value: function _handleOnScreenShareReplaceBegin(id, type, bounds) {
-      if ((0, _env.isElectron)()) {
-        this._initControlbar();
-      }
-      this._eventProvider.sendEvent(_constant.FcrUIAction.SET_CURRENT_SHARE_SCREEN, {
-        id: id,
-        type: type,
-        bounds: bounds
-      });
       this._annotationProvider.setCurrentShareInfo({
         id: id,
         type: type,
@@ -860,27 +866,20 @@ var ShareScreenStore = exports["default"] = /*#__PURE__*/function () {
     key: "_initControlbar",
     value: function () {
       var _initControlbar2 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee9() {
-        var params, mainWindow;
+        var mainWindow;
         return _regenerator["default"].wrap(function _callee9$(_context9) {
           while (1) switch (_context9.prev = _context9.next) {
             case 0:
-              params = {
-                currentShareAudioProcessingChannel: _shareAudio.AudioProcessingChannel.MONO,
-                currentShareId: this.currentShareId,
-                currentShareType: this.currentShareType,
-                shareWithAudio: this.shareWithAudio,
-                currentShareBounds: this.currentSelectionBounds
-              };
               if ((0, _env.isElectron)()) {
-                this._controlBarDialogId = this._dialogProvider.openDialog(_constant.FcrUIDialogKey.CONTROL_BAR, _constant.FcrUIDialogKey.CONTROL_BAR, params);
+                this._controlBarDialogId = this._dialogProvider.openDialog(_constant.FcrUIDialogKey.CONTROL_BAR, _constant.FcrUIDialogKey.CONTROL_BAR);
                 mainWindow = window.runtime.browserWindow;
                 if (mainWindow) {
                   mainWindow.hide();
                 }
               } else {
-                this._controlBarDialogId = this._dialogProvider.openDialog(_constant.FcrUIDialogKey.CONTROL_BAR, _constant.FcrUIDialogKey.CONTROL_BAR, params);
+                this._controlBarDialogId = this._dialogProvider.openDialog(_constant.FcrUIDialogKey.CONTROL_BAR, _constant.FcrUIDialogKey.CONTROL_BAR);
               }
-            case 2:
+            case 1:
             case "end":
               return _context9.stop();
           }
@@ -891,6 +890,16 @@ var ShareScreenStore = exports["default"] = /*#__PURE__*/function () {
       }
       return _initControlbar;
     }()
+  }, {
+    key: "_handleBrowserShow",
+    value: function _handleBrowserShow() {
+      this.logger.info("[screen-share]: browser window show, current sharing info: ".concat(this._screenShareInfoForLog));
+    }
+  }, {
+    key: "_hendleBrowserHide",
+    value: function _hendleBrowserHide() {
+      this.logger.info("[screen-share]: browser window hide, current sharing info: ".concat(this._screenShareInfoForLog));
+    }
   }, {
     key: "handleToggleScreenShareWithAudio",
     value: function handleToggleScreenShareWithAudio(withAudio) {
@@ -899,7 +908,7 @@ var ShareScreenStore = exports["default"] = /*#__PURE__*/function () {
   }]);
 }();
 _ShareScreenStore = ShareScreenStore;
-var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_ShareScreenStore, [[_mobx.observable, 1, "boardOwnerUser"], [_setShareWithAudioStateDecs, 18, "setShareWithAudioState"], [_hasLoopbackDeviceDecs, 18, "hasLoopbackDevice"], [_setShareAudioProcessingChannelDecs, 18, "setShareAudioProcessingChannel"], [_decorator.bound, 2, "handlerBoardShareStop"], [_decorator.bound, 2, "release"], [_openRelaunchTipsDialogDecs, 18, "openRelaunchTipsDialog"], [_startRenderSharePreviewDecs, 18, "startRenderSharePreview"], [_stopRenderSharePreviewDecs, 18, "stopRenderSharePreview"], [_handleStopShareDecs, 18, "handleStopShare"], [_handleStartShareDecs, 18, "handleStartShare"], [_openShareScreenSelectionDecs, 18, "_openShareScreenSelection"], [_closeShareScreenSelectionDecs, 18, "_closeShareScreenSelection"], [_setControlBarWindowIdDecs, 18, "_setControlBarWindowId"], [_openVideoWindowDialogDecs, 18, "_openVideoWindowDialog"], [_closeControlBarDecs, 18, "_closeControlBar"], [_closeVideoWindowDialogDecs, 18, "_closeVideoWindowDialog"], [_handleReplaceScreenDecs, 18, "_handleReplaceScreen"], [_decorator.bound, 2, "_handleOnline"], [_decorator.bound, 2, "_handleOffline"], [_initControlbarDecs, 18, "_initControlbar"], [_decorator.bound, 2, "handleToggleScreenShareWithAudio"], [_handleChooseScreenDecs, 16, "handleChooseScreen"]], []).e, 3);
+var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_ShareScreenStore, [[_mobx.observable, 1, "boardOwnerUser"], [_setShareWithAudioStateDecs, 18, "setShareWithAudioState"], [_hasLoopbackDeviceDecs, 18, "hasLoopbackDevice"], [_setShareAudioProcessingChannelDecs, 18, "setShareAudioProcessingChannel"], [_decorator.bound, 2, "handlerBoardShareStop"], [_decorator.bound, 2, "release"], [_openRelaunchTipsDialogDecs, 18, "openRelaunchTipsDialog"], [_startRenderSharePreviewDecs, 18, "startRenderSharePreview"], [_stopRenderSharePreviewDecs, 18, "stopRenderSharePreview"], [_handleStopShareDecs, 18, "handleStopShare"], [_handleStartShareDecs, 18, "handleStartShare"], [_openShareScreenSelectionDecs, 18, "_openShareScreenSelection"], [_closeShareScreenSelectionDecs, 18, "_closeShareScreenSelection"], [_setControlBarWindowIdDecs, 18, "_setControlBarWindowId"], [_openVideoWindowDialogDecs, 18, "_openVideoWindowDialog"], [_closeControlBarDecs, 18, "_closeControlBar"], [_closeVideoWindowDialogDecs, 18, "_closeVideoWindowDialog"], [_handleReplaceScreenDecs, 18, "_handleReplaceScreen"], [_decorator.bound, 2, "_handleOnline"], [_decorator.bound, 2, "_handleOffline"], [_initControlbarDecs, 18, "_initControlbar"], [_decorator.bound, 2, "_handleBrowserShow"], [_decorator.bound, 2, "_hendleBrowserHide"], [_decorator.bound, 2, "handleToggleScreenShareWithAudio"], [_handleChooseScreenDecs, 16, "handleChooseScreen"]], []).e, 3);
 _init_boardOwnerUser = _applyDecs$e[0];
 _init_handleChooseScreen = _applyDecs$e[1];
 _initProto = _applyDecs$e[2];

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

@@ -255,12 +255,6 @@
   }
 }
 
-.fcr-state-bar__time {
-}
-
-.fcr-state-bar__layout {
-}
-
 .fcr-state-bar__full-screen {
   border-radius: var(--fcr_cornerradius_xxs);
   border: 1px solid var(--fcr_ui_scene_line1);
@@ -631,3 +625,11 @@
     display: none;
   }
 }
+
+.layout-set-options-item-disable .fcr-layout-config-panel__option-text {
+  color: var(--fcr_ui_scene_icontext3);
+}
+
+.layout-set-options-item-disable .fcr-layout-config-panel__option-layout-img-wrapper {
+  opacity: 0.5;
+}

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

@@ -12,6 +12,7 @@ import { FcrUIAbilityProviderImpl } from 'fcr-ui-scene/src/providers/ability-pro
 import { FcrUIMeetingTimeSharedDataSource } from '../../shared-data-source/meeting-time';
 import { FcrUIAnnotationProvider } from '../../providers/annotation-provider';
 import { FcrUIDialogProvider } from '../../providers/dialog-provider';
+import { FcrUIScreenShareSharedDataSource } from '../../shared-data-source/screen-share-data';
 export declare class StateBarUIModule extends UIModule {
     private _store?;
     currentRoomControlProvider?: FcrUICurrentRoomControlProvider;
@@ -29,6 +30,7 @@ export declare class StateBarUIModule extends UIModule {
     abilityProvider?: FcrUIAbilityProviderImpl;
     annotationProvider: FcrUIAnnotationProvider;
     dialogProvider?: FcrUIDialogProvider;
+    sharedScreenShareSharedDataSource?: FcrUIScreenShareSharedDataSource;
     onNodeWillActive(): void;
     getComponent(): import("react/jsx-runtime").JSX.Element;
     onNodeWillInactive(): void;

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

@@ -59,7 +59,8 @@ var StateBarUIModule = exports.StateBarUIModule = /*#__PURE__*/function (_UIModu
         abilityProvider: this.abilityProvider,
         sharedMeetingTimeDataSource: this.sharedMeetingTimeDataSource,
         annotationProvider: this.annotationProvider,
-        dialogProvider: this.dialogProvider
+        dialogProvider: this.dialogProvider,
+        sharedScreenShareSharedDataSource: this.sharedScreenShareSharedDataSource
       });
     }
   }, {

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

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

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

@@ -14,7 +14,6 @@ var _i18n = require("agora-ui-foundation/lib/i18n");
 var _mobxReact = require("mobx-react");
 var _useNamespace = require("../../utilities/useNamespace");
 require("./index.css");
-var _view = require("./view");
 var _icon = require("agora-ui-foundation/lib/components/icon");
 var _type = require("agora-ui-foundation/lib/components/icon/type");
 var _react = require("react");
@@ -24,6 +23,7 @@ var _fcr_listontop_big = _interopRequireDefault(require("../../../public/assets/
 var _fcr_grid_big = _interopRequireDefault(require("../../../public/assets/fcr_grid_big.svg"));
 var _store = require("./store");
 var _store2 = require("../setting/store");
+var _tooltip = require("agora-ui-foundation/lib/components/tooltip");
 var _jsxRuntime = require("react/jsx-runtime");
 var LayoutPanel = (0, _mobxReact.observer)(function (props) {
   var ns = (0, _useNamespace.useNamespace)('layout-config-panel');
@@ -53,9 +53,13 @@ var LayoutPanel = (0, _mobxReact.observer)(function (props) {
     className: ns.b(),
     children: [options.map(function (item) {
       return /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
-        className: (0, _classnames["default"])(ns.e('option'), ns.is('active', props.layoutView === item.type)),
+        className: (0, _classnames["default"])(ns.e('option'), ns.is('active', !props.disable && props.layoutView === item.type), {
+          'layout-set-options-item-disable': props.disable
+        }),
         onClick: function onClick() {
-          return props.setLayoutView(item.type);
+          if (!props.disable) {
+            props.setLayoutView(item.type);
+          }
         },
         children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
           className: ns.e('option-layout'),
@@ -93,6 +97,7 @@ var LayoutConfig = exports.LayoutConfig = (0, _mobxReact.observer)(function (pro
     layoutView = _useContext2.layoutView,
     toggleLayoutBarLock = _useContext2.toggleLayoutBarLock,
     galleryWidth = _useContext2.galleryWidth;
+  var disable = props.disable;
   var _useState = (0, _react.useState)(false),
     _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
     isOpen = _useState2[0],
@@ -111,7 +116,11 @@ var LayoutConfig = exports.LayoutConfig = (0, _mobxReact.observer)(function (pro
     _setIsOpen(false);
     toggleLayout(view);
   };
-  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_view.MyFcrToolTip, {
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_tooltip.FcrToolTip, {
+    disable: disable,
+    trigger: "hover",
+    placement: 'bottom',
+    mouseEnterDelay: 0,
     content: t('fmt_uimanager_labels_Switchview'),
     children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_popover.FcrPopover, {
       showArrow: false,
@@ -123,7 +132,8 @@ var LayoutConfig = exports.LayoutConfig = (0, _mobxReact.observer)(function (pro
         setIsOpen: function setIsOpen(visible) {
           _setIsOpen(visible);
           toggleLayoutBarLock(visible);
-        }
+        },
+        disable: disable
       }),
       visible: isOpen,
       onVisibleChange: function onVisibleChange(visible) {

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

@@ -15,6 +15,7 @@ import { FcrUIAbilityProviderImpl } from 'fcr-ui-scene/src/providers/ability-pro
 import { FcrUIMeetingTimeSharedDataSource } from '../../shared-data-source/meeting-time';
 import { FcrUIAnnotationProvider } from '../../providers/annotation-provider';
 import { FcrUIDialogProvider } from '../../providers/dialog-provider';
+import { FcrUIScreenShareSharedDataSource } from '../../shared-data-source/screen-share-data';
 export type NetworkStatus = 'excellent' | 'average' | 'poor' | 'unknown';
 export declare const GALLERY_MIN_SIZE = 825;
 export default class StateBarStore {
@@ -28,6 +29,7 @@ export default class StateBarStore {
     private _sharedLayoutDataSource;
     private _sharedVideoWindowDataSource;
     private _sharedMeetingTimeDataSource;
+    private _sharedScreenShareSharedDataSource;
     private _messageProvider;
     private _sharedMemberDataSource;
     private _localStorageProvider;
@@ -62,12 +64,13 @@ export default class StateBarStore {
     get meetingTimeStatus(): import("../../shared-data-source/meeting-time").MeetingStatus;
     get meetingTime(): string;
     get password(): string | undefined;
+    get isSharingScreen(): boolean;
     get layoutSize(): number;
     get layoutView(): import("../../type").FcrUIVideoWindowLayoutType;
     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, }: {
+    constructor({ roomControl, uiEventStore, securityStore, config, parameters, sharedLayoutDataSource, roomProvider, sharedVideoWindowDataSource, messageProvider, sharedMemberDataSource, localStorageProvider, abilityProvider, sharedMeetingTimeDataSource, annotationProvider, dialogProvider, sharedScreenShareSharedDataSource, }: {
         roomControl: FcrMainRoomControl | FcrWaitingRoomControl;
         uiEventStore: FcrUIEventProvider;
         securityStore: FcrUIPrivilegeProvider;
@@ -83,6 +86,7 @@ export default class StateBarStore {
         sharedMeetingTimeDataSource: FcrUIMeetingTimeSharedDataSource;
         annotationProvider: FcrUIAnnotationProvider;
         dialogProvider: FcrUIDialogProvider;
+        sharedScreenShareSharedDataSource: FcrUIScreenShareSharedDataSource;
     });
     get roomId(): string | undefined;
     get meetingId(): string | undefined;

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

@@ -131,7 +131,8 @@ var StateBarStore = exports["default"] = /*#__PURE__*/function () {
       abilityProvider = _ref2.abilityProvider,
       sharedMeetingTimeDataSource = _ref2.sharedMeetingTimeDataSource,
       annotationProvider = _ref2.annotationProvider,
-      dialogProvider = _ref2.dialogProvider;
+      dialogProvider = _ref2.dialogProvider,
+      sharedScreenShareSharedDataSource = _ref2.sharedScreenShareSharedDataSource;
     (0, _classCallCheck2["default"])(this, StateBarStore);
     (0, _defineProperty2["default"])(this, _ref, (_initProto(this), (0, _logger.createLogger)({
       prefix: 'StateBarStore'
@@ -175,6 +176,7 @@ var StateBarStore = exports["default"] = /*#__PURE__*/function () {
     this._sharedMeetingTimeDataSource = sharedMeetingTimeDataSource;
     this._messageProvider = messageProvider;
     this._sharedMemberDataSource = sharedMemberDataSource;
+    this._sharedScreenShareSharedDataSource = sharedScreenShareSharedDataSource;
     this._localStorageProvider = localStorageProvider;
     this._roomControl.addObserver(this._roomObserver);
     this._abilityProvider = abilityProvider;
@@ -363,6 +365,11 @@ var StateBarStore = exports["default"] = /*#__PURE__*/function () {
       var _this$_roomControl$ge2;
       return (_this$_roomControl$ge2 = this._roomControl.getRoomInfo()) === null || _this$_roomControl$ge2 === void 0 ? void 0 : _this$_roomControl$ge2.password;
     }
+  }, {
+    key: "isSharingScreen",
+    get: function get() {
+      return this._sharedScreenShareSharedDataSource.isSharingScreen;
+    }
   }, {
     key: "layoutSize",
     get: function get() {

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

@@ -67,7 +67,7 @@ var View = exports.View = (0, _mobxReact.observer)(function () {
     showNotification = _useContext.showNotification,
     closeNotification = _useContext.closeNotification,
     isRoomDetailSupported = _useContext.isRoomDetailSupported,
-    annotationHasStart = _useContext.annotationHasStart;
+    isSharingScreen = _useContext.isSharingScreen;
   var _useState = (0, _react.useState)(false),
     _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
     isFullScreen = _useState2[0],
@@ -210,11 +210,15 @@ 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 && !annotationHasStart && /*#__PURE__*/(0, _jsxRuntime.jsx)(MyFcrToolTip, {
-        content: t('fmt_statusbar_label_switchlayout'),
+      }), 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: ns.e('layout'),
-          children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_layoutConfig.LayoutConfig, {})
+          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/whiteboard/components/control-bar/store.js

@@ -262,6 +262,7 @@ var WhiteboardControlBarStore = exports.WhiteboardControlBarStore = /*#__PURE__*
   }, {
     key: "onClose",
     value: function onClose() {
+      this._uiEventStore.sendEvent(_constant.FcrUIAction.RESET_WHITEBOARD_TOOLBAR_VARS);
       this._uiEventStore.sendEvent(_constant.FcrUIAction.CLOSE_WHITEBOARD);
     }
   }, {
@@ -276,6 +277,7 @@ var WhiteboardControlBarStore = exports.WhiteboardControlBarStore = /*#__PURE__*
         action: _type.WhiteboardControlbarEvents.ENABLE_CONTROL,
         payload: controlEnabled
       });
+      this._uiEventStore.sendEvent(_constant.FcrUIAction.RESET_WHITEBOARD_TOOLBAR_VARS);
     }
   }]);
 }();

package/lib/modules/whiteboard/components/toolbar/store.d.ts

@@ -4,13 +4,17 @@ import { FcrBoardMainWindow } from 'fcr-core/lib/room-control/whiteboard-control
 import { FcrBaseRoomControl } from 'fcr-core/lib/room-control/type';
 import { FcrWhiteboardControl } from 'fcr-core/lib/room-control/whiteboard-control-v2/whiteboard-control/type';
 import { FcrUIAnnotationProvider } from '../../../../providers/annotation-provider';
+import { FcrUIEventProvider } from '../../../../providers/event-provider';
 export declare class ToolbarStore {
     private _whiteboardControl;
     private _roomControl;
     private _annotationProvider;
+    private _eventProvider;
     private _boardMainWindow;
     private _lastStrokeWidth;
     private _boardObserver;
+    private _whiteboardObserver;
+    private _uiEventObserver;
     accessor observables: {
         currentTool: FcrBoardToolType | undefined;
         currentShape: FcrBoardShape | undefined;
@@ -41,9 +45,9 @@ export declare class ToolbarStore {
     };
     get roomInfo(): import("fcr-core/lib/type").FcrRoomInfo | undefined;
     get boardMainWindow(): FcrBoardMainWindow;
-    constructor(_whiteboardControl: FcrWhiteboardControl, _roomControl: FcrBaseRoomControl, _annotationProvider: FcrUIAnnotationProvider);
-    disableToolbar(): void;
-    resumeToolbar(): void;
+    constructor(_whiteboardControl: FcrWhiteboardControl, _roomControl: FcrBaseRoomControl, _annotationProvider: FcrUIAnnotationProvider, _eventProvider: FcrUIEventProvider);
+    private _onUiEvent;
+    resetToolbarVars(): void;
     get annotationHasStart(): boolean;
     redo(): void;
     undo(): void;