fcr-ui-scene-mobile 3.8.0 → 3.8.1-alpha

package/lib/common/security-store.d.ts

@@ -1,8 +1,8 @@
 import { FcrPrivilegeControl, FcrStreamControl, FcrUserControl } from 'fcr-core';
 import { FcrUserRole, FcrUserInfo, FcrLineType } from 'fcr-core/lib/type';
 import { FcrUIEventStore } from './event-store';
-import { FcrSharePermissionState } from 'fcr-core/lib/room-control/whiteboard-control/enums';
 import { FcrPermissionAction, FcrPermissionInfo, FcrPrivilegeUserRole, FcrSecurityInfo, FcrSecuritySendChatPayload } from 'fcr-core/lib/room-control/privilege-control/type';
+import { FcrSharePermissionState } from 'fcr-core/lib/room-control/sharing-control/type';
 export type FcrSecuritySendChatOriginalPayload = {
     public: 0 | 1;
     private: {

package/lib/common/security-store.js

@@ -73,11 +73,11 @@ var _constant = require("../utilities/constant");
 var _lodash = require("lodash");
 var _user = require("fcr-core/lib/utilities/user");
 var _toast = require("agora-ui-foundation/lib/components/toast");
-var _enums = require("fcr-core/lib/room-control/whiteboard-control/enums");
 var _type2 = require("agora-ui-foundation/lib/components/icon/type");
 var _i18n = require("agora-ui-foundation/lib/i18n");
 var _type3 = require("fcr-core/lib/room-control/privilege-control/type");
 var _logger = require("../utilities/logger");
+var _type4 = require("fcr-core/lib/room-control/sharing-control/type");
 var _FcrSecurityStore;
 var _initProto, _init_securityInfos, _init_permissionInfos, _init_privilegeOperator, _init_boardOwnerUser, _setSecurityInfoDecs, _setPermissionInfosDecs, _handlePermissionUpdatedDecs, _handleSecurityUpdatedDecs, _ref;
 function _classPrivateFieldInitSpec(e, t, a) { _checkPrivateRedeclaration(e, t), t.set(e, a); }
@@ -191,7 +191,7 @@ var FcrSecurityStore = exports.FcrSecurityStore = /*#__PURE__*/function () {
         return (info === null || info === void 0 ? void 0 : info.action) === _type3.FcrSecurityAction.Sharing;
       });
       var shareState = info === null || info === void 0 || (_info$info = info.info) === null || _info$info === void 0 ? void 0 : _info$info.payload;
-      var screenShareState = shareState.screen === _enums.FcrSharePermissionState.ON;
+      var screenShareState = shareState.screen === _type4.FcrSharePermissionState.ON;
       return screenShareState;
     }));
     (0, _defineProperty2["default"])(this, "allowBoardWrite", (0, _mobxUtils.computedFn)(function () {
@@ -201,7 +201,7 @@ var FcrSecurityStore = exports.FcrSecurityStore = /*#__PURE__*/function () {
         return (info === null || info === void 0 ? void 0 : info.action) === _type3.FcrSecurityAction.Sharing;
       });
       var shareState = info === null || info === void 0 || (_info$info2 = info.info) === null || _info$info2 === void 0 ? void 0 : _info$info2.payload;
-      var boardWriteState = ((_shareState$board = shareState.board) === null || _shareState$board === void 0 ? void 0 : _shareState$board.write) === _enums.FcrSharePermissionState.ON;
+      var boardWriteState = ((_shareState$board = shareState.board) === null || _shareState$board === void 0 ? void 0 : _shareState$board.write) === _type4.FcrSharePermissionState.ON;
       return boardWriteState;
     }));
     (0, _defineProperty2["default"])(this, "allowUnmuteSelfVideo", (0, _mobxUtils.computedFn)(function () {
@@ -665,7 +665,7 @@ var FcrSecurityStore = exports.FcrSecurityStore = /*#__PURE__*/function () {
         return _regenerator["default"].wrap(function (_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
-              enable = state === _enums.FcrSharePermissionState.ON;
+              enable = state === _type4.FcrSharePermissionState.ON;
               _context.next = 1;
               return this._privilegeControl.allowShareAndWrite(enable, [_type3.FcrPrivilegeUserRole.PARTICIPANT]);
             case 1:
@@ -690,7 +690,7 @@ var FcrSecurityStore = exports.FcrSecurityStore = /*#__PURE__*/function () {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
               this.logger.info('setAllowWriteBoard', state);
-              enable = state === _enums.FcrSharePermissionState.ON;
+              enable = state === _type4.FcrSharePermissionState.ON;
               _context2.next = 1;
               return this._privilegeControl.allowWriteBoard(enable, [_type3.FcrPrivilegeUserRole.PARTICIPANT]);
             case 1:

package/lib/creator.js

@@ -59,7 +59,7 @@ var FcrUISceneCreator = exports.FcrUISceneCreator = /*#__PURE__*/function () {
       },
       dualScreenVideoStreamConfig: {
         highVideoEncoderConfig: _defaultConfig.screenCaptureHighStreamEncoderConfig,
-        lowVideoEncoderConfig: _defaultConfig.screenCaptureLowStreamEncoderConfig,
+        lowVideoEncoderConfig: _defaultConfig.screenCaptureHighStreamEncoderConfig,
         enableDualStreamMode: false
       }
     });

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

@@ -77,13 +77,13 @@ var _decorator = require("agora-foundation/lib/decorator");
 var _constant = require("../../utilities/constant");
 var _type2 = require("../../type");
 var _type3 = require("./type");
-var _enums = require("fcr-core/lib/room-control/whiteboard-control/enums");
 var _type4 = require("agora-rte-sdk/lib/core/scene/type");
 var _type5 = require("agora-rte-sdk/lib/type");
 var _i18n = require("agora-ui-foundation/lib/i18n");
 var _type6 = require("fcr-core/lib/room-control/type");
 var _type7 = require("fcr-core/lib/room-control/privilege-control/type");
 var _logger = require("../../utilities/logger");
+var _type8 = require("fcr-core/lib/room-control/sharing-control/type");
 var _ActionBarStore;
 var _initProto, _init_newMessageTooltipVisible, _init_newMessageCount, _init_latestMessage, _init_totalUser, _init_totalWaitingRoomUser, _init_liveStreamingState, _init_currentMenuIs, _init_cloudRecordingState, _init_localUserRole, _init_localUser, _init_connectionSettingVisible, _init_connectType, _init_folded, _init_boardOwnerUser, _init_hasScreenShare, _init_showArrow, _init_phoneMicEnabled, _init_isNewWaitingRoomUserEnter, _init_chatTabIndex, _init_popoverOpened, _init_participantsPopoverOpened, _pauseCloudRecordingDecs, _resumeCloudRecordingDecs, _stopCloudRecordingDecs, _toggleLayoutBarLockDecs, _showNewMessageTooltipDecs, _hideNewMessageTooltipDecs, _switchMenuDecs, _assignHostDecs, _setPopoverOpenedDecs, _toggleFoldDecs, _setShowArrowDecs, _setEnableWaitingRoomDecs, _kickOutWaitingRoomAllMemberDecs, _moveToMainRoomAllMemberDecs, _handleAllUserCountUpdatedDecs, _getWaitingRoomUserCountDecs, _handleRemoteWaitingUserLeftDecs, _handleRemoteWaitingUserJoinedDecs, _handleLiveStreamingStateUpdatedDecs, _handleNewMessageEventDecs, _init__handleNewMessageEvent, _handleChatVisibleDecs, _handlerTraceScreenCaptureStateUpdateDecs, _operateWaitingRoomDecs, _handleCloudRecordingStateUpdatedDecs, _handleStreamsAddedOrUpdatedDecs, _ref;
 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; }
@@ -677,7 +677,7 @@ var ActionBarStore = exports["default"] = /*#__PURE__*/function () {
         return _regenerator["default"].wrap(function (_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
-              write = this.isBoardWriteEnabled ? _enums.FcrSharePermissionState.OFF : _enums.FcrSharePermissionState.ON;
+              write = this.isBoardWriteEnabled ? _type8.FcrSharePermissionState.OFF : _type8.FcrSharePermissionState.ON;
               return _context.abrupt("return", this._securityStore.setAllowWriteBoard(write));
             case 1:
             case "end":
@@ -693,7 +693,7 @@ var ActionBarStore = exports["default"] = /*#__PURE__*/function () {
   }, {
     key: "setAllowScreenShare",
     value: function setAllowScreenShare() {
-      var enable = this.isScreenShareAndBoardEnabled ? _enums.FcrSharePermissionState.OFF : _enums.FcrSharePermissionState.ON;
+      var enable = this.isScreenShareAndBoardEnabled ? _type8.FcrSharePermissionState.OFF : _type8.FcrSharePermissionState.ON;
       return this._securityStore.allowShare(enable);
     }
   }, {

package/lib/modules/member-layout/store.d.ts

@@ -7,7 +7,7 @@ import { FcrParticipantStore } from '../../common/participant-store';
 import { FcrUIEventStore } from '../../common/event-store';
 import { FcrDeviceStreamStore } from '../../common/device-stream-store';
 import { AgoraRtcVideoStreamType } from 'fcr-core/lib/imports';
-import { FcrPrivilegedWhiteboardControl } from 'fcr-core/lib/room-control/whiteboard-control-v2/whiteboard-control/type';
+import { FcrWhiteboardControl } from 'fcr-core/lib/room-control/whiteboard-control-v2/whiteboard-control/type';
 export interface IMemberProps {
     streamControl: FcrStreamControl;
     deviceStore: FcrDeviceStore;
@@ -15,7 +15,7 @@ export interface IMemberProps {
     userControl: FcrUserControl;
     settingStore: SettingStore;
     uiEventStore: FcrUIEventStore;
-    whiteBoredControl: FcrPrivilegedWhiteboardControl;
+    whiteBoredControl: FcrWhiteboardControl;
     participantStore: FcrParticipantStore;
 }
 export default class Store {
@@ -28,7 +28,7 @@ export default class Store {
     private _hightlightTimber;
     private _userVolumeMap;
     private _renderCount;
-    protected logger: import("agora-foundation/lib/logger").Logger;
+    protected logger: import("fcr-core/lib/imports").Logger;
     accessor localUserRole: FcrUserRole;
     accessor spotlightStreamId: string;
     accessor microphoneVolumeLevel: number;

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

@@ -15,7 +15,7 @@ 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("fcr-core/lib/room-control/whiteboard-control/enums");
+var _fcrCore = require("fcr-core");
 var _jsxRuntime = require("react/jsx-runtime");
 var EraserPickerItem = exports.EraserPickerItem = (0, _mobxReact.observer)(function (_ref) {
   var offset = _ref.offset;
@@ -24,7 +24,7 @@ var EraserPickerItem = exports.EraserPickerItem = (0, _mobxReact.observer)(funct
     currentTool = _useContext$observabl.currentTool,
     toolbarDockPosition = _useContext$observabl.toolbarDockPosition;
   var transI18n = (0, _i18n.useI18n)();
-  var isActive = currentTool === _enums.FcrBoardToolType.ERASER;
+  var isActive = currentTool === _fcrCore.FcrBoardToolType.ERASER;
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_.ExpansionToolbarItem, {
     isActive: isActive,
     tooltip: transI18n('fmt_screenshare_whiteboard_button_eraser'),
@@ -45,10 +45,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 === _enums.FcrBoardToolType.ERASER
+    'fcr-board-toolbar-panel--active': currentTool === _fcrCore.FcrBoardToolType.ERASER
   });
   var handleEraserClick = function handleEraserClick() {
-    setTool(_enums.FcrBoardToolType.ERASER);
+    setTool(_fcrCore.FcrBoardToolType.ERASER);
   };
   var handleCleanClick = function handleCleanClick() {
     clean();
@@ -66,7 +66,7 @@ var EraserPickerPanel = (0, _mobxReact.observer)(function () {
           type: _type.FcrIconType.FCR_WHITEBOARD_ERASER,
           size: 28,
           colors: {
-            iconPrimary: currentTool === _enums.FcrBoardToolType.ERASER ? 'var(--fcr_ui_scene_ramp_brand6)' : 'var(--fcr_ui_scene_black8)'
+            iconPrimary: currentTool === _fcrCore.FcrBoardToolType.ERASER ? 'var(--fcr_ui_scene_ramp_brand6)' : 'var(--fcr_ui_scene_black8)'
           }
         })
       })

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

@@ -13,13 +13,13 @@ var _react = require("react");
 var _mobxReact = require("mobx-react");
 var _ = require("..");
 var _classnames = _interopRequireDefault(require("classnames"));
-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 _i18n = require("agora-ui-foundation/lib/i18n");
 var _icon = require("agora-ui-foundation/lib/components/icon");
 var _store = require("../store");
+var _fcrCore = require("fcr-core");
 var _jsxRuntime = require("react/jsx-runtime");
-var penIconMap = (0, _defineProperty2["default"])((0, _defineProperty2["default"])({}, _type.FcrBoardShape.Curve, _type2.FcrIconType.FCR_WHITEBOARD_PED3), _type.FcrBoardShape.Straight, _type2.FcrIconType.FCR_WHITEBOARD_PED2);
+var penIconMap = (0, _defineProperty2["default"])((0, _defineProperty2["default"])({}, _fcrCore.FcrBoardShape.Curve, _type.FcrIconType.FCR_WHITEBOARD_PED3), _fcrCore.FcrBoardShape.Straight, _type.FcrIconType.FCR_WHITEBOARD_PED2);
 var PenPickerItem = exports.PenPickerItem = (0, _mobxReact.observer)(function (_ref) {
   var offset = _ref.offset;
   var _useContext = (0, _react.useContext)(_store.ToolbarContext),
@@ -35,9 +35,9 @@ var PenPickerItem = exports.PenPickerItem = (0, _mobxReact.observer)(function (_
       setPen(shapeTool);
     };
   };
-  var isActive = currentShape === _type.FcrBoardShape.Curve;
-  var icon = lastPen ? penIconMap[lastPen] : _type2.FcrIconType.FCR_WHITEBOARD_PED3;
-  var clickShape = lastPen ? lastPen : _type.FcrBoardShape.Curve;
+  var isActive = currentShape === _fcrCore.FcrBoardShape.Curve;
+  var icon = lastPen ? penIconMap[lastPen] : _type.FcrIconType.FCR_WHITEBOARD_PED3;
+  var clickShape = lastPen ? lastPen : _fcrCore.FcrBoardShape.Curve;
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_.ExpansionToolbarItem, {
     isActive: isActive,
     tooltip: transI18n('fmt_screenshare_whiteboard_button_paintbrush'),
@@ -60,19 +60,19 @@ var PenPickerPanel = (0, _mobxReact.observer)(function () {
   var _useContext2 = (0, _react.useContext)(_store.ToolbarContext),
     observables = _useContext2.observables,
     setStrokeWidth = _useContext2.setStrokeWidth;
-  var isCurve = observables.currentShape === _type.FcrBoardShape.Curve;
+  var isCurve = observables.currentShape === _fcrCore.FcrBoardShape.Curve;
   var weights = [{
     value: 2,
-    icon: isCurve ? _type2.FcrIconType.FCR_PENSIZE : _type2.FcrIconType.FCR_PENSIZE_STRAIGHT
+    icon: isCurve ? _type.FcrIconType.FCR_PENSIZE : _type.FcrIconType.FCR_PENSIZE_STRAIGHT
   }, {
     value: 4,
-    icon: isCurve ? _type2.FcrIconType.FCR_PENSIZE : _type2.FcrIconType.FCR_PENSIZE_STRAIGHT
+    icon: isCurve ? _type.FcrIconType.FCR_PENSIZE : _type.FcrIconType.FCR_PENSIZE_STRAIGHT
   }, {
     value: 5,
-    icon: isCurve ? _type2.FcrIconType.FCR_PENSIZE : _type2.FcrIconType.FCR_PENSIZE_STRAIGHT
+    icon: isCurve ? _type.FcrIconType.FCR_PENSIZE : _type.FcrIconType.FCR_PENSIZE_STRAIGHT
   }, {
     value: 6,
-    icon: isCurve ? _type2.FcrIconType.FCR_PENSIZE : _type2.FcrIconType.FCR_PENSIZE_STRAIGHT
+    icon: isCurve ? _type.FcrIconType.FCR_PENSIZE : _type.FcrIconType.FCR_PENSIZE_STRAIGHT
   }];
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
     className: "fcr-board-toolbar-panel fcr-board-toolbar-panel--pen",

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

@@ -14,14 +14,14 @@ var _react = require("react");
 var _mobxReact = require("mobx-react");
 var _ = require("..");
 var _classnames = _interopRequireDefault(require("classnames"));
-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 _i18n = require("agora-ui-foundation/lib/i18n");
 var _icon = require("agora-ui-foundation/lib/components/icon");
 var _store = require("../store");
 var _tooltip = require("agora-ui-foundation/lib/components/tooltip");
+var _fcrCore = require("fcr-core");
 var _jsxRuntime = require("react/jsx-runtime");
-var shapeIconMap = (0, _defineProperty2["default"])((0, _defineProperty2["default"])((0, _defineProperty2["default"])((0, _defineProperty2["default"])((0, _defineProperty2["default"])((0, _defineProperty2["default"])((0, _defineProperty2["default"])({}, _type.FcrBoardShape.Arrow, _type2.FcrIconType.FCR_WHITEBOARD_SHAP_ARROW), _type.FcrBoardShape.Ellipse, _type2.FcrIconType.FCR_WHITEBOARD_SHAP_CIRCLE), _type.FcrBoardShape.Pentagram, _type2.FcrIconType.FCR_WHITEBOARD_SHAP_STAR), _type.FcrBoardShape.Rectangle, _type2.FcrIconType.FCR_WHITEBOARD_SHAP_SQUARE), _type.FcrBoardShape.Rhombus, _type2.FcrIconType.FCR_WHITEBOARD_SHAP_REHUMBUS), _type.FcrBoardShape.Triangle, _type2.FcrIconType.FCR_WHITEBOARD_SHAP_TRIANGLE), _type.FcrBoardShape.Straight, _type2.FcrIconType.FCR_WHITEBOARD_SHAP_LINE);
+var shapeIconMap = (0, _defineProperty2["default"])((0, _defineProperty2["default"])((0, _defineProperty2["default"])((0, _defineProperty2["default"])((0, _defineProperty2["default"])((0, _defineProperty2["default"])((0, _defineProperty2["default"])({}, _fcrCore.FcrBoardShape.Arrow, _type.FcrIconType.FCR_WHITEBOARD_SHAP_ARROW), _fcrCore.FcrBoardShape.Ellipse, _type.FcrIconType.FCR_WHITEBOARD_SHAP_CIRCLE), _fcrCore.FcrBoardShape.Pentagram, _type.FcrIconType.FCR_WHITEBOARD_SHAP_STAR), _fcrCore.FcrBoardShape.Rectangle, _type.FcrIconType.FCR_WHITEBOARD_SHAP_SQUARE), _fcrCore.FcrBoardShape.Rhombus, _type.FcrIconType.FCR_WHITEBOARD_SHAP_REHUMBUS), _fcrCore.FcrBoardShape.Triangle, _type.FcrIconType.FCR_WHITEBOARD_SHAP_TRIANGLE), _fcrCore.FcrBoardShape.Straight, _type.FcrIconType.FCR_WHITEBOARD_SHAP_LINE);
 var ShapePickerItem = exports.ShapePickerItem = (0, _mobxReact.observer)(function (_ref) {
   var offset = _ref.offset;
   var _useContext = (0, _react.useContext)(_store.ToolbarContext),
@@ -37,9 +37,9 @@ var ShapePickerItem = exports.ShapePickerItem = (0, _mobxReact.observer)(functio
       setShape(shapeTool);
     };
   };
-  var isActive = !!currentShape && [_type.FcrBoardShape.Arrow, _type.FcrBoardShape.Ellipse, _type.FcrBoardShape.Pentagram, _type.FcrBoardShape.Rectangle, _type.FcrBoardShape.Rhombus, _type.FcrBoardShape.Triangle, _type.FcrBoardShape.Straight].includes(currentShape);
-  var icon = lastShape ? shapeIconMap[lastShape] : _type2.FcrIconType.FCR_WHITEBOARD_SHAP_CIRCLE;
-  var clickShape = lastShape ? lastShape : _type.FcrBoardShape.Ellipse;
+  var isActive = !!currentShape && [_fcrCore.FcrBoardShape.Arrow, _fcrCore.FcrBoardShape.Ellipse, _fcrCore.FcrBoardShape.Pentagram, _fcrCore.FcrBoardShape.Rectangle, _fcrCore.FcrBoardShape.Rhombus, _fcrCore.FcrBoardShape.Triangle, _fcrCore.FcrBoardShape.Straight].includes(currentShape);
+  var icon = lastShape ? shapeIconMap[lastShape] : _type.FcrIconType.FCR_WHITEBOARD_SHAP_CIRCLE;
+  var clickShape = lastShape ? lastShape : _fcrCore.FcrBoardShape.Ellipse;
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_.ExpansionToolbarItem, {
     isActive: isActive,
     tooltip: transI18n('fmt_screenshare_whiteboard_button_shape'),
@@ -64,12 +64,12 @@ var ShapePickerPanel = (0, _mobxReact.observer)(function () {
     setStrokeWidth = _useContext2.setStrokeWidth;
   var t = (0, _i18n.useI18n)();
   var shapes = [{
-    type: _type.FcrBoardShape.Rectangle,
-    icon: _type2.FcrIconType.FCR_WHITEBOARD_SHAP_SQUARE,
+    type: _fcrCore.FcrBoardShape.Rectangle,
+    icon: _type.FcrIconType.FCR_WHITEBOARD_SHAP_SQUARE,
     tip: t('fmt_whiteboard_tips_rectangle')
   }, {
-    type: _type.FcrBoardShape.Ellipse,
-    icon: _type2.FcrIconType.FCR_WHITEBOARD_SHAP_CIRCLE,
+    type: _fcrCore.FcrBoardShape.Ellipse,
+    icon: _type.FcrIconType.FCR_WHITEBOARD_SHAP_CIRCLE,
     tip: t('fmt_whiteboard_tips_circle')
   },
   // {
@@ -78,8 +78,8 @@ var ShapePickerPanel = (0, _mobxReact.observer)(function () {
   //   tip: t('fmt_whiteboard_label_pentagon'),
   // },
   {
-    type: _type.FcrBoardShape.Triangle,
-    icon: _type2.FcrIconType.FCR_WHITEBOARD_SHAP_TRIANGLE,
+    type: _fcrCore.FcrBoardShape.Triangle,
+    icon: _type.FcrIconType.FCR_WHITEBOARD_SHAP_TRIANGLE,
     tip: t('fmt_whiteboard_tips_triangle')
   },
   // {
@@ -88,26 +88,26 @@ var ShapePickerPanel = (0, _mobxReact.observer)(function () {
   //   tip: t('fmt_whiteboard_label_prismatic'),
   // },
   {
-    type: _type.FcrBoardShape.Straight,
-    icon: _type2.FcrIconType.FCR_WHITEBOARD_SHAP_LINE,
+    type: _fcrCore.FcrBoardShape.Straight,
+    icon: _type.FcrIconType.FCR_WHITEBOARD_SHAP_LINE,
     tip: t('fmt_whiteboard_tips_straight')
   }, {
-    type: _type.FcrBoardShape.Arrow,
-    icon: _type2.FcrIconType.FCR_WHITEBOARD_SHAP_ARROW,
+    type: _fcrCore.FcrBoardShape.Arrow,
+    icon: _type.FcrIconType.FCR_WHITEBOARD_SHAP_ARROW,
     tip: t('fmt_whiteboard_tips_arrow')
   }];
   var weights = [{
     value: 2,
-    icon: _type2.FcrIconType.FCR_PENSIZE
+    icon: _type.FcrIconType.FCR_PENSIZE
   }, {
     value: 4,
-    icon: _type2.FcrIconType.FCR_PENSIZE
+    icon: _type.FcrIconType.FCR_PENSIZE
   }, {
     value: 5,
-    icon: _type2.FcrIconType.FCR_PENSIZE
+    icon: _type.FcrIconType.FCR_PENSIZE
   }, {
     value: 6,
-    icon: _type2.FcrIconType.FCR_PENSIZE
+    icon: _type.FcrIconType.FCR_PENSIZE
   }];
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
     className: "fcr-board-toolbar-panel fcr-board-toolbar-panel--shape",

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

@@ -29,7 +29,7 @@ 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 _store = require("../store");
-var _enums = require("fcr-core/lib/room-control/whiteboard-control/enums");
+var _fcrCore = require("fcr-core");
 var _jsxRuntime = require("react/jsx-runtime");
 var useVisibleTools = exports.useVisibleTools = function useVisibleTools(diraction) {
   var _useContext = (0, _react.useContext)(_store.ToolbarContext),
@@ -51,8 +51,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(_enums.FcrBoardToolType.LASER_POINTER),
-        isActive: currentTool === _enums.FcrBoardToolType.LASER_POINTER,
+        onClick: handleToolChange(_fcrCore.FcrBoardToolType.LASER_POINTER),
+        isActive: currentTool === _fcrCore.FcrBoardToolType.LASER_POINTER,
         diraction: diraction
       });
     }
@@ -74,8 +74,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(_enums.FcrBoardToolType.SELECTOR),
-        isActive: currentTool === _enums.FcrBoardToolType.SELECTOR,
+        onClick: handleToolChange(_fcrCore.FcrBoardToolType.SELECTOR),
+        isActive: currentTool === _fcrCore.FcrBoardToolType.SELECTOR,
         diraction: diraction
       });
     }
@@ -101,8 +101,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(_enums.FcrBoardToolType.TEXT),
-        isActive: currentTool === _enums.FcrBoardToolType.TEXT,
+        onClick: handleToolChange(_fcrCore.FcrBoardToolType.TEXT),
+        isActive: currentTool === _fcrCore.FcrBoardToolType.TEXT,
         diraction: diraction
       });
     }
@@ -112,8 +112,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(_enums.FcrBoardToolType.HAND),
-        isActive: currentTool === _enums.FcrBoardToolType.HAND,
+        onClick: handleToolChange(_fcrCore.FcrBoardToolType.HAND),
+        isActive: currentTool === _fcrCore.FcrBoardToolType.HAND,
         diraction: diraction
       });
     }

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

@@ -1,5 +1,5 @@
-import { FcrBoardShape, WhiteboardThemeType } from '../../type';
-import { FcrBoardToolType } from 'fcr-core/lib/room-control/whiteboard-control/enums';
+import { WhiteboardThemeType } from '../../type';
+import { FcrBoardShape, FcrBoardToolType } from 'fcr-core';
 export declare class ToolbarStore {
     accessor observables: {
         currentTool: FcrBoardToolType | undefined;

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

@@ -1,5 +1,5 @@
 import { FcrUIEventStore } from '../../common/event-store';
-import { FcrBoardRegion, ToolbarEvents, WhiteboardBaseEvents, WhiteboardControlbarEvents, WhiteboardEvents, WhiteboardUIEvents } from './type';
+import { ToolbarEvents, WhiteboardBaseEvents, WhiteboardControlbarEvents, WhiteboardEvents, WhiteboardUIEvents } from './type';
 import { DialogKey, UIAction } from '../../utilities/constant';
 import { UIModule } from '../../base';
 import { FcrUserInfo } from 'fcr-core/lib/type';
@@ -7,7 +7,8 @@ import { FcrStreamControl, FcrUserControl } from 'fcr-core';
 import { FcrSecurityStore } from '../../common/security-store';
 import { FcrUIVideoWindowLayoutType } from './type';
 import { FcrBaseRoomControl } from 'fcr-core/lib/room-control/type';
-import { FcrPrivilegedWhiteboardControl } from 'fcr-core/lib/room-control/whiteboard-control-v2/whiteboard-control/type';
+import { FcrWhiteboardControl } from 'fcr-core/lib/room-control/whiteboard-control-v2/whiteboard-control/type';
+import { FcrBoardRegion } from 'fcr-core/lib/room-control/whiteboard-control/enum';
 export declare class FcrWhiteboardUIModule extends UIModule {
     private _disposers;
     private _uiEventStore;
@@ -60,7 +61,7 @@ export declare class FcrWhiteboardUIModule extends UIModule {
         uiEventStore: FcrUIEventStore;
         userControl: FcrUserControl;
         roomControl: FcrBaseRoomControl;
-        whiteboardControl: FcrPrivilegedWhiteboardControl;
+        whiteboardControl: FcrWhiteboardControl;
         streamControl: FcrStreamControl;
         securityStore: FcrSecurityStore;
     });

package/lib/modules/whiteboard/index.js

@@ -113,11 +113,10 @@ var _store2 = require("./components/control-bar/store");
 var _reactDom = _interopRequireDefault(require("react-dom"));
 var _type2 = require("fcr-core/lib/type");
 var _fcrCore = require("fcr-core");
-var _enums = require("fcr-core/lib/room-control/whiteboard-control/enums");
 var _libs = _interopRequireDefault(require("./components/switch-theme/libs"));
-var _types = require("fcr-core/lib/room-control/whiteboard-control/types");
 var _i18n = require("agora-ui-foundation/lib/i18n");
 var _type3 = require("agora-ui-foundation/lib/components/icon/type");
+var _enum = require("fcr-core/lib/room-control/whiteboard-control/enum");
 var _jsxRuntime = require("react/jsx-runtime");
 var _FcrWhiteboardUIModule;
 var _initProto, _init__lonelyWindowState, _init__ownerUser, _init__isHost, _init__boardBackground, _init__localUser, _onPropertiesUpdateDecs, _mountDecs, _unmountDecs, _unloadDecs, _boardUIEventsDecs, _createToolbarUIContextDecs, _repositionToolbarDecs, _updateRedoDecs, _updateUndoDecs, _setConnectionStateDecs, _getSnapshotImageDecs, _openLonelyWindowDecs, _setJoinSuccessedDecs, _ref; // import { sendEvent } from '../../utilities/renderer-event';
@@ -156,7 +155,7 @@ var FcrWhiteboardUIModule = exports.FcrWhiteboardUIModule = /*#__PURE__*/functio
     (0, _defineProperty2["default"])(_this, _ref, (_initProto(_this), []));
     (0, _defineProperty2["default"])(_this, "_connectionState", _fcrCore.FcrConnectionState.DISCONNECTED);
     (0, _defineProperty2["default"])(_this, "_defaultBoardState", {
-      tool: _enums.FcrBoardToolType.LASER_POINTER,
+      tool: _fcrCore.FcrBoardToolType.LASER_POINTER,
       strokeColor: '#fed130',
       strokeWidth: 2
     });
@@ -510,7 +509,7 @@ var FcrWhiteboardUIModule = exports.FcrWhiteboardUIModule = /*#__PURE__*/functio
       var _this2 = this;
       var isReplaced = events.find(function (event) {
         var _event$cause;
-        return ((_event$cause = event.cause) === null || _event$cause === void 0 ? void 0 : _event$cause.data.reason) === _types.FcrBoardInactiveReason.SEIZE;
+        return ((_event$cause = event.cause) === null || _event$cause === void 0 ? void 0 : _event$cause.data.reason) === _enum.FcrBoardInactiveReason.SEIZE;
       });
       var isMyStream = events.some(function (event) {
         return event.modifiedStream.owner.userId === _this2._localUser.userId;
@@ -1032,7 +1031,7 @@ var FcrWhiteboardUIModule = exports.FcrWhiteboardUIModule = /*#__PURE__*/functio
         onInactive: function onInactive(reason, operatorUser) {
           var _this7$_ownerUser;
           var currentUserId = _this7._localUser.userId;
-          if (reason === _types.FcrBoardInactiveReason.SEIZE && (operatorUser === null || operatorUser === void 0 ? void 0 : operatorUser.userId) !== currentUserId && ((_this7$_ownerUser = _this7._ownerUser) === null || _this7$_ownerUser === void 0 ? void 0 : _this7$_ownerUser.userId) === currentUserId) {
+          if (reason === _enum.FcrBoardInactiveReason.SEIZE && (operatorUser === null || operatorUser === void 0 ? void 0 : operatorUser.userId) !== currentUserId && ((_this7$_ownerUser = _this7._ownerUser) === null || _this7$_ownerUser === void 0 ? void 0 : _this7$_ownerUser.userId) === currentUserId) {
             _this7._alertWhenReplace(operatorUser);
           }
           _this7.onDestroy({
@@ -1093,24 +1092,24 @@ var FcrWhiteboardUIModule = exports.FcrWhiteboardUIModule = /*#__PURE__*/functio
     key: "_convertShapeToBoardToolType",
     value: function _convertShapeToBoardToolType(shape) {
       switch (shape) {
-        case _enums.FcrBoardShape.Arrow:
-          return _enums.FcrBoardToolType.ARROW;
-        case _enums.FcrBoardShape.Curve:
-          return _enums.FcrBoardToolType.CURVE;
-        case _enums.FcrBoardShape.Ellipse:
-          return _enums.FcrBoardToolType.ELLIPSE;
-        case _enums.FcrBoardShape.Pentagram:
-          return _enums.FcrBoardToolType.PENTAGRAM;
-        case _enums.FcrBoardShape.Rectangle:
-          return _enums.FcrBoardToolType.RECTANGLE;
-        case _enums.FcrBoardShape.Rhombus:
-          return _enums.FcrBoardToolType.RHOMBUS;
-        case _enums.FcrBoardShape.Straight:
-          return _enums.FcrBoardToolType.STRAIGHT;
-        case _enums.FcrBoardShape.Triangle:
-          return _enums.FcrBoardToolType.TRIANGLE;
+        case _fcrCore.FcrBoardShape.Arrow:
+          return _fcrCore.FcrBoardToolType.ARROW;
+        case _fcrCore.FcrBoardShape.Curve:
+          return _fcrCore.FcrBoardToolType.CURVE;
+        case _fcrCore.FcrBoardShape.Ellipse:
+          return _fcrCore.FcrBoardToolType.ELLIPSE;
+        case _fcrCore.FcrBoardShape.Pentagram:
+          return _fcrCore.FcrBoardToolType.PENTAGRAM;
+        case _fcrCore.FcrBoardShape.Rectangle:
+          return _fcrCore.FcrBoardToolType.RECTANGLE;
+        case _fcrCore.FcrBoardShape.Rhombus:
+          return _fcrCore.FcrBoardToolType.RHOMBUS;
+        case _fcrCore.FcrBoardShape.Straight:
+          return _fcrCore.FcrBoardToolType.STRAIGHT;
+        case _fcrCore.FcrBoardShape.Triangle:
+          return _fcrCore.FcrBoardToolType.TRIANGLE;
         default:
-          return _enums.FcrBoardToolType.NONE;
+          return _fcrCore.FcrBoardToolType.NONE;
       }
     }
   }, {

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

@@ -1,38 +1,3 @@
-import { FcrBoardToolType } from 'fcr-core/lib/room-control/whiteboard-control/enums';
-export declare enum FcrBoardShape {
-    Curve = 1,
-    Straight = 2,
-    Arrow = 3,
-    Rectangle = 4,
-    Triangle = 5,
-    Rhombus = 6,
-    Pentagram = 7,
-    Ellipse = 8
-}
-export declare enum FcrBoardRegion {
-    CN = "cn-hz",
-    US = "us-sv",
-    IN = "in-mum",
-    SG = "sg",
-    GB = "gb-lon"
-}
-export declare enum FcrBoardMainWindowFailureReason {
-    ResourceWindowAlreadyOpened = "resource-window-already-opened",
-    SnapshotFailure = "snapshot-failure",
-    MountFailure = "mount-failure"
-}
-export type BoardState = {
-    strokeColor: Color;
-    strokeWidth: number;
-    textSize: number;
-    tool: FcrBoardToolType;
-    shape: FcrBoardShape;
-};
-export type Color = {
-    r: number;
-    g: number;
-    b: number;
-};
 export declare enum ToolbarEvents {
     REDO = "redo",
     UNDO = "undo",

package/lib/modules/whiteboard/type.js

@@ -4,32 +4,7 @@ require("core-js/modules/es.object.define-property.js");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.WhiteboardUIEvents = exports.WhiteboardEvents = exports.WhiteboardControlbarEvents = exports.WhiteboardBaseEvents = exports.ToolbarEvents = exports.LonelyWindowState = exports.FcrUIVideoWindowLayoutType = exports.FcrBoardShape = exports.FcrBoardRegion = exports.FcrBoardMainWindowFailureReason = void 0;
-var FcrBoardShape = exports.FcrBoardShape = /*#__PURE__*/function (FcrBoardShape) {
-  FcrBoardShape[FcrBoardShape["Curve"] = 1] = "Curve";
-  FcrBoardShape[FcrBoardShape["Straight"] = 2] = "Straight";
-  FcrBoardShape[FcrBoardShape["Arrow"] = 3] = "Arrow";
-  FcrBoardShape[FcrBoardShape["Rectangle"] = 4] = "Rectangle";
-  FcrBoardShape[FcrBoardShape["Triangle"] = 5] = "Triangle";
-  FcrBoardShape[FcrBoardShape["Rhombus"] = 6] = "Rhombus";
-  FcrBoardShape[FcrBoardShape["Pentagram"] = 7] = "Pentagram";
-  FcrBoardShape[FcrBoardShape["Ellipse"] = 8] = "Ellipse";
-  return FcrBoardShape;
-}({});
-var FcrBoardRegion = exports.FcrBoardRegion = /*#__PURE__*/function (FcrBoardRegion) {
-  FcrBoardRegion["CN"] = "cn-hz";
-  FcrBoardRegion["US"] = "us-sv";
-  FcrBoardRegion["IN"] = "in-mum";
-  FcrBoardRegion["SG"] = "sg";
-  FcrBoardRegion["GB"] = "gb-lon";
-  return FcrBoardRegion;
-}({});
-var FcrBoardMainWindowFailureReason = exports.FcrBoardMainWindowFailureReason = /*#__PURE__*/function (FcrBoardMainWindowFailureReason) {
-  FcrBoardMainWindowFailureReason["ResourceWindowAlreadyOpened"] = "resource-window-already-opened";
-  FcrBoardMainWindowFailureReason["SnapshotFailure"] = "snapshot-failure";
-  FcrBoardMainWindowFailureReason["MountFailure"] = "mount-failure";
-  return FcrBoardMainWindowFailureReason;
-}({});
+exports.WhiteboardUIEvents = exports.WhiteboardEvents = exports.WhiteboardControlbarEvents = exports.WhiteboardBaseEvents = exports.ToolbarEvents = exports.LonelyWindowState = exports.FcrUIVideoWindowLayoutType = void 0;
 var ToolbarEvents = exports.ToolbarEvents = /*#__PURE__*/function (ToolbarEvents) {
   ToolbarEvents["REDO"] = "redo";
   ToolbarEvents["UNDO"] = "undo";