react-native-gifted-charts 1.3.33 → 1.4.1

package/src/PieChart/index.tsx

@@ -1,95 +1,31 @@
-import React, {useEffect, useState} from 'react';
+import React from 'react';
 import {View} from 'react-native';
 import {PieChartMain} from './main';
-import {pieColors} from '../utils/constants';
-import { PieChartPropsType } from './types';
+import {PieChartPropsType, pieColors, usePieChart} from 'gifted-charts-core';
 
 export const PieChart = (props: PieChartPropsType) => {
-  const radius = props.radius || 120;
-  const extraRadiusForFocused =
-    props.extraRadiusForFocused ??
-    (props.focusOnPress || props.sectionAutoFocus ? radius / 10 : 0);
-  const pi = props.semiCircle ? Math.PI / 2 : Math.PI;
-  const [selectedIndex, setSelectedIndex] = useState(-1); // at the start, nothing is selected
-  // because we're going to use a useEffect, we need startAngle and total to be state variables
-  const [startAngle, setStartAngle] = useState(
-    props.initialAngle || (props.semiCircle ? -pi : 0),
-  );
-  const [total, setTotal] = useState(0);
-
-  useEffect(() => {
-    // Update the total, this could be use to replace the forEach : const newTotal = props.data.reduce((acc, item) => acc + item.value, 0);
-    let newTotal = 0;
-    props.data.forEach(item => {
-      newTotal += item.value;
-    });
-    setTotal(newTotal);
-
-    // Update selectedIndex based on focused item
-    const newSelectedIndex = props.data.findIndex(
-      item => item.focused === true,
-    );
-    setSelectedIndex(newSelectedIndex);
-
-    // Calculate the new start angle
-    let newStartAngle = props.initialAngle || (props.semiCircle ? -pi : 0);
-    if (newSelectedIndex !== -1) {
-      // it was !== 0 here before, which would not work, it's either !==-1 or >=0
-      // This could be used to replace the for loop that was used before
-      const sumBeforeSelectedIndex = props.data
-        .slice(0, newSelectedIndex)
-        .reduce((acc, item) => acc + item.value, 0);
-      setStartAngle(
-        newStartAngle + (2 * pi * sumBeforeSelectedIndex) / (newTotal || 1),
-      );
-    } else {
-      setStartAngle(newStartAngle);
-    }
-  }, [props.data, props.initialAngle, props.semiCircle]);
-
-  useEffect(() => {
-    if (selectedIndex !== -1) {
-      const newStartAngle = props.initialAngle || (props.semiCircle ? -pi : 0);
-      let start = 0;
-      for (let i = 0; i < selectedIndex; i++) {
-        start += props.data[i].value;
-      }
-      if (total) {
-        setStartAngle(newStartAngle + (2 * pi * start) / (total || 1));
-      }
-    }
-  }, [selectedIndex]);
-
   const {
-    data,
+    radius,
+    extraRadiusForFocused,
+    selectedIndex,
+    setSelectedIndex,
+    startAngle,
+    total,
     donut,
     isThreeD,
     semiCircle,
-    inwardExtraLengthForFocused = 0,
-  } = props;
-  const canvasWidth = radius * 2;
-  const canvasHeight = isThreeD ? radius * 2.3 : radius * 2;
-
-  const strokeWidth = props.strokeWidth || 0;
-  const innerRadius = props.innerRadius || radius / 2.5;
-  const innerCircleColor =
-    props.innerCircleColor || props.backgroundColor || 'white';
-  const innerCircleBorderWidth =
-    props.innerCircleBorderWidth ||
-    (props.innerCircleBorderColor ? strokeWidth || 2 : 0);
-  const innerCircleBorderColor = props.innerCircleBorderColor || 'lightgray';
-  const shiftInnerCenterX = props.shiftInnerCenterX || 0;
-  const shiftInnerCenterY = props.shiftInnerCenterY || 0;
-
-  let tiltAngle = props.tiltAngle || '55deg';
-
-  let isDataShifted = false;
-
-  data.forEach((item: any) => {
-    if (item.shiftX || item.shiftY) {
-      isDataShifted = true;
-    }
-  });
+    inwardExtraLengthForFocused,
+    canvasWidth,
+    canvasHeight,
+    innerRadius,
+    innerCircleColor,
+    innerCircleBorderWidth,
+    innerCircleBorderColor,
+    shiftInnerCenterX,
+    shiftInnerCenterY,
+    tiltAngle,
+    isDataShifted,
+  } = usePieChart(props);
 
   const renderInnerCircle = (innerRadius, innerCircleBorderWidth) => {
     if (props.centerLabelComponent || (donut && !isDataShifted)) {

package/src/PieChart/main.tsx

@@ -9,126 +9,54 @@ import Svg, {
   Stop,
   G,
 } from 'react-native-svg';
-import {pieColors} from '../utils/constants';
-import {rnVersion} from '../utils';
-import {PieChartPropsType, pieDataItem} from './types';
+import {
+  getPieChartMainProps,
+  PieChartMainProps,
+  pieColors,
+  rnVersion,
+} from 'gifted-charts-core';
 
-interface propTypes extends PieChartPropsType {
-  setSelectedIndex: Function;
-  isBiggerPie?: boolean;
-}
-
-export const PieChartMain = (props: propTypes) => {
-  const {isThreeD, isBiggerPie} = props;
-  const propData = props.data;
-  const data: Array<pieDataItem> = [];
-  let itemHasInnerComponent = false;
-  if (propData) {
-    for (let i = 0; i < propData.length; i++) {
-      if(propData[i].pieInnerComponent) itemHasInnerComponent = true;
-      if (propData[i].value !== 0) {
-        data.push(propData[i]);
-      } else {
-        data.push({
-          ...propData[i],
-          value:
-            props.data.map(item => item.value).reduce((v, a) => v + a) / 160000,
-        });
-      }
-    }
-  }
-  const showInnerComponent = (!!props.pieInnerComponent) || itemHasInnerComponent;
-
-  const radius = props.radius || 120;
-  const canvasWidth = radius * 2;
-  const canvasHeight = isThreeD ? radius * 2.3 : radius * 2;
-  const shadowWidth = props.shadowWidth || radius / 5;
-  const backgroundColor = props.backgroundColor || 'transparent';
-  const shadowColor = props.shadowColor || 'lightgray';
-  const semiCircle = props.semiCircle || false;
-  let pi = Math.PI;
-  const initialAngle = props.initialAngle || (semiCircle ? pi / -2 : 0);
-  const shadow = props.shadow || false;
-  const donut = props.donut || false;
-  const strokeWidth = props.strokeWidth || 0;
-  const strokeColor =
-    props.strokeColor || (strokeWidth ? 'gray' : 'transparent');
-  const innerRadius = props.innerRadius || radius / 2.5;
-
-  const showText = props.showText || false;
-  const textColor = props.textColor || '';
-  const textSize = props.textSize ? Math.min(props.textSize, radius / 5) : 16;
-  let tiltAngle = props.tiltAngle || '55deg';
-  if (
-    tiltAngle &&
-    !isNaN(Number(tiltAngle)) &&
-    !(tiltAngle + '').endsWith('deg')
-  ) {
-    tiltAngle += 'deg';
-  }
-  // const tilt = props.tilt ? Math.min(props.tilt, 1) : props.isThreeD ? 0.5 : 1;
-  const labelsPosition = props.labelsPosition
-    ? props.labelsPosition
-    : donut || props.centerLabelComponent
-      ? 'outward'
-      : 'mid';
-
-  const showTextBackground = props.showTextBackground || false;
-  const textBackgroundColor = props.textBackgroundColor || 'white';
-  const showValuesAsLabels = props.showValuesAsLabels || false;
-  const showGradient = props.showGradient || false;
-  const gradientCenterColor = props.gradientCenterColor || 'white';
-  const toggleFocusOnPress = props.toggleFocusOnPress ?? true;
-
-  let minShiftX = 0,
-    maxShiftX = 0,
-    minShiftY = 0,
-    maxShiftY = 0,
-    total = 0;
-
-  data.forEach((item: any) => {
-    if (item.shiftX || item.shiftY) {
-      if (minShiftX > item.shiftX) {
-        minShiftX = item.shiftX;
-      }
-      if (minShiftY > item.shiftY) {
-        minShiftY = item.shiftY;
-      }
-      if (maxShiftX < item.shiftX) {
-        maxShiftX = item.shiftX;
-      }
-      if (maxShiftY < item.shiftY) {
-        maxShiftY = item.shiftY;
-      }
-    }
-  });
-
-  const horizAdjustment = maxShiftX - minShiftX;
-  const vertAdjustment = maxShiftY - minShiftY;
-
-  if (semiCircle) {
-    pi = Math.PI / 2;
-  }
-
-  let cx = radius,
-    cy = radius;
-
-  total =
-    data && data.length
-      ? data.map(item => item.value).reduce((v, a) => v + a)
-      : 0;
-  let acc = 0;
-  let pData = data.map(item => {
-    acc += item.value / total;
-    return acc;
-  });
-  acc = 0;
-  let mData = data.map(item => {
-    let pAcc = acc;
-    acc += item.value / total;
-    return pAcc + (acc - pAcc) / 2;
-  });
-  pData = [0, ...pData];
+export const PieChartMain = (props: PieChartMainProps) => {
+  const {
+    isThreeD,
+    isBiggerPie,
+    data,
+    showInnerComponent,
+    radius,
+    canvasWidth,
+    canvasHeight,
+    shadowWidth,
+    backgroundColor,
+    shadowColor,
+    semiCircle,
+    pi,
+    initialAngle,
+    shadow,
+    donut,
+    strokeWidth,
+    strokeColor,
+    innerRadius,
+    showText,
+    textColor,
+    textSize,
+    tiltAngle,
+    labelsPosition,
+    showTextBackground,
+    textBackgroundColor,
+    showValuesAsLabels,
+    showGradient,
+    gradientCenterColor,
+    toggleFocusOnPress,
+    minShiftX,
+    minShiftY,
+    total,
+    horizAdjustment,
+    vertAdjustment,
+    cx,
+    cy,
+    pData,
+    mData,
+  } = getPieChartMainProps(props);
 
   return (
     <View

package/src/PopulationPyramid/index.tsx

@@ -1,11 +1,11 @@
 import React, {Fragment} from 'react';
 import {View} from 'react-native';
-import {PopulationPyramidPropsType, RulesProps} from './types';
 import {
-  AxesAndRulesDefaults,
-  populationDefaults,
+  PopulationPyramidPropsType,
+  RulesProps,
   ruleTypes,
-} from '../utils/constants';
+  usePopulationPyramid,
+} from 'gifted-charts-core';
 import {
   ClipPath,
   Line,
@@ -17,208 +17,95 @@ import {
 
 export const PopulationPyramid = (props: PopulationPyramidPropsType) => {
   const {
-    height = populationDefaults.height,
-    width = populationDefaults.width,
-    verticalMarginBetweenBars = populationDefaults.verticalMarginBetweenBars,
-    barsMapToYAxisSections = populationDefaults.barsMapToYAxisSections,
+    width,
+    verticalMarginBetweenBars,
+    barsMapToYAxisSections,
     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,
-    xAxisLabelSuffix = populationDefaults.suffix,
+    hideRules,
+    yAxisColor,
+    xAxisColor,
+    xAxisThickness,
+    xAxisType,
+    xAxisNoOfSections,
+    showXAxisIndices,
+    showXAxisLabelTexts,
+    xAxisLabelShiftX,
+    xAxisLabelPrefix,
+    xAxisLabelSuffix,
     formatXAxisLabels,
-
-    showVerticalLines = populationDefaults.showVerticalLines,
-    verticalLinesColor = populationDefaults.verticalLinesColor,
-    verticalLinesThickness = populationDefaults.verticalLinesThickness,
-    verticalLinesType = populationDefaults.verticalLinesType,
-    verticalLinesStrokeDashArray = populationDefaults.verticalLinesStrokeDashArray,
-
-    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,
-
-    leftBarLabelWidth = populationDefaults.leftBarLabelWidth,
-    leftBarLabelFontSize = props.barLabelFontSize ??
-      populationDefaults.defaultFontSize,
-    leftBarLabelColor = props.barLabelColor ??
-      populationDefaults.defaultFontColor,
-    leftBarLabelFontStyle = props.barLabelFontStyle ??
-      populationDefaults.defaultFontStyle,
-    leftBarLabelFontWeight = props.barLabelFontWeight ??
-      populationDefaults.defaultFontWeight,
-    leftBarLabelFontFamily = props.barLabelFontFamily ??
-      populationDefaults.defaultFontFamily,
-    leftBarLabelPrefix = populationDefaults.prefix,
-    leftBarLabelSuffix = populationDefaults.suffix,
-
-    rightBarLabelWidth = populationDefaults.rightBarLabelWidth,
-    rightBarLabelFontSize = props.barLabelFontSize ??
-      populationDefaults.defaultFontSize,
-    rightBarLabelColor = props.barLabelColor ??
-      populationDefaults.defaultFontColor,
-    rightBarLabelFontStyle = props.barLabelFontStyle ??
-      populationDefaults.defaultFontStyle,
-    rightBarLabelFontWeight = props.barLabelFontWeight ??
-      populationDefaults.defaultFontWeight,
-    rightBarLabelFontFamily = props.barLabelFontFamily ??
-      populationDefaults.defaultFontFamily,
-    rightBarLabelPrefix = populationDefaults.prefix,
-    rightBarLabelSuffix = populationDefaults.suffix,
+    showVerticalLines,
+    showYAxisIndices,
+    yAxisIndicesWidth,
+    yAxisIndicesHeight,
+    yAxisIndicesColor,
+    yAxisLabelFontSize,
+    yAxisLabelFontStyle,
+    yAxisLabelFontWeight,
+    yAxisLabelFontFamily,
+    yAxisLabelColor,
+    yAxisLabelTextMarginRight,
+    yAxisLabelTexts,
+    showValuesAsBarLabels,
+    rulesThickness,
+    rulesColor,
+    rulesType,
+    dashWidth,
+    dashGap,
+    leftBarLabelWidth,
+    leftBarLabelFontSize,
+    leftBarLabelColor,
+    leftBarLabelFontStyle,
+    leftBarLabelFontWeight,
+    leftBarLabelFontFamily,
+    leftBarLabelPrefix,
+    leftBarLabelSuffix,
+    rightBarLabelFontSize,
+    rightBarLabelColor,
+    rightBarLabelFontStyle,
+    rightBarLabelFontWeight,
+    rightBarLabelFontFamily,
+    rightBarLabelPrefix,
+    rightBarLabelSuffix,
     formatBarLabels,
-
-    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 ??
-      populationDefaults.rightBarBorderWidth,
-    leftBarBorderRadius = props.barBorderRadius ??
-      populationDefaults.leftBarBorderRadius,
-    rightBarBorderRadius = props.barBorderRadius ??
-      populationDefaults.rightBarBorderRadius,
-    allCornersRounded = populationDefaults.allCornersRounded,
-
-    showSurplus = populationDefaults.showSurplus,
-    showSurplusLeft = populationDefaults.showSurplusLeft,
-    showSurplusRight = populationDefaults.showSurplusRight,
-    leftSurplusColor = populationDefaults.leftSurplusColor,
-    leftSurplusBorderColor = populationDefaults.leftSurplusBorderColor,
-    rightSurplusColor = populationDefaults.rightSurplusColor,
-    rightSurplusBorderColor = populationDefaults.rightSurplusBorderColor,
-    leftSurplusBorderWidth = populationDefaults.leftSurplusBorderWidth,
-    rightSurplusBorderWidth = populationDefaults.rightSurplusBorderWidth,
-  } = props;
-
-  const yAxisLabelWidth = hideYAxisText
-    ? yAxisThickness
-    : props.yAxisLabelWidth ?? AxesAndRulesDefaults.yAxisLabelWidth;
-
-  const noOfSections = props.noOfSections ?? data.length;
-  const containerHeight = props.stepHeight
-    ? props.stepHeight * noOfSections
-    : height;
-  const stepHeight = props.stepHeight ?? containerHeight / noOfSections;
-
-  const xAxisLabelsHeight = 80;
-  const containerHeightWithXaxisLabels = containerHeight + xAxisLabelsHeight;
-
-  const mid = (width + yAxisLabelWidth) / 2;
-
-  const leftMax = Math.max(...data.map(item => item.left));
-  const rightMax = Math.max(...data.map(item => item.right));
-
-  const max = Math.max(leftMax, rightMax);
-
-  const xAxisRoundToDigits =
-    props.xAxisRoundToDigits ??
-    (max < 0.1 ? 3 : max < 1 ? 2 : max < 10 ? 1 : 0);
-
-  const midAxisAndLabelWidth =
-    (showMidAxis ? midAxisLabelWidth : 0) / 2 +
-    Math.max(leftBarLabelWidth, rightBarLabelWidth);
-  const barWidthFactor =
-    ((width - yAxisLabelWidth) / 2 - midAxisAndLabelWidth) / max;
-
-  const leftXAfterMid = mid - (showMidAxis ? midAxisLabelWidth / 2 : 0);
-  const rightXAfterMid = mid + (showMidAxis ? midAxisLabelWidth / 2 : 0);
-
-  const yAxisLineProps: RulesProps = {
-    x1: yAxisLabelWidth,
-    y1: 0,
-    x2: yAxisLabelWidth,
-    y2: containerHeight,
-    stroke: yAxisColor,
-    strokeWidth: yAxisThickness,
-  };
-  if (props.yAxisStrokeDashArray?.length === 2) {
-    yAxisLineProps.strokeDasharray = props.yAxisStrokeDashArray;
-  }
-
-  const midAxisLineCommonProps: RulesProps = {
-    y1: 0,
-    y2: containerHeight,
-    strokeWidth: props.midAxisThickness ?? yAxisThickness,
-  };
-  if (props.midAxisStrokeDashArray?.length === 2) {
-    midAxisLineCommonProps.strokeDasharray = props.midAxisStrokeDashArray;
-  }
-
-  const xAxisLabelY =
-    containerHeight + xAxisLabelFontSize + 6 + xAxisLabelShiftY;
-  const xAxisIndicesCommonProps = {
-    y1: containerHeight - xAxisIndicesHeight / 2 + xAxisIndicesShiftY,
-    y2: containerHeight + xAxisIndicesHeight / 2 + xAxisIndicesShiftY,
-    stroke: xAxisIndicesColor,
-    strokeWidth: xAxisIndicesWidth,
-  };
-  const verticalLinesCommonProps: RulesProps = {
-    y1: 0,
-    y2: containerHeight,
-    stroke: verticalLinesColor,
-    strokeWidth: verticalLinesThickness,
-  };
-  if (verticalLinesType !== ruleTypes.SOLID) {
-    verticalLinesCommonProps.strokeDasharray = verticalLinesStrokeDashArray;
-  }
-  const xAxisLabelsCommonProps = {
-    y: xAxisLabelY + xAxisLabelShiftY,
-    stroke: xAxisLabelColor,
-    fontSize: xAxisLabelFontSize,
-    fontStyle: xAxisLabelFontStyle,
-    fontWeight: xAxisLabelFontWeight,
-    fontFamily: xAxisLabelFontFamily,
-  };
-
-  const getXLabel = (index: number) =>
-    ((leftXAfterMid * index) / xAxisNoOfSections / barWidthFactor)
-      .toFixed(xAxisRoundToDigits)
-      .toString();
+    showMidAxis,
+    midAxisLabelFontSize,
+    midAxisLabelColor,
+    midAxisLabelFontStyle,
+    midAxisLabelFontWeight,
+    midAxisLabelFontFamily,
+    leftBarColor,
+    rightBarColor,
+    leftBarBorderColor,
+    rightBarBorderColor,
+    leftBarBorderWidth,
+    rightBarBorderWidth,
+    leftBarBorderRadius,
+    rightBarBorderRadius,
+    allCornersRounded,
+    showSurplus,
+    showSurplusLeft,
+    showSurplusRight,
+    leftSurplusColor,
+    leftSurplusBorderColor,
+    rightSurplusColor,
+    rightSurplusBorderColor,
+    leftSurplusBorderWidth,
+    rightSurplusBorderWidth,
+    yAxisLabelWidth,
+    noOfSections,
+    stepHeight,
+    containerHeightWithXaxisLabels,
+    mid,
+    barWidthFactor,
+    leftXAfterMid,
+    rightXAfterMid,
+    yAxisLineProps,
+    midAxisLineCommonProps,
+    xAxisIndicesCommonProps,
+    verticalLinesCommonProps,
+    xAxisLabelsCommonProps,
+    getXLabel,
+  } = usePopulationPyramid(props);
 
   return (
     <View style={{height: containerHeightWithXaxisLabels, width}}>

package/src/index.tsx

@@ -9,21 +9,16 @@ export {
   stackDataItem,
   BarChartPropsType,
   StackedBarChartPropsType,
-} from './BarChart/types';
-
-export {pieDataItem, PieChartPropsType} from './PieChart/types';
-
-export {
+  pieDataItem,
+  PieChartPropsType,
   lineDataItem,
   bicolorLineDataItem,
   LineChartPropsType,
   LineChartBicolorPropsType,
-} from './LineChart/types';
-
-export {
   popnPyramidDataItem,
   PopulationPyramidPropsType,
-} from './PopulationPyramid/types';
-
-export {chartTypes, yAxisSides, ruleTypes} from './utils/constants';
-export {CurveType, EdgePosition} from './utils/types';
+  chartTypes,
+  ruleTypes,
+  yAxisSides,
+  EdgePosition,
+} from 'gifted-charts-core';