@easyv/charts - npm Package Compare versions

Comparing version 1.0.28 to 1.0.29

lib/components/PieChart.js

@@ -158,3 +158,5 @@ "use strict";
       percent = _ref3.percent,
-      color = _ref3.series.color;
+      _ref3$series = _ref3.series,
+      seriesColor = _ref3$series.color,
+      icon = _ref3$series.icon;
   var _ref4$name = _ref4.name,
@@ -180,9 +182,11 @@ showName = _ref4$name.show,
       percentGap = _ref4$percent.gap;
+  var seriesColorType = seriesColor.type,
+      pure = seriesColor.pure,
+      stops = seriesColor.linear.stops; // const _icon = getIcon(type, { background: getColor(seriesColor) });
 
-  var _icon = (0, _utils.getIcon)(type, {
-    background: (0, _utils2.getColor)(color)
-  });
+  var _color = seriesColorType == 'pure' ? pure : stops[0].color;
 
+  console.log(icon);
   return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement("span", {
-    style: _icon
+    style: icon
   }), /*#__PURE__*/_react["default"].createElement("span", {
@@ -198,3 +202,3 @@ className: showName && showValue && showPercent ? _indexModule["default"].showAllStyle : _indexModule["default"].notShowAllStyle
       display: 'flex',
-      color: valueSameColor ? color : valueFont.color,
+      color: valueSameColor ? _color : valueFont.color,
       alignItems: 'center',
@@ -211,3 +215,3 @@ justifyContent: 'flex-start'
       paddingLeft: percentGap,
-      color: percentSameColor ? color : valueFont.color
+      color: percentSameColor ? _color : valueFont.color
     })
@@ -214,0 +218,0 @@ }, percent + '%')));

package.json

 {
   "name": "@easyv/charts",
-  "version": "1.0.28",
+  "version": "1.0.29",
   "description": "",
@@ -5,0 +5,0 @@ "main": "lib/index.js",

src/components/PieChart.js

@@ -123,3 +123,3 @@ /**
 const legendFormatter = (
-  { type, displayName, value, percent, series: { color } },
+  { displayName, value, percent, series: { color: seriesColor, icon } },
   {
@@ -147,6 +147,12 @@ name: { show: showName, font: nameFont },
 ) => {
-  const _icon = getIcon(type, { background: getColor(color) });
+  const {
+    type: seriesColorType,
+    pure,
+    linear: { stops },
+  } = seriesColor;
+
+  const _color = seriesColorType == 'pure' ? pure : stops[0].color;
   return (
     <>
-      <span style={_icon} />
+      <span style={icon} />
       <span
@@ -170,3 +176,3 @@ className={
               display: 'flex',
-              color: valueSameColor ? color : valueFont.color,
+              color: valueSameColor ? _color : valueFont.color,
               alignItems: 'center',
@@ -194,3 +200,3 @@ justifyContent: 'flex-start',
               paddingLeft: percentGap,
-              color: percentSameColor ? color : valueFont.color,
+              color: percentSameColor ? _color : valueFont.color,
             }}
@@ -197,0 +203,0 @@ >

No alert changes

Improved metrics

Total package byte prevSize

309369

increased by0.12%

Lines of code

9115

increased by0.1%

No dependency changes