fcr-ui-scene 3.7.8 → 3.8.0-alpha

package/lib/modules/subtitles-history/store.electron.d.ts

@@ -0,0 +1,15 @@
+import SubtitlesHistoryStoreBase from './store.base';
+import { StoreArgs } from './type';
+export default class SubtitlesHistoryStoreElectron extends SubtitlesHistoryStoreBase {
+    private _screenShareProvider;
+    private _screenShareObserver;
+    /** screen share provide 的 isLocalUserScreenSharing 依赖服务端下发的屏幕共享流有延迟, 所以独立维护一个状态 */
+    private accessor _isLocalUserScreenSharing;
+    get isLocalUserScreenSharing(): boolean;
+    constructor(args: StoreArgs);
+    release(): void;
+    /** 开启屏幕共享时移动转写视图 */
+    private _handleScreenShareStarted;
+    /** 关闭屏幕共享时移动转写视图 */
+    private _handleScreenShareStopped;
+}

package/lib/{shared-data-source/security-data.js → modules/subtitles-history/store.electron.js}

@@ -8,12 +8,14 @@ require("core-js/modules/es.error.to-string.js");
 require("core-js/modules/es.array.is-array.js");
 require("core-js/modules/es.array.push.js");
 require("core-js/modules/es.date.to-primitive.js");
+require("core-js/modules/es.function.bind.js");
 require("core-js/modules/es.function.name.js");
 require("core-js/modules/es.map.js");
 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/es.reflect.construct.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");
@@ -35,28 +37,31 @@ var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.FcrUISecuritySharedDataSourceImpl = void 0;
-require("core-js/modules/es.array.for-each.js");
+exports["default"] = void 0;
 require("core-js/modules/es.array.iterator.js");
-require("core-js/modules/es.function.bind.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.iterator.constructor.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 _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
+var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
+var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
+var _get2 = _interopRequireDefault(require("@babel/runtime/helpers/get"));
+var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _decorator = require("agora-foundation/lib/decorator");
+var _objectManager = require("../../object-manager");
+var _store = _interopRequireDefault(require("./store.base"));
 var _mobx = require("mobx");
-var _base = require("../base");
-var _logger = require("../utilities/logger");
-var _FcrUISecuritySharedDataSourceImpl;
-var _initProto, _init__checkedStateMap, _setCheckedStateMapDecs, _ref;
+var _SubtitlesHistoryStoreElectron;
+var _initProto, _init__isLocalUserScreenSharing;
+function _callSuper(t, o, e) { return o = (0, _getPrototypeOf2["default"])(o), (0, _possibleConstructorReturn2["default"])(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], (0, _getPrototypeOf2["default"])(t).constructor) : o.apply(t, e)); }
+function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
+function _superPropGet(t, o, e, r) { var p = (0, _get2["default"])((0, _getPrototypeOf2["default"])(1 & r ? t.prototype : t), o, e); return 2 & r && "function" == typeof p ? function (t) { return p.apply(e, t); } : p; }
 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; }
@@ -68,25 +73,28 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
 function _setFunctionName(e, t, n) { "symbol" == _typeof(t) && (t = (t = t.description) ? "[" + t + "]" : ""); try { Object.defineProperty(e, "name", { configurable: !0, value: n ? n + " " + t : t }); } catch (e) {} return e; }
 function _checkInRHS(e) { if (Object(e) !== e) throw TypeError("right-hand side of 'in' should be an object, got " + (null !== e ? _typeof(e) : "null")); return e; }
 var _A = /*#__PURE__*/new WeakMap();
