From 452111db33f579b239e44f525cc8865fcef8b683 Mon Sep 17 00:00:00 2001
From: Duong Tran <duong.tran@gridstone.com.au>
Date: Thu, 14 Jun 2018 15:00:44 +1000
Subject: [PATCH 1/2] improve static router props context

---
 types/react-router/index.d.ts                             | 8 +++++++-
 .../examples-from-react-router-website/StaticRouter.tsx   | 3 ++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/types/react-router/index.d.ts b/types/react-router/index.d.ts
index 5ae92ababc..2b1e2f97c1 100644
--- a/types/react-router/index.d.ts
+++ b/types/react-router/index.d.ts
@@ -17,6 +17,7 @@
 //                 Youen Toupin <https://github.com/neuoy>
 //                 Rahul Raina <https://github.com/rraina>
 //                 Maksim Sharipov <https://github.com/pret-a-porter>
+//                 Duong Tran <https://github.com/t49tran>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
 
@@ -86,10 +87,15 @@ export interface RouterProps {
 }
 export class Router extends React.Component<RouterProps, any> { }
 
+export interface StaticRouterContext {
+  url?: string;
+  action?: 'PUSH' | 'REPLACE';
+  location?: object;
+}
 export interface StaticRouterProps {
   basename?: string;
   location?: string | object;
-  context?: object;
+  context?: StaticRouterContext;
 }
 
 export class StaticRouter extends React.Component<StaticRouterProps, any> { }
diff --git a/types/react-router/test/examples-from-react-router-website/StaticRouter.tsx b/types/react-router/test/examples-from-react-router-website/StaticRouter.tsx
index c9763bdda5..3dce9a5def 100644
--- a/types/react-router/test/examples-from-react-router-website/StaticRouter.tsx
+++ b/types/react-router/test/examples-from-react-router-website/StaticRouter.tsx
@@ -1,7 +1,8 @@
 import * as React from 'react';
 import { StaticRouter, Route } from 'react-router-dom';
+import { StaticRouterContext } from 'react-router';
 
-interface StaticContext {
+interface StaticContext extends StaticRouterContext {
     statusCode?: number;
 }
 

From 085789a0e15f506caacc5372eea59a7e8ca6a45b Mon Sep 17 00:00:00 2001
From: Duong Tran <duong.tran@gridstone.com.au>
Date: Mon, 27 Aug 2018 11:54:01 +1000
Subject: [PATCH 2/2] fix onChange definition toggle button group

---
 .../lib/ToggleButtonGroup.d.ts                | 57 +++++++++----------
 ...-bootstrap-individual-components-tests.tsx | 16 +++++-
 2 files changed, 42 insertions(+), 31 deletions(-)

diff --git a/types/react-bootstrap/lib/ToggleButtonGroup.d.ts b/types/react-bootstrap/lib/ToggleButtonGroup.d.ts
index 1c3f6f4020..2c40c6553f 100644
--- a/types/react-bootstrap/lib/ToggleButtonGroup.d.ts
+++ b/types/react-bootstrap/lib/ToggleButtonGroup.d.ts
@@ -3,37 +3,36 @@ import { ButtonGroup } from 'react-bootstrap';
 import { Omit } from "../index";
 
 declare namespace ToggleButtonGroup {
-    interface BaseProps {
-        /**
-         * You'll usually want to use string|number|string[]|number[] here,
-         * but you can technically use any|any[].
-         */
-        defaultValue?: any;
-        /**
-         * You'll usually want to use string|number|string[]|number[] here,
-         * but you can technically use any|any[].
-         */
-        value?: any;
-    }
+  interface BaseProps {
+    /**
+     * You'll usually want to use string|number|string[]|number[] here,
+     * but you can technically use any|any[].
+     */
+    defaultValue?: any;
+    /**
+     * You'll usually want to use string|number|string[]|number[] here,
+     * but you can technically use any|any[].
+     */
+    value?: any;
+  }
 
-    interface RadioProps {
-        /** Required if `type` is set to "radio" */
-        name: string;
-        type: "radio";
-        onChange?(value: any): void;
-    }
+  interface RadioProps {
+    /** Required if `type` is set to "radio" */
+    name: string;
+    type: "radio";
+    onChange?(value: any): void;
+  }
 
-    interface CheckboxProps {
-        name?: string;
-        type: "checkbox";
-        onChange?(values: any[]): void;
-    }
-
-    export type ToggleButtonGroupProps = BaseProps
-                                       & (RadioProps | CheckboxProps)
-                                       & Omit<React.HTMLProps<ToggleButtonGroup>, "defaultValue" | "type" | "value">
-                                       & Omit<React.HTMLProps<ToggleButtonGroup>, "defaultValue" | "type" | "value" | "onChange">;
+  interface CheckboxProps {
+    name?: string;
+    type: "checkbox";
+    onChange?(values: any[]): void;
+  }
 
+  export type ToggleButtonGroupProps = BaseProps
+    & (RadioProps | CheckboxProps)
+    & Omit<ButtonGroup.ButtonGroupProps, "onChange">
+    & Omit<React.HTMLProps<ToggleButtonGroup>, "defaultValue" | "type" | "value" | "onChange">;
 }
-declare class ToggleButtonGroup extends React.Component<ToggleButtonGroup.ToggleButtonGroupProps & ButtonGroup.ButtonGroupProps> { }
+declare class ToggleButtonGroup extends React.Component<ToggleButtonGroup.ToggleButtonGroupProps> { }
 export = ToggleButtonGroup;
diff --git a/types/react-bootstrap/test/react-bootstrap-individual-components-tests.tsx b/types/react-bootstrap/test/react-bootstrap-individual-components-tests.tsx
index 8c4237d22b..a50e5176f1 100644
--- a/types/react-bootstrap/test/react-bootstrap-individual-components-tests.tsx
+++ b/types/react-bootstrap/test/react-bootstrap-individual-components-tests.tsx
@@ -210,8 +210,20 @@ export class ReactBootstrapIndividualComponentsTest extends React.Component {
         <Tabs />
         <Thumbnail />
         <ToggleButton value="foo" bsSize="small" />
-        <ToggleButtonGroup type="checkbox" bsSize="small" />
-        <ToggleButtonGroup type="radio" name="foo" />
+        <ToggleButtonGroup
+          type="checkbox"
+          bsSize="small"
+          defaultValue={[1]}
+          value={[1, 2]}
+          onChange={(value: number[]) => { }}
+        />
+        <ToggleButtonGroup
+          type="radio"
+          name="foo"
+          defaultValue={1}
+          value={1}
+          onChange={(value: number) => { }}
+        />
         <Tooltip />
         <Well />
       </div>