gifted-charts-core 0.0.23 → 0.0.25

package/package.json

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

package/src/BarChart/Animated2DWithGradient.ts

@@ -9,18 +9,18 @@ import {
 } from './types'
 import { type ReactNode } from 'react'
 
-interface Animated2dWithFradientPropsType extends BarChartPropsType {
+interface Animated2dWithGradientPropsType extends BarChartPropsType {
   item: barDataItem
   index: number
   barHeight: number
   selectedIndex: number
-  barBackgroundPattern: () => ReactNode
-  barInnerComponent: (
+  barBackgroundPattern?: () => ReactNode
+  barInnerComponent?: (
     item?: stackDataItem | barDataItem,
     index?: number
   ) => ReactNode
-  patternId: string
-  barStyle: object
+  patternId?: string
+  barStyle?: object
   intactTopLabel: boolean
 }
 
@@ -34,7 +34,7 @@ interface IgetPropsForAnimated2DWithGradientReturnType {
 }
 
 export const getPropsForAnimated2DWithGradient = (
-  props: Animated2dWithFradientPropsType
+  props: Animated2dWithGradientPropsType
 ): IgetPropsForAnimated2DWithGradientReturnType => {
   const {
     barBorderWidth,

package/src/BarChart/index.ts

@@ -593,7 +593,7 @@ export const useBarChart = (props: extendedBarChartPropsType) => {
   })
 
   const getPropsCommonForBarAndStack = (
-    item: stackDataItem | barDataItem,
+    item: any,
     index: number
   ) => {
     return {

package/src/BarChart/types.ts

@@ -532,7 +532,7 @@ export interface RenderBarsPropsType {
   barBorderTopRightRadius?: number
   barBorderBottomLeftRadius?: number
   barBorderBottomRightRadius?: number
-  barInnerComponent?: (item?: barDataItem, index?: number) => ReactNode
+  barInnerComponent?: (item?: barDataItem | stackDataItem, index?: number) => ReactNode
   autoShiftLabels?: boolean
   barBackgroundPattern?: () => ReactNode
   patternId?: string
@@ -592,11 +592,11 @@ export interface animatedBarPropTypes {
 }
 
 export interface CommonPropsFor2Dand3DbarsType {
-  barBackgroundPattern: () => ReactNode
-  barInnerComponent: (item?: barDataItem, index?: number) => ReactNode
-  patternId: string
+  barBackgroundPattern?: () => ReactNode
+  barInnerComponent?: (item?: barDataItem, index?: number) => ReactNode
+  patternId?: string
   barWidth: number
-  barStyle: object
+  barStyle?: object
   item: barDataItem
   index: number
 

package/src/PopulationPyramid/index.ts

@@ -1,12 +1,11 @@
-import {
-  AxesAndRulesDefaults,
-  populationDefaults,
-  ruleTypes
-} from '../utils/constants'
-import { type PopulationPyramidPropsType, type RulesProps } from './types'
+import { getStrokeDashArray } from '../utils'
+import { AxesAndRulesDefaults, populationDefaults } from '../utils/constants'
+import { Framework } from '../utils/types'
+import { type RulesPropsType, type TPopulationPyramidPropsType } from './types'
 
-export const usePopulationPyramid = (props: PopulationPyramidPropsType) => {
+export const usePopulationPyramid = (props: TPopulationPyramidPropsType) => {
   const {
+    framework,
     height = populationDefaults.height,
     width = populationDefaults.width,
     verticalMarginBetweenBars = populationDefaults.verticalMarginBetweenBars,
@@ -14,24 +13,20 @@ export const usePopulationPyramid = (props: PopulationPyramidPropsType) => {
     data,
     hideRules = AxesAndRulesDefaults.hideRules,
     hideYAxisText = AxesAndRulesDefaults.hideYAxisText,
-    yAxisColor = AxesAndRulesDefaults.yAxisColor,
     yAxisThickness = AxesAndRulesDefaults.yAxisThickness,
 
-    xAxisColor = AxesAndRulesDefaults.xAxisColor,
     xAxisThickness = AxesAndRulesDefaults.xAxisThickness,
     xAxisType = AxesAndRulesDefaults.xAxisType,
     xAxisNoOfSections = populationDefaults.xAxisNoOfSections,
     showXAxisIndices = populationDefaults.showXAxisIndices,
     xAxisIndicesWidth = populationDefaults.xAxisIndicesWidth,
     xAxisIndicesHeight = populationDefaults.xAxisIndicesHeight,
-    xAxisIndicesColor = populationDefaults.xAxisIndicesColor,
     xAxisIndicesShiftY = 0,
     showXAxisLabelTexts = populationDefaults.showXAxisLabelTexts,
     xAxisLabelFontSize = populationDefaults.defaultFontSize,
     xAxisLabelFontStyle = populationDefaults.defaultFontStyle,
     xAxisLabelFontWeight = populationDefaults.defaultFontWeight,
     xAxisLabelFontFamily = populationDefaults.defaultFontFamily,
-    xAxisLabelColor = populationDefaults.defaultFontColor,
     xAxisLabelShiftX = 0,
     xAxisLabelShiftY = 0,
     xAxisLabelPrefix = populationDefaults.prefix,
@@ -39,7 +34,6 @@ export const usePopulationPyramid = (props: PopulationPyramidPropsType) => {
     formatXAxisLabels,
 
     showVerticalLines = populationDefaults.showVerticalLines,
-    verticalLinesColor = populationDefaults.verticalLinesColor,
     verticalLinesThickness = populationDefaults.verticalLinesThickness,
     verticalLinesType = populationDefaults.verticalLinesType,
     verticalLinesStrokeDashArray = populationDefaults.verticalLinesStrokeDashArray,
@@ -47,18 +41,15 @@ export const usePopulationPyramid = (props: PopulationPyramidPropsType) => {
     showYAxisIndices = AxesAndRulesDefaults.showYAxisIndices,
     yAxisIndicesWidth = AxesAndRulesDefaults.yAxisIndicesWidth,
     yAxisIndicesHeight = AxesAndRulesDefaults.yAxisIndicesHeight,
-    yAxisIndicesColor = AxesAndRulesDefaults.yAxisIndicesColor,
     yAxisLabelFontSize = populationDefaults.defaultFontSize,
     yAxisLabelFontStyle = populationDefaults.defaultFontStyle,
     yAxisLabelFontWeight = populationDefaults.defaultFontWeight,
     yAxisLabelFontFamily = populationDefaults.defaultFontFamily,
-    yAxisLabelColor = populationDefaults.defaultFontColor,
     yAxisLabelTextMarginRight = populationDefaults.yAxisLabelTextMarginRight,
     yAxisLabelTexts = [],
     showValuesAsBarLabels = populationDefaults.showValuesAsBarLabels,
 
     rulesThickness = AxesAndRulesDefaults.rulesThickness,
-    rulesColor = AxesAndRulesDefaults.rulesColor,
     rulesType = AxesAndRulesDefaults.rulesType,
     dashWidth = AxesAndRulesDefaults.dashWidth,
     dashGap = AxesAndRulesDefaults.dashGap,
@@ -66,8 +57,6 @@ export const usePopulationPyramid = (props: PopulationPyramidPropsType) => {
     leftBarLabelWidth = populationDefaults.leftBarLabelWidth,
     leftBarLabelFontSize = props.barLabelFontSize ??
       populationDefaults.defaultFontSize,
-    leftBarLabelColor = props.barLabelColor ??
-      populationDefaults.defaultFontColor,
     leftBarLabelFontStyle = props.barLabelFontStyle ??
       populationDefaults.defaultFontStyle,
     leftBarLabelFontWeight = props.barLabelFontWeight ??
@@ -80,8 +69,6 @@ export const usePopulationPyramid = (props: PopulationPyramidPropsType) => {
     rightBarLabelWidth = populationDefaults.rightBarLabelWidth,
     rightBarLabelFontSize = props.barLabelFontSize ??
       populationDefaults.defaultFontSize,
-    rightBarLabelColor = props.barLabelColor ??
-      populationDefaults.defaultFontColor,
     rightBarLabelFontStyle = props.barLabelFontStyle ??
       populationDefaults.defaultFontStyle,
     rightBarLabelFontWeight = props.barLabelFontWeight ??
@@ -95,15 +82,10 @@ export const usePopulationPyramid = (props: PopulationPyramidPropsType) => {
     showMidAxis = populationDefaults.showMidAxis,
     midAxisLabelWidth = populationDefaults.midAxisLabelWidth,
     midAxisLabelFontSize = populationDefaults.defaultFontSize,
-    midAxisLabelColor = populationDefaults.defaultFontColor,
     midAxisLabelFontStyle = populationDefaults.defaultFontStyle,
     midAxisLabelFontWeight = populationDefaults.defaultFontWeight,
     midAxisLabelFontFamily = populationDefaults.defaultFontFamily,
 
-    leftBarColor = populationDefaults.leftBarColor,
-    rightBarColor = populationDefaults.rightBarColor,
-    leftBarBorderColor = populationDefaults.leftBarBorderColor,
-    rightBarBorderColor = populationDefaults.rightBarBorderColor,
     leftBarBorderWidth = props.barBorderWidth ??
       populationDefaults.leftBarBorderWidth,
     rightBarBorderWidth = props.barBorderWidth ??
@@ -117,14 +99,56 @@ export const usePopulationPyramid = (props: PopulationPyramidPropsType) => {
     showSurplus = populationDefaults.showSurplus,
     showSurplusLeft = populationDefaults.showSurplusLeft,
     showSurplusRight = populationDefaults.showSurplusRight,
+    leftSurplusBorderWidth = populationDefaults.leftSurplusBorderWidth,
+    rightSurplusBorderWidth = populationDefaults.rightSurplusBorderWidth
+  } = props
+
+  let {
+    yAxisColor = AxesAndRulesDefaults.yAxisColor,
+    xAxisColor = AxesAndRulesDefaults.xAxisColor,
+    xAxisIndicesColor = populationDefaults.xAxisIndicesColor,
+    xAxisLabelColor = populationDefaults.defaultFontColor,
+    verticalLinesColor = populationDefaults.verticalLinesColor,
+    yAxisIndicesColor = AxesAndRulesDefaults.yAxisIndicesColor,
+    yAxisLabelColor = populationDefaults.defaultFontColor,
+    rulesColor = AxesAndRulesDefaults.rulesColor,
+    leftBarLabelColor = props.barLabelColor ??
+      populationDefaults.defaultFontColor,
+    rightBarLabelColor = props.barLabelColor ??
+      populationDefaults.defaultFontColor,
+    midAxisLabelColor = populationDefaults.defaultFontColor,
+    leftBarColor = populationDefaults.leftBarColor,
+    rightBarColor = populationDefaults.rightBarColor,
+    leftBarBorderColor = populationDefaults.leftBarBorderColor,
+    rightBarBorderColor = populationDefaults.rightBarBorderColor,
     leftSurplusColor = populationDefaults.leftSurplusColor,
     leftSurplusBorderColor = populationDefaults.leftSurplusBorderColor,
     rightSurplusColor = populationDefaults.rightSurplusColor,
-    rightSurplusBorderColor = populationDefaults.rightSurplusBorderColor,
-    leftSurplusBorderWidth = populationDefaults.leftSurplusBorderWidth,
-    rightSurplusBorderWidth = populationDefaults.rightSurplusBorderWidth
+    rightSurplusBorderColor = populationDefaults.rightSurplusBorderColor
   } = props
 
+  if (framework === Framework.reactJS) {
+    yAxisColor = yAxisColor.toString()
+    xAxisColor = xAxisColor.toString()
+    xAxisIndicesColor = xAxisIndicesColor.toString()
+    xAxisLabelColor = xAxisLabelColor.toString()
+    verticalLinesColor = verticalLinesColor.toString()
+    yAxisIndicesColor = yAxisIndicesColor.toString()
+    yAxisLabelColor = yAxisLabelColor.toString()
+    rulesColor = rulesColor.toString()
+    leftBarLabelColor = leftBarLabelColor.toString()
+    rightBarLabelColor = rightBarLabelColor.toString()
+    midAxisLabelColor = midAxisLabelColor.toString()
+    leftBarColor = leftBarColor.toString()
+    rightBarColor = rightBarColor.toString()
+    leftBarBorderColor = leftBarBorderColor.toString()
+    rightBarBorderColor = rightBarBorderColor.toString()
+    leftSurplusColor = leftSurplusColor.toString()
+    leftSurplusBorderColor = leftSurplusBorderColor.toString()
+    rightSurplusColor = rightSurplusColor.toString()
+    rightSurplusBorderColor = rightSurplusBorderColor.toString()
+  }
+
   const yAxisLabelWidth = hideYAxisText
     ? yAxisThickness
     : props.yAxisLabelWidth ?? AxesAndRulesDefaults.yAxisLabelWidth
@@ -146,8 +170,7 @@ export const usePopulationPyramid = (props: PopulationPyramidPropsType) => {
   const max = Math.max(leftMax, rightMax)
 
   const xAxisRoundToDigits =
-    props.xAxisRoundToDigits ??
-    (max < 0.1 ? 3 : max < 1 ? 2 : max < 10 ? 1 : 0)
+    props.xAxisRoundToDigits ?? (max < 0.1 ? 3 : max < 1 ? 2 : max < 10 ? 1 : 0)
 
   const midAxisAndLabelWidth =
     (showMidAxis ? midAxisLabelWidth : 0) / 2 +
@@ -158,7 +181,7 @@ export const usePopulationPyramid = (props: PopulationPyramidPropsType) => {
   const leftXAfterMid = mid - (showMidAxis ? midAxisLabelWidth / 2 : 0)
   const rightXAfterMid = mid + (showMidAxis ? midAxisLabelWidth / 2 : 0)
 
-  const yAxisLineProps: RulesProps = {
+  const yAxisLineProps: RulesPropsType = {
     x1: yAxisLabelWidth,
     y1: 0,
     x2: yAxisLabelWidth,
@@ -166,18 +189,22 @@ export const usePopulationPyramid = (props: PopulationPyramidPropsType) => {
     stroke: yAxisColor,
     strokeWidth: yAxisThickness
   }
-  if (props.yAxisStrokeDashArray?.length === 2) {
-    yAxisLineProps.strokeDasharray = props.yAxisStrokeDashArray
-  }
 
-  const midAxisLineCommonProps: RulesProps = {
+  yAxisLineProps.strokeDasharray = getStrokeDashArray(
+    props.yAxisStrokeDashArray,
+    framework
+  )
+
+  const midAxisLineCommonProps: RulesPropsType = {
     y1: 0,
     y2: containerHeight,
     strokeWidth: props.midAxisThickness ?? yAxisThickness
   }
-  if (props.midAxisStrokeDashArray?.length === 2) {
-    midAxisLineCommonProps.strokeDasharray = props.midAxisStrokeDashArray
-  }
+
+  midAxisLineCommonProps.strokeDasharray = getStrokeDashArray(
+    props.midAxisStrokeDashArray,
+    framework
+  )
 
   const xAxisLabelY =
     containerHeight + xAxisLabelFontSize + 6 + xAxisLabelShiftY
@@ -187,15 +214,16 @@ export const usePopulationPyramid = (props: PopulationPyramidPropsType) => {
     stroke: xAxisIndicesColor,
     strokeWidth: xAxisIndicesWidth
   }
-  const verticalLinesCommonProps: RulesProps = {
+  const verticalLinesCommonProps: RulesPropsType = {
     y1: 0,
     y2: containerHeight,
     stroke: verticalLinesColor,
     strokeWidth: verticalLinesThickness
   }
-  if (verticalLinesType !== ruleTypes.SOLID) {
-    verticalLinesCommonProps.strokeDasharray = verticalLinesStrokeDashArray
-  }
+  verticalLinesCommonProps.strokeDasharray = getStrokeDashArray(
+    verticalLinesStrokeDashArray
+  )
+
   const xAxisLabelsCommonProps = {
     y: xAxisLabelY + xAxisLabelShiftY,
     stroke: xAxisLabelColor,

package/src/PopulationPyramid/types.ts

@@ -1,5 +1,5 @@
 import { type ColorValue } from 'react-native'
-import { type RuleTypes } from '../utils/types'
+import { type Framework, type RuleTypes } from '../utils/types'
 import { type FontStyle, type FontWeight } from 'react-native-svg'
 
 export interface popnPyramidDataItem {
@@ -60,6 +60,21 @@ export interface popnPyramidDataItem {
   rightSurplusBorderWidth?: number
 }
 
+export type popnPyramidDataItemReactJS = popnPyramidDataItem & {
+  leftBarColor?: string
+  rightBarColor?: string
+  leftBarBorderColor?: string
+  rightBarBorderColor?: string
+  barLabelColor?: string
+  leftBarLabelColor?: string
+  rightBarLabelColor?: string
+  midAxisLabelColor?: string
+  leftSurplusColor?: string
+  leftSurplusBorderColor?: string
+  rightSurplusColor?: string
+  rightSurplusBorderColor?: string
+}
+
 export interface RulesProps {
   x1?: number
   y1?: number
@@ -67,7 +82,11 @@ export interface RulesProps {
   y2?: number
   stroke?: ColorValue
   strokeWidth?: number
-  strokeDasharray?: number[]
+  strokeDasharray?: number[] | string
+}
+
+export type RulesPropsReactJS = RulesProps & {
+  stroke?: string
 }
 
 export interface PopulationPyramidPropsType {
@@ -81,7 +100,7 @@ export interface PopulationPyramidPropsType {
   yAxisLabelWidth?: number
   yAxisColor?: ColorValue
   yAxisThickness?: number
-  yAxisStrokeDashArray?: number[]
+  yAxisStrokeDashArray?: number[] | string
   xAxisColor?: ColorValue
   xAxisThickness?: number
   xAxisType?: RuleTypes
@@ -108,7 +127,7 @@ export interface PopulationPyramidPropsType {
   verticalLinesColor?: ColorValue
   verticalLinesThickness?: number
   verticalLinesType?: RuleTypes
-  verticalLinesStrokeDashArray?: number[]
+  verticalLinesStrokeDashArray?: number[] | string
 
   noOfSections?: number
   barsMapToYAxisSections?: boolean
@@ -139,7 +158,7 @@ export interface PopulationPyramidPropsType {
   midAxisColor?: ColorValue
   midAxisLeftColor?: ColorValue
   midAxisRightColor?: ColorValue
-  midAxisStrokeDashArray?: number[]
+  midAxisStrokeDashArray?: number[] | string
   midAxisLabelFontSize?: number
   midAxisLabelColor?: ColorValue
   midAxisLabelFontStyle?: FontStyle
@@ -195,5 +214,39 @@ export interface PopulationPyramidPropsType {
   rightSurplusBorderColor?: ColorValue
   leftSurplusBorderWidth?: number
   rightSurplusBorderWidth?: number
+}
 
+export type PopulationPyramidPropsTypeReactJS = PopulationPyramidPropsType & {
+  data: popnPyramidDataItemReactJS[]
+  yAxisColor?: string
+  xAxisColor?: string
+  xAxisIndicesColor?: string
+  xAxisLabelColor?: string
+  verticalLinesColor?: string
+  yAxisIndicesColor?: string
+  yAxisLabelColor?: string
+  rulesColor?: string
+  midAxisColor?: string
+  midAxisLeftColor?: string
+  midAxisRightColor?: string
+  midAxisLabelColor?: string
+  barLabelColor?: string
+  leftBarLabelColor?: string
+  rightBarLabelColor?: string
+  leftBarColor?: string
+  rightBarColor?: string
+  leftBarBorderColor?: string
+  rightBarBorderColor?: string
+  leftSurplusColor?: string
+  leftSurplusBorderColor?: string
+  rightSurplusColor?: string
+  rightSurplusBorderColor?: string
 }
+
+export type RulesPropsType =
+  | ({ framework: Framework.reactJS } & RulesPropsReactJS)
+  | ({ framework?: Framework.reactNative } & RulesProps)
+
+export type TPopulationPyramidPropsType =
+  | ({ framework: Framework.reactJS } & PopulationPyramidPropsTypeReactJS)
+  | ({ framework?: Framework.reactNative } & PopulationPyramidPropsType)

package/src/utils/index.ts

@@ -18,7 +18,8 @@ import {
   CurveType,
   type HighlightedRange,
   type LineProperties,
-  type LineSegment
+  type LineSegment,
+  Framework
 } from './types'
 import {
   type lineConfigType,
@@ -1362,7 +1363,7 @@ export const getInterpolatedData = (
     const post: lineDataItem[] = data.slice(index + 1, n)
 
     const preValidIndex = pre.findLastIndex(
-      (item) => typeof item.value === 'number'
+      (item: lineDataItem) => typeof item.value === 'number'
     )
     const postValidInd = post.findIndex(
       (item) => typeof item.value === 'number'
@@ -1384,7 +1385,7 @@ export const getInterpolatedData = (
       //    2. There are more than valid values in pre
       const secondPre: lineDataItem[] = data.slice(0, preValidIndex)
       const secondPreIndex = secondPre.findLastIndex(
-        (item) => typeof item.value === 'number'
+        (item: lineDataItem) => typeof item.value === 'number'
       )
 
       count = preValidIndex - secondPreIndex
@@ -1490,3 +1491,43 @@ export const getSanitisedData = (
   }
   return nullishHandledData
 }
+
+export const getStrokeDashArray = (
+  strokeDash?: number[] | string,
+  framework?: Framework
+): number[] | string | undefined => {
+  let strokeDashArrayOrString: number[] | string | undefined
+  if (framework === Framework.reactJS) {
+    if (strokeDash instanceof Array) {
+      strokeDashArrayOrString = strokeDash.toString().replace(',', ' ')
+    } else if (typeof strokeDash === 'string') {
+      strokeDashArrayOrString = strokeDash
+        .replace(',', ' ')
+        .replace('[', '')
+        .replace(']', '')
+        .replace('{', '')
+        .replace('}', '')
+    }
+  } else {
+    if (strokeDash instanceof Array) {
+      strokeDashArrayOrString = strokeDash
+    } else if (typeof strokeDash === 'string') {
+      const ar = strokeDash
+        .replace(',', ' ')
+        .replace('[', '')
+        .replace(']', '')
+        .replace('{', '')
+        .replace('}', '')
+        .split(' ')
+      if (ar[0] && ar[1]) {
+        const n1 = Number(ar[0])
+        const n2 = Number(ar[1])
+        if (!isNaN(n1) && !isNaN(n2)) {
+          strokeDashArrayOrString = [n1, n2]
+        }
+      }
+    }
+  }
+
+  return strokeDashArrayOrString
+}

package/src/utils/types.ts

@@ -3,6 +3,11 @@ import { type chartTypes, type yAxisSides } from './constants'
 import { type lineDataItem } from '../LineChart/types'
 import { type barDataItem, type stackDataItem } from '../BarChart/types'
 
+export enum Framework {
+  reactJS,
+  reactNative
+}
+
 export type RuleType = 'solid' | 'dashed' | 'dotted' | string
 
 export interface RuleTypes {