From 8f0a389126ab29145684c7a8108cb3871b14edfc Mon Sep 17 00:00:00 2001 From: Dan Lewi Harkestad Date: Tue, 4 Aug 2015 16:01:43 +0200 Subject: [PATCH 1/4] minorTickInterval can be "auto" as well as a number. --- highcharts/highcharts.d.ts | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/highcharts/highcharts.d.ts b/highcharts/highcharts.d.ts index 9bda29782..c0326d1c2 100644 --- a/highcharts/highcharts.d.ts +++ b/highcharts/highcharts.d.ts @@ -114,7 +114,7 @@ interface HighchartsAxisOptions { minRange?: number; minTickInterval?: number; minorTickColor?: string; - minorTickInterval?: number; + minorTickInterval?: number|string; minorTickLength?: number; minorTickPosition?: string; // 'inside' 'outside' minorTickWidth?: number; @@ -191,11 +191,11 @@ interface HighchartsChartResetZoomButton { } interface HighchartsChartResetZoomButtonTheme { - fill?: string; //css HEX colours. - stroke?: string;//css HEX colours. + fill?: string; //css HEX colours. + stroke?: string;//css HEX colours. r?: number; // Radius % - states?: any; // HTML element states eg: hover, with css attributes in object. - display?: string; // css attr eg: 'none' + states?: any; // HTML element states eg: hover, with css attributes in object. + display?: string; // css attr eg: 'none' } interface HighchartsChartOptions { From ad926271e86a4d4861f0aaa97e01f93303d810f4 Mon Sep 17 00:00:00 2001 From: Dan Lewi Harkestad Date: Tue, 4 Aug 2015 16:24:39 +0200 Subject: [PATCH 2/4] Visible property should be boolean, not number --- highcharts/highcharts.d.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/highcharts/highcharts.d.ts b/highcharts/highcharts.d.ts index c0326d1c2..c29eb65f0 100644 --- a/highcharts/highcharts.d.ts +++ b/highcharts/highcharts.d.ts @@ -877,7 +877,7 @@ interface HighchartsLineChart { stickyTracking?: boolean; tooltip?: HighchartsTooltipOptions; turboThreshold?: number; - visible?: number; + visible?: boolean; zIndex?: number; } @@ -911,7 +911,7 @@ interface HighchartsPieChart { }; stickyTracking?: boolean; tooltip?: HighchartsTooltipOptions; - visible?: number; + visible?: boolean; zIndex?: number; } @@ -953,7 +953,7 @@ interface HighchartsScatterChart { stickyTracking?: boolean; tooltip?: HighchartsTooltipOptions; turboThreshold?: number; - visible?: number; + visible?: boolean; zIndex?: number; } @@ -1006,7 +1006,7 @@ interface HighchartsSeriesChart { stickyTracking?: boolean; tooltip?: HighchartsTooltipOptions; turboThreshold?: number; - visible?: number; + visible?: boolean; zIndex?: number; } From ccaf6162aa95c5b4872cebd90840480e45484b67 Mon Sep 17 00:00:00 2001 From: Dan Lewi Harkestad Date: Wed, 5 Aug 2015 10:54:49 +0200 Subject: [PATCH 3/4] Added some missing methods and properties. Also some fixes to existing methods and properties which didn't match implementation. --- highcharts/highcharts.d.ts | 66 ++++++++++++++------------------------ 1 file changed, 24 insertions(+), 42 deletions(-) diff --git a/highcharts/highcharts.d.ts b/highcharts/highcharts.d.ts index c29eb65f0..5104eedb4 100644 --- a/highcharts/highcharts.d.ts +++ b/highcharts/highcharts.d.ts @@ -191,11 +191,11 @@ interface HighchartsChartResetZoomButton { } interface HighchartsChartResetZoomButtonTheme { - fill?: string; //css HEX colours. - stroke?: string;//css HEX colours. + fill?: string; //css HEX colours. + stroke?: string;//css HEX colours. r?: number; // Radius % - states?: any; // HTML element states eg: hover, with css attributes in object. - display?: string; // css attr eg: 'none' + states?: any; // HTML element states eg: hover, with css attributes in object. + display?: string; // css attr eg: 'none' } interface HighchartsChartOptions { @@ -873,7 +873,7 @@ interface HighchartsLineChart { states?: { hover: HighchartsAreaStates; }; - step?: boolean; + step?: boolean|string; stickyTracking?: boolean; tooltip?: HighchartsTooltipOptions; turboThreshold?: number; @@ -986,7 +986,6 @@ interface HighchartsSeriesChart { dataLabels?: HighchartsDataLabels; enableMouseTracking?: boolean; events?: HighchartsPlotEvents; - id?: string; lineWidth?: number; marker?: HighchartsMarker; point?: { @@ -1041,13 +1040,14 @@ interface HighchartsPlotOptions { */ interface HighchartsIndividualSeriesOptions { data?: number[]|[number, number][]| HighchartsDataPoint[]; // [value1,value2, ... ] | [[x1,y1],[x2,y2],... ] | HighchartsDataPoint[] + id?: string; index?: number; legendIndex?: number; name?: string; stack?: any; // type doesn't matter, as long as grouped series' stack options match each other. type?: string; - xAxis?: number; - yAxis?: number; + xAxis?: string | number; + yAxis?: string | number; } interface HighchartsSeriesOptions extends HighchartsIndividualSeriesOptions, HighchartsSeriesChart { } @@ -1095,8 +1095,8 @@ interface HighchartsSeriesOptions extends HighchartsSeriesChart { legendIndex?: number; name?: string; stack?: string | number; - xAxis?: number; - yAxis?: number; + xAxis?: string | number; + yAxis?: string | number; } interface HighchartsSubtitleOptions { @@ -1180,6 +1180,7 @@ interface HighchartsAxisObject { addPlotBand(options: HighchartsPlotBands): void; addPlotLine(options: HighchartsPlotLines): void; getExtremes(): HighchartsExtremes; + remove(redraw?: boolean): void; removePlotBand(id: string): void; removePlotLine(id: string): void; setCategories(categories: string[]): void; @@ -1187,8 +1188,10 @@ interface HighchartsAxisObject { setExtremes(min: number, max: number): void; setExtremes(min: number, max: number, redraw: boolean): void; setExtremes(min: number, max: number, redraw: boolean, animation: boolean | HighchartsAnimation): void; - setTitle(title: HighchartsAxisTitle): void; - setTitle(title: HighchartsAxisTitle, redraw: boolean): void; + setTitle(title: HighchartsAxisTitle, redraw?: boolean): void; + toPixels(value: number, paneCoordinates?: boolean): number; + toValue(pixel: number, paneCoordinates?: boolean): number; + update(options: HighchartsAxisOptions, redraw?: boolean): void; } interface HighchartsChartObject { @@ -1275,52 +1278,31 @@ declare var Highcharts: HighchartsStatic; interface HighchartsPointObject { category: string | number; percentage: number; - remove(): void; - remove(redraw: boolean): void; - remove(redraw: boolean, animation: boolean): void; - remove(redraw: boolean, animation: HighchartsAnimation): void; + remove(redraw?: boolean, animation?: boolean|HighchartsAnimation): void; select(): void; select(select: boolean): void; select(select: boolean, accumulate: boolean): void; selected: boolean; series: HighchartsSeriesObject; - slice(): void; - slice(sliced: boolean): void; - slice(sliced: boolean, redraw: boolean): void; - slice(sliced: boolean, redraw: boolean, animation: boolean): void; - slice(sliced: boolean, redraw: boolean, animation: HighchartsAnimation): void; + slice(sliced?: boolean, redraw?: boolean, animation?: boolean|HighchartsAnimation): void; total: number; - update(options: any): void; - update(options: any, redraw: boolean): void; - update(options: any, redraw: boolean, animation: boolean): void; - update(options: any, redraw: boolean, animation: HighchartsAnimation): void; + update(options: number | [number, number] | HighchartsDataPoint, redraw?: boolean, animation?: boolean | HighchartsAnimation): void; x: number; y: number; } interface HighchartsSeriesObject { - addPoint(options: number |[number, number]| HighchartsDataPoint): void; - addPoint(options: number |[number, number]| HighchartsDataPoint, redraw: boolean, shift: boolean): void; - addPoint(options: number |[number, number]| HighchartsDataPoint, redraw: boolean, shift: boolean, animation: boolean): void; - addPoint(options: number |[number, number]| HighchartsDataPoint, redraw: boolean, shift: boolean, animation: HighchartsAnimation): void; + addPoint(options: number |[number, number]| HighchartsDataPoint, redraw?: boolean, shift?: boolean, animation?: boolean | HighchartsAnimation): void; chart: HighchartsChartObject; - data: HighchartsDataPoint[]; + data: HighchartsPointObject[]; hide(): void; name: string; options: HighchartsSeriesOptions; - remove(): void; - remove(redraw: boolean): void; - select(): void; - select(selected: boolean): void; + remove(redraw?: boolean): void; + select(selected?: boolean): void; selected: boolean; - setData(data: number[]): void; // [value1,value2, ... ] - setData(data: number[], redraw: boolean): void; - setData(data: number[][]): void; // [[x1,y1],[x2,y2],... ] - setData(data: number[][], redraw: boolean): void; - setData(data: HighchartsDataPoint[]): void; // HighchartsDataPoint[] - setData(data: HighchartsDataPoint[], redraw: boolean): void; - setVisible(visible: boolean): void; - setVisible(visible: boolean, redraw: boolean): void; + setData(data: number[] | number[][] | HighchartsDataPoint[], redraw?: boolean, animation?: boolean | HighchartsAnimation, updatePoints?: boolean); + setVisible(visible: boolean, redraw?: boolean): void; show(): void; type: string; update(options: HighchartsSeriesOptions, redraw?: boolean): void; From 808cedd2ec29b4da0d42c15b209d1fda16d4ced9 Mon Sep 17 00:00:00 2001 From: Dan Lewi Harkestad Date: Wed, 5 Aug 2015 11:05:52 +0200 Subject: [PATCH 4/4] Fixed forgotten return type. --- highcharts/highcharts.d.ts | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/highcharts/highcharts.d.ts b/highcharts/highcharts.d.ts index 5104eedb4..ee3a2ce4c 100644 --- a/highcharts/highcharts.d.ts +++ b/highcharts/highcharts.d.ts @@ -191,11 +191,11 @@ interface HighchartsChartResetZoomButton { } interface HighchartsChartResetZoomButtonTheme { - fill?: string; //css HEX colours. - stroke?: string;//css HEX colours. + fill?: string; //css HEX colours. + stroke?: string;//css HEX colours. r?: number; // Radius % - states?: any; // HTML element states eg: hover, with css attributes in object. - display?: string; // css attr eg: 'none' + states?: any; // HTML element states eg: hover, with css attributes in object. + display?: string; // css attr eg: 'none' } interface HighchartsChartOptions { @@ -1301,7 +1301,7 @@ interface HighchartsSeriesObject { remove(redraw?: boolean): void; select(selected?: boolean): void; selected: boolean; - setData(data: number[] | number[][] | HighchartsDataPoint[], redraw?: boolean, animation?: boolean | HighchartsAnimation, updatePoints?: boolean); + setData(data: number[] | number[][] | HighchartsDataPoint[], redraw?: boolean, animation?: boolean | HighchartsAnimation, updatePoints?: boolean): void; setVisible(visible: boolean, redraw?: boolean): void; show(): void; type: string;