@easyv/charts 1.10.26 → 1.10.27

package/lib/components/Band.js

@@ -159,9 +159,9 @@ var _default = exports["default"] = /*#__PURE__*/(0, _react.memo)(function (_ref
     seriesStart = _getSeriesInfo.seriesStart;
   var _data = showHighlight ? getHighlightData(data, extent) : data;
   var isVertical = direction === "vertical";
-  var handleMouseMove = (0, _react.useCallback)((0, _lodash.throttle)(function (e) {
+  var handleMouseMove = (0, _react.useCallback)((0, _lodash.throttle)(function (payload) {
     if (triggerEvents) {
-      triggerEvents(e, "setCurrent");
+      triggerEvents(payload, "setCurrent");
     }
   }, 100),
   // 每 100ms 最多执行一次
@@ -259,7 +259,16 @@ var _default = exports["default"] = /*#__PURE__*/(0, _react.memo)(function (_ref
         triggerEvents ? triggerEvents(e, "setCurrent") : "";
       },
       onMouseMove: function onMouseMove(e) {
-        triggerEvents ? handleMouseMove(e) : "";
+        var _e$currentTarget, _ref7, _e$pageX, _e$nativeEvent, _ref8, _e$pageY, _e$nativeEvent2;
+        if (!triggerEvents) return;
+        e.stopPropagation();
+        var data = (_e$currentTarget = e.currentTarget) === null || _e$currentTarget === void 0 || (_e$currentTarget = _e$currentTarget.dataset) === null || _e$currentTarget === void 0 ? void 0 : _e$currentTarget.data;
+        if (!data) return;
+        handleMouseMove({
+          data: data,
+          pageX: (_ref7 = (_e$pageX = e.pageX) !== null && _e$pageX !== void 0 ? _e$pageX : (_e$nativeEvent = e.nativeEvent) === null || _e$nativeEvent === void 0 ? void 0 : _e$nativeEvent.pageX) !== null && _ref7 !== void 0 ? _ref7 : 0,
+          pageY: (_ref8 = (_e$pageY = e.pageY) !== null && _e$pageY !== void 0 ? _e$pageY : (_e$nativeEvent2 = e.nativeEvent) === null || _e$nativeEvent2 === void 0 ? void 0 : _e$nativeEvent2.pageY) !== null && _ref8 !== void 0 ? _ref8 : 0
+        });
       },
       onMouseEnter: function onMouseEnter(e) {
         triggerEvents ? triggerEvents(e, "mouseenter") : "";

package/lib/components/CartesianChart.js

@@ -278,18 +278,29 @@ var Chart = /*#__PURE__*/(0, _react.memo)(function (_ref) {
     x: position
   };
   var onInteraction = (0, _react.useCallback)(function (e, type) {
-    e.stopPropagation();
-    var _e$nativeEvent = e.nativeEvent,
-      pageX = _e$nativeEvent.pageX,
-      pageY = _e$nativeEvent.pageY;
-    var data = e.currentTarget.dataset.data;
-    var _data = JSON.parse(data);
-    var _scale$current = (0, _slicedToArray2["default"])(scale.current, 2),
-      scaleX = _scale$current[0],
-      scaleY = _scale$current[1];
-    var _screenPos$current = screenPos.current,
-      left = _screenPos$current.left,
-      top = _screenPos$current.top;
+    var _e$stopPropagation, _ref2, _e$pageX, _e$nativeEvent, _ref3, _e$pageY, _e$nativeEvent2, _e$data, _e$currentTarget, _scale$current, _screenPos$current;
+    e === null || e === void 0 || (_e$stopPropagation = e.stopPropagation) === null || _e$stopPropagation === void 0 || _e$stopPropagation.call(e);
+    var pageX = (_ref2 = (_e$pageX = e === null || e === void 0 ? void 0 : e.pageX) !== null && _e$pageX !== void 0 ? _e$pageX : e === null || e === void 0 || (_e$nativeEvent = e.nativeEvent) === null || _e$nativeEvent === void 0 ? void 0 : _e$nativeEvent.pageX) !== null && _ref2 !== void 0 ? _ref2 : 0;
+    var pageY = (_ref3 = (_e$pageY = e === null || e === void 0 ? void 0 : e.pageY) !== null && _e$pageY !== void 0 ? _e$pageY : e === null || e === void 0 || (_e$nativeEvent2 = e.nativeEvent) === null || _e$nativeEvent2 === void 0 ? void 0 : _e$nativeEvent2.pageY) !== null && _ref3 !== void 0 ? _ref3 : 0;
+    var data = (_e$data = e === null || e === void 0 ? void 0 : e.data) !== null && _e$data !== void 0 ? _e$data : e === null || e === void 0 || (_e$currentTarget = e.currentTarget) === null || _e$currentTarget === void 0 || (_e$currentTarget = _e$currentTarget.dataset) === null || _e$currentTarget === void 0 ? void 0 : _e$currentTarget.data;
+    if (!data) return;
+    var _data;
+    try {
+      _data = JSON.parse(data);
+    } catch (_unused) {
+      return;
+    }
+    var _ref4 = (_scale$current = scale === null || scale === void 0 ? void 0 : scale.current) !== null && _scale$current !== void 0 ? _scale$current : [1, 1],
+      _ref5 = (0, _slicedToArray2["default"])(_ref4, 2),
+      _ref5$ = _ref5[0],
+      scaleX = _ref5$ === void 0 ? 1 : _ref5$,
+      _ref5$2 = _ref5[1],
+      scaleY = _ref5$2 === void 0 ? 1 : _ref5$2;
+    var _ref6 = (_screenPos$current = screenPos === null || screenPos === void 0 ? void 0 : screenPos.current) !== null && _screenPos$current !== void 0 ? _screenPos$current : {},
+      _ref6$left = _ref6.left,
+      left = _ref6$left === void 0 ? 0 : _ref6$left,
+      _ref6$top = _ref6.top,
+      top = _ref6$top === void 0 ? 0 : _ref6$top;
     var eventData = _objectSpread(_objectSpread({}, _data), {}, {
       xPos: (pageX - left) * scaleX,
       yPos: (pageY - top) * scaleY
@@ -641,10 +652,10 @@ var Chart = /*#__PURE__*/(0, _react.memo)(function (_ref) {
       ctlIndicatorList: ctlIndicatorList,
       manual: true
     }));
-  })), series.map(function (_ref2, index) {
-    var Component = _ref2.Component,
-      yOrZ = _ref2.yOrZ,
-      config = (0, _objectWithoutProperties2["default"])(_ref2, _excluded);
+  })), series.map(function (_ref7, index) {
+    var Component = _ref7.Component,
+      yOrZ = _ref7.yOrZ,
+      config = (0, _objectWithoutProperties2["default"])(_ref7, _excluded);
     var yAxis = axes.get(yOrZ);
     var isXRepeat = hasDuplicateX(series); //x项有重复项判断
     return yAxis && Component && /*#__PURE__*/_react["default"].createElement(Component, (0, _extends2["default"])({
@@ -665,10 +676,10 @@ var Chart = /*#__PURE__*/(0, _react.memo)(function (_ref) {
       isXRepeat: isXRepeat,
       maxWidth: bar ? bar.maxWidth : 0
     }));
-  }), series.map(function (_ref3, index) {
-    var Component = _ref3.Component,
-      yOrZ = _ref3.yOrZ,
-      config = (0, _objectWithoutProperties2["default"])(_ref3, _excluded2);
+  }), series.map(function (_ref8, index) {
+    var Component = _ref8.Component,
+      yOrZ = _ref8.yOrZ,
+      config = (0, _objectWithoutProperties2["default"])(_ref8, _excluded2);
     var yAxis = axes.get(yOrZ);
     var isXRepeat = hasDuplicateX(series); //x项有重复项判断
     return yAxis && /*#__PURE__*/_react["default"].createElement(_.Label, (0, _extends2["default"])({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@easyv/charts",
-  "version": "1.10.26",
+  "version": "1.10.27",
   "description": "",
   "main": "lib/index.js",
   "scripts": {

package/src/components/Band.tsx

@@ -152,9 +152,9 @@ export default memo(
     const _data = showHighlight ? getHighlightData(data, extent) : data;
     const isVertical = direction === "vertical";
     const handleMouseMove = useCallback(
-      throttle((e) => {
+      throttle((payload) => {
         if (triggerEvents) {
-          triggerEvents(e, "setCurrent");
+          triggerEvents(payload, "setCurrent");
         }
       }, 100), // 每 100ms 最多执行一次
       [triggerEvents],
@@ -259,7 +259,15 @@ export default memo(
                     triggerEvents ? triggerEvents(e, "setCurrent") : "";
                   }}
                   onMouseMove={(e) => {
-                    triggerEvents ? handleMouseMove(e) : "";
+                    if (!triggerEvents) return;
+                    e.stopPropagation();
+                    const data = e.currentTarget?.dataset?.data;
+                    if (!data) return;
+                    handleMouseMove({
+                      data,
+                      pageX: e.pageX ?? e.nativeEvent?.pageX ?? 0,
+                      pageY: e.pageY ?? e.nativeEvent?.pageY ?? 0,
+                    });
                   }}
                   onMouseEnter={(e) => {
                     triggerEvents ? triggerEvents(e, "mouseenter") : "";

package/src/components/CartesianChart.js

@@ -271,12 +271,19 @@ const Chart = memo(
 
     const onInteraction = useCallback(
       (e, type) => {
-        e.stopPropagation();
-        const { pageX, pageY } = e.nativeEvent;
-        const { data } = e.currentTarget.dataset;
-        const _data = JSON.parse(data);
-        const [scaleX, scaleY] = scale.current;
-        const { left, top } = screenPos.current;
+        e?.stopPropagation?.();
+        const pageX = e?.pageX ?? e?.nativeEvent?.pageX ?? 0;
+        const pageY = e?.pageY ?? e?.nativeEvent?.pageY ?? 0;
+        const data = e?.data ?? e?.currentTarget?.dataset?.data;
+        if (!data) return;
+        let _data;
+        try {
+          _data = JSON.parse(data);
+        } catch {
+          return;
+        }
+        const [scaleX = 1, scaleY = 1] = scale?.current ?? [1, 1];
+        const { left = 0, top = 0 } = screenPos?.current ?? {};
         const eventData = {
           ..._data,
           xPos: (pageX - left) * scaleX,