gifted-charts-core 0.1.2 → 0.1.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gifted-charts-core",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "description": "Mathematical and logical utilities used by react-gifted-charts and react-native-gifted-charts",
   "main": "./src/index.js",
   "files": [

package/src/LineChart/index.d.ts

@@ -306,7 +306,7 @@ export declare const useLineChart: (props: extendedLineChartPropsType) => {
     addLeadingAndTrailingPathForAreaFill: (initialPath: string, value: number, dataLength: number) => string;
     getNextPoint: (data: lineDataItem[], index: number, around: boolean, before: boolean) => string;
     getStepPath: (data: lineDataItem[], i: number) => string;
-    getSegmentPath: (data: lineDataItem[], i: number, lineSegment: LineSegment[] | undefined, startIndex: number, endIndex: number) => string;
+    getSegmentPath: (data: lineDataItem[], i: number, lineSegment: LineSegment[] | undefined, startIndex: number, endIndex: number, isSecondary?: boolean) => string;
     gradientDirection: string;
     horizSections: {
         value: string;

package/src/LineChart/index.js

@@ -414,11 +414,11 @@ export var useLineChart = function (props) {
             getY(data[i].value) +
             getNextPoint(data, i, around, before));
     };
-    var getSegmentPath = function (data, i, lineSegment, startIndex, endIndex) {
+    var getSegmentPath = function (data, i, lineSegment, startIndex, endIndex, isSecondary) {
         var path = 'L' +
             getX(i) +
             ' ' +
-            getY(data[i].value) +
+            (isSecondary ? getSecondaryY(data[i].value) : getY(data[i].value)) +
             ' ' +
             getSegmentString(lineSegment, i, SEGMENT_START, SEGMENT_END);
         if (highlightedRange) {
@@ -439,7 +439,12 @@ export var useLineChart = function (props) {
                     for (var i = 0; i < set.data.length; i++) {
                         if (i >= ((_b = set.startIndex) !== null && _b !== void 0 ? _b : 0) &&
                             i <= ((_c = set.endIndex) !== null && _c !== void 0 ? _c : set.data.length - 1)) {
-                            pArray.push([getX(i), getY(set.data[i].value)]);
+                            pArray.push([
+                                getX(i),
+                                set.isSecondary
+                                    ? getSecondaryY(set.data[i].value)
+                                    : getY(set.data[i].value)
+                            ]);
                         }
                     }
                     var xx = svgPath(pArray, (_d = set.curveType) !== null && _d !== void 0 ? _d : curveType, (_e = set.curvature) !== null && _e !== void 0 ? _e : curvature);
@@ -468,7 +473,7 @@ export var useLineChart = function (props) {
                                 pp += getStepPath(set.data, i);
                             }
                             else {
-                                pp += getSegmentPath(set.data, i, set.lineSegments, (_l = set.startIndex) !== null && _l !== void 0 ? _l : 0, (_m = set.endIndex) !== null && _m !== void 0 ? _m : set.data.length - 1);
+                                pp += getSegmentPath(set.data, i, set.lineSegments, (_l = set.startIndex) !== null && _l !== void 0 ? _l : 0, (_m = set.endIndex) !== null && _m !== void 0 ? _m : set.data.length - 1, set.isSecondary);
                             }
                         }
                     }

package/src/LineChart/index.ts

@@ -727,13 +727,14 @@ export const useLineChart = (props: extendedLineChartPropsType) => {
     i: number,
     lineSegment: LineSegment[] | undefined,
     startIndex: number,
-    endIndex: number
+    endIndex: number,
+    isSecondary?: boolean
   ): string => {
     let path =
       'L' +
       getX(i) +
       ' ' +
-      getY(data[i].value) +
+      (isSecondary ? getSecondaryY(data[i].value) : getY(data[i].value)) +
       ' ' +
       getSegmentString(lineSegment, i, SEGMENT_START, SEGMENT_END)
 
@@ -764,7 +765,12 @@ export const useLineChart = (props: extendedLineChartPropsType) => {
               i >= (set.startIndex ?? 0) &&
               i <= (set.endIndex ?? set.data.length - 1)
             ) {
-              pArray.push([getX(i), getY(set.data[i].value)])
+              pArray.push([
+                getX(i),
+                set.isSecondary
+                  ? getSecondaryY(set.data[i].value)
+                  : getY(set.data[i].value)
+              ])
             }
           }
           let xx = svgPath(
@@ -825,7 +831,8 @@ export const useLineChart = (props: extendedLineChartPropsType) => {
                   i,
                   set.lineSegments,
                   set.startIndex ?? 0,
-                  set.endIndex ?? set.data.length - 1
+                  set.endIndex ?? set.data.length - 1,
+                  set.isSecondary
                 )
               }
             }

package/src/PieChart/pro.js

@@ -34,9 +34,9 @@ export var usePiePro = function (props) {
     var heightFactor = semiCircle ? 1 : 2;
     var height = radius + maxStrokeWidth;
     var svgProps = {
-        height: (radius + maxStrokeWidth) * 2,
-        width: (radius + maxStrokeWidth) * 2,
-        viewBox: "".concat(-maxStrokeWidth, " ").concat(-maxStrokeWidth - (semiCircle ? height / 2 : 0), " ").concat((radius + maxStrokeWidth) * 2, " ").concat((radius + maxStrokeWidth) * 2)
+        height: height * 2,
+        width: height * 2,
+        viewBox: "".concat(-maxStrokeWidth * 1.5, " ").concat(-maxStrokeWidth - (semiCircle ? height / 2 : 0), " ").concat(height * 2, " ").concat(height * 2)
     };
     //   let endAngleLocal = 0
     var addValues = function (index) {

package/src/PieChart/pro.ts

@@ -57,11 +57,11 @@ export const usePiePro = (props: PieChartPropsType): IusePiePro => {
   const height = radius + maxStrokeWidth
 
   const svgProps = {
-    height: (radius + maxStrokeWidth) * 2,
-    width: (radius + maxStrokeWidth) * 2,
-    viewBox: `${-maxStrokeWidth} ${
+    height: height * 2,
+    width: height * 2,
+    viewBox: `${-maxStrokeWidth * 1.5} ${
       -maxStrokeWidth - (semiCircle ? height / 2 : 0)
-    } ${(radius + maxStrokeWidth) * 2} ${(radius + maxStrokeWidth) * 2}`
+    } ${height * 2} ${height * 2}`
   }
 
   //   let endAngleLocal = 0

package/src/utils/types.d.ts

@@ -334,5 +334,6 @@ export interface DataSet {
     curvature?: number;
     curveType?: CurveType;
     lineSegments?: LineSegment[];
+    isSecondary?: boolean;
 }
 export {};

package/src/utils/types.ts

@@ -371,4 +371,5 @@ export interface DataSet {
   curvature?: number
   curveType?: CurveType
   lineSegments?: LineSegment[]
+  isSecondary?: boolean
 }