From a2ff92c6b32e767f7dfe9d458021688fc5a10d2a Mon Sep 17 00:00:00 2001
From: Ryan Taylor <ryanewtaylor@gmail.com>
Date: Fri, 5 May 2017 13:31:29 -0400
Subject: [PATCH 1/3] [highcharts] Add ScrollbarOptions type to the x/y axes
 (#16328)

---
 types/highcharts/highstock.d.ts | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/types/highcharts/highstock.d.ts b/types/highcharts/highstock.d.ts
index 4541e5d715..3ec90ec6a1 100644
--- a/types/highcharts/highstock.d.ts
+++ b/types/highcharts/highstock.d.ts
@@ -81,10 +81,16 @@ declare namespace Highstock {
         trackBorderWidth?: number;
     }
 
+    interface AxisOptions extends Highcharts.AxisOptions {
+        scrollbar?: ScrollbarOptions;
+    }
+
     interface Options extends Highcharts.Options {
         navigator?: NavigatorOptions;
         rangeSelector?: RangeSelectorOptions;
         scrollbar?: ScrollbarOptions;
+        xAxis?: AxisOptions[] | AxisOptions;
+        yAxis?: AxisOptions[] | AxisOptions;
     }
 
     interface Chart {

From 09672a53567d73e59859d84d87d3b337ddbd87f5 Mon Sep 17 00:00:00 2001
From: Ryan Taylor <ryanewtaylor@gmail.com>
Date: Fri, 5 May 2017 13:32:24 -0400
Subject: [PATCH 2/3] [highcharts] Update test with axis ScrollbarOptions
 (#16328)

---
 types/highcharts/test/highstock.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/types/highcharts/test/highstock.ts b/types/highcharts/test/highstock.ts
index 7fde17d3ce..2021e65b68 100644
--- a/types/highcharts/test/highstock.ts
+++ b/types/highcharts/test/highstock.ts
@@ -9,6 +9,10 @@ $(() => {
             type: "arearange"
         },
 
+        xAxis: {
+            scrollbar: { enabled: true }
+        },
+
         navigator: {
             height: 80,
             maskFill: 'rgba(255, 198, 220, 0.75)',

From 21759a16dcb258845c4adb09c4655a8d071b1f61 Mon Sep 17 00:00:00 2001
From: Ryan Taylor <ryanewtaylor@gmail.com>
Date: Fri, 5 May 2017 21:12:30 -0400
Subject: [PATCH 3/3] Fix no-object-literal-type-assertion error (#13628)

---
 types/highcharts/tslint.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/types/highcharts/tslint.json b/types/highcharts/tslint.json
index a0b35dc4d9..d8b67d5d1f 100644
--- a/types/highcharts/tslint.json
+++ b/types/highcharts/tslint.json
@@ -4,6 +4,7 @@
     "ban-types": false,
     "unified-signatures": false,
     "no-empty-interface": false,
-    "dt-header": false
+    "dt-header": false,
+    "no-object-literal-type-assertion": false
   }
 }