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

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

@@ -27,8 +27,7 @@ var _store = _interopRequireWildcard(require("./store"));
 require("./index.css");
 var _type = require("fcr-core/lib/room-control/type");
 var _jsxRuntime = require("react/jsx-runtime");
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { "default": e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n["default"] = e, t && t.set(e, n), n; }
+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); }
 function _callSuper(t, o, e) { return o = (0, _getPrototypeOf2["default"])(o), (0, _possibleConstructorReturn2["default"])(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], (0, _getPrototypeOf2["default"])(t).constructor) : o.apply(t, e)); }
 function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
 var StateBarUIModule = exports.StateBarUIModule = /*#__PURE__*/function (_UIModule) {
@@ -59,7 +58,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

@@ -8,13 +8,13 @@ Object.defineProperty(exports, "__esModule", {
 exports.LayoutConfig = void 0;
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 require("core-js/modules/es.array.map.js");
-require("core-js/modules/esnext.async-iterator.map.js");
+require("core-js/modules/es.object.to-string.js");
+require("core-js/modules/esnext.iterator.constructor.js");
 require("core-js/modules/esnext.iterator.map.js");
 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 +24,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 +54,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 +98,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 +117,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 +133,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/live-streaming-state.js

@@ -8,9 +8,6 @@ Object.defineProperty(exports, "__esModule", {
 exports.LiveStreamingState = void 0;
 require("core-js/modules/es.array.filter.js");
 require("core-js/modules/es.object.to-string.js");
-require("core-js/modules/esnext.async-iterator.filter.js");
-require("core-js/modules/esnext.iterator.constructor.js");
-require("core-js/modules/esnext.iterator.filter.js");
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _icon = require("agora-ui-foundation/lib/components/icon");
 var _type = require("agora-ui-foundation/lib/components/icon/type");

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

@@ -45,7 +45,6 @@ require("core-js/modules/es.object.to-string.js");
 require("core-js/modules/es.set.js");
 require("core-js/modules/es.string.iterator.js");
 require("core-js/modules/es.weak-map.js");
-require("core-js/modules/esnext.async-iterator.for-each.js");
 require("core-js/modules/esnext.iterator.constructor.js");
 require("core-js/modules/esnext.iterator.for-each.js");
 require("core-js/modules/esnext.set.add-all.js");
@@ -131,7 +130,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 +175,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 +364,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/video-window/components/members/index.js

@@ -7,7 +7,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.Members = void 0;
 require("core-js/modules/es.array.map.js");
-require("core-js/modules/esnext.async-iterator.map.js");
+require("core-js/modules/es.object.to-string.js");
+require("core-js/modules/esnext.iterator.constructor.js");
 require("core-js/modules/esnext.iterator.map.js");
 var _react = require("react");
 var _mobxReact = require("mobx-react");

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

@@ -9,10 +9,7 @@ exports["default"] = void 0;
 require("core-js/modules/es.array.filter.js");
 require("core-js/modules/es.array.map.js");
 require("core-js/modules/es.object.to-string.js");
-require("core-js/modules/esnext.async-iterator.filter.js");
-require("core-js/modules/esnext.async-iterator.map.js");
 require("core-js/modules/esnext.iterator.constructor.js");
-require("core-js/modules/esnext.iterator.filter.js");
 require("core-js/modules/esnext.iterator.map.js");
 var _react = require("react");
 var _mobxReact = require("mobx-react");

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

@@ -29,8 +29,7 @@ var _constant = require("../../utilities/constant");
 var _type = require("./type");
 var _store2 = require("../components/device-control/store");
 var _jsxRuntime = require("react/jsx-runtime");
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { "default": e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n["default"] = e, t && t.set(e, n), n; }
+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); }
 function _callSuper(t, o, e) { return o = (0, _getPrototypeOf2["default"])(o), (0, _possibleConstructorReturn2["default"])(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], (0, _getPrototypeOf2["default"])(t).constructor) : o.apply(t, e)); }
 function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
 var VideoWindowUIModule = exports.VideoWindowUIModule = /*#__PURE__*/function (_UIModule) {

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

@@ -32,10 +32,6 @@ require("core-js/modules/es.map.js");
 require("core-js/modules/es.object.to-string.js");
 require("core-js/modules/es.string.iterator.js");
 require("core-js/modules/es.weak-map.js");
-require("core-js/modules/esnext.async-iterator.filter.js");
-require("core-js/modules/esnext.async-iterator.find.js");
-require("core-js/modules/esnext.async-iterator.for-each.js");
-require("core-js/modules/esnext.async-iterator.some.js");
 require("core-js/modules/esnext.iterator.constructor.js");
 require("core-js/modules/esnext.iterator.filter.js");
 require("core-js/modules/esnext.iterator.find.js");

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

@@ -29,8 +29,7 @@ var _view = _interopRequireDefault(require("./view"));
 var _confirm = require("../dialog/components/confirm");
 var _jsxRuntime = require("react/jsx-runtime");
 var _excluded = ["globalToast", "confirm"];
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { "default": e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n["default"] = e, t && t.set(e, n), n; }
+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); }
 function _callSuper(t, o, e) { return o = (0, _getPrototypeOf2["default"])(o), (0, _possibleConstructorReturn2["default"])(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], (0, _getPrototypeOf2["default"])(t).constructor) : o.apply(t, e)); }
 function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
 var WaitingRoomLayout = exports.WaitingRoomLayout = /*#__PURE__*/function (_UIModule) {

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

@@ -40,7 +40,6 @@ exports.WhiteboardControlBarUIContext = exports.WhiteboardControlBarStore = void
 require("core-js/modules/es.array.includes.js");
 require("core-js/modules/es.array.iterator.js");
 require("core-js/modules/es.object.to-string.js");
-require("core-js/modules/es.string.includes.js");
 require("core-js/modules/es.string.iterator.js");
 require("core-js/modules/es.weak-map.js");
 require("core-js/modules/esnext.weak-map.delete-all.js");
@@ -262,6 +261,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 +276,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/switch-theme/index.js

@@ -9,8 +9,6 @@ exports["default"] = void 0;
 require("core-js/modules/es.array.find.js");
 require("core-js/modules/es.array.map.js");
 require("core-js/modules/es.object.to-string.js");
-require("core-js/modules/esnext.async-iterator.find.js");
-require("core-js/modules/esnext.async-iterator.map.js");
 require("core-js/modules/esnext.iterator.constructor.js");
 require("core-js/modules/esnext.iterator.find.js");
 require("core-js/modules/esnext.iterator.map.js");

package/lib/modules/whiteboard/components/switch-theme/item.js

@@ -8,7 +8,8 @@ Object.defineProperty(exports, "__esModule", {
 exports["default"] = WhiteboardSwitchThemeItem;
 require("core-js/modules/es.array.concat.js");
 require("core-js/modules/es.array.map.js");
-require("core-js/modules/esnext.async-iterator.map.js");
+require("core-js/modules/es.object.to-string.js");
+require("core-js/modules/esnext.iterator.constructor.js");
 require("core-js/modules/esnext.iterator.map.js");
 var _classnames = _interopRequireDefault(require("classnames"));
 var _jsxRuntime = require("react/jsx-runtime");

package/lib/modules/whiteboard/components/toolbar/components/color-picker/components/panel.js

@@ -9,8 +9,9 @@ exports.ColorPickerPanel = void 0;
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 require("core-js/modules/es.array.includes.js");
 require("core-js/modules/es.array.map.js");
+require("core-js/modules/es.object.to-string.js");
 require("core-js/modules/es.string.includes.js");
-require("core-js/modules/esnext.async-iterator.map.js");
+require("core-js/modules/esnext.iterator.constructor.js");
 require("core-js/modules/esnext.iterator.map.js");
 var _mobxReact = require("mobx-react");
 var _react = require("react");

package/lib/modules/whiteboard/components/toolbar/components/color-picker/index.js

@@ -8,7 +8,8 @@ exports.ColorPickerItem = void 0;
 require("core-js/modules/es.array.map.js");
 require("core-js/modules/es.array.push.js");
 require("core-js/modules/es.array.slice.js");
-require("core-js/modules/esnext.async-iterator.map.js");
+require("core-js/modules/es.object.to-string.js");
+require("core-js/modules/esnext.iterator.constructor.js");
 require("core-js/modules/esnext.iterator.map.js");
 var _mobxReact = require("mobx-react");
 var _react = require("react");

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

@@ -13,8 +13,6 @@ require("core-js/modules/es.object.keys.js");
 require("core-js/modules/es.object.to-string.js");
 require("core-js/modules/es.string.iterator.js");
 require("core-js/modules/es.weak-map.js");
-require("core-js/modules/esnext.async-iterator.filter.js");
-require("core-js/modules/esnext.async-iterator.for-each.js");
 require("core-js/modules/esnext.iterator.constructor.js");
 require("core-js/modules/esnext.iterator.filter.js");
 require("core-js/modules/esnext.iterator.for-each.js");
@@ -35,8 +33,7 @@ var _popover = require("agora-ui-foundation/lib/components/popover");
 var _classnames = _interopRequireDefault(require("classnames"));
 var _react = _interopRequireWildcard(require("react"));
 var _jsxRuntime = require("react/jsx-runtime");
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { "default": e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n["default"] = e, t && t.set(e, n), n; }
+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); }
 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; }
 /** @internal */

