fcr-ui-scene 3.1.1 → 3.2.0

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

@@ -15,7 +15,7 @@ var _mobxReact = require("mobx-react");
 var _context = require("../../context");
 var _i18n = require("agora-ui-foundation/lib/i18n");
 var _button = require("agora-ui-foundation/lib/components/button");
-var _enums = require("agora-edu-core/lib/room-control/whiteboard-control/enums");
+var _agoraEduCore = require("agora-edu-core");
 var _jsxRuntime = require("react/jsx-runtime");
 var Loading = exports.Loading = (0, _mobxReact.observer)(function () {
   var transI18n = (0, _i18n.useI18n)();
@@ -25,7 +25,7 @@ var Loading = exports.Loading = (0, _mobxReact.observer)(function () {
     joinSuccessed = _useContext$observabl.joinSuccessed,
     canOperate = _useContext$observabl.canOperate,
     handleClose = _useContext.handleClose;
-  var isReconnecting = connectionState === _enums.FcrBoardRoomConnectionState.RECONNECTING || connectionState === _enums.FcrBoardRoomConnectionState.CONNECTING && joinSuccessed;
+  var isReconnecting = connectionState === _agoraEduCore.FcrConnectionState.RECONNECTING || connectionState === _agoraEduCore.FcrConnectionState.CONNECTING && joinSuccessed;
   var _useState = (0, _react.useState)(!isReconnecting || !canOperate),
     _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
     minimize = _useState2[0],

package/lib/modules/whiteboard/components/multi-window/index.js

@@ -10,9 +10,9 @@ var _mobxReact = require("mobx-react");
 var _controlBar = require("../control-bar");
 var _react = require("react");
 var _context = require("../../context");
-var _enums = require("agora-edu-core/lib/room-control/whiteboard-control/enums");
 require("./index.css");
 var _boardContext = _interopRequireDefault(require("../../../../utilities/board-context"));
+var _agoraEduCore = require("agora-edu-core");
 var _jsxRuntime = require("react/jsx-runtime");
 var MultiWindowWidgetDialog = exports.MultiWindowWidgetDialog = (0, _mobxReact.observer)(function (_ref) {
   var children = _ref.children;
@@ -20,7 +20,7 @@ var MultiWindowWidgetDialog = exports.MultiWindowWidgetDialog = (0, _mobxReact.o
     connectionState = _useContext.observables.connectionState;
   var _useContext2 = (0, _react.useContext)(_boardContext["default"]),
     showToolbar = _useContext2.showToolbar;
-  var showControlbar = connectionState === _enums.FcrBoardRoomConnectionState.CONNECTED;
+  var showControlbar = connectionState === _agoraEduCore.FcrConnectionState.CONNECTED;
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
     className: "fcr-widget-dialog-zindex-wrapper fcr-widget-dialog",
     children: [showControlbar && showToolbar && /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 declare const scenePaginationUIContextDefault: {
     observables: {
         currentPage: number;

package/lib/modules/whiteboard/components/progress/electron.js

@@ -12,7 +12,7 @@ var ProgressElectronDialog = (0, _mobxReact.observer)(function (_ref) {
     var node;
     window.runtime.openRendererWindow('progress-dialog', function (dom) {
       node = dom;
-      (0, _reactDom.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(_context.StoreContext.Provider, {
+      (0, _reactDom.render)(/*#__PURE__*/(0, _jsxRuntime.jsx)(_context.StoreContext.Provider, {
         value: store,
         children: children
       }), dom);

package/lib/modules/whiteboard/components/progress/style.css

@@ -1,14 +1,15 @@
 .progress-dialog-frame {
   width: 290px;
-  height: 58px;
+  min-height: 58px;
+  padding: 10px 0;
   border-radius: var(--fcr_cornerradius_s);
   background: var(--fcr_ui_scene_white6);
   box-shadow: var(--fcr_web_light_dropup);
   display: flex;
   align-items: center;
   z-index: 1000;
-  position: sticky;
-  top: calc(100% - 68px);
+  position: absolute;
+  top: calc(100% - 98px);
   left: calc(100vw - 310px);
 }
 .progress-dialog-icon {

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

@@ -9,6 +9,11 @@ exports["default"] = WhiteboardSwitchTheme;
 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");
 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");
@@ -18,6 +23,7 @@ var _item = _interopRequireDefault(require("./item"));
 var _libs = _interopRequireDefault(require("./libs"));
 var _react = require("react");
 var _store = require("../toolbar/store");
+var _i18n = require("agora-ui-foundation/lib/i18n");
 var _jsxRuntime = require("react/jsx-runtime");
 function WhiteboardSwitchTheme() {
   var _useContext = (0, _react.useContext)(_store.ToolbarContext),
@@ -26,6 +32,7 @@ function WhiteboardSwitchTheme() {
     _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
     visible = _useState2[0],
     setVisible = _useState2[1];
+  var t = (0, _i18n.useI18n)();
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_popover.FcrPopover, {
     trigger: "click",
     overlayClassName: "whiteboard-switch-theme-popover",
@@ -36,13 +43,13 @@ function WhiteboardSwitchTheme() {
     visible: visible,
     content: /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
       className: "whiteboard-switch-theme",
-      children: [_libs["default"].map(function (theme, idx) {
+      children: [(0, _libs["default"])(t).map(function (theme, idx) {
         return /*#__PURE__*/(0, _jsxRuntime.jsx)(_item["default"], {
           colors: theme.showColors,
           title: theme.title,
           theme: theme.theme,
           onClick: function onClick(theme) {
-            var result = _libs["default"].find(function (item) {
+            var result = (0, _libs["default"])(t).find(function (item) {
               return item.theme === theme.theme;
             });
             setTheme(result);

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

@@ -7,6 +7,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/esnext.iterator.map.js");
 var _jsxRuntime = require("react/jsx-runtime");
 function WhiteboardSwitchThemeItem(props) {
   var title = props.title,

package/lib/modules/whiteboard/components/switch-theme/libs.d.ts

@@ -1,3 +1,4 @@
+import { GenerateI18nKey } from 'agora-ui-foundation/lib/i18n';
 import { WhiteboardThemeType } from '../../type';
-declare const whiteboardTheme: Required<WhiteboardThemeType>[];
+declare const whiteboardTheme: (t: (t: GenerateI18nKey<I18nResouceTypes>) => string) => Required<WhiteboardThemeType>[];
 export default whiteboardTheme;

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

@@ -5,24 +5,25 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = void 0;
-var _i18n = require("agora-ui-foundation/lib/i18n");
-var whiteboardTheme = [{
-  showColors: [['#E2E2E2', '#968D86', '#0E0E0E'], ['#A1C473', '#FFC908', '#FF86C9', '#FC3141']],
-  colors: ['#E2E2E2', '#A1C473', '#FFC908', '#CC3100', '#968D86', '#4262FF', '#51BD69', '#EB47A2', '#0E0E0E', '#50E3C2', '#FC3141', '#7740EC'],
-  background: '#ffffff',
-  title: (0, _i18n.transI18n)('fmt_screenshare_whiteboard_tips_defaultwhiteboard'),
-  theme: 'whiteboard'
-}, {
-  showColors: [['#FFFFFF', '#968D86', '#717171'], ['#A1C473', '#FFC908', '#FF86C9', '#FC3141']],
-  colors: ['#FFFFFF', '#A1C473', '#FFC908', '#CC3100', '#968D86', '#4262FF', '#51BD69', '#EB47A2', '#0E0E0E', '#50E3C2', '#FC3141', '#7740EC'],
-  background: '#000000',
-  title: (0, _i18n.transI18n)('fmt_screenshare_whiteboard_tips_blackboard'),
-  theme: 'blackboard'
-}, {
-  showColors: [['#E2E2E2', '#E8B288', '#0E0E0E'], ['#A1C473', '#FFC908', '#FFAFDC', '#FF616D']],
-  colors: ['#E2E2E2', '#A1C473', '#FFC908', '#CC3100', '#968D86', '#4262FF', '#51BD69', '#EB47A2', '#0E0E0E', '#50E3C2', '#FC3141', '#7740EC'],
-  background: '#5A7D75',
-  title: (0, _i18n.transI18n)('fmt_screenshare_whiteboard_lables_wallpoaster'),
-  theme: 'chalkboard'
-}];
+var whiteboardTheme = function whiteboardTheme(t) {
+  return [{
+    showColors: [['#E2E2E2', '#968D86', '#0E0E0E'], ['#A1C473', '#FFC908', '#FF86C9', '#FC3141']],
+    colors: ['#E2E2E2', '#A1C473', '#FFC908', '#CC3100', '#968D86', '#4262FF', '#51BD69', '#EB47A2', '#0E0E0E', '#50E3C2', '#FC3141', '#7740EC'],
+    background: '#ffffff',
+    title: t('fmt_screenshare_whiteboard_tips_defaultwhiteboard'),
+    theme: 'whiteboard'
+  }, {
+    showColors: [['#FFFFFF', '#968D86', '#717171'], ['#A1C473', '#FFC908', '#FF86C9', '#FC3141']],
+    colors: ['#FFFFFF', '#A1C473', '#FFC908', '#CC3100', '#968D86', '#4262FF', '#51BD69', '#EB47A2', '#0E0E0E', '#50E3C2', '#FC3141', '#7740EC'],
+    background: '#000000',
+    title: t('fmt_screenshare_whiteboard_tips_blackboard'),
+    theme: 'blackboard'
+  }, {
+    showColors: [['#E2E2E2', '#E8B288', '#0E0E0E'], ['#A1C473', '#FFC908', '#FFAFDC', '#FF616D']],
+    colors: ['#E2E2E2', '#A1C473', '#FFC908', '#CC3100', '#968D86', '#4262FF', '#51BD69', '#EB47A2', '#0E0E0E', '#50E3C2', '#FC3141', '#7740EC'],
+    background: '#5A7D75',
+    title: t('fmt_screenshare_whiteboard_lables_wallpoaster'),
+    theme: 'chalkboard'
+  }];
+};
 var _default = exports["default"] = whiteboardTheme;

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

@@ -10,6 +10,8 @@ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/sli
 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");
 var _mobxReact = require("mobx-react");
 var _react = require("react");
 var _store = require("../../../store");

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

@@ -8,6 +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/esnext.iterator.map.js");
 var _mobxReact = require("mobx-react");
 var _react = require("react");
 var _store = require("../../store");
@@ -32,7 +34,7 @@ var ColorPickerItem = exports.ColorPickerItem = (0, _mobxReact.observer)(functio
       }, color);
     }).slice(0, Math.min(showColorCount - commonColors.length + 1, commonColors.length));
     if (showColorCount > 0) {
-      list.push( /*#__PURE__*/(0, _jsxRuntime.jsx)(_picker.Picker, {}, "picker"));
+      list.push(/*#__PURE__*/(0, _jsxRuntime.jsx)(_picker.Picker, {}, "picker"));
     }
   } else {
     list = [/*#__PURE__*/(0, _jsxRuntime.jsx)(_picker.Picker, {}, "picker")];

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

@@ -6,6 +6,8 @@ require("core-js/modules/es.object.get-own-property-descriptor.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.weak-map.delete-all.js");
+require("core-js/modules/esnext.weak-map.emplace.js");
 require("core-js/modules/web.dom-collections.iterator.js");
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 var _typeof = require("@babel/runtime/helpers/typeof");
@@ -18,11 +20,11 @@ var _react = _interopRequireWildcard(require("react"));
 var _ = require("..");
 var _classnames = _interopRequireDefault(require("classnames"));
 var _i18n = require("agora-ui-foundation/lib/i18n");
-var _type = require("../../../type");
-var _type2 = require("agora-ui-foundation/lib/components/icon/type");
+var _type = require("agora-ui-foundation/lib/components/icon/type");
 var _icon = require("agora-ui-foundation/lib/components/icon");
 var _store = require("../store");
 var _tooltip = require("agora-ui-foundation/lib/components/tooltip");
+var _enums = require("agora-edu-core/lib/room-control/whiteboard-control/enums");
 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; }
@@ -33,13 +35,13 @@ var EraserPickerItem = exports.EraserPickerItem = (0, _mobxReact.observer)(funct
     currentTool = _useContext$observabl.currentTool,
     toolbarDockPosition = _useContext$observabl.toolbarDockPosition;
   var transI18n = (0, _i18n.useI18n)();
-  var isActive = currentTool === _type.FcrBoardTool.Eraser;
+  var isActive = currentTool === _enums.FcrBoardToolType.ERASER;
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_.ExpansionToolbarItem, {
     isActive: isActive,
     tooltip: transI18n('fmt_screenshare_whiteboard_button_eraser'),
     tooltipPlacement: toolbarDockPosition.placement === 'left' ? 'right' : 'left',
     popoverPlacement: toolbarDockPosition.placement === 'left' ? 'right' : 'left',
-    icon: _type2.FcrIconType.FCR_WHITEBOARD_ERASER,
+    icon: _type.FcrIconType.FCR_WHITEBOARD_ERASER,
     popoverOverlayClassName: "fcr-board-toolbar__picker__overlay",
     popoverContent: /*#__PURE__*/(0, _jsxRuntime.jsx)(EraserPickerPanel, {}),
     popoverOffset: offset
@@ -54,10 +56,10 @@ var EraserPickerPanel = (0, _mobxReact.observer)(function () {
     setTool = _useContext2.setTool;
   var transI18n = (0, _i18n.useI18n)();
   var eraserCls = (0, _classnames["default"])({
-    'fcr-board-toolbar-panel--active': currentTool === _type.FcrBoardTool.Eraser
+    'fcr-board-toolbar-panel--active': currentTool === _enums.FcrBoardToolType.ERASER
   });
   var handleEraserClick = function handleEraserClick() {
-    setTool(_type.FcrBoardTool.Eraser);
+    setTool(_enums.FcrBoardToolType.ERASER);
   };
   var handleCleanClick = function handleCleanClick() {
     clean();
@@ -72,10 +74,10 @@ var EraserPickerPanel = (0, _mobxReact.observer)(function () {
         className: eraserCls,
         onClick: handleEraserClick,
         children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_icon.FcrIcon, {
-          type: _type2.FcrIconType.FCR_WHITEBOARD_ERASER,
+          type: _type.FcrIconType.FCR_WHITEBOARD_ERASER,
           size: 28,
           colors: {
-            iconPrimary: currentTool === _type.FcrBoardTool.Eraser ? 'var(--fcr_ui_scene_ramp_brand6)' : 'var(--fcr_ui_scene_black8)'
+            iconPrimary: currentTool === _enums.FcrBoardToolType.ERASER ? 'var(--fcr_ui_scene_ramp_brand6)' : 'var(--fcr_ui_scene_black8)'
           }
         })
       })
@@ -86,7 +88,7 @@ var EraserPickerPanel = (0, _mobxReact.observer)(function () {
       children: /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
         onClick: handleCleanClick,
         children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_icon.FcrIcon, {
-          type: _type2.FcrIconType.FCR_WHITEBOARD_ELIMINATE,
+          type: _type.FcrIconType.FCR_WHITEBOARD_ELIMINATE,
           size: 28,
           colors: {
             iconPrimary: 'var(--fcr_ui_scene_black8)'

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

@@ -5,6 +5,8 @@ require("core-js/modules/es.object.define-property.js");
 require("core-js/modules/es.object.get-own-property-descriptor.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");
+require("core-js/modules/esnext.weak-map.emplace.js");
 require("core-js/modules/web.dom-collections.iterator.js");
 var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
@@ -16,6 +18,8 @@ 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.map.js");
 var _mobxReact = require("mobx-react");
 var _ = require("..");
 var _hooks = require("../hooks");

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

@@ -10,6 +10,11 @@ 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");
 require("core-js/modules/web.dom-collections.for-each.js");
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {

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

@@ -7,6 +7,8 @@ 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");
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _react = require("react");
 var _mobxReact = require("mobx-react");

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

@@ -9,6 +9,8 @@ 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");
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _react = require("react");
 var _mobxReact = require("mobx-react");
@@ -133,8 +135,8 @@ var ShapePickerPanel = (0, _mobxReact.observer)(function () {
               level: 2
             }
           })
-        }, type)
-      });
+        })
+      }, type);
     }), /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
       className: "fcr-divider-vertical fcr-divider-marign-bottom"
     }), weights.map(function (_ref3, level) {

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

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

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

@@ -11,6 +11,11 @@ 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");
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _react = require("react");
 var _ = require("..");
@@ -26,10 +31,10 @@ var _max = _interopRequireDefault(require("lodash/max"));
 var _extraToolPicker = require("../components/extra-tool-picker");
 var _i18n = require("agora-ui-foundation/lib/i18n");
 var _type = require("agora-ui-foundation/lib/components/icon/type");
-var _type2 = require("../../../type");
 var _store = require("../store");
 var _screenCapturePicker = require("../components/screen-capture-picker");
 var _env = require("agora-foundation/lib/utilities/env");
+var _enums = require("agora-edu-core/lib/room-control/whiteboard-control/enums");
 var _jsxRuntime = require("react/jsx-runtime");
 var useVisibleTools = exports.useVisibleTools = function useVisibleTools(diraction) {
   var _useContext = (0, _react.useContext)(_store.ToolbarContext),
@@ -51,8 +56,8 @@ var useVisibleTools = exports.useVisibleTools = function useVisibleTools(diracti
         tooltipPlacement: toolbarDockPosition.placement === 'left' ? 'right' : 'left',
         tooltip: transI18n('fmt_screenshare_whiteboard_button_laserpen'),
         icon: _type.FcrIconType.FCR_WHITEBOARD_LASERPEN2,
-        onClick: handleToolChange(_type2.FcrBoardTool.LaserPointer),
-        isActive: currentTool === _type2.FcrBoardTool.LaserPointer,
+        onClick: handleToolChange(_enums.FcrBoardToolType.LASER_POINTER),
+        isActive: currentTool === _enums.FcrBoardToolType.LASER_POINTER,
         diraction: diraction
       });
     }
@@ -63,8 +68,8 @@ var useVisibleTools = exports.useVisibleTools = function useVisibleTools(diracti
   //       tooltipPlacement={toolbarDockPosition.placement === 'left' ? 'right' : 'left'}
   //       tooltip={'fcr_board_tool_clicker'}
   //       icon={FcrIconType.FCR_WHITEBOARD_MOUSE}
-  //       onClick={handleToolChange(FcrBoardTool.Clicker)}
-  //       isActive={currentTool === FcrBoardTool.Clicker}
+  //       onClick={handleToolChange(FcrBoardToolType.Clicker)}
+  //       isActive={currentTool === FcrBoardToolType.Clicker}
   //     />
   //   ),
   // },
@@ -74,8 +79,8 @@ var useVisibleTools = exports.useVisibleTools = function useVisibleTools(diracti
         tooltipPlacement: toolbarDockPosition.placement === 'left' ? 'right' : 'left',
         tooltip: transI18n('fmt_screenshare_whiteboard_button_boxselection'),
         icon: _type.FcrIconType.FCR_WHITECHOOSE,
-        onClick: handleToolChange(_type2.FcrBoardTool.Selector),
-        isActive: currentTool === _type2.FcrBoardTool.Selector,
+        onClick: handleToolChange(_enums.FcrBoardToolType.SELECTOR),
+        isActive: currentTool === _enums.FcrBoardToolType.SELECTOR,
         diraction: diraction
       });
     }
@@ -101,8 +106,8 @@ var useVisibleTools = exports.useVisibleTools = function useVisibleTools(diracti
         tooltipPlacement: toolbarDockPosition.placement === 'left' ? 'right' : 'left',
         tooltip: transI18n('fmt_screenshare_whiteboard_button_text'),
         icon: _type.FcrIconType.FCR_WHITEBOARD_TEXT,
-        onClick: handleToolChange(_type2.FcrBoardTool.Text),
-        isActive: currentTool === _type2.FcrBoardTool.Text,
+        onClick: handleToolChange(_enums.FcrBoardToolType.TEXT),
+        isActive: currentTool === _enums.FcrBoardToolType.TEXT,
         diraction: diraction
       });
     }
@@ -112,8 +117,8 @@ var useVisibleTools = exports.useVisibleTools = function useVisibleTools(diracti
         tooltipPlacement: toolbarDockPosition.placement === 'left' ? 'right' : 'left',
         tooltip: transI18n('fmt_screenshare_whiteboard_button_dragdrop'),
         icon: _type.FcrIconType.FCR_WHITEBOARD_MOVESUBJECTS2,
-        onClick: handleToolChange(_type2.FcrBoardTool.Hand),
-        isActive: currentTool === _type2.FcrBoardTool.Hand,
+        onClick: handleToolChange(_enums.FcrBoardToolType.HAND),
+        isActive: currentTool === _enums.FcrBoardToolType.HAND,
         diraction: diraction
       });
     }

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

@@ -12,6 +12,13 @@ require("core-js/modules/es.object.get-own-property-descriptors.js");
 require("core-js/modules/es.object.keys.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");
+require("core-js/modules/esnext.weak-map.delete-all.js");
+require("core-js/modules/esnext.weak-map.emplace.js");
 require("core-js/modules/web.dom-collections.for-each.js");
 require("core-js/modules/web.dom-collections.iterator.js");
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
@@ -25,6 +32,8 @@ 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.map.js");
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _mobxReact = require("mobx-react");

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

@@ -1,8 +1,8 @@
-/// <reference types="react" />
-import { FcrBoardShape, FcrBoardTool, WhiteboardThemeType } from '../../type';
+import { FcrBoardShape, WhiteboardThemeType } from '../../type';
+import { FcrBoardToolType } from 'agora-edu-core/lib/room-control/whiteboard-control/enums';
 export declare class ToolbarStore {
     accessor observables: {
-        currentTool: FcrBoardTool | undefined;
+        currentTool: FcrBoardToolType | undefined;
         currentShape: FcrBoardShape | undefined;
         currentColor: string;
         currentStrokeWidth: number;
@@ -14,10 +14,10 @@ export declare class ToolbarStore {
         toolbarDockPosition: {
             x: number | undefined;
             y: number | undefined;
-            placement: "right" | "left";
+            placement: "left" | "right";
         };
-        redoSteps: number;
-        undoSteps: number;
+        redoSteps: boolean;
+        undoSteps: boolean;
         lastPen: FcrBoardShape | undefined;
         lastShape: FcrBoardShape | undefined;
         maxCountVisibleTools: number;
@@ -30,7 +30,7 @@ export declare class ToolbarStore {
     redo(): void;
     undo(): void;
     clean(): void;
-    setTool(tool: FcrBoardTool): void;
+    setTool(tool: FcrBoardToolType): void;
     setPen(shape: FcrBoardShape): void;
     setShape(shape: FcrBoardShape): void;
     setStrokeColor(color: string): void;

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

@@ -15,6 +15,22 @@ require("core-js/modules/es.number.constructor.js");
 require("core-js/modules/es.object.create.js");
 require("core-js/modules/es.object.define-property.js");
 require("core-js/modules/es.object.get-own-property-descriptor.js");
+require("core-js/modules/esnext.function.metadata.js");
+require("core-js/modules/esnext.map.delete-all.js");
+require("core-js/modules/esnext.map.emplace.js");
+require("core-js/modules/esnext.map.every.js");
+require("core-js/modules/esnext.map.filter.js");
+require("core-js/modules/esnext.map.find.js");
+require("core-js/modules/esnext.map.find-key.js");
+require("core-js/modules/esnext.map.includes.js");
+require("core-js/modules/esnext.map.key-of.js");
+require("core-js/modules/esnext.map.map-keys.js");
+require("core-js/modules/esnext.map.map-values.js");
+require("core-js/modules/esnext.map.merge.js");
+require("core-js/modules/esnext.map.reduce.js");
+require("core-js/modules/esnext.map.some.js");
+require("core-js/modules/esnext.map.update.js");
+require("core-js/modules/esnext.symbol.metadata.js");
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
@@ -25,6 +41,8 @@ require("core-js/modules/es.array.iterator.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.weak-map.delete-all.js");
+require("core-js/modules/esnext.weak-map.emplace.js");
 require("core-js/modules/web.dom-collections.iterator.js");
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
@@ -35,8 +53,8 @@ var _react = require("react");
 var _rendererEvent = require("../../../../utilities/renderer-event");
 var _ToolbarStore;
 var _initProto, _init_observables;
-function _classPrivateFieldInitSpec(obj, privateMap, value) { _checkPrivateRedeclaration(obj, privateMap); privateMap.set(obj, value); }
-function _checkPrivateRedeclaration(obj, privateCollection) { if (privateCollection.has(obj)) { throw new TypeError("Cannot initialize the same private elements twice on an object"); } }
+function _classPrivateFieldInitSpec(e, t, a) { _checkPrivateRedeclaration(e, t), t.set(e, a); }
+function _checkPrivateRedeclaration(e, t) { if (t.has(e)) throw new TypeError("Cannot initialize the same private elements twice on an object"); }
 function _classPrivateFieldSet(s, a, r) { return s.set(_assertClassBrand(s, a), r), r; }
 function _classPrivateFieldGet(s, a) { return s.get(_assertClassBrand(s, a)); }
 function _assertClassBrand(e, t, n) { if ("function" == typeof e ? e === t : e.has(t)) return arguments.length < 3 ? t : n; throw new TypeError("Private element is not present on this object"); }
@@ -64,8 +82,8 @@ var ToolbarStore = exports.ToolbarStore = /*#__PURE__*/function () {
         y: 0,
         placement: 'left'
       },
-      redoSteps: 0,
-      undoSteps: 0,
+      redoSteps: false,
+      undoSteps: false,
       lastPen: undefined,
       lastShape: undefined,
       maxCountVisibleTools: 4,

package/lib/modules/whiteboard/context.d.ts

@@ -1,5 +1,5 @@
+import { FcrConnectionState } from 'agora-edu-core';
 import React from 'react';
-import { FcrBoardRoomConnectionState } from 'agora-edu-core/lib/room-control/whiteboard-control/enums';
 export interface DraggableHandler {
     getPosition(): {
         x: number;
@@ -22,7 +22,7 @@ declare const boardUIContextDefault: {
     observables: {
         canOperate: boolean;
         minimized: boolean;
-        connectionState: FcrBoardRoomConnectionState;
+        connectionState: FcrConnectionState;
         joinSuccessed: boolean;
         contentAreaSize: {
             width: number;
@@ -44,7 +44,7 @@ export declare const BoardUIContext: React.Context<{
     observables: {
         canOperate: boolean;
         minimized: boolean;
-        connectionState: FcrBoardRoomConnectionState;
+        connectionState: FcrConnectionState;
         joinSuccessed: boolean;
         contentAreaSize: {
             width: number;

package/lib/modules/whiteboard/context.js

@@ -5,15 +5,15 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.BoardUIContext = void 0;
+var _agoraEduCore = require("agora-edu-core");
 var _react = require("react");
-var _enums = require("agora-edu-core/lib/room-control/whiteboard-control/enums");
 /* eslint-disable @typescript-eslint/no-unused-vars */
 
 var boardUIContextDefault = {
   observables: {
     canOperate: false,
     minimized: false,
-    connectionState: _enums.FcrBoardRoomConnectionState.DISCONNECTED,
+    connectionState: _agoraEduCore.FcrConnectionState.DISCONNECTED,
     joinSuccessed: false,
     contentAreaSize: {
       width: 0,