gifted-charts-core 0.0.20 → 0.0.22

package/index.ts

@@ -38,7 +38,11 @@ export {
 
 export { usePieChart } from "./src/PieChart";
 export { getPieChartMainProps } from "./src/PieChart/main";
-export { PieChartPropsType, pieDataItem, PieChartMainProps } from "./src/PieChart/types";
+export {
+  PieChartPropsType,
+  pieDataItem,
+  PieChartMainProps,
+} from "./src/PieChart/types";
 
 /***********************************************************************************************************************/
 /************************************          Population Pyramid Chart             ************************************/
@@ -90,6 +94,7 @@ export {
   getYForLineInBar,
   clone,
   getLineConfigForBarChart,
+  adjustToOffset,
 } from "./src/utils";
 
 export {

package/package.json

@@ -1,19 +1,27 @@
 {
   "name": "gifted-charts-core",
-  "version": "0.0.20",
+  "version": "0.0.22",
   "description": "Mathematical and logical utilities used by react-gifted-charts and react-native-gifted-charts",
   "main": "index.ts",
   "files": [
     "src"
   ],
   "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
+    "test": "echo \"Error: no test specified\" && exit 1",
+    "lint": "eslint src/**/*.ts"
   },
-  "dependencies": {},
   "devDependencies": {
     "@testing-library/jest-dom": "^5.17.0",
     "@testing-library/react": "^13.4.0",
-    "@testing-library/user-event": "^13.5.0"
+    "@testing-library/user-event": "^13.5.0",
+    "@typescript-eslint/eslint-plugin": "^6.21.0",
+    "eslint": "^8.56.0",
+    "eslint-config-standard-with-typescript": "^43.0.1",
+    "eslint-plugin-import": "^2.29.1",
+    "eslint-plugin-n": "^16.6.2",
+    "eslint-plugin-promise": "^6.1.1",
+    "eslint-plugin-react": "^7.33.2",
+    "typescript": "^5.3.3"
   },
   "peerDependencies": {
     "react": "*",

package/src/BarChart/Animated2DWithGradient.ts

@@ -1,8 +1,41 @@
-import { ViewStyle } from "react-native";
-import { getBarFrontColor, getBarWidth } from "../utils";
-import { CommonPropsFor2Dand3DbarsType } from "./types";
+import { type ColorValue, type ViewStyle } from 'react-native'
+import { getBarFrontColor, getBarWidth } from '../utils'
+import {
+  type FocusedBarConfig,
+  type BarChartPropsType,
+  type CommonPropsFor2Dand3DbarsType,
+  type barDataItem,
+  type stackDataItem
+} from './types'
+import { type ReactNode } from 'react'
 
-export const getPropsForAnimated2DWithGradient = (props) => {
+interface Animated2dWithFradientPropsType extends BarChartPropsType {
+  item: barDataItem
+  index: number
+  barHeight: number
+  selectedIndex: number
+  barBackgroundPattern: () => ReactNode
+  barInnerComponent: (
+    item?: stackDataItem | barDataItem,
+    index?: number
+  ) => ReactNode
+  patternId: string
+  barStyle: object
+  intactTopLabel: boolean
+}
+
+interface IgetPropsForAnimated2DWithGradientReturnType {
+  commonStyleForBar: ViewStyle[]
+  barStyleWithBackground: ViewStyle[]
+  commonPropsFor2Dand3Dbars: CommonPropsFor2Dand3DbarsType
+  isFocused?: boolean
+  focusedBarConfig?: FocusedBarConfig
+  localFrontColor: ColorValue
+}
+
+export const getPropsForAnimated2DWithGradient = (
+  props: Animated2dWithFradientPropsType
+): IgetPropsForAnimated2DWithGradientReturnType => {
   const {
     barBorderWidth,
     barBorderColor,
@@ -34,36 +67,37 @@ export const getPropsForAnimated2DWithGradient = (props) => {
     selectedIndex,
     focusBarOnPress,
     focusedBarConfig,
-    isThreeD,
-  } = props;
+    isThreeD
+  } = props
 
-  const isFocused = focusBarOnPress && selectedIndex === index;
+  const isFocused = (focusBarOnPress ?? false) && selectedIndex === index
   const itemOrPropsBarBorderRadius =
-    item.barBorderRadius ?? barBorderRadius ?? 0;
-  const localBarBorderRadius = isFocused
-    ? focusedBarConfig?.borderRadius ?? itemOrPropsBarBorderRadius
-    : itemOrPropsBarBorderRadius;
+    item.barBorderRadius ?? barBorderRadius ?? 0
+  const localBarBorderRadius =
+    isFocused ?? false
+      ? focusedBarConfig?.borderRadius ?? itemOrPropsBarBorderRadius
+      : itemOrPropsBarBorderRadius
   const localBarWidth = getBarWidth(
     isFocused,
     focusedBarConfig,
     item.barWidth,
     barWidth
-  );
+  )
   const localFrontColor = getBarFrontColor(
     isFocused,
     focusedBarConfig,
     item.frontColor,
     frontColor,
     isThreeD
-  );
-  const localGradientColor = item.gradientColor || gradientColor;
-  const localOpacity = opacity || 1;
+  )
+  const localGradientColor = item.gradientColor ?? gradientColor
+  const localOpacity = opacity ?? 1
 
   const commonStyleForBar: ViewStyle[] = [
     {
-      position: "absolute",
-      width: "100%",
-      height: "100%",
+      position: 'absolute',
+      width: '100%',
+      height: '100%',
       borderWidth: barBorderWidth ?? 0,
       borderColor: barBorderColor,
       borderRadius: localBarBorderRadius,
@@ -82,52 +116,52 @@ export const getPropsForAnimated2DWithGradient = (props) => {
       borderBottomRightRadius:
         item.barBorderBottomRightRadius ??
         barBorderBottomRightRadius ??
-        localBarBorderRadius,
-    },
-  ];
+        localBarBorderRadius
+    }
+  ]
 
-  if (roundedBottom || (isFocused && focusedBarConfig?.roundedBottom)) {
+  if (roundedBottom ?? (isFocused && focusedBarConfig?.roundedBottom) ?? false) {
     commonStyleForBar.push({
       borderBottomLeftRadius: localBarWidth / 2,
-      borderBottomRightRadius: localBarWidth / 2,
-    });
+      borderBottomRightRadius: localBarWidth / 2
+    })
   }
 
-  if (cappedBars) {
+  if (cappedBars ?? false) {
     commonStyleForBar.push({
       borderTopLeftRadius:
-        item.capRadius === 0 ? 0 : item.capRadius || capRadius || 0,
+        item.capRadius === 0 ? 0 : item.capRadius ?? capRadius ?? 0,
       borderTopRightRadius:
-        item.capRadius === 0 ? 0 : item.capRadius || capRadius || 0,
-    });
+        item.capRadius === 0 ? 0 : item.capRadius ?? capRadius ?? 0
+    })
   }
 