-_ref = (_setCheckedStateMapDecs = [_mobx.action, _mobx.action.bound], "logger");
-var FcrUISecuritySharedDataSourceImpl = exports.FcrUISecuritySharedDataSourceImpl = /*#__PURE__*/function () {
-  function FcrUISecuritySharedDataSourceImpl(_privilegeProvider, _sharedMemberDataSource) {
-    (0, _classCallCheck2["default"])(this, FcrUISecuritySharedDataSourceImpl);
-    (0, _defineProperty2["default"])(this, _ref, (_initProto(this), (0, _logger.createLogger)({
-      prefix: 'FcrUISecuritySharedDataSourceImpl'
-    })));
-    (0, _defineProperty2["default"])(this, "_disposers", []);
-    (0, _defineProperty2["default"])(this, "_privilegeObserver", {
-      onLocalUserSecurityInfosUpdated: this._handleLocalUserSecurityInfosUpdated.bind(this)
+var SubtitlesHistoryStoreElectron = exports["default"] = /*#__PURE__*/function (_SubtitlesHistoryStor) {
+  function SubtitlesHistoryStoreElectron(args) {
+    var _this;
+    (0, _classCallCheck2["default"])(this, SubtitlesHistoryStoreElectron);
+    var objectManager = args.objectManager;
+    _this = _callSuper(this, SubtitlesHistoryStoreElectron, [args]);
+    (0, _defineProperty2["default"])(_this, "_screenShareProvider", void _initProto(_this));
+    (0, _defineProperty2["default"])(_this, "_screenShareObserver", {
+      onPrepreScreenCapture: _this._handleScreenShareStarted,
+      onScreenShareErrorOccurred: _this._handleScreenShareStopped,
+      onScreenShareStopped: _this._handleScreenShareStopped,
+      onShareSourceReplaced: _this._handleScreenShareStopped
     });
-    _classPrivateFieldInitSpec(this, _A, _init__checkedStateMap(this));
-    this._privilegeProvider = _privilegeProvider;
-    this._sharedMemberDataSource = _sharedMemberDataSource;
-    this._privilegeProvider.addObserver(this._privilegeObserver);
-    this._checkedStateMap = this._getCurrentCheckedStateMap();
+    /** screen share provide 的 isLocalUserScreenSharing 依赖服务端下发的屏幕共享流有延迟, 所以独立维护一个状态 */
+    _classPrivateFieldInitSpec(_this, _A, _init__isLocalUserScreenSharing(_this, false));
+    _this._screenShareProvider = objectManager.getObject(_objectManager.FcrUIObjectKeys.P_SCREEN_SHARE_PROVIDER);
+    _this._screenShareProvider.addObserver(_this._screenShareObserver);
+    return _this;
   }
-  return (0, _createClass2["default"])(FcrUISecuritySharedDataSourceImpl, [{
-    key: "_checkedStateMap",
+  (0, _inherits2["default"])(SubtitlesHistoryStoreElectron, _SubtitlesHistoryStor);
+  return (0, _createClass2["default"])(SubtitlesHistoryStoreElectron, [{
+    key: "_isLocalUserScreenSharing",
     get: function get() {
       return _classPrivateFieldGet(_A, this);
     },
@@ -94,63 +102,53 @@ var FcrUISecuritySharedDataSourceImpl = exports.FcrUISecuritySharedDataSourceImp
       _classPrivateFieldSet(_A, this, v);
     }
   }, {
-    key: "checkedStateMap",
-    get: function get() {
-      return this._checkedStateMap;
-    }
-  }, {
-    key: "_getCurrentCheckedStateMap",
-    value: function _getCurrentCheckedStateMap() {
-      return {
-        lockRoom: this._privilegeProvider.isLockRoomEnabled(),
-        enableWaitingRoom: this._privilegeProvider.isWaitingRoomEnabled(),
-        enableJoinWithAudio: this._privilegeProvider.allowJoinWithMuteAudio(),
-        joinWithCloseVideo: this._privilegeProvider.allowJoinWithMutedVideo(),
-        enableWatermark: this._privilegeProvider.isWaterMarkEnabled(),
-        shareScreen: this._privilegeProvider.allowScreenShareAndBoard(),
-        enableAnnotation: this._privilegeProvider.hasAnnotationAllowWritePermission(),
-        chat: this._privilegeProvider.allowChat(),
-        unmuteYourself: this._privilegeProvider.allowUnmuteSelfAudio(),
-        startVideo: this._privilegeProvider.allowUnmuteSelfVideo(),
-        rename: this._privilegeProvider.allowChangeSelfName(),
-        allowBoardWriteState: this._privilegeProvider.allowBoardWriteState(),
-        allowAnnotationWriteState: this._privilegeProvider.allowAnnotationWriteState(),
-        hasAnnotationWritePermission: this._privilegeProvider.hasAnnotationWritePermission()
-      };
-    }
-  }, {
-    key: "_refreshCheckedStateMap",
-    value: function _refreshCheckedStateMap() {
-      this._checkedStateMap = this._getCurrentCheckedStateMap();
-    }
-  }, {
-    key: "localUserId",
+    key: "isLocalUserScreenSharing",
     get: function get() {
-      return this._sharedMemberDataSource.localUser.userId;
+      return this._isLocalUserScreenSharing;
     }
   }, {
-    key: "setCheckedStateMap",
-    value: function setCheckedStateMap(val) {
-      this._checkedStateMap = val;
+    key: "release",
+    value: function release() {
+      _superPropGet(SubtitlesHistoryStoreElectron, "release", this, 3)([]);
+      this._screenShareProvider.removeObserver(this._screenShareObserver);
     }
+
+    /** 开启屏幕共享时移动转写视图 */
   }, {
-    key: "_handleLocalUserSecurityInfosUpdated",
-    value: function _handleLocalUserSecurityInfosUpdated(event) {
-      this._refreshCheckedStateMap();
+    key: "_handleScreenShareStarted",
+    value: function _handleScreenShareStarted() {
+      var _this2 = this;
+      (0, _mobx.runInAction)(function () {
+        _this2._isLocalUserScreenSharing = true;
+      });
+      var sideViewVisible = this._sharedLayoutDataSource.subtitlesHistoryRenderAt === 'aside' && this._sharedLayoutDataSource.asideLayout.subtitlesHistory;
+
+      // 开启屏幕共享时, 如果转写视图在侧边栏中处于打开状态, 则将转写视图移动到独立弹窗中显示
+      if (this.isOpen && sideViewVisible) {
+        this._hasMoveToAsideOnScreenShareStop = true;
+        this.moveAsideToDialog();
+        this.logger.info('set subtitles history view to dialog on screen share start');
+        return;
+      }
     }
+
+    /** 关闭屏幕共享时移动转写视图 */
   }, {
-    key: "release",
-    value: function release() {
-      this._disposers.forEach(function (disposer) {
-        return disposer();
+    key: "_handleScreenShareStopped",
+    value: function _handleScreenShareStopped() {
+      var _this3 = this;
+      (0, _mobx.runInAction)(function () {
+        _this3._isLocalUserScreenSharing = false;
       });
-      this._disposers = [];
-      this._privilegeProvider.removeObserver(this._privilegeObserver);
+      if (this._hasMoveToAsideOnScreenShareStop) {
+        this._hasMoveToAsideOnScreenShareStop = false;
+        this.moveDialogToAside();
+        this.logger.info('move subtitles history view to aside on screen share stop');
+      }
     }
   }]);
-}();
-_FcrUISecuritySharedDataSourceImpl = FcrUISecuritySharedDataSourceImpl;
-var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_FcrUISecuritySharedDataSourceImpl, [[_mobx.observable, 1, "_checkedStateMap"], [_setCheckedStateMapDecs, 18, "setCheckedStateMap"]], []).e, 2);
-_init__checkedStateMap = _applyDecs$e[0];
-_initProto = _applyDecs$e[1];
-(0, _base.registerDependency)('sharedSecuritySharedDataSource');
+}(_store["default"]);
+_SubtitlesHistoryStoreElectron = SubtitlesHistoryStoreElectron;
+var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_SubtitlesHistoryStoreElectron, [[_mobx.observable, 1, "_isLocalUserScreenSharing"], [_mobx.computed, 3, "isLocalUserScreenSharing"], [_decorator.bound, 2, "_handleScreenShareStarted"], [_decorator.bound, 2, "_handleScreenShareStopped"]], [], 0, void 0, _store["default"]).e, 2);
+_init__isLocalUserScreenSharing = _applyDecs$e[0];
+_initProto = _applyDecs$e[1];

package/lib/modules/subtitles-history/type.d.ts

@@ -0,0 +1,4 @@
+import { FcrUIObjectManager } from '../../object-manager';
+export type StoreArgs = {
+    objectManager: FcrUIObjectManager;
+};

package/lib/modules/subtitles-history/view.d.ts

@@ -0,0 +1 @@
+export declare const SubtitlesHistory: () => import("react/jsx-runtime").JSX.Element;

package/lib/modules/subtitles-history/view.js

@@ -0,0 +1,104 @@
+"use strict";
+
+require("core-js/modules/es.object.define-property.js");
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.SubtitlesHistory = void 0;
+require("core-js/modules/es.function.name.js");
+var _button = require("agora-ui-foundation/lib/components/button");
+var _iconAnimation = require("agora-ui-foundation/lib/components/icon-animation");
+var _type = require("agora-ui-foundation/lib/components/icon-animation/type");
+var _mobxReact = require("mobx-react");
+var _react = require("react");
+var _store = require("./store.base");
+var _i18n = require("agora-ui-foundation/lib/i18n");
+var _list = require("./components/list");
+var _empty = _interopRequireDefault(require("./empty"));
+var _tooltip = require("agora-ui-foundation/lib/components/tooltip");
+var _classnames = _interopRequireDefault(require("classnames"));
+var _env = require("agora-foundation/lib/utilities/env");
+var _jsxRuntime = require("react/jsx-runtime");
+var SubtitlesHistoryState = function SubtitlesHistoryState(props) {
+  var t = (0, _i18n.useI18n)();
+  var isOpen = props.isOpen,
+    name = props.name;
+  var textKey = isOpen ? 'fmt_ai_subtitles_toast_started_transcription' : 'fmt_ai_subtitles_toast_stopped_transcription';
+  return /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
+    className: "fcr-subtitles-history__header",
+    children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_iconAnimation.FcrIconAnimation, {
+      type: _type.FcrIconAnimationType.FCR_SUBTITLES_HISTORY_LOADING,
+      style: {
+        marginRight: 12
+      },
+      paused: !isOpen
+    }), /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+      className: "fcr-subtitles-history__header__title",
+      children: t(textKey, {
+        reason1: ''
+      })
+    })]
+  });
+};
+var SubtitlesHistory = exports.SubtitlesHistory = (0, _mobxReact.observer)(function () {
+  var t = (0, _i18n.useI18n)();
+  var _useContext = (0, _react.useContext)(_store.SubtitlesHistoryContext),
+    isOpen = _useContext.isOpen,
+    toggleOpen = _useContext.toggleOpen,
+    isLoading = _useContext.isLoading,
+    list = _useContext.list,
+    openOrStopTranscribingUserName = _useContext.openOrStopTranscribingUserName,
+    hasStopTranscribePermission = _useContext.hasStopTranscribePermission,
+    translateLanguage = _useContext.translateLanguage,
+    isTwoLineTranscribingEnabled = _useContext.isTwoLineTranscribingEnabled;
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+    className: (0, _classnames["default"])('fcr-subtitles-history-wrapper', {
+      'fcr-subtitles-history-wrapper-electron': (0, _env.isElectron)()
+    }),
+    children: /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
+      className: "fcr-subtitles-history-container",
+      children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(SubtitlesHistoryState, {
+        isOpen: isOpen,
+        name: openOrStopTranscribingUserName
+      }), /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+        className: "fcr-subtitles-history__content",
+        children: !isOpen && list.length === 0 ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_empty["default"], {}) : /*#__PURE__*/(0, _jsxRuntime.jsx)(_list.SubtitlesHistoryList, {
+          list: list,
+          isOpen: isOpen,
+          translateLanguage: translateLanguage,
+          isTwoLineTranscribingEnabled: isTwoLineTranscribingEnabled
+        })
+      }), /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+        className: "fcr-subtitles-history__footer",
+        children: isOpen ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_tooltip.FcrToolTip, {
+          disable: hasStopTranscribePermission,
+          transparent: true,
+          content: t('fmt_ai_rtt_tips_only_host_stop'),
+          placement: "topRight",
+          children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_button.FcrButton, {
+            className: "fcr-subtitles-history__footer__btn",
+            size: "XS",
+            type: "secondary",
+            loading: isLoading,
+            disabled: !hasStopTranscribePermission || isLoading,
+            onClick: function onClick() {
+              toggleOpen();
+            },
+            children: t('fmt_ai_transcriptions_sidebar_button_stop_translation')
+          })
+        }) : /*#__PURE__*/(0, _jsxRuntime.jsx)(_button.FcrButton, {
+          className: "fcr-subtitles-history__footer__btn",
+          size: "XS",
+          type: "primary",
+          loading: isLoading,
+          disabled: isLoading,
+          onClick: function onClick() {
+            toggleOpen();
+          },
+          children: t('fmt_ai_transcriptions_sidebar_button_start_translation')
+        })
+      })]
+    })
+  });
+});

