gifted-charts-core 0.0.22 → 0.0.23

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gifted-charts-core",
-  "version": "0.0.22",
+  "version": "0.0.23",
   "description": "Mathematical and logical utilities used by react-gifted-charts and react-native-gifted-charts",
   "main": "index.ts",
   "files": [

package/src/BarChart/index.ts

@@ -36,7 +36,7 @@ export interface extendedBarChartPropsType extends BarChartPropsType {
   widthValue: Animated.Value
   opacValue: Animated.Value
   verticalLinesUptoDataPoint?: boolean
-  secondaryYAxis?: secondaryYAxisType
+  secondaryYAxis?: secondaryYAxisType | boolean
 }
 
 export const useBarChart = (props: extendedBarChartPropsType) => {
@@ -116,8 +116,9 @@ export const useBarChart = (props: extendedBarChartPropsType) => {
   )
   const containerHeight =
     heightFromProps ??
-    (props.stepHeight ?? 0) * noOfSections ??
-    AxesAndRulesDefaults.containerHeight
+    (props.stepHeight
+      ? props.stepHeight * noOfSections
+      : AxesAndRulesDefaults.containerHeight)
   const horizSections = [{ value: '0' }]
   const stepHeight = props.stepHeight ?? containerHeight / noOfSections
   const labelWidth = props.labelWidth ?? AxesAndRulesDefaults.labelWidth
@@ -276,8 +277,7 @@ export const useBarChart = (props: extendedBarChartPropsType) => {
       ? false
       : defaultPointerConfig.showPointerStrip
   const pointerStripHeight =
-    pointerConfig?.pointerStripHeight ??
-    defaultPointerConfig.pointerStripHeight
+    pointerConfig?.pointerStripHeight ?? defaultPointerConfig.pointerStripHeight
   const pointerStripWidth =
     pointerConfig?.pointerStripWidth ?? defaultPointerConfig.pointerStripWidth
   const pointerStripColor =
@@ -291,22 +291,18 @@ export const useBarChart = (props: extendedBarChartPropsType) => {
   const stripOverPointer =
     pointerConfig?.stripOverPointer ?? defaultPointerConfig.stripOverPointer
   const shiftPointerLabelX =
-    pointerConfig?.shiftPointerLabelX ??
-    defaultPointerConfig.shiftPointerLabelX
+    pointerConfig?.shiftPointerLabelX ?? defaultPointerConfig.shiftPointerLabelX
   const shiftPointerLabelY =
-    pointerConfig?.shiftPointerLabelY ??
-    defaultPointerConfig.shiftPointerLabelY
+    pointerConfig?.shiftPointerLabelY ?? defaultPointerConfig.shiftPointerLabelY
   const pointerLabelWidth =
     pointerConfig?.pointerLabelWidth ?? defaultPointerConfig.pointerLabelWidth
   const pointerLabelHeight =
-    pointerConfig?.pointerLabelHeight ??
-    defaultPointerConfig.pointerLabelHeight
+    pointerConfig?.pointerLabelHeight ?? defaultPointerConfig.pointerLabelHeight
   const autoAdjustPointerLabelPosition =
     pointerConfig?.autoAdjustPointerLabelPosition ??
     defaultPointerConfig.autoAdjustPointerLabelPosition
   const pointerVanishDelay =
-    pointerConfig?.pointerVanishDelay ??
-    defaultPointerConfig.pointerVanishDelay
+    pointerConfig?.pointerVanishDelay ?? defaultPointerConfig.pointerVanishDelay
   const activatePointersOnLongPress =
     pointerConfig?.activatePointersOnLongPress ??
     defaultPointerConfig.activatePointersOnLongPress
@@ -347,17 +343,22 @@ export const useBarChart = (props: extendedBarChartPropsType) => {
         (props.stackData ?? data)?.[0].barWidth ?? props.barWidth ?? 30
       if (!lineConfig.curved) {
         for (let i = 0; i < lineData.length; i++) {
-          if (i < (lineConfig.startIndex ?? 0) || i > (lineConfig.endIndex ?? 0)) continue
+          if (
+            i < (lineConfig.startIndex ?? 0) ||
+            i > (lineConfig.endIndex ?? 0)
+          ) {
+            continue
+          }
           const currentBarWidth =
             data?.[i]?.barWidth ?? props.barWidth ?? BarDefaults.barWidth
           const currentValue = props.lineData
             ? props.lineData[i].value
             : props.stackData
-              ? props.stackData[i].stacks.reduce(
+            ? props.stackData[i].stacks.reduce(
                 (total, item) => total + item.value,
                 0
               )
-              : data[i].value
+            : data[i].value
           pp +=
             'L' +
             getXForLineInBar(
@@ -402,17 +403,22 @@ export const useBarChart = (props: extendedBarChartPropsType) => {
       } else {
         const p1Array: number[][] = []
         for (let i = 0; i < lineData.length; i++) {
-          if (i < (lineConfig.startIndex ?? 0) || i > (lineConfig.endIndex ?? 0)) continue
+          if (
+            i < (lineConfig.startIndex ?? 0) ||
+            i > (lineConfig.endIndex ?? 0)
+          ) {
+            continue
+          }
           const currentBarWidth =
             data?.[i]?.barWidth ?? props.barWidth ?? BarDefaults.barWidth
           const currentValue = props.lineData
             ? props.lineData[i].value
             : props.stackData
-              ? props.stackData[i].stacks.reduce(
+            ? props.stackData[i].stacks.reduce(
                 (total, item) => total + item.value,
                 0
               )
-              : data[i].value
+            : data[i].value
           p1Array.push([
             getXForLineInBar(
               i,
@@ -440,7 +446,10 @@ export const useBarChart = (props: extendedBarChartPropsType) => {
       if (lineData2?.length) {
         if (!lineConfig2?.curved) {
           for (let i = 0; i < lineData2.length; i++) {
-            if (i < (lineConfig2.startIndex ?? 0) || i > (lineConfig2.endIndex ?? 0)) {
+            if (
+              i < (lineConfig2.startIndex ?? 0) ||
+              i > (lineConfig2.endIndex ?? 0)
+            ) {
               continue
             }
             const currentBarWidth =
@@ -469,7 +478,10 @@ export const useBarChart = (props: extendedBarChartPropsType) => {
         } else {
           const p2Array: number[][] = []
           for (let i = 0; i < lineData2.length; i++) {
-            if (i < (lineConfig2.startIndex ?? 0) || i > (lineConfig2.endIndex ?? 0)) {
+            if (
+              i < (lineConfig2.startIndex ?? 0) ||
+              i > (lineConfig2.endIndex ?? 0)
+            ) {
               continue
             }
             const currentBarWidth =

package/src/BarChart/types.ts

@@ -46,7 +46,7 @@ export interface stackDataItem {
     barWidth?: number
     innerBarComponent?: Function
   }>
-  barBackgroundPattern?: Function
+  barBackgroundPattern?: () => ReactNode
   borderRadius?: number
   borderTopLeftRadius?: number
   borderTopRightRadius?: number
@@ -106,7 +106,7 @@ export interface StackedBarChartPropsType {
   stackBorderBottomLeftRadius?: number
   stackBorderBottomRightRadius?: number
   xAxisThickness: number
-  barBackgroundPattern?: Function
+  barBackgroundPattern?: () => ReactNode
   patternId?: string
   xAxisTextNumberOfLines: number
   xAxisLabelsHeight?: number
@@ -279,7 +279,7 @@ export interface BarChartPropsType {
   scrollAnimation?: boolean
   scrollEventThrottle?: number
   labelsExtraHeight?: number
-  barBackgroundPattern?: Function
+  barBackgroundPattern?: () => ReactNode
   patternId?: string
   barMarginBottom?: number
   onPress?: Function
@@ -423,7 +423,7 @@ export interface barDataItem {
   topLabelComponentHeight?: number
   spacing?: number
   labelWidth?: number
-  barBackgroundPattern?: Function
+  barBackgroundPattern?: () => ReactNode
   patternId?: string
   barMarginBottom?: number
   leftShiftForTooltip?: number
@@ -464,7 +464,7 @@ export interface Animated2DWithGradientPropsType {
   barBorderBottomRightRadius?: number
   containerHeight?: number
   maxValue?: number
-  barBackgroundPattern?: Function
+  barBackgroundPattern?: () => ReactNode
   patternId?: string
   barMarginBottom?: number
   barStyle?: object
@@ -534,7 +534,7 @@ export interface RenderBarsPropsType {
   barBorderBottomRightRadius?: number
   barInnerComponent?: (item?: barDataItem, index?: number) => ReactNode
   autoShiftLabels?: boolean
-  barBackgroundPattern?: Function
+  barBackgroundPattern?: () => ReactNode
   patternId?: string
   barMarginBottom?: number
   onPress?: Function
@@ -580,7 +580,7 @@ export interface animatedBarPropTypes {
   showValuesAsTopLabel: boolean
   topLabelContainerStyle?: any
   topLabelTextStyle?: any
-  barBackgroundPattern?: Function
+  barBackgroundPattern?: () => ReactNode
   barInnerComponent?: (item?: barDataItem, index?: number) => ReactNode
   patternId?: string
   barStyle?: object
@@ -592,7 +592,7 @@ export interface animatedBarPropTypes {
 }
 
 export interface CommonPropsFor2Dand3DbarsType {
-  barBackgroundPattern: Function
+  barBackgroundPattern: () => ReactNode
   barInnerComponent: (item?: barDataItem, index?: number) => ReactNode
   patternId: string
   barWidth: number

package/src/utils/index.ts

@@ -18,8 +18,7 @@ import {
   CurveType,
   type HighlightedRange,
   type LineProperties,
-  type LineSegment,
-  type secondaryYAxisType
+  type LineSegment
 } from './types'
 import {
   type lineConfigType,
@@ -237,8 +236,8 @@ export const getPreviousSegmentsLastPoint = (
   const prevSegmentLastPoint = isCurved
     ? previousSegment.substring(previousSegment.trim().lastIndexOf(' '))
     : previousSegment
-      .substring(previousSegment.lastIndexOf('L'))
-      .replace('L', 'M')
+        .substring(previousSegment.lastIndexOf('L'))
+        .replace('L', 'M')
 
   return (
     (prevSegmentLastPoint.trim()[0] === 'M' ? '' : 'M') + prevSegmentLastPoint
@@ -264,8 +263,8 @@ export const getPathWithHighlight = (
       data[i + 1].value < from
         ? loc.DOWN
         : data[i + 1].value > to
-          ? loc.UP
-          : loc.IN
+        ? loc.UP
+        : loc.IN
     if (
       currentPointRegion !== nextPointRegion ||
       (i === startIndex && currentPointRegion === loc.IN)
@@ -499,7 +498,6 @@ export const getSegmentedPathObjects = (
   strokeDashArray: number[],
   isCurved: boolean,
   startDelimeter: string,
-  stop: string,
   endDelimeter: string
 ): LineProperties[] => {
   const ar: [LineProperties] = [{ d: '', color: '', strokeWidth: 0 }]
@@ -661,7 +659,6 @@ export const getArrowPoints = (
 
 interface IgetAxesAndRulesProps extends BarChartPropsType {
   verticalLinesUptoDataPoint?: boolean
-  secondaryYAxis?: secondaryYAxisType
 }
 
 export const getAxesAndRulesProps = (
@@ -669,6 +666,10 @@ export const getAxesAndRulesProps = (
   stepValue: number,
   maxValue?: number
 ): IgetAxesAndRulesProps => {
+  const secondaryYAxis =
+    !props.secondaryYAxis || props.secondaryYAxis === true
+      ? {}
+      : props.secondaryYAxis
   const axesAndRulesProps = {
     yAxisSide: props.yAxisSide,
     yAxisLabelContainerStyle: props.yAxisLabelContainerStyle,
@@ -738,7 +739,7 @@ export const getAxesAndRulesProps = (
     (props.secondaryYAxis ?? props.lineConfig?.isSecondary) &&
     maxValue !== undefined
   ) {
-    axesAndRulesProps.secondaryYAxis = { ...props.secondaryYAxis, maxValue }
+    axesAndRulesProps.secondaryYAxis = { ...secondaryYAxis, maxValue }
   }
 
   return axesAndRulesProps
@@ -1357,8 +1358,8 @@ export const getInterpolatedData = (
     //    3. Only post has valid value
     //    4. None has valid value -> this is already handled in preprocessing
 
-    const pre = data.slice(0, index)
-    const post = data.slice(index + 1, n)
+    const pre: lineDataItem[] = data.slice(0, index)
+    const post: lineDataItem[] = data.slice(index + 1, n)
 
     const preValidIndex = pre.findLastIndex(
       (item) => typeof item.value === 'number'
@@ -1381,7 +1382,7 @@ export const getInterpolatedData = (
       //  Now there are 2 possibilities-
       //    1. There's only 1 valid value in the pre -> this is already handled in preprocessing
       //    2. There are more than valid values in pre
-      const secondPre = data.slice(0, preValidIndex)
+      const secondPre: lineDataItem[] = data.slice(0, preValidIndex)
       const secondPreIndex = secondPre.findLastIndex(
         (item) => typeof item.value === 'number'
       )
@@ -1396,7 +1397,7 @@ export const getInterpolatedData = (
       //    1. There's only 1 valid value in the post -> this is already handled in preprocessing
       //    2. There are more than valid values in post
 
-      const secondPost = data.slice(postValidIndex + 1, n)
+      const secondPost: lineDataItem[] = data.slice(postValidIndex + 1, n)
       const secondPostInd = secondPost.findIndex(
         (item) => typeof item.value === 'number'
       )