-  if (roundedTop || (isFocused && focusedBarConfig?.roundedTop)) {
+  if (roundedTop ?? (isFocused && focusedBarConfig?.roundedTop) ?? false) {
     commonStyleForBar.push({
       borderTopLeftRadius: localBarWidth / 2,
-      borderTopRightRadius: localBarWidth / 2,
-    });
+      borderTopRightRadius: localBarWidth / 2
+    })
   }
   const barStyleWithBackground: ViewStyle[] = [
     ...commonStyleForBar,
     {
-      backgroundColor: localFrontColor,
-    },
-  ];
+      backgroundColor: localFrontColor
+    }
+  ]
 
   const commonPropsFor2Dand3Dbars: CommonPropsFor2Dand3DbarsType = {
-    barBackgroundPattern: item.barBackgroundPattern || barBackgroundPattern,
+    barBackgroundPattern: item.barBackgroundPattern ?? barBackgroundPattern,
     barInnerComponent: isFocused
       ? focusedBarConfig?.barInnerComponent ?? barInnerComponent
       : barInnerComponent,
-    patternId: item.patternId || patternId,
+    patternId: item.patternId ?? patternId,
     barWidth: localBarWidth,
-    barStyle: barStyle,
-    item: item,
-    index: index,
+    barStyle,
+    item,
+    index,
 
     frontColor: localFrontColor,
-    showGradient: item.showGradient || showGradient || false,
+    showGradient: item.showGradient ?? showGradient ?? false,
     gradientColor: isFocused
       ? focusedBarConfig?.gradientColor ?? localGradientColor
       : localGradientColor,
@@ -136,10 +170,10 @@ export const getPropsForAnimated2DWithGradient = (props) => {
       : localOpacity,
     height: barHeight,
     intactTopLabel,
-    showValuesAsTopLabel: !!showValuesAsTopLabel,
+    showValuesAsTopLabel: (showValuesAsTopLabel ?? false),
     topLabelContainerStyle,
-    topLabelTextStyle,
-  };
+    topLabelTextStyle
+  }
 
   return {
     commonStyleForBar,
@@ -147,6 +181,6 @@ export const getPropsForAnimated2DWithGradient = (props) => {
     commonPropsFor2Dand3Dbars,
     isFocused,
     focusedBarConfig,
-    localFrontColor,
-  };
-};
+    localFrontColor
+  }
+}

package/src/BarChart/RenderStackBars.ts