package/lib/modules/whiteboard/components/toolbar/components/extra-tool-picker.js

@@ -18,7 +18,7 @@ require("core-js/modules/es.array.map.js");
 require("core-js/modules/es.date.to-string.js");
 require("core-js/modules/es.object.to-string.js");
 require("core-js/modules/es.regexp.to-string.js");
-require("core-js/modules/esnext.async-iterator.map.js");
+require("core-js/modules/esnext.iterator.constructor.js");
 require("core-js/modules/esnext.iterator.map.js");
 var _mobxReact = require("mobx-react");
 var _hooks = require("../hooks");
@@ -28,8 +28,7 @@ var _type = require("agora-ui-foundation/lib/components/icon/type");
 var _store = require("../store");
 var _expansion = require("./expansion");
 var _jsxRuntime = require("react/jsx-runtime");
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { "default": e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n["default"] = e, t && t.set(e, n), n; }
+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); }
 var AdditionToolPickerItem = exports.AdditionToolPickerItem = (0, _mobxReact.observer)(function () {
   var _useContext = (0, _react.useContext)(_store.ToolbarContext),
     toolbarDockPosition = _useContext.observables.toolbarDockPosition;

package/lib/modules/whiteboard/components/toolbar/components/move-handle.js

@@ -10,8 +10,6 @@ require("core-js/modules/es.object.get-own-property-descriptor.js");
 require("core-js/modules/es.object.get-own-property-descriptors.js");
 require("core-js/modules/es.object.keys.js");
 require("core-js/modules/es.object.to-string.js");
-require("core-js/modules/esnext.async-iterator.filter.js");
-require("core-js/modules/esnext.async-iterator.for-each.js");
 require("core-js/modules/esnext.iterator.constructor.js");
 require("core-js/modules/esnext.iterator.filter.js");
 require("core-js/modules/esnext.iterator.for-each.js");

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

@@ -7,8 +7,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.PenPickerItem = void 0;
 require("core-js/modules/es.array.map.js");
-require("core-js/modules/esnext.async-iterator.map.js");
-require("core-js/modules/esnext.iterator.map.js");
+require("core-js/modules/es.object.to-string.js");
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _react = require("react");

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

@@ -8,9 +8,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.ShapePickerItem = void 0;
 require("core-js/modules/es.array.includes.js");
 require("core-js/modules/es.array.map.js");
-require("core-js/modules/es.string.includes.js");
-require("core-js/modules/esnext.async-iterator.map.js");
-require("core-js/modules/esnext.iterator.map.js");
+require("core-js/modules/es.object.to-string.js");
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _react = require("react");

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

@@ -11,8 +11,6 @@ require("core-js/modules/es.array.filter.js");
 require("core-js/modules/es.array.map.js");
 require("core-js/modules/es.array.reverse.js");
 require("core-js/modules/es.object.to-string.js");
-require("core-js/modules/esnext.async-iterator.filter.js");
-require("core-js/modules/esnext.async-iterator.map.js");
 require("core-js/modules/esnext.iterator.constructor.js");
 require("core-js/modules/esnext.iterator.filter.js");
 require("core-js/modules/esnext.iterator.map.js");
@@ -349,8 +347,8 @@ var useAnnotationVisibleTools = exports.useAnnotationVisibleTools = function use
   // },
   {
     renderItem: function renderItem() {
-      var _ref10 = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
-        offset = _ref10.offset;
+      var _ref0 = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
+        offset = _ref0.offset;
       return /*#__PURE__*/(0, _jsxRuntime.jsx)(_eraserPicker.EraserPickerItem, {
         offset: offset
       });

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

@@ -11,7 +11,7 @@ require("core-js/modules/es.array.map.js");
 require("core-js/modules/es.date.to-string.js");
 require("core-js/modules/es.object.to-string.js");
 require("core-js/modules/es.regexp.to-string.js");
-require("core-js/modules/esnext.async-iterator.map.js");
+require("core-js/modules/esnext.iterator.constructor.js");
 require("core-js/modules/esnext.iterator.map.js");
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _mobxReact = require("mobx-react");

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;