fcr-ui-scene 3.1.1 → 3.3.0

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");
@@ -71,19 +73,23 @@ var ShapePickerPanel = (0, _mobxReact.observer)(function () {
     type: _type.FcrBoardShape.Ellipse,
     icon: _type2.FcrIconType.FCR_WHITEBOARD_SHAP_CIRCLE,
     tip: t('fmt_whiteboard_tips_circle')
-  }, {
-    type: _type.FcrBoardShape.Pentagram,
-    icon: _type2.FcrIconType.FCR_WHITEBOARD_SHAP_STAR,
-    tip: t('fmt_whiteboard_label_pentagon')
-  }, {
+  },
+  // {
+  //   type: FcrBoardShape.Pentagram,
+  //   icon: FcrIconType.FCR_WHITEBOARD_SHAP_STAR,
+  //   tip: t('fmt_whiteboard_label_pentagon'),
+  // },
+  {
     type: _type.FcrBoardShape.Triangle,
     icon: _type2.FcrIconType.FCR_WHITEBOARD_SHAP_TRIANGLE,
     tip: t('fmt_whiteboard_tips_triangle')
-  }, {
-    type: _type.FcrBoardShape.Rhombus,
-    icon: _type2.FcrIconType.FCR_WHITEBOARD_SHAP_REHUMBUS,
-    tip: t('fmt_whiteboard_label_prismatic')
-  }, {
+  },
+  // {
+  //   type: FcrBoardShape.Rhombus,
+  //   icon: FcrIconType.FCR_WHITEBOARD_SHAP_REHUMBUS,
+  //   tip: t('fmt_whiteboard_label_prismatic'),
+  // },
+  {
     type: _type.FcrBoardShape.Straight,
     icon: _type2.FcrIconType.FCR_WHITEBOARD_SHAP_LINE,
     tip: t('fmt_whiteboard_tips_straight')
@@ -133,8 +139,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,11 +1,12 @@
-/// <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;
+        currentThemeType: WhiteboardThemeType;
         toolbarPosition: {
             x: number;
             y: number;
@@ -14,10 +15,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 +31,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"));
@@ -33,10 +51,12 @@ var _mobx = require("mobx");
 var _type = require("../../type");
 var _react = require("react");
 var _rendererEvent = require("../../../../utilities/renderer-event");
+var _libs = _interopRequireDefault(require("../switch-theme/libs"));
+var _i18n = require("agora-ui-foundation/lib/i18n");
 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"); }
@@ -54,6 +74,7 @@ var ToolbarStore = exports.ToolbarStore = /*#__PURE__*/function () {
       currentShape: undefined,
       currentColor: '',
       currentStrokeWidth: 0,
+      currentThemeType: (0, _libs["default"])(_i18n.transI18n)[0],
       toolbarPosition: {
         x: 0,
         y: 0
@@ -64,8 +85,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;
@@ -32,6 +32,7 @@ declare const boardUIContextDefault: {
         };
         progress: number;
         writeEnabled: boolean;
+        whiteboardVisible: boolean;
     };
     handleBoardDomLoad: (ref: HTMLDivElement | null) => void;
     handleCollectorDomLoad: (ref: HTMLDivElement | null) => void;
@@ -39,12 +40,13 @@ declare const boardUIContextDefault: {
     handleOpen: () => void;
     setPrivilege: (canOperate: boolean) => void;
     setWriteEnable: (enable: boolean) => void;
+    setWhiteboardVisible: (visible: boolean) => void;
 };
 export declare const BoardUIContext: React.Context<{
     observables: {
         canOperate: boolean;
         minimized: boolean;
-        connectionState: FcrBoardRoomConnectionState;
+        connectionState: FcrConnectionState;
         joinSuccessed: boolean;
         contentAreaSize: {
             width: number;
@@ -54,6 +56,7 @@ export declare const BoardUIContext: React.Context<{
         };
         progress: number;
         writeEnabled: boolean;
+        whiteboardVisible: boolean;
     };
     handleBoardDomLoad: (ref: HTMLDivElement | null) => void;
     handleCollectorDomLoad: (ref: HTMLDivElement | null) => void;
@@ -61,6 +64,7 @@ export declare const BoardUIContext: React.Context<{
     handleOpen: () => void;
     setPrivilege: (canOperate: boolean) => void;
     setWriteEnable: (enable: boolean) => void;
+    setWhiteboardVisible: (visible: boolean) => void;
 }>;
 export type BoardUIContextValue = typeof boardUIContextDefault;
 export {};

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,
@@ -22,13 +22,15 @@ var boardUIContextDefault = {
       top: 0
     },
     progress: 0,
-    writeEnabled: false
+    writeEnabled: false,
+    whiteboardVisible: false
   },
   handleBoardDomLoad: function handleBoardDomLoad(ref) {},
   handleCollectorDomLoad: function handleCollectorDomLoad(ref) {},
   handleClose: function handleClose() {},
   handleOpen: function handleOpen() {},
   setPrivilege: function setPrivilege(canOperate) {},
-  setWriteEnable: function setWriteEnable(enable) {}
+  setWriteEnable: function setWriteEnable(enable) {},
+  setWhiteboardVisible: function setWhiteboardVisible(visible) {}
 };
 var BoardUIContext = exports.BoardUIContext = /*#__PURE__*/(0, _react.createContext)(boardUIContextDefault);

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

@@ -1,15 +1,13 @@
-/// <reference types="react" />
-import { FcrUserControl } from 'agora-edu-core/lib/room-control/user-control';
 import { FcrUIEventStore } from '../../common/event-store';
-import { FcrBoardRegion, ToolbarEvents, WhiteboardBaseEvents, WhiteboardControlbarEvents, WhiteboardRoomEvents, WhiteboardUIEvents } from './type';
-import { FcrRoomControl } from 'agora-edu-core/lib/room-control';
+import { FcrBoardRegion, ToolbarEvents, WhiteboardBaseEvents, WhiteboardControlbarEvents, WhiteboardEvents, WhiteboardUIEvents } from './type';
 import { DialogKey, UIAction } from '../../utilities/constant';
 import { UIModule } from '../../base';
 import { FcrUserInfo } from 'agora-edu-core/lib/type';
-import { FcrStreamControl } from 'agora-edu-core';
+import { FcrStreamControl, FcrUserControl } from 'agora-edu-core';
 import { FcrSecurityStore } from '../../common/security-store';
 import { FcrWhiteboardControl } from 'agora-edu-core/lib/room-control/whiteboard-control/types';
 import { FcrUIVideoWindowLayoutType } from '../layout/type';
+import { FcrBaseRoomControl } from 'agora-edu-core/lib/room-control/type';
 export declare class FcrWhiteboardUIModule extends UIModule {
     private _disposers;
     private _uiEventStore;
@@ -57,7 +55,7 @@ export declare class FcrWhiteboardUIModule extends UIModule {
     constructor({ uiEventStore, userControl, roomControl, whiteboardControl, streamControl, securityStore, }: {
         uiEventStore: FcrUIEventStore;
         userControl: FcrUserControl;
-        roomControl: FcrRoomControl;
+        roomControl: FcrBaseRoomControl;
         whiteboardControl: FcrWhiteboardControl;
         streamControl: FcrStreamControl;
         securityStore: FcrSecurityStore;
@@ -73,7 +71,7 @@ export declare class FcrWhiteboardUIModule extends UIModule {
         layout: FcrUIVideoWindowLayoutType;
     }): void;
     onProcessEvent(event: {
-        action: ToolbarEvents & WhiteboardRoomEvents & WhiteboardUIEvents;
+        action: ToolbarEvents & WhiteboardEvents & WhiteboardUIEvents;
         payload: never;
     }): void;
     onPropertiesUpdate(params: {
@@ -109,7 +107,7 @@ export declare class FcrWhiteboardUIModule extends UIModule {
     private _openLonelyWindow;
     private _setJoinSuccessed;
     private _boardObservble;
-    private _MainWindowEvents;
     private _addDisposers;
     private _alertWhenReplace;
+    private _convertShapeToBoardToolType;
 }