@@ -1,5 +1,5 @@
-import { useState } from "react";
-import { StackedBarChartPropsType, stackDataItem } from "./types";
+import { useState } from 'react'
+import { type StackedBarChartPropsType, type stackDataItem } from './types'
 
 export const useRenderStackBars = (props: StackedBarChartPropsType) => {
   const {
@@ -10,45 +10,45 @@ export const useRenderStackBars = (props: StackedBarChartPropsType) => {
     propSpacing,
     initialSpacing,
     stackData,
-    isAnimated,
-  } = props;
-  const cotainsNegative = item.stacks.some((item) => item.value < 0);
-  const noAnimation = cotainsNegative || !isAnimated;
+    isAnimated
+  } = props
+  const cotainsNegative = item.stacks.some((item) => item.value < 0)
+  const noAnimation = cotainsNegative || !isAnimated
 
   const localBarInnerComponent =
-    item.barInnerComponent ?? props.barInnerComponent;
+    item.barInnerComponent ?? props.barInnerComponent
 
   const {
     borderRadius,
     borderTopLeftRadius,
     borderTopRightRadius,
     borderBottomLeftRadius,
-    borderBottomRightRadius,
-  } = item;
+    borderBottomRightRadius
+  } = item
 
-  let leftSpacing = initialSpacing;
+  let leftSpacing = initialSpacing
   for (let i = 0; i < index; i++) {
     leftSpacing +=
       (stackData[i].spacing ?? propSpacing ?? 0) +
-      (stackData[i].stacks[0].barWidth ?? props.barWidth ?? 30);
+      (stackData[i].stacks[0].barWidth ?? props.barWidth ?? 30)
   }
-  const disablePress = props.disablePress || false;
+  const disablePress = props.disablePress ?? false
 
   const totalHeight = props.item.stacks.reduce(
     (acc, stack) =>
       acc +
-      (Math.abs(stack.value) * (containerHeight || 200)) / (maxValue || 200),
+      (Math.abs(stack.value) * (containerHeight ?? 200)) / (maxValue || 200),
     0
-  );
+  )
 
-  const [height, setHeight] = useState(noAnimation ? totalHeight : 1);
+  const [height, setHeight] = useState(noAnimation ? totalHeight : 1)
 
-  const getBarHeight = (value: number, marginBottom?: number) => {
+  const getBarHeight = (value: number, marginBottom?: number): number => {
     return (
-      (Math.abs(value) * (containerHeight || 200)) / (maxValue || 200) -
-      (marginBottom || 0)
-    );
-  };
+      (Math.abs(value) * (containerHeight ?? 200)) / (maxValue || 200) -
+      (marginBottom ?? 0)
+    )
+  }
 
   const getPosition = (index: number) => {
     /* Returns bottom position for stack item
@@ -56,37 +56,37 @@ export const useRenderStackBars = (props: StackedBarChartPropsType) => {
     const height = getBarHeight(
       item.stacks[index].value,
       item.stacks[index].marginBottom
-    );
+    )
 
-    const itemValue = item.stacks[index].value;
-    const isNegative = itemValue <= 0;
-    let position = isNegative ? -(height || 0) : 0;
+    const itemValue = item.stacks[index].value
+    const isNegative = itemValue <= 0
+    let position = isNegative ? -(height || 0) : 0
 
     for (let i = 0; i < index; i++) {
-      const valueOnIndex = item.stacks[i].value;
+      const valueOnIndex = item.stacks[i].value
       if (isNegative && valueOnIndex <= 0) {
         position +=
-          (valueOnIndex * (containerHeight || 200)) / (maxValue || 200);
+          (valueOnIndex * (containerHeight ?? 200)) / (maxValue || 200)
       } else if (!isNegative && valueOnIndex >= 0) {
         position +=
-          (valueOnIndex * (containerHeight || 200)) / (maxValue || 200);
+          (valueOnIndex * (containerHeight ?? 200)) / (maxValue || 200)
       }
     }
-    return position;
-  };
+    return position
+  }
 
-  const getLowestPosition = () => {
+  const getLowestPosition = (): number => {
     return (
       item.stacks
         .map((_, index) => getPosition(index))
         .sort((a, b) => a - b)?.[0] || 0
-    );
-  };
+    )
+  }
 
-  const lowestBarPosition = getLowestPosition();
+  const lowestBarPosition = getLowestPosition()
 
   const getStackBorderRadii = (item: stackDataItem, index: number) => {
-    const stackItem = item.stacks[index];
+    const stackItem = item.stacks[index]
     const borderRadii = {
       borderTopLeftRadius:
         stackItem.borderTopLeftRadius ??
@@ -111,10 +111,10 @@ export const useRenderStackBars = (props: StackedBarChartPropsType) => {
         stackItem.borderRadius ??
         props.barBorderBottomRightRadius ??
         props.barBorderRadius ??
-        0,
-    };
-    return borderRadii;
-  };
+        0
+    }
+    return borderRadii
+  }
 
   return {
     cotainsNegative,
@@ -134,6 +134,6 @@ export const useRenderStackBars = (props: StackedBarChartPropsType) => {
     getPosition,
     getLowestPosition,
     lowestBarPosition,
-    getStackBorderRadii,
-  };
-};
+    getStackBorderRadii
+  }
+}