package/lib/modules/video-window/popover-watcher.js

@@ -33,7 +33,10 @@ function usePopoverWatcher(_ref) {
       mutationsList.forEach(function (mutation) {
         if (mutation.type === 'childList') {
           mutation.removedNodes.forEach(function (node) {
-            if (node.nodeType === Node.ELEMENT_NODE && node.classList.contains(popoverClassName)) {
+            var hasPopoverNode = function hasPopoverNode(node) {
+              return node.classList.contains(popoverClassName) || node.querySelector(".".concat(popoverClassName));
+            };
+            if (isPopoverOpened && node.nodeType === Node.ELEMENT_NODE && hasPopoverNode(node)) {
               isPopoverOpened = false;
               resetVideoWindowSize();
             }

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

@@ -496,7 +496,13 @@ var VideoWindowStore = exports["default"] = /*#__PURE__*/function () {
           width: _type.DefaultVideoWindowWidth,
           height: _type.DefaultVideoWindowSmallTypeHeight
         };
-        _this4.setVideoWindowPreviewType(_type.FcrVideoWindowPreviewType.SMALL);
+
+        // 如果是小窗模式, 则重置为 dialog 为小窗尺寸, 否则切换为小窗模式, reaction 里会更新 dialog 尺寸
+        if (_this4.videoWindowPreviewType === _type.FcrVideoWindowPreviewType.SMALL) {
+          _this4._setVideoWindowDialogSize(_type.DefaultVideoWindowWidth, _type.DefaultVideoWindowSmallTypeHeight);
+        } else {
+          _this4.setVideoWindowPreviewType(_type.FcrVideoWindowPreviewType.SMALL);
+        }
       });
     }
   }]);

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

@@ -61,14 +61,24 @@ var View = exports.View = (0, _mobxReact.observer)(function () {
   }, [isHover]);
   (0, _react.useEffect)(function () {
     if (divRef.current === null) return;
+
+    // 刚打开 dialog 时, divRef.current 还在主窗口的 document 中, 需要等到下一次渲染才会被移动到 dialog 的 document 中
+    if (divRef.current.ownerDocument === document) return;
     var ownerDocument = divRef.current.ownerDocument;
     var defaultView = ownerDocument.defaultView;
     var body = ownerDocument.body;
     var onResize = function onResize() {
-      handleVideowWindowResize({
-        width: body.offsetWidth,
-        height: body.offsetHeight
-      });
+      if (defaultView) {
+        handleVideowWindowResize({
+          width: defaultView.innerWidth,
+          height: defaultView.innerHeight
+        });
+      } else {
+        handleVideowWindowResize({
+          width: body.clientWidth,
+          height: body.clientHeight
+        });
+      }
     };
     if (defaultView) {
       defaultView.addEventListener('resize', onResize);

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

@@ -17,7 +17,7 @@ var _popover = require("agora-ui-foundation/lib/components/popover");
 var _panel = require("./panel");
 var _icon = require("agora-ui-foundation/lib/components/icon");
 var _type = require("agora-ui-foundation/lib/components/icon/type");
-var _enums = require("fcr-core/lib/room-control/whiteboard-control/enums");
+var _fcrCore = require("fcr-core");
 var _jsxRuntime = require("react/jsx-runtime");
 var Picker = exports.Picker = (0, _mobxReact.observer)(function () {
   var _useContext = (0, _react.useContext)(_store.ToolbarContext),
@@ -32,7 +32,7 @@ var Picker = exports.Picker = (0, _mobxReact.observer)(function () {
     _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
     visible = _useState2[0],
     setVisible = _useState2[1];
-  var canShowColorPicker = !!currentShape || currentTool === _enums.FcrBoardToolType.TEXT;
+  var canShowColorPicker = !!currentShape || currentTool === _fcrCore.FcrBoardToolType.TEXT;
   var cls = (0, _classnames["default"])('fcr-board-toolbar__color-item fcr-board-toolbar__color-item--picker', {
     // 'fcr-board-toolbar__color-item--active': isOtherColorActive,
     'fcr-board-toolbar__color-item--disabled': !canShowColorPicker

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 _expansion = require("./expansion");
 var _jsxRuntime = require("react/jsx-runtime");
 var EraserPickerItem = exports.EraserPickerItem = (0, _mobxReact.observer)(function (_ref) {
@@ -29,7 +29,7 @@ var EraserPickerItem = exports.EraserPickerItem = (0, _mobxReact.observer)(funct
     _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
     isHover = _useState2[0],
     setIsHover = _useState2[1];
-  var isActive = currentTool === _enums.FcrBoardToolType.ERASER;
+  var isActive = currentTool === _fcrCore.FcrBoardToolType.ERASER;
   var handleMouseEnter = function handleMouseEnter() {
     setIsHover(true);
   };
@@ -74,11 +74,11 @@ var EraserPickerPanel = (0, _mobxReact.observer)(function (_ref2) {
     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() {
     hidePopover();
-    setTool(_enums.FcrBoardToolType.ERASER);
+    setTool(_fcrCore.FcrBoardToolType.ERASER);
   };
   var handleCleanClick = function handleCleanClick() {
     hidePopover();
@@ -119,7 +119,7 @@ var EraserPickerPanel = (0, _mobxReact.observer)(function (_ref2) {
           type: _type.FcrIconType.FCR_WHITEBOARD_ERASER,
           size: 28,
           colors: {
-            iconPrimary: currentTool === _enums.FcrBoardToolType.ERASER || isEraserHover ? 'var(--fcr_ui_scene_ramp_brand6)' : 'var(--fcr_ui_scene_black8)'
+            iconPrimary: currentTool === _fcrCore.FcrBoardToolType.ERASER || isEraserHover ? 'var(--fcr_ui_scene_ramp_brand6)' : 'var(--fcr_ui_scene_black8)'
           }
         })
       })

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

@@ -13,14 +13,14 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 var _react = require("react");
 var _mobxReact = require("mobx-react");
 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 _expansion = require("./expansion");
+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),
@@ -47,9 +47,9 @@ var PenPickerItem = exports.PenPickerItem = (0, _mobxReact.observer)(function (_
   var handleMouseLeave = function handleMouseLeave() {
     setIsHover(false);
   };
-  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;
   var popoverRef = (0, _react.useRef)(null);
   (0, _react.useEffect)(function () {
     var _popoverRef$current;
@@ -84,13 +84,13 @@ var PenPickerPanel = (0, _mobxReact.observer)(function () {
     setPen = _useContext2.setPen,
     setStrokeWidth = _useContext2.setStrokeWidth;
   var pens = [{
-    type: _type.FcrBoardShape.Straight,
-    icon: _type2.FcrIconType.FCR_WHITEBOARD_PED2
+    type: _fcrCore.FcrBoardShape.Straight,
+    icon: _type.FcrIconType.FCR_WHITEBOARD_PED2
   }, {
-    type: _type.FcrBoardShape.Curve,
-    icon: _type2.FcrIconType.FCR_WHITEBOARD_PED3
+    type: _fcrCore.FcrBoardShape.Curve,
+    icon: _type.FcrIconType.FCR_WHITEBOARD_PED3
   }];
-  var isCurve = observables.currentShape === _type.FcrBoardShape.Curve;
+  var isCurve = observables.currentShape === _fcrCore.FcrBoardShape.Curve;
   var _useState3 = (0, _react.useState)(false),
     _useState4 = (0, _slicedToArray2["default"])(_useState3, 2),
     isHover = _useState4[0],
@@ -108,16 +108,16 @@ var PenPickerPanel = (0, _mobxReact.observer)(function () {
   };
   var weights = [{
     value: 3,
-    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: 7,
-    icon: isCurve ? _type2.FcrIconType.FCR_PENSIZE : _type2.FcrIconType.FCR_PENSIZE_STRAIGHT
+    icon: isCurve ? _type.FcrIconType.FCR_PENSIZE : _type.FcrIconType.FCR_PENSIZE_STRAIGHT
   }, {
     value: 10,
-    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,15 +14,15 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 var _react = require("react");
 var _mobxReact = require("mobx-react");
 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 _expansion = require("./expansion");
+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),
@@ -38,9 +38,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)(_expansion.ExpansionToolbarItem, {
     isActive: isActive,
     tooltip: transI18n('fmt_screenshare_whiteboard_button_shape'),
@@ -95,12 +95,12 @@ var ShapePickerPanel = (0, _mobxReact.observer)(function () {
     setIsShapeHover(false);
   };
   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')
   },
   // {
@@ -109,8 +109,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')
   },
   // {
@@ -119,27 +119,27 @@ 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 isCurve = observables.lastPen === _type.FcrBoardShape.Curve;
+  var isCurve = observables.lastPen === _fcrCore.FcrBoardShape.Curve;
   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",