fcr-ui-scene 3.6.0 → 3.6.2

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

@@ -1,10 +1,12 @@
 "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.UndoItem = exports.RedoItem = void 0;
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _mobxReact = require("mobx-react");
 var _react = require("react");
 var _type = require("agora-ui-foundation/lib/components/icon/type");
@@ -19,13 +21,28 @@ var UndoItem = exports.UndoItem = (0, _mobxReact.observer)(function () {
     toolbarDockPosition = _useContext$observabl.toolbarDockPosition,
     undo = _useContext.undo;
   var transI18n = (0, _i18n.useI18n)();
-  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_item.ToolbarItem, {
-    tooltipPlacement: toolbarDockPosition.placement === 'left' ? 'right' : 'left',
-    tooltip: transI18n('fmt_screenshare_whiteboard_button_withdrwa'),
-    icon: _type.FcrIconType.FCR_MOBILE_WHITEBOARD_UNDO,
-    onClick: undo,
-    isActive: false,
-    isDisabled: !undoSteps
+  var _useState = (0, _react.useState)(false),
+    _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
+    isHover = _useState2[0],
+    setIsHover = _useState2[1];
+  var handleMouseEnter = function handleMouseEnter() {
+    setIsHover(true);
+  };
+  var handleMouseLeave = function handleMouseLeave() {
+    setIsHover(false);
+  };
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+    onMouseEnter: handleMouseEnter,
+    onMouseLeave: handleMouseLeave,
+    children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_item.ToolbarItem, {
+      tooltipPlacement: toolbarDockPosition.placement === 'left' ? 'right' : 'left',
+      tooltip: transI18n('fmt_screenshare_whiteboard_button_withdrwa'),
+      icon: _type.FcrIconType.FCR_MOBILE_WHITEBOARD_UNDO,
+      onClick: undo,
+      isActive: false,
+      isDisabled: !undoSteps,
+      iconColor: isHover ? 'var(--fcr_ui_scene_ramp_brand6)' : 'var(--fcr_ui_scene_black8)'
+    })
   });
 });
 var RedoItem = exports.RedoItem = (0, _mobxReact.observer)(function () {
@@ -35,12 +52,27 @@ var RedoItem = exports.RedoItem = (0, _mobxReact.observer)(function () {
     toolbarDockPosition = _useContext2$observab.toolbarDockPosition,
     redo = _useContext2.redo;
   var transI18n = (0, _i18n.useI18n)();
-  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_item.ToolbarItem, {
-    tooltipPlacement: toolbarDockPosition.placement === 'left' ? 'right' : 'left',
-    tooltip: transI18n('fmt_screenshare_whiteboard_button_forward'),
-    icon: _type.FcrIconType.FCR_MOBILE_WHITEBOARD_REDO,
-    onClick: redo,
-    isActive: false,
-    isDisabled: !redoSteps
+  var _useState3 = (0, _react.useState)(false),
+    _useState4 = (0, _slicedToArray2["default"])(_useState3, 2),
+    isHover = _useState4[0],
+    setIsHover = _useState4[1];
+  var handleMouseEnter = function handleMouseEnter() {
+    setIsHover(true);
+  };
+  var handleMouseLeave = function handleMouseLeave() {
+    setIsHover(false);
+  };
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+    onMouseEnter: handleMouseEnter,
+    onMouseLeave: handleMouseLeave,
+    children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_item.ToolbarItem, {
+      tooltipPlacement: toolbarDockPosition.placement === 'left' ? 'right' : 'left',
+      tooltip: transI18n('fmt_screenshare_whiteboard_button_forward'),
+      icon: _type.FcrIconType.FCR_MOBILE_WHITEBOARD_REDO,
+      onClick: redo,
+      isActive: false,
+      isDisabled: !redoSteps,
+      iconColor: isHover ? 'var(--fcr_ui_scene_ramp_brand6)' : 'var(--fcr_ui_scene_black8)'
+    })
   });
 });

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

@@ -19,7 +19,8 @@ var ToolbarItem = exports.ToolbarItem = function ToolbarItem(_ref) {
     className = _ref.className,
     isActive = _ref.isActive,
     isDisabled = _ref.isDisabled,
-    diraction = _ref.diraction;
+    diraction = _ref.diraction,
+    iconColor = _ref.iconColor;
   var cls = (0, _classnames["default"])('fcr-board-toolbar-item-surrounding', className, {
     'fcr-board-toolbar-item-surrounding--active': isActive,
     'fcr-board-toolbar-item-surrounding--disabled': isDisabled
@@ -34,7 +35,7 @@ var ToolbarItem = exports.ToolbarItem = function ToolbarItem(_ref) {
         type: icon,
         size: diraction === 'horizontal' ? 32 : 28,
         colors: {
-          iconPrimary: isActive ? 'var(--fcr_ui_scene_ramp_brand6)' : 'var(--fcr_ui_scene_black8)'
+          iconPrimary: iconColor ? iconColor : isActive ? 'var(--fcr_ui_scene_ramp_brand6)' : 'var(--fcr_ui_scene_black8)'
         }
       })
     })

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

@@ -86,7 +86,7 @@ var DraggableWrapper = exports.DraggableWrapper = (0, _mobxReact.observer)(funct
     var mouseReleaseHandler = function mouseReleaseHandler() {
       releaseToolbar();
     };
-    var dom = window.document.querySelector('.netless-whiteboard-wrapper .fcr-widget-dialog-content');
+    var dom = window.document.querySelector('.netless-whiteboard-wrapper');
     if (dom) {
       dom.addEventListener('mouseup', mouseReleaseHandler);
     }

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;
+};