@evergis/charts 2.0.91 → 2.0.92

package/dist/charts/BubbleChart/types.d.ts

@@ -42,11 +42,10 @@ export declare type BubbleChartProps = {
     maxYValue?: number;
     drawGridY?: boolean;
     drawGridX?: boolean;
-    xScaleLog?: boolean;
+    scaleLog?: boolean;
     xScaleItemWidth?: number;
     bubbleStyle?: string;
     customize?: (props: BubbleChartCustomizeProps) => void;
-    yScaleLog?: boolean;
     yScaleLabel?: string;
     yScaleLabelPadding?: number;
     enableTooltip?: boolean;

package/dist/charts.cjs.development.js

@@ -3395,11 +3395,10 @@ const draw$5 = (node, props) => {
     maxYValue,
     drawGridY,
     drawGridX,
-    xScaleLog,
+    scaleLog,
     xScaleItemWidth,
     bubbleStyle,
     customize,
-    yScaleLog,
     yScaleLabel,
     yScaleLabelPadding,
     enableTooltip,
@@ -3432,19 +3431,29 @@ const draw$5 = (node, props) => {
       return yValue;
     });
     const svg = appendSvg(node, width, height || 0);
-    const sizeScale = d3.scaleLinear().domain([d3.min(data, _ref3 => {
+    const sizeScale = scaleLog ? d3.scaleLog().domain([d3.min(data, _ref3 => {
       let {
         sizeValue
       } = _ref3;
       return sizeValue;
-    }), d3.max(data, _ref4 => {
+    }) || 0.1, d3.max(data, _ref4 => {
       let {
         sizeValue
       } = _ref4;
       return sizeValue;
+    }) || 0.1]).range([minSize || bubbleChartDefaultProps.minSize || 0.1, maxSize || bubbleChartDefaultProps.maxSize || 0.1]) : d3.scaleLinear().domain([d3.min(data, _ref5 => {
+      let {
+        sizeValue
+      } = _ref5;
+      return sizeValue;
+    }), d3.max(data, _ref6 => {
+      let {
+        sizeValue
+      } = _ref6;
+      return sizeValue;
     })]).range([minSize || bubbleChartDefaultProps.minSize, maxSize || bubbleChartDefaultProps.maxSize]);
     const yRange1 = height - marginTop - marginBottom - (xAxisPadding || 0);
-    const yScale = yScaleLog ? d3.scaleLog().domain([minY, maxY]).range([yRange1, marginTop]).nice() : d3.scaleLinear().domain([minY, maxY]).range([yRange1, marginTop]).nice();
+    const yScale = scaleLog ? d3.scaleLog().domain([minY || 0.1, maxY || 0.1]).range([yRange1 || 0.1, marginTop || 0.1]).nice() : d3.scaleLinear().domain([minY, maxY]).range([yRange1, marginTop]).nice();
     customYScale && customYScale(yScale);
     const yTicks = yScale.ticks();
     const yAxisLeft = d3.axisLeft(yScale).ticks(yTicksCountDefault);
@@ -3469,28 +3478,27 @@ const draw$5 = (node, props) => {
     const {
       width: yAxisWidth
     } = computeDimensions(yAxis);
-    const range = [marginLeft + yAxisWidth + (yAxisPadding || 0) + yScaleLabelHeight, width - marginRight];
-    const xScale = xScaleLog ? d3.scaleLog().domain([d3.min(data, _ref5 => {
+    const xScale = scaleLog ? d3.scaleLog().domain([d3.min(data, _ref7 => {
       let {
         xValue
-      } = _ref5;
+      } = _ref7;
       return xValue;
-    }), d3.max(data, _ref6 => {
+    }) || 0.1, d3.max(data, _ref8 => {
       let {
         xValue
-      } = _ref6;
+      } = _ref8;
       return xValue;
-    })]).range(range) : d3.scaleLinear().domain([d3.min(data, _ref7 => {
+    }) || 0.1]).range([marginLeft + yAxisWidth + (yAxisPadding || 0) + yScaleLabelHeight || 0.1, width - marginRight || 0.1]) : d3.scaleLinear().domain([d3.min(data, _ref9 => {
       let {
         xValue
-      } = _ref7;
+      } = _ref9;
       return xValue;
-    }), d3.max(data, _ref8 => {
+    }), d3.max(data, _ref10 => {
       let {
         xValue
-      } = _ref8;
+      } = _ref10;
       return xValue;
-    })]).range(range);
+    })]).range([marginLeft + yAxisWidth + (yAxisPadding || 0) + yScaleLabelHeight, width - marginRight]);
     customXScale && customXScale(xScale);
     const xAxisBottom = d3.axisBottom(xScale);
 
@@ -3512,35 +3520,35 @@ const draw$5 = (node, props) => {
       drawGridX
     });
     xAxis.attr('transform', "translate(0, " + (yScale(yTicks[0]) + (xAxisPadding || 0)) + ")");
-    const bubbles = svg.append('g').selectAll('dot').data(data).enter().append('circle').attr('class', bubbleChartClassNames.bubbleChartCircle).attr('cx', _ref9 => {
+    const bubbles = svg.append('g').selectAll('dot').data(data).enter().append('circle').attr('class', bubbleChartClassNames.bubbleChartCircle).attr('cx', _ref11 => {
       let {
         xValue
-      } = _ref9;
+      } = _ref11;
       return xScale(xValue);
-    }).attr('cy', _ref10 => {
+    }).attr('cy', _ref12 => {
       let {
         yValue
-      } = _ref10;
+      } = _ref12;
       return yScale(yValue);
-    }).attr('r', _ref11 => {
+    }).attr('r', _ref13 => {
       let {
         sizeValue
-      } = _ref11;
+      } = _ref13;
       return sizeScale(sizeValue) / 2;
-    }).attr('fill', _ref12 => {
+    }).attr('fill', _ref14 => {
       let {
         color
-      } = _ref12;
+      } = _ref14;
       return color || 'rgba(0, 176, 113, 0.6)';
-    }).attr('stroke', _ref13 => {
+    }).attr('stroke', _ref15 => {
       let {
         stroke
-      } = _ref13;
+      } = _ref15;
       return stroke || 'transparent';
-    }).attr('style', _ref14 => {
+    }).attr('style', _ref16 => {
       let {
         style
-      } = _ref14;
+      } = _ref16;
       return style || bubbleStyle || '';
     });