fcr-ui-scene 3.6.1 → 3.6.2

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

@@ -9,6 +9,7 @@ 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 _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _react = require("react");
 var _mobxReact = require("mobx-react");
@@ -29,32 +30,53 @@ var PenPickerItem = exports.PenPickerItem = (0, _mobxReact.observer)(function (_
     lastPen = _useContext$observabl.lastPen,
     toolbarDockPosition = _useContext$observabl.toolbarDockPosition,
     currentColor = _useContext$observabl.currentColor,
+    currentStrokeWidth = _useContext$observabl.currentStrokeWidth,
     setPen = _useContext.setPen;
+  var _useState = (0, _react.useState)(false),
+    _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
+    isHover = _useState2[0],
+    setIsHover = _useState2[1];
   var transI18n = (0, _i18n.useI18n)();
   var handlePenToolChange = function handlePenToolChange(shapeTool) {
     return function () {
       setPen(shapeTool);
     };
   };
+  var handleMouseEnter = function handleMouseEnter() {
+    setIsHover(true);
+  };
+  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;
-  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_expansion.ExpansionToolbarItem, {
-    isActive: isActive,
-    tooltip: transI18n('fmt_screenshare_whiteboard_button_paintbrush'),
-    icon: icon,
-    onClick: handlePenToolChange(clickShape),
-    tooltipPlacement: toolbarDockPosition.placement === 'left' ? 'right' : 'left',
-    popoverPlacement: toolbarDockPosition.placement === 'left' ? 'right' : 'left',
-    popoverOverlayClassName: "fcr-board-toolbar__picker__overlay",
-    popoverContent: /*#__PURE__*/(0, _jsxRuntime.jsx)(PenPickerPanel, {}),
-    popoverOffset: offset,
-    iconProps: {
-      colors: {
-        iconPrimary: isActive ? 'var(--fcr_ui_scene_ramp_brand6)' : 'var(--fcr_ui_scene_black8)',
-        iconSecondary: currentColor
+  var popoverRef = (0, _react.useRef)(null);
+  (0, _react.useEffect)(function () {
+    var _popoverRef$current;
+    (_popoverRef$current = popoverRef.current) === null || _popoverRef$current === void 0 || _popoverRef$current.closePopover();
+  }, [currentStrokeWidth]);
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+    onMouseEnter: handleMouseEnter,
+    onMouseLeave: handleMouseLeave,
+    children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_expansion.ExpansionToolbarItem, {
+      ref: popoverRef,
+      isActive: isActive,
+      tooltip: transI18n('fmt_screenshare_whiteboard_button_paintbrush'),
+      icon: icon,
+      onClick: handlePenToolChange(clickShape),
+      tooltipPlacement: toolbarDockPosition.placement === 'left' ? 'right' : 'left',
+      popoverPlacement: toolbarDockPosition.placement === 'left' ? 'right' : 'left',
+      popoverOverlayClassName: "fcr-board-toolbar__picker__overlay",
+      popoverContent: /*#__PURE__*/(0, _jsxRuntime.jsx)(PenPickerPanel, {}),
+      popoverOffset: offset,
+      iconProps: {
+        colors: {
+          iconPrimary: isActive || isHover ? 'var(--fcr_ui_scene_ramp_brand6)' : 'var(--fcr_ui_scene_black8)',
+          iconSecondary: currentColor
+        }
       }
-    }
+    })
   });
 });
 var PenPickerPanel = (0, _mobxReact.observer)(function () {
@@ -70,6 +92,21 @@ var PenPickerPanel = (0, _mobxReact.observer)(function () {
     icon: _type2.FcrIconType.FCR_WHITEBOARD_PED3
   }];
   var isCurve = observables.currentShape === _type.FcrBoardShape.Curve;
+  var _useState3 = (0, _react.useState)(false),
+    _useState4 = (0, _slicedToArray2["default"])(_useState3, 2),
+    isHover = _useState4[0],
+    setIsHover = _useState4[1];
+  var _useState5 = (0, _react.useState)(0),
+    _useState6 = (0, _slicedToArray2["default"])(_useState5, 2),
+    hoverValue = _useState6[0],
+    setHoverValue = _useState6[1];
+  var handleMouseEnter = function handleMouseEnter(value) {
+    setIsHover(true);
+    setHoverValue(value);
+  };
+  var handleMouseLeave = function handleMouseLeave() {
+    setIsHover(false);
+  };
   var weights = [{
     value: 2,
     icon: isCurve ? _type2.FcrIconType.FCR_PENSIZE : _type2.FcrIconType.FCR_PENSIZE_STRAIGHT
@@ -96,14 +133,19 @@ var PenPickerPanel = (0, _mobxReact.observer)(function () {
       var handleClick = function handleClick() {
         setStrokeWidth(value);
       };
+      var isHoverActive = hoverValue === value && isHover;
       return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
         className: cls,
         onClick: handleClick,
+        onMouseEnter: function onMouseEnter() {
+          return handleMouseEnter(value);
+        },
+        onMouseLeave: handleMouseLeave,
         children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_icon.FcrIcon, {
           type: icon,
           size: 28,
           colors: {
-            iconPrimary: observables.currentStrokeWidth === value ? 'var(--fcr_ui_scene_ramp_brand6)' : 'var(--fcr_ui_scene_black8)',
+            iconPrimary: observables.currentStrokeWidth === value || isHoverActive ? 'var(--fcr_ui_scene_ramp_brand6)' : 'var(--fcr_ui_scene_black8)',
             iconSecondary: 'red',
             level: level
           }

package/lib/modules/whiteboard/components/toolbar/components/screen-capture-picker.js

@@ -20,18 +20,27 @@ var ScreenCapturePickerItem = exports.ScreenCapturePickerItem = (0, _mobxReact.o
   var _useContext = (0, _react.useContext)(_store.ToolbarContext),
     toolbarDockPosition = _useContext.observables.toolbarDockPosition;
   var transI18n = (0, _i18n.useI18n)();
+  var popoverRef = (0, _react.useRef)(null);
+  var hidePopover = function hidePopover() {
+    var _popoverRef$current;
+    (_popoverRef$current = popoverRef.current) === null || _popoverRef$current === void 0 || _popoverRef$current.closePopover();
+  };
   return (0, _env.isElectron)() ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_expansion.ExpansionToolbarItem, {
+    ref: popoverRef,
     isActive: false,
     tooltip: transI18n('fmt_screenshare_whiteboard_button_cutting'),
     tooltipPlacement: toolbarDockPosition.placement === 'left' ? 'right' : 'left',
     popoverPlacement: toolbarDockPosition.placement === 'left' ? 'right' : 'left',
     icon: _type.FcrIconType.FCR_WIHITEBOARD_SLICE,
     popoverOverlayClassName: "fcr-board-toolbar__picker__overlay",
-    popoverContent: /*#__PURE__*/(0, _jsxRuntime.jsx)(ScreenCapturePickerPanel, {}),
+    popoverContent: /*#__PURE__*/(0, _jsxRuntime.jsx)(ScreenCapturePickerPanel, {
+      hidePopover: hidePopover
+    }),
     popoverOffset: offset
   }) : null;
 });
-var ScreenCapturePickerPanel = (0, _mobxReact.observer)(function () {
+var ScreenCapturePickerPanel = (0, _mobxReact.observer)(function (_ref2) {
+  var hidePopover = _ref2.hidePopover;
   var _useContext2 = (0, _react.useContext)(_store.ToolbarContext),
     captureScreen = _useContext2.captureScreen,
     toolbarDockPosition = _useContext2.observables.toolbarDockPosition;
@@ -43,7 +52,8 @@ var ScreenCapturePickerPanel = (0, _mobxReact.observer)(function () {
       placement: toolbarDockPosition.placement === 'left' ? 'right' : 'left',
       children: /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
         onClick: function onClick() {
-          return captureScreen(false);
+          hidePopover();
+          captureScreen(false);
         },
         children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_icon.FcrIcon, {
           type: _type.FcrIconType.FCR_WIHITEBOARD_SLICE,
@@ -59,7 +69,8 @@ var ScreenCapturePickerPanel = (0, _mobxReact.observer)(function () {
       placement: toolbarDockPosition.placement === 'left' ? 'right' : 'left',
       children: /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
         onClick: function onClick() {
-          return captureScreen(true);
+          hidePopover();
+          captureScreen(true);
         },
         children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_icon.FcrIcon, {
           type: _type.FcrIconType.FCR_WIHITEBOARD_SLICEWITHOUTCLASSROOM,

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

@@ -11,6 +11,7 @@ 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 _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _react = require("react");
 var _mobxReact = require("mobx-react");
@@ -65,6 +66,36 @@ var ShapePickerPanel = (0, _mobxReact.observer)(function () {
     setShape = _useContext2.setShape,
     setStrokeWidth = _useContext2.setStrokeWidth;
   var t = (0, _i18n.useI18n)();
+  var _useState = (0, _react.useState)(false),
+    _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
+    isHover = _useState2[0],
+    setIsHover = _useState2[1];
+  var _useState3 = (0, _react.useState)(0),
+    _useState4 = (0, _slicedToArray2["default"])(_useState3, 2),
+    hoverValue = _useState4[0],
+    setHoverValue = _useState4[1];
+  var _useState5 = (0, _react.useState)(false),
+    _useState6 = (0, _slicedToArray2["default"])(_useState5, 2),
+    isShapeHover = _useState6[0],
+    setIsShapeHover = _useState6[1];
+  var _useState7 = (0, _react.useState)(0),
+    _useState8 = (0, _slicedToArray2["default"])(_useState7, 2),
+    hoverShapeValue = _useState8[0],
+    setHoverShapeValue = _useState8[1];
+  var handleMouseEnter = function handleMouseEnter(value) {
+    setIsHover(true);
+    setHoverValue(value);
+  };
+  var handleMouseLeave = function handleMouseLeave() {
+    setIsHover(false);
+  };
+  var handleShapeMouseEnter = function handleShapeMouseEnter(value) {
+    setIsShapeHover(true);
+    setHoverShapeValue(value);
+  };
+  var handleShapeMouseLeave = function handleShapeMouseLeave() {
+    setIsShapeHover(false);
+  };
   var shapes = [{
     type: _type.FcrBoardShape.Rectangle,
     icon: _type2.FcrIconType.FCR_WHITEBOARD_SHAP_SQUARE,
@@ -118,6 +149,8 @@ var ShapePickerPanel = (0, _mobxReact.observer)(function () {
       var type = _ref2.type,
         icon = _ref2.icon,
         tip = _ref2.tip;
+      var isHoverActive = hoverValue === type && isHover;
+      var isActive = observables.currentShape === type;
       var cls = (0, _classnames["default"])({
         'fcr-board-toolbar-panel--active': observables.currentShape === type
       });
@@ -131,11 +164,15 @@ var ShapePickerPanel = (0, _mobxReact.observer)(function () {
         children: /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
           className: cls,
           onClick: handleClick,
+          onMouseEnter: function onMouseEnter() {
+            return handleMouseEnter(type);
+          },
+          onMouseLeave: handleMouseLeave,
           children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_icon.FcrIcon, {
             type: icon,
             size: 28,
             colors: {
-              iconPrimary: 'var(--fcr_ui_scene_black8)',
+              iconPrimary: isActive || isHoverActive ? 'var(--fcr_ui_scene_ramp_brand6)' : 'var(--fcr_ui_scene_black8)',
               level: 2
             }
           })
@@ -146,6 +183,8 @@ var ShapePickerPanel = (0, _mobxReact.observer)(function () {
     }), weights.map(function (_ref3, level) {
       var value = _ref3.value,
         icon = _ref3.icon;
+      var isHoverActive = hoverShapeValue === value && isShapeHover;
+      var isActive = observables.currentStrokeWidth === value;
       var cls = (0, _classnames["default"])({
         'fcr-board-toolbar-panel--active': observables.currentStrokeWidth === value
       });
@@ -155,11 +194,15 @@ var ShapePickerPanel = (0, _mobxReact.observer)(function () {
       return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
         className: cls,
         onClick: handleClick,
+        onMouseEnter: function onMouseEnter() {
+          return handleShapeMouseEnter(value);
+        },
+        onMouseLeave: handleShapeMouseLeave,
         children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_icon.FcrIcon, {
           type: icon,
           size: 28,
           colors: {
-            iconPrimary: 'var(--fcr_ui_scene_black8)',
+            iconPrimary: isActive || isHoverActive ? 'var(--fcr_ui_scene_ramp_brand6)' : 'var(--fcr_ui_scene_black8)',
             level: level
           }
         })

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

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

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

@@ -5,7 +5,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.useVisibleTools = void 0;
+exports.useVisibleTools = exports.useAnnotationVisibleTools = void 0;
 require("core-js/modules/es.array.concat.js");
 require("core-js/modules/es.array.filter.js");
 require("core-js/modules/es.array.map.js");
@@ -43,22 +43,24 @@ var useVisibleTools = exports.useVisibleTools = function useVisibleTools(diracti
     maxCountVisibleTools = _useContext$observabl.maxCountVisibleTools,
     toolbarDockPosition = _useContext$observabl.toolbarDockPosition,
     setTool = _useContext.setTool,
-    saveDraft = _useContext.saveDraft;
+    saveDraft = _useContext.saveDraft,
+    annotationHasStart = _useContext.annotationHasStart;
   var transI18n = (0, _i18n.useI18n)();
   var handleToolChange = function handleToolChange(tool) {
     return function () {
       setTool(tool);
     };
   };
-  var baseMainTools = [{
+  var whiteboardMainTools = [{
     renderItem: function renderItem() {
       return /*#__PURE__*/(0, _jsxRuntime.jsx)(_item.ToolbarItem, {
         tooltipPlacement: toolbarDockPosition.placement === 'left' ? 'right' : 'left',
         tooltip: transI18n('fmt_screenshare_whiteboard_button_laserpen'),
-        icon: _type.FcrIconType.FCR_WHITEBOARD_LASERPEN2,
+        icon: _type.FcrIconType.FCR_WHITEBOARD_LASERPEN1,
         onClick: handleToolChange(_enums.FcrBoardToolType.LASER_POINTER),
         isActive: currentTool === _enums.FcrBoardToolType.LASER_POINTER,
-        diraction: diraction
+        diraction: diraction,
+        iconColor: "#FF0005"
       });
     }
   },
@@ -81,7 +83,8 @@ var useVisibleTools = exports.useVisibleTools = function useVisibleTools(diracti
         icon: _type.FcrIconType.FCR_WHITECHOOSE,
         onClick: handleToolChange(_enums.FcrBoardToolType.SELECTOR),
         isActive: currentTool === _enums.FcrBoardToolType.SELECTOR,
-        diraction: diraction
+        diraction: diraction,
+        iconColor: "#FF0005"
       });
     }
   }, {
@@ -139,6 +142,67 @@ var useVisibleTools = exports.useVisibleTools = function useVisibleTools(diracti
       });
     }
   }] : []));
+  var annontationMainTools = [{
+    renderItem: function renderItem() {
+      return /*#__PURE__*/(0, _jsxRuntime.jsx)(_item.ToolbarItem, {
+        tooltipPlacement: toolbarDockPosition.placement === 'left' ? 'right' : 'left',
+        tooltip: transI18n('fmt_screenshare_whiteboard_button_laserpen'),
+        icon: _type.FcrIconType.FCR_WHITEBOARD_LASERPEN1,
+        onClick: handleToolChange(_enums.FcrBoardToolType.LASER_POINTER),
+        isActive: currentTool === _enums.FcrBoardToolType.LASER_POINTER,
+        diraction: diraction,
+        iconColor: "#FF0005"
+      });
+    }
+  }, {
+    renderItem: function renderItem() {
+      var _ref5 = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
+        offset = _ref5.offset;
+      return /*#__PURE__*/(0, _jsxRuntime.jsx)(_penPicker.PenPickerItem, {
+        offset: offset
+      });
+    }
+  }, {
+    renderItem: function renderItem() {
+      var _ref6 = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
+        offset = _ref6.offset;
+      return /*#__PURE__*/(0, _jsxRuntime.jsx)(_shapePicker.ShapePickerItem, {
+        offset: offset
+      });
+    }
+  },
+  // {
+  //   renderItem: () => (
+  //     <ToolbarItem
+  //       tooltipPlacement={toolbarDockPosition.placement === 'left' ? 'right' : 'left'}
+  //       tooltip={transI18n('fmt_screenshare_whiteboard_button_text')}
+  //       icon={FcrIconType.FCR_WHITEBOARD_TEXT}
+  //       onClick={handleToolChange(FcrBoardToolType.TEXT)}
+  //       isActive={currentTool === FcrBoardToolType.TEXT}
+  //       diraction={diraction}
+  //     />
+  //   ),
+  // },
+  {
+    renderItem: function renderItem() {
+      var _ref7 = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
+        offset = _ref7.offset;
+      return /*#__PURE__*/(0, _jsxRuntime.jsx)(_eraserPicker.EraserPickerItem, {
+        offset: offset
+      });
+    }
+  }
+  // ...(isElectron()
+  //   ? [
+  //       {
+  //         renderItem: ({ offset }: { offset?: number } = {}) => (
+  //           <ScreenCapturePickerItem offset={offset} />
+  //         ),
+  //       },
+  //     ]
+  //   : []),
+  ];
+  var baseMainTools = annotationHasStart ? annontationMainTools : whiteboardMainTools;
   var divider = {
     renderItem: function renderItem() {
       return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
@@ -175,6 +239,19 @@ var useVisibleTools = exports.useVisibleTools = function useVisibleTools(diracti
       return /*#__PURE__*/(0, _jsxRuntime.jsx)(_moveHandle.MoveHandleItem, {});
     }
   }];
+  var fixedAnnotationTools = [divider, colorTool, divider, {
+    renderItem: function renderItem() {
+      return /*#__PURE__*/(0, _jsxRuntime.jsx)(_history.UndoItem, {});
+    }
+  }, {
+    renderItem: function renderItem() {
+      return /*#__PURE__*/(0, _jsxRuntime.jsx)(_history.RedoItem, {});
+    }
+  }, {
+    renderItem: function renderItem() {
+      return /*#__PURE__*/(0, _jsxRuntime.jsx)(_moveHandle.MoveHandleItem, {});
+    }
+  }];
   var additionTool = {
     renderItem: function renderItem() {
       return /*#__PURE__*/(0, _jsxRuntime.jsx)(_extraToolPicker.AdditionToolPickerItem, {});
@@ -191,9 +268,10 @@ var useVisibleTools = exports.useVisibleTools = function useVisibleTools(diracti
   // }
 
   var maxCountAvailableToDisplay = maxCountVisibleTools;
+  var resultFixedTools = annotationHasStart ? fixedAnnotationTools : fixedTools;
   var mainTools = isShinked && diraction !== 'horizontal' ? (0, _range["default"])(0, (0, _max["default"])([0, (0, _min["default"])([maxCountAvailableToDisplay, baseMainTools.length])])).map(function (index) {
     return baseMainTools[index];
-  }).concat([additionTool]).concat(fixedTools) : baseMainTools.concat(fixedTools);
+  }).concat([additionTool]).concat(resultFixedTools) : baseMainTools.concat(resultFixedTools);
   var additionToolsCount = baseMainTools.length - maxCountAvailableToDisplay;
   var additionTools = (0, _toConsumableArray2["default"])(baseMainTools).reverse().filter(function (tool, index) {
     if (index < additionToolsCount) {
@@ -206,6 +284,156 @@ var useVisibleTools = exports.useVisibleTools = function useVisibleTools(diracti
   //   additionTools.unshift(colorTool);
   // }
 
+  additionTools = additionTools.reverse();
+  return {
+    mainTools: mainTools,
+    additionTools: additionTools,
+    showColorCount: showColorCount,
+    isShinked: isShinked
+  };
+};
+var useAnnotationVisibleTools = exports.useAnnotationVisibleTools = function useAnnotationVisibleTools(diraction) {
+  var _useContext2 = (0, _react.useContext)(_store.ToolbarContext),
+    _useContext2$observab = _useContext2.observables,
+    currentTool = _useContext2$observab.currentTool,
+    maxCountVisibleTools = _useContext2$observab.maxCountVisibleTools,
+    toolbarDockPosition = _useContext2$observab.toolbarDockPosition,
+    setTool = _useContext2.setTool,
+    saveDraft = _useContext2.saveDraft;
+  var transI18n = (0, _i18n.useI18n)();
+  var handleToolChange = function handleToolChange(tool) {
+    return function () {
+      setTool(tool);
+    };
+  };
+  var annontationMainTools = [{
+    renderItem: function renderItem() {
+      return /*#__PURE__*/(0, _jsxRuntime.jsx)(_item.ToolbarItem, {
+        tooltipPlacement: toolbarDockPosition.placement === 'left' ? 'right' : 'left',
+        tooltip: transI18n('fmt_screenshare_whiteboard_button_laserpen'),
+        icon: _type.FcrIconType.FCR_WHITEBOARD_LASERPEN1,
+        onClick: handleToolChange(_enums.FcrBoardToolType.LASER_POINTER),
+        isActive: currentTool === _enums.FcrBoardToolType.LASER_POINTER,
+        diraction: diraction,
+        iconColor: "#FF0005"
+      });
+    }
+  }, {
+    renderItem: function renderItem() {
+      var _ref8 = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
+        offset = _ref8.offset;
+      return /*#__PURE__*/(0, _jsxRuntime.jsx)(_penPicker.PenPickerItem, {
+        offset: offset
+      });
+    }
+  }, {
+    renderItem: function renderItem() {
+      var _ref9 = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
+        offset = _ref9.offset;
+      return /*#__PURE__*/(0, _jsxRuntime.jsx)(_shapePicker.ShapePickerItem, {
+        offset: offset
+      });
+    }
+  },
+  // {
+  //   renderItem: () => (
+  //     <ToolbarItem
+  //       tooltipPlacement={toolbarDockPosition.placement === 'left' ? 'right' : 'left'}
+  //       tooltip={transI18n('fmt_screenshare_whiteboard_button_text')}
+  //       icon={FcrIconType.FCR_WHITEBOARD_TEXT}
+  //       onClick={handleToolChange(FcrBoardToolType.TEXT)}
+  //       isActive={currentTool === FcrBoardToolType.TEXT}
+  //       diraction={diraction}
+  //     />
+  //   ),
+  // },
+  {
+    renderItem: function renderItem() {
+      var _ref10 = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
+        offset = _ref10.offset;
+      return /*#__PURE__*/(0, _jsxRuntime.jsx)(_eraserPicker.EraserPickerItem, {
+        offset: offset
+      });
+    }
+  }
+  // ...(isElectron()
+  //   ? [
+  //       {
+  //         renderItem: ({ offset }: { offset?: number } = {}) => (
+  //           <ScreenCapturePickerItem offset={offset} />
+  //         ),
+  //       },
+  //     ]
+  //   : []),
+  ];
+  var baseMainTools = annontationMainTools;
+  var divider = {
+    renderItem: function renderItem() {
+      return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+        className: "fcr-divider-vertical"
+      });
+    }
+  };
+  var colorTool = {
+    renderItem: function renderItem() {
+      return /*#__PURE__*/(0, _jsxRuntime.jsx)(_index.ColorPickerItem, {});
+    }
+  };
+  var fixedTools = [divider, colorTool, divider, {
+    renderItem: function renderItem() {
+      return /*#__PURE__*/(0, _jsxRuntime.jsx)(_item.ToolbarItem, {
+        tooltipPlacement: toolbarDockPosition.placement === 'left' ? 'right' : 'left',
+        tooltip: transI18n('fmt_screenshare_whiteboard_button_savescript'),
+        icon: _type.FcrIconType.FCR_DOWNLOAD,
+        onClick: saveDraft,
+        isActive: false,
+        diraction: diraction
+      });
+    }
+  }, divider, {
+    renderItem: function renderItem() {
+      return /*#__PURE__*/(0, _jsxRuntime.jsx)(_history.UndoItem, {});
+    }
+  }, {
+    renderItem: function renderItem() {
+      return /*#__PURE__*/(0, _jsxRuntime.jsx)(_history.RedoItem, {});
+    }
+  }, {
+    renderItem: function renderItem() {
+      return /*#__PURE__*/(0, _jsxRuntime.jsx)(_moveHandle.MoveHandleItem, {});
+    }
+  }];
+  var additionTool = {
+    renderItem: function renderItem() {
+      return /*#__PURE__*/(0, _jsxRuntime.jsx)(_extraToolPicker.AdditionToolPickerItem, {});
+    }
+  };
+
+  // whether toolbar needs to shrink in vertical direction
+  var isShinked = maxCountVisibleTools < baseMainTools.length + 1;
+  var showColorCount = isShinked ? 0 : maxCountVisibleTools - baseMainTools.length; /* addition tool */
+
+  // if (showColorCount) {
+  //   baseMainTools.push(divider);
+  //   baseMainTools.push(colorTool);
+  // }
+
+  var maxCountAvailableToDisplay = maxCountVisibleTools;
+  var mainTools = isShinked && diraction !== 'horizontal' ? (0, _range["default"])(0, (0, _max["default"])([0, (0, _min["default"])([maxCountAvailableToDisplay, baseMainTools.length])])).map(function (index) {
+    return baseMainTools[index];
+  }).concat([additionTool]).concat(fixedTools) : baseMainTools.concat(fixedTools);
+  var additionToolsCount = baseMainTools.length - maxCountAvailableToDisplay;
+  var additionTools = [].concat(baseMainTools).reverse().filter(function (tool, index) {
+    if (index < additionToolsCount) {
+      return true;
+    }
+    return false;
+  });
+
+  // if (isShinked) {
+  //   additionTools.unshift(colorTool);
+  // }
+
   additionTools = additionTools.reverse();
   return {
     mainTools: mainTools,

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

@@ -1,2 +1,2 @@
-import './ style.css';
+import './style.css';
 export declare const Toolbar: () => import("react/jsx-runtime").JSX.Element;

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

@@ -22,7 +22,7 @@ var _moveHandle = require("./components/move-handle");
 var _icon = require("agora-ui-foundation/lib/components/icon");
 var _type = require("agora-ui-foundation/lib/components/icon/type");
 var _foldIcon = _interopRequireDefault(require("./components/icons/fold-icon"));
-require("./ style.css");
+require("./style.css");
 var _i18n = require("agora-ui-foundation/lib/i18n");
 var _store = require("./store");
 var _jsxRuntime = require("react/jsx-runtime");

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

@@ -1,11 +1,15 @@
 import { FcrBoardShape, WhiteboardThemeType } from '../../type';
 import { FcrBoardToolType } from 'fcr-core/lib/room-control/whiteboard-control/enums';
-import { FcrBoardMainWindow, FcrWhiteboardControl } from 'fcr-core/lib/room-control/whiteboard-control/types';
+import { FcrBoardMainWindow } from 'fcr-core/lib/room-control/whiteboard-control/types';
 import { FcrBaseRoomControl } from 'fcr-core/lib/room-control/type';
+import { FcrWhiteboardControl } from 'fcr-core/lib/room-control/whiteboard-control-v2/whiteboard-control/type';
+import { FcrUIAnnotationProvider } from '../../../../providers/annotation-provider';
 export declare class ToolbarStore {
     private _whiteboardControl;
     private _roomControl;
+    private _annotationProvider;
     private _boardMainWindow;
+    private _lastStrokeWidth;
     private _boardObserver;
     accessor observables: {
         currentTool: FcrBoardToolType | undefined;
@@ -37,7 +41,10 @@ export declare class ToolbarStore {
     };
     get roomInfo(): import("fcr-core/lib/type").FcrRoomInfo | undefined;
     get boardMainWindow(): FcrBoardMainWindow;
-    constructor(_whiteboardControl: FcrWhiteboardControl, _roomControl: FcrBaseRoomControl);
+    constructor(_whiteboardControl: FcrWhiteboardControl, _roomControl: FcrBaseRoomControl, _annotationProvider: FcrUIAnnotationProvider);
+    disableToolbar(): void;
+    resumeToolbar(): void;
+    get annotationHasStart(): boolean;
     redo(): void;
     undo(): void;
     clean(): void;