From ecec6c0af053c954bc8b13242a82b76366ae18cc Mon Sep 17 00:00:00 2001
From: Krzysztof Miemiec <krzysztof.miemiec@gmail.com>
Date: Fri, 18 May 2018 22:36:30 +0200
Subject: [PATCH 1/2] Initial version of typings for react-native-svg-charts

---
 types/react-native-svg-charts/index.d.ts      | 271 ++++++++++++++++++
 types/react-native-svg-charts/package.json    |   8 +
 .../react-native-svg-charts-tests.tsx         |  74 +++++
 types/react-native-svg-charts/tsconfig.json   |  25 ++
 types/react-native-svg-charts/tslint.json     |   1 +
 5 files changed, 379 insertions(+)
 create mode 100644 types/react-native-svg-charts/index.d.ts
 create mode 100644 types/react-native-svg-charts/package.json
 create mode 100644 types/react-native-svg-charts/react-native-svg-charts-tests.tsx
 create mode 100644 types/react-native-svg-charts/tsconfig.json
 create mode 100644 types/react-native-svg-charts/tslint.json

diff --git a/types/react-native-svg-charts/index.d.ts b/types/react-native-svg-charts/index.d.ts
new file mode 100644
index 0000000000..e35f30d410
--- /dev/null
+++ b/types/react-native-svg-charts/index.d.ts
@@ -0,0 +1,271 @@
+// Type definitions for react-native-svg-charts 5.0
+// Project: https://github.com/JesperLekland/react-native-svg-charts
+// Definitions by: Krzysztof Miemiec <https://github.com/krzysztof-miemiec>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.8
+
+import { ScaleBand, ScaleLinear, ScaleLogarithmic, ScalePower, ScaleTime } from 'd3-scale';
+import { CurveFactory, Series } from 'd3-shape';
+import * as React from 'react';
+import { StyleProp, ViewStyle } from 'react-native';
+import {
+    CommonPathProps,
+    LinearGradientProps,
+    LineProps,
+    PathProps,
+    RadialGradientProps,
+    TextProps
+} from 'react-native-svg';
+
+export type ScaleType<Range, Output> =
+    | ScaleLinear<Range, Output>
+    | ScaleLogarithmic<Range, Output>
+    | ScalePower<Range, Output>
+    | ScaleTime<Range, Output>;
+
+export type ScaleFunction = () => ScaleType<any, any> | ScaleBand<any>;
+export type AccessorFunction<T, U> = (props: { item: T, index: number }) => U;
+export type SortFunction<T> = (a: T, b: T) => number;
+export type OffsetFunction = (series: Series<any, any>, order: number[]) => void;
+export type OrderFunction = (series: Series<any, any>) => number[];
+
+// Chart
+
+export interface ChartProps<T> {
+    data: T[];
+    style: StyleProp<ViewStyle>;
+    animate?: boolean;
+    animationDuration?: number;
+    svg?: PathProps;
+    width?: number;
+    height?: number;
+    curve?: CurveFactory;
+    contentInset?: {
+        top?: number,
+        left?: number,
+        right?: number,
+        bottom?: number,
+    };
+    gridMin?: number;
+    gridMax?: number;
+    gridProps?: GridProps<any>;
+    numberOfTicks?: number;
+    xScale?: ScaleFunction;
+    yScale?: ScaleFunction;
+    xAccessor?: AccessorFunction<T, number>;
+    yAccessor?: AccessorFunction<T, number>;
+}
+
+// Line Chart
+
+export class LineChart<T> extends React.PureComponent<ChartProps<T>> {
+}
+
+// Pie Chart
+
+export interface PieChartData {
+    svg?: PathProps;
+    key: string | number;
+    value?: number;
+    arc?: {
+        outerRadius?: number | string;
+        cornerRadius?: number | string;
+    };
+}
+
+export interface PieChartProps<T extends PieChartData> extends ChartProps<T> {
+    innerRadius?: number | string;
+    outerRadius?: number | string;
+    labelRadius?: number | string;
+    padAngle?: number;
+    sort?: SortFunction<T>;
+    valueAccessor?: AccessorFunction<T, number>;
+}
+
+export class PieChart<T extends PieChartData> extends React.PureComponent<PieChartProps<T>> {
+}
+
+// Area Chart
+
+export interface AreaChartProps<T> extends ChartProps<T> {
+    start?: number;
+}
+
+export class AreaChart<T> extends React.PureComponent<AreaChartProps<T>> {
+}
+
+// Stacked Area Chart
+
+export interface StackedAreaChartProps<T> extends ChartProps<T> {
+    keys: ReadonlyArray<keyof T>;
+    colors: string[];
+    offset?: OffsetFunction;
+    order?: OrderFunction;
+    renderGradient?: (props: {
+        id: string,
+        width: number,
+        height: number,
+        x: number,
+        y: number,
+        index: number,
+        key: keyof T,
+        color: string,
+    }) => React.Component<LinearGradientProps | RadialGradientProps>;
+    showGrid?: boolean;
+    extras?: any[];
+    renderDecorator?: () => {};
+}
+
+export class StackedAreaChart<T> extends React.PureComponent<StackedAreaChartProps<T>> {
+    static extractDataPoints<T>(data: T[], keys: ReadonlyArray<keyof T>, order?: OrderFunction, offset?: OffsetFunction): number[];
+}
+
+// Stacked Bar Chart
+
+export interface StackedBarChartProps<T> extends ChartProps<T> {
+    keys: ReadonlyArray<keyof T>;
+    colors: string[];
+    offset?: OffsetFunction;
+    order?: OrderFunction;
+    strokeColor?: string;
+    renderGradient: (props: { id: string }) => React.Component<LinearGradientProps | RadialGradientProps>;
+    spacingInner?: number;
+    spacingOuter?: number;
+    showGrid?: boolean;
+    extras?: any[];
+    extra?: () => {};
+}
+
+export class StackedBarChart<T> extends React.PureComponent<StackedBarChartProps<T>> {
+    static extractDataPoints<T>(data: T, keys: ReadonlyArray<keyof T>, order?: OrderFunction, offset?: OffsetFunction): number[];
+}
+
+// Bar Chart
+
+export interface BarChartProps<T> extends ChartProps<T> {
+    spacingInner?: number;
+    spacingOuter?: number;
+}
+
+export class BarChart<T> extends React.PureComponent<BarChartProps<T>> {
+}
+
+// XAxis
+
+export interface AxisProps<T> {
+    data: T[];
+    spacingInner?: number;
+    spacingOuter?: number;
+    formatLabel?: (value: any, index: number) => number | string;
+    scale?: ScaleFunction;
+    numberOfTicks?: number;
+    svg?: TextProps;
+}
+
+export interface XAxisProps<T> extends AxisProps<T> {
+    contentInset?: {
+        left?: number;
+        right?: number
+    };
+    xAccessor?: AccessorFunction<T, any>;
+}
+
+export class XAxis<T> extends React.PureComponent<XAxisProps<T>> {
+}
+
+// YAxis
+
+export interface YAxisProps<T> extends AxisProps<T> {
+    contentInset?: {
+        top?: number;
+        bottom?: number;
+    };
+    min?: number;
+    max?: number;
+    yAccessor?: AccessorFunction<T, any>;
+}
+
+export class YAxis<T> extends React.PureComponent<YAxisProps<T>> {
+}
+
+// Progress Circle
+
+export interface ProgressCircleProps {
+    progress: number;
+    style?: StyleProp<ViewStyle>;
+    progressColor?: string;
+    backgroundColor?: string;
+    strokeWidth?: number;
+    startAngle?: number;
+    endAngle?: number;
+    animate?: boolean;
+    animateDuration?: number;
+}
+
+export class ProgressCircle extends React.PureComponent<ProgressCircleProps> {
+}
+
+// Horizontal Line
+
+export interface HorizontalLineProps {
+    stroke: string;
+}
+
+// Point
+
+export interface PointProps {
+    x: (index: number) => number;
+    y: (value: number) => number;
+    value?: number;
+    radius?: number;
+    index?: number;
+    color: string;
+}
+
+// Tooltip
+
+export interface TooltipProps {
+    x: (index: number) => number;
+    y: (value: number) => number;
+    value?: number;
+    index?: number;
+    height?: number;
+    stroke?: string;
+    text: string;
+    pointStroke?: string;
+}
+
+export namespace Decorators {
+    class HorizontalLine extends React.Component<HorizontalLineProps> {}
+    class Point extends React.Component<PointProps> {}
+    class Tooltip extends React.Component<TooltipProps> {}
+}
+
+export type GridDirection = 'VERTICAL' | 'HORIZONTAL' | 'BOTH';
+
+export interface GridProps<T> {
+    direction?: GridDirection;
+    belowChart?: boolean;
+    svg?: LineProps;
+    ticks?: T[];
+    x?: (t: T) => number;
+    y?: (t: T) => number;
+}
+
+// Export as Component despite it's SFC.
+export class Grid<T> extends React.Component<GridProps<T>> {
+    static Direction: {
+        VERTICAL: 'VERTICAL',
+        HORIZONTAL: 'HORIZONTAL',
+        BOTH: 'BOTH',
+    };
+}
+
+export interface AnimatedPathProps extends CommonPathProps {
+    animated?: boolean;
+    animationDuration?: number;
+    renderPlaceholder?: () => any;
+}
+
+export class Path extends React.Component<AnimatedPathProps> {
+}
diff --git a/types/react-native-svg-charts/package.json b/types/react-native-svg-charts/package.json
new file mode 100644
index 0000000000..21ce5da517
--- /dev/null
+++ b/types/react-native-svg-charts/package.json
@@ -0,0 +1,8 @@
+{
+    "private": true,
+    "dependencies": {
+        "@types/d3-scale": "^2.0.0",
+        "@types/d3-shape": "^1.2.2",
+        "react-native-svg": "^6.2.1"
+    }
+}
diff --git a/types/react-native-svg-charts/react-native-svg-charts-tests.tsx b/types/react-native-svg-charts/react-native-svg-charts-tests.tsx
new file mode 100644
index 0000000000..5f12c801fc
--- /dev/null
+++ b/types/react-native-svg-charts/react-native-svg-charts-tests.tsx
@@ -0,0 +1,74 @@
+import * as React from 'react';
+import { Defs, LinearGradient, Stop } from 'react-native-svg';
+import { StackedAreaChart, XAxis, Grid } from 'react-native-svg-charts';
+import { curveNatural } from 'd3-shape';
+import { scaleTime } from 'd3-scale';
+
+interface Data {
+    time: number;
+    cpuUsage: number;
+    totalMemoryConsumption: number;
+    privateMemoryConsumption: number;
+}
+
+interface Props {
+    data: Data[];
+    width: number;
+}
+
+class Example extends React.Component<Props> {
+	render() {
+        const { data, width } = this.props;
+		return (
+            <StackedAreaChart
+                style={{ height: 200 }}
+                data={data}
+                keys={['totalMemoryConsumption', 'privateMemoryConsumption']}
+                colors={['url(#totalMemoryConsumption)', 'url(#privateMemoryConsumption)']}
+                contentInset={{ top: 20 }}
+                curve={curveNatural}
+                showGrid={true}
+                animate={true}
+                animationDuration={350}
+                numberOfTicks={10}
+
+            >
+                <Defs key="defs">
+                    <LinearGradient id="totalMemoryConsumption" x1="0%" y1="0%" x2="0%" y2="100%">
+                        <Stop offset="0%" stopColor="#4ccfef" stopOpacity={0.9} />
+                        <Stop offset="100%" stopColor="#182b41" stopOpacity={0.9} />
+                    </LinearGradient>
+                    <LinearGradient id="privateMemoryConsumption" x1="0%" y1="0%" x2="0%" y2="100%">
+                        <Stop offset="0%" stopColor="#a1d343" stopOpacity={0.8} />
+                        <Stop offset="100%" stopColor="#a1d343" stopOpacity={0.3} />
+                    </LinearGradient>
+                </Defs>
+                <XAxis
+                    data={data}
+                    formatLabel={(value) => new Date(value).toTimeString()}
+                    numberOfTicks={8}
+                    scale={scaleTime}
+                    contentInset={{ left: 10, right: 10 }}
+                    svg={{
+                        fillOpacity: .2,
+                        fill: '#fff',
+                        fontFamily: 'Regular',
+                        fontSize: 10,
+                    }}
+                    xAccessor={({ item }) => item.time}
+                />
+                <Grid
+                    direction="BOTH"
+                    ticks={[20, 40, 60, 80]}
+                    x={x => x * width}
+                    y={y => y * width}
+                    svg={{
+                        stroke: '#fff',
+                        strokeOpacity: .2,
+                    }}
+                    belowChart={true}
+                />
+            </StackedAreaChart>
+		);
+	}
+}
diff --git a/types/react-native-svg-charts/tsconfig.json b/types/react-native-svg-charts/tsconfig.json
new file mode 100644
index 0000000000..ea66ecf6b7
--- /dev/null
+++ b/types/react-native-svg-charts/tsconfig.json
@@ -0,0 +1,25 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true,
+        "jsx": "react"
+    },
+    "files": [
+        "index.d.ts",
+        "react-native-svg-charts-tests.tsx"
+    ]
+}
diff --git a/types/react-native-svg-charts/tslint.json b/types/react-native-svg-charts/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/react-native-svg-charts/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 817264d9db437b6239ef31c41cb365dcb887d3d2 Mon Sep 17 00:00:00 2001
From: Krzysztof Miemiec <krzysztof.miemiec@gmail.com>
Date: Fri, 18 May 2018 23:37:34 +0200
Subject: [PATCH 2/2] * Removed `@types` dependencies from `package.json` *
 Don't require style prop for chart components * Include style for Axis *
 Treat svg props as partials

