@easyv/charts 1.10.18 → 1.10.20

package/lib/components/Legend.js

@@ -214,8 +214,10 @@ var _default = exports["default"] = /*#__PURE__*/(0, _react.memo)(function (_ref
   var isSideLegend = isPieAdaptive && isSidePlacement;
   var isTopBottomAdaptive = isPieAdaptive && isCenterTopOrBottom;
   var fullWidth = (_ref3 = componentWidth !== null && componentWidth !== void 0 ? componentWidth : chartWidth) !== null && _ref3 !== void 0 ? _ref3 : 0;
-  var legendAreaWidth = Math.max(0, fullWidth - marginLeft - marginRight);
-  var sideLegendMaxWidth = isSideLegend ? Math.max(0, position === "left" || _alignment === "left" ? marginLeft : marginRight) : 0;
+  // Adaptive+上下：组件总宽；Adaptive+左右：仅 maxWidth = 总宽 − 左右 chart.margin，宽度由内容撑开
+  var pieLegendFullWidth = Math.max(0, fullWidth);
+  var pieLegendInnerWidth = Math.max(0, fullWidth - marginLeft - marginRight);
+  var sideLegendMaxWidth = isSideLegend ? pieLegendInnerWidth : 0;
   var fixedColumnsPerRow = Math.min(Math.max(1, Number(gridTemplateColumns) || 1), length);
   var isPieTopBottomFixedMultiCol = isPieChart && isFixedWidth && isCenterTopOrBottom && fixedColumnsPerRow > 1;
   var formatterExtra = _objectSpread(_objectSpread(_objectSpread({}, config), {}, {
@@ -231,7 +233,7 @@ var _default = exports["default"] = /*#__PURE__*/(0, _react.memo)(function (_ref
   }, isSideLegend && sideLegendMaxWidth > 0 ? {
     adaptiveMaxWidth: sideLegendMaxWidth
   } : {}), isTopBottomAdaptive ? {
-    chartWidth: legendAreaWidth
+    chartWidth: pieLegendFullWidth
   } : {});
   var renderPieSideItem = function renderPieSideItem(series, i) {
     var _series$config;
@@ -336,8 +338,8 @@ var _default = exports["default"] = /*#__PURE__*/(0, _react.memo)(function (_ref
   if (isTopBottomAdaptive) {
     var topBottomWrapperStyle = _objectSpread(_objectSpread({
       position: "absolute",
-      width: legendAreaWidth || "100%",
-      maxWidth: legendAreaWidth || "100%",
+      width: pieLegendFullWidth || "100%",
+      maxWidth: pieLegendFullWidth || "100%",
       boxSizing: "border-box"
     }, getPosition(position, _alignment, x, y)), {}, {
       height: loop.show ? height : "auto",

package/lib/components/PieChart.js

@@ -22,7 +22,6 @@ var _formatter = require("../formatter");
 var _piechartModule = _interopRequireDefault(require("../css/piechart.module.css"));
 var _hooks = require("../hooks");
 var _PieTooltip = require("./PieTooltip");
-var _legendPlacement = require("../utils/legendPlacement");
 var _excluded = ["startAngle", "endAngle", "antiClockwise"],
   _excluded2 = ["padAngle", "innerRadius", "outerRadius", "cornerRadius", "startAngle", "endAngle"],
   _excluded3 = ["formatter"],
@@ -35,41 +34,6 @@ function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e;
 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; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2["default"])(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var PI = Math.PI;
-var PIE_ADAPTIVE_MARGINS = {
-  right: {
-    marginTop: 24,
-    marginBottom: 24,
-    marginLeft: 0,
-    marginRight: 200
-  },
-  left: {
-    marginTop: 24,
-    marginBottom: 24,
-    marginLeft: 200,
-    marginRight: 0
-  },
-  top: {
-    marginTop: 110,
-    marginBottom: 24,
-    marginLeft: 24,
-    marginRight: 24
-  },
-  bottom: {
-    marginTop: 24,
-    marginBottom: 110,
-    marginLeft: 24,
-    marginRight: 24
-  },
-  hidden: {
-    marginTop: 24,
-    marginBottom: 24,
-    marginLeft: 24,
-    marginRight: 24
-  }
-};
-var getPieAdaptiveMargin = function getPieAdaptiveMargin(show, alignment) {
-  return (0, _legendPlacement.getPieAdaptiveMarginPreset)(show, alignment, PIE_ADAPTIVE_MARGINS);
-};
 var defaultChart = {
   outerRadius: 1,
   innerRadius: 0,
@@ -274,7 +238,6 @@ var getCircleScale = function getCircleScale() {
   }));
 };
 var Component = /*#__PURE__*/(0, _react.memo)(function (_ref5) {
-  var _legend$config2;
   var width = _ref5.width,
     height = _ref5.height,
     _ref5$config = _ref5.config,
@@ -358,43 +321,7 @@ var Component = /*#__PURE__*/(0, _react.memo)(function (_ref5) {
     chartWidth = _useContext.width,
     chartHeight = _useContext.height,
     triggerOnRelative = _useContext.triggerOnRelative,
-    onEmit = _useContext.onEmit,
-    updateConfig = _useContext.updateConfig;
-  var _legend$config = legend.config,
-    legendShow = _legend$config.show,
-    _legend$config$name = _legend$config.name,
-    _legend$config$name2 = _legend$config$name === void 0 ? {} : _legend$config$name,
-    legendLayoutMode = _legend$config$name2.layoutMode;
-  var legendAlignment = (_legend$config2 = legend.config) === null || _legend$config2 === void 0 || (_legend$config2 = _legend$config2.layout) === null || _legend$config2 === void 0 ? void 0 : _legend$config2.alignment;
-  var adaptiveMarginPresetKey = (0, _react.useRef)("");
-  (0, _react.useEffect)(function () {
-    if (legendLayoutMode !== "Adaptive" || !updateConfig) return;
-    var presetKey = "".concat(legendLayoutMode, "-").concat(legendShow, "-").concat(legendAlignment);
-    if (adaptiveMarginPresetKey.current === presetKey) return;
-    adaptiveMarginPresetKey.current = presetKey;
-    var target = getPieAdaptiveMargin(legendShow, legendAlignment);
-    updateConfig({
-      id: id,
-      type: "config",
-      payload: [{
-        path: ["chart", "margin", "marginTop"],
-        field: "value",
-        value: target.marginTop
-      }, {
-        path: ["chart", "margin", "marginBottom"],
-        field: "value",
-        value: target.marginBottom
-      }, {
-        path: ["chart", "margin", "marginLeft"],
-        field: "value",
-        value: target.marginLeft
-      }, {
-        path: ["chart", "margin", "marginRight"],
-        field: "value",
-        value: target.marginRight
-      }]
-    });
-  }, [id, updateConfig, legendLayoutMode, legendShow, legendAlignment]);
+    onEmit = _useContext.onEmit;
   var _useState = (0, _react.useState)(1),
     _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
     y = _useState2[0],

package/package.json

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

package/src/components/CartesianChart.js

@@ -128,7 +128,7 @@ const Chart = memo(
         cPercent: dragPercent,
         cBarX: controlX,
       });
-    }, [JSON.stringify(control), width]);
+    }, [JSON.stringify(control), width, height]);
 
     const svg = useRef();
     const axes = useAxes({

package/src/components/Legend.js

@@ -232,15 +232,10 @@ export default memo(
     const isSideLegend = isPieAdaptive && isSidePlacement;
     const isTopBottomAdaptive = isPieAdaptive && isCenterTopOrBottom;
     const fullWidth = componentWidth ?? chartWidth ?? 0;
-    const legendAreaWidth = Math.max(0, fullWidth - marginLeft - marginRight);
-    const sideLegendMaxWidth = isSideLegend
-      ? Math.max(
-          0,
-          position === "left" || _alignment === "left"
-            ? marginLeft
-            : marginRight,
-        )
-      : 0;
+    // Adaptive+上下：组件总宽；Adaptive+左右：仅 maxWidth = 总宽 − 左右 chart.margin，宽度由内容撑开
+    const pieLegendFullWidth = Math.max(0, fullWidth);
+    const pieLegendInnerWidth = Math.max(0, fullWidth - marginLeft - marginRight);
+    const sideLegendMaxWidth = isSideLegend ? pieLegendInnerWidth : 0;
     const fixedColumnsPerRow = Math.min(
       Math.max(1, Number(gridTemplateColumns) || 1),
       length,
@@ -265,7 +260,7 @@ export default memo(
       ...(isSideLegend && sideLegendMaxWidth > 0
         ? { adaptiveMaxWidth: sideLegendMaxWidth }
         : {}),
-      ...(isTopBottomAdaptive ? { chartWidth: legendAreaWidth } : {}),
+      ...(isTopBottomAdaptive ? { chartWidth: pieLegendFullWidth } : {}),
     };
 
     const renderPieSideItem = (series, i) => {
@@ -403,8 +398,8 @@ export default memo(
     if (isTopBottomAdaptive) {
       const topBottomWrapperStyle = {
         position: "absolute",
-        width: legendAreaWidth || "100%",
-        maxWidth: legendAreaWidth || "100%",
+        width: pieLegendFullWidth || "100%",
+        maxWidth: pieLegendFullWidth || "100%",
         boxSizing: "border-box",
         ...getPosition(position, _alignment, x, y),
         height: loop.show ? height : "auto",

package/src/components/PieChart.js

@@ -34,21 +34,9 @@ import { pieLegendFormatter as legendFormatter } from "../formatter";
 import ringCss from "../css/piechart.module.css";
 import { useAiDataOfPie } from "../hooks";
 import { PieTooltip } from "./PieTooltip";
-import { getPieAdaptiveMarginPreset } from "../utils/legendPlacement";
 
 const PI = Math.PI;
 
-const PIE_ADAPTIVE_MARGINS = {
-  right: { marginTop: 24, marginBottom: 24, marginLeft: 0, marginRight: 200 },
-  left: { marginTop: 24, marginBottom: 24, marginLeft: 200, marginRight: 0 },
-  top: { marginTop: 110, marginBottom: 24, marginLeft: 24, marginRight: 24 },
-  bottom: { marginTop: 24, marginBottom: 110, marginLeft: 24, marginRight: 24 },
-  hidden: { marginTop: 24, marginBottom: 24, marginLeft: 24, marginRight: 24 },
-};
-
-const getPieAdaptiveMargin = (show, alignment) =>
-  getPieAdaptiveMarginPreset(show, alignment, PIE_ADAPTIVE_MARGINS);
-
 const defaultChart = {
   outerRadius: 1,
   innerRadius: 0,
@@ -312,45 +300,7 @@ const Component = memo(
       height: chartHeight,
       triggerOnRelative,
       onEmit,
-      updateConfig,
     } = useContext(chartContext);
-    const { show: legendShow, name: { layoutMode: legendLayoutMode } = {} } =
-      legend.config;
-    const legendAlignment = legend.config?.layout?.alignment;
-    const adaptiveMarginPresetKey = useRef("");
-    useEffect(() => {
-      if (legendLayoutMode !== "Adaptive" || !updateConfig) return;
-      const presetKey = `${legendLayoutMode}-${legendShow}-${legendAlignment}`;
-      if (adaptiveMarginPresetKey.current === presetKey) return;
-      adaptiveMarginPresetKey.current = presetKey;
-      const target = getPieAdaptiveMargin(legendShow, legendAlignment);
-      updateConfig({
-        id,
-        type: "config",
-        payload: [
-          {
-            path: ["chart", "margin", "marginTop"],
-            field: "value",
-            value: target.marginTop,
-          },
-          {
-            path: ["chart", "margin", "marginBottom"],
-            field: "value",
-            value: target.marginBottom,
-          },
-          {
-            path: ["chart", "margin", "marginLeft"],
-            field: "value",
-            value: target.marginLeft,
-          },
-          {
-            path: ["chart", "margin", "marginRight"],
-            field: "value",
-            value: target.marginRight,
-          },
-        ],
-      });
-    }, [id, updateConfig, legendLayoutMode, legendShow, legendAlignment]);
     const [y, setY] = useState(1);
     const radius = (Math.min(chartWidth, chartHeight) / 2) * outerRadius;