---
 types/react-native-svg-charts/index.d.ts   | 16 ++++++++++------
 types/react-native-svg-charts/package.json |  2 --
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/types/react-native-svg-charts/index.d.ts b/types/react-native-svg-charts/index.d.ts
index e35f30d410..88bde6c6d0 100644
--- a/types/react-native-svg-charts/index.d.ts
+++ b/types/react-native-svg-charts/index.d.ts
@@ -33,10 +33,10 @@ export type OrderFunction = (series: Series<any, any>) => number[];
 
 export interface ChartProps<T> {
     data: T[];
-    style: StyleProp<ViewStyle>;
+    style?: StyleProp<ViewStyle>;
     animate?: boolean;
     animationDuration?: number;
-    svg?: PathProps;
+    svg?: Partial<PathProps>;
     width?: number;
     height?: number;
     curve?: CurveFactory;
@@ -64,7 +64,7 @@ export class LineChart<T> extends React.PureComponent<ChartProps<T>> {
 // Pie Chart
 
 export interface PieChartData {
-    svg?: PathProps;
+    svg?: Partial<PathProps>;
     key: string | number;
     value?: number;
     arc?: {
@@ -150,18 +150,21 @@ export interface BarChartProps<T> extends ChartProps<T> {
 export class BarChart<T> extends React.PureComponent<BarChartProps<T>> {
 }
 
-// XAxis
+// Axis
 
 export interface AxisProps<T> {
+    style?: StyleProp<ViewStyle>;
     data: T[];
     spacingInner?: number;
     spacingOuter?: number;
     formatLabel?: (value: any, index: number) => number | string;
     scale?: ScaleFunction;
     numberOfTicks?: number;
-    svg?: TextProps;
+    svg?: Partial<TextProps>;
 }
 
+// XAxis
+
 export interface XAxisProps<T> extends AxisProps<T> {
     contentInset?: {
         left?: number;
@@ -176,6 +179,7 @@ export class XAxis<T> extends React.PureComponent<XAxisProps<T>> {
 // YAxis
 
 export interface YAxisProps<T> extends AxisProps<T> {
+    style?: StyleProp<ViewStyle>;
     contentInset?: {
         top?: number;
         bottom?: number;
@@ -246,7 +250,7 @@ export type GridDirection = 'VERTICAL' | 'HORIZONTAL' | 'BOTH';
 export interface GridProps<T> {
     direction?: GridDirection;
     belowChart?: boolean;
-    svg?: LineProps;
+    svg?: Partial<LineProps>;
     ticks?: T[];
     x?: (t: T) => number;
     y?: (t: T) => number;
diff --git a/types/react-native-svg-charts/package.json b/types/react-native-svg-charts/package.json
index 21ce5da517..2ca3d929ed 100644
--- a/types/react-native-svg-charts/package.json
+++ b/types/react-native-svg-charts/package.json
@@ -1,8 +1,6 @@
 {
     "private": true,
     "dependencies": {
-        "@types/d3-scale": "^2.0.0",
-        "@types/d3-shape": "^1.2.2",
         "react-native-svg": "^6.2.1"
     }
 }