From 15fd47e35fd1b7659ffb00e0767d7ceb6fbcf11d Mon Sep 17 00:00:00 2001
From: Andrew Makarov <me@r3nya.ru>
Date: Sat, 9 Jun 2018 12:34:41 +0300
Subject: [PATCH 1/2] [react-bootstrap] Add bsSize property for ToggleButton
 and ToggleButtonGroup

---
 types/react-bootstrap/index.d.ts              |   1 +
 types/react-bootstrap/lib/ToggleButton.d.ts   |   4 +-
 .../lib/ToggleButtonGroup.d.ts                |   2 +
 .../test/react-bootstrap-tests.tsx            | 105 ++++++++++++++----
 4 files changed, 91 insertions(+), 21 deletions(-)

diff --git a/types/react-bootstrap/index.d.ts b/types/react-bootstrap/index.d.ts
index 6a78dcbb1a..d015ce6402 100644
--- a/types/react-bootstrap/index.d.ts
+++ b/types/react-bootstrap/index.d.ts
@@ -12,6 +12,7 @@
 //                 Karol Janyst <https://github.com/LKay>
 //                 Aaron Beall <https://github.com/aaronbeall>
 //                 Johann Rakotoharisoa <https://github.com/jrakotoharisoa>
+//                 Andrew Makarov <https://github.com/r3nya>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
 
diff --git a/types/react-bootstrap/lib/ToggleButton.d.ts b/types/react-bootstrap/lib/ToggleButton.d.ts
index ef231bf288..3566ad2a4a 100644
--- a/types/react-bootstrap/lib/ToggleButton.d.ts
+++ b/types/react-bootstrap/lib/ToggleButton.d.ts
@@ -1,10 +1,12 @@
 import * as React from 'react';
+import { Sizes } from 'react-bootstrap';
 
 declare namespace ToggleButton {
     export interface ToggleButtonProps extends React.HTMLProps<ToggleButton> {
         checked?: boolean;
         name?: string;
-        value: number|string;
+        value: number | string;
+        bsSize?: Sizes;
     }
 }
 declare class ToggleButton extends React.Component<ToggleButton.ToggleButtonProps> { }
diff --git a/types/react-bootstrap/lib/ToggleButtonGroup.d.ts b/types/react-bootstrap/lib/ToggleButtonGroup.d.ts
index 27be6b95a9..a3ea325192 100644
--- a/types/react-bootstrap/lib/ToggleButtonGroup.d.ts
+++ b/types/react-bootstrap/lib/ToggleButtonGroup.d.ts
@@ -1,4 +1,5 @@
 import * as React from 'react';
+import { Sizes } from 'react-bootstrap';
 import { Omit } from "../index";
 
 declare namespace ToggleButtonGroup {
@@ -13,6 +14,7 @@ declare namespace ToggleButtonGroup {
          * but you can technically use any|any[].
          */
         value?: any;
+        bsSize?: Sizes;
     }
 
     interface RadioProps {
diff --git a/types/react-bootstrap/test/react-bootstrap-tests.tsx b/types/react-bootstrap/test/react-bootstrap-tests.tsx
index ccebe35add..bfe8f9f6ea 100644
--- a/types/react-bootstrap/test/react-bootstrap-tests.tsx
+++ b/types/react-bootstrap/test/react-bootstrap-tests.tsx
@@ -1,18 +1,56 @@
 import * as React from 'react';
 import { Component, CSSProperties } from 'react';
 import {
-    Button, ButtonToolbar, Modal, Well, ButtonGroup,
-    DropdownButton, MenuItem, Panel, PanelGroup, ListGroup,
-    ListGroupItem, Accordion, Tooltip,
-    OverlayTrigger, Popover, ProgressBar,
-    Nav, NavItem, Navbar, NavDropdown,
-    Tabs, Tab, Pager, PageItem,
-    Pagination, Alert, Carousel, SafeAnchor,
-    Grid, Row, Col, Thumbnail, Image, ResponsiveEmbed,
-    Label, Badge, Jumbotron, PageHeader,
-    Glyphicon, Table, Form, FormGroup,
-    ControlLabel, FormControl, HelpBlock,
-    Radio, Checkbox, Media, InputGroup, ToggleButtonGroup,
+    Button,
+    ButtonToolbar,
+    Modal,
+    Well,
+    ButtonGroup,
+    DropdownButton,
+    MenuItem,
+    Panel,
+    PanelGroup,
+    ListGroup,
+    ListGroupItem,
+    Accordion,
+    Tooltip,
+    OverlayTrigger,
+    Popover,
+    ProgressBar,
+    Nav,
+    NavItem,
+    Navbar,
+    NavDropdown,
+    Tabs,
+    Tab,
+    Pager,
+    PageItem,
+    Pagination,
+    Alert,
+    Carousel,
+    SafeAnchor,
+    Grid,
+    Row,
+    Col,
+    Thumbnail,
+    Image,
+    ResponsiveEmbed,
+    Label,
+    Badge,
+    Jumbotron,
+    PageHeader,
+    Glyphicon,
+    Table,
+    Form,
+    FormGroup,
+    ControlLabel,
+    FormControl,
+    HelpBlock,
+    Radio,
+    Checkbox,
+    Media,
+    InputGroup,
+    ToggleButtonGroup,
     ToggleButton
 } from 'react-bootstrap';
 
@@ -1418,20 +1456,47 @@ export class ReactBootstrapTest extends Component {
 
               <div>
                 <ButtonToolbar>
-                  <ToggleButtonGroup type="checkbox" defaultValue={[1, 3]}>
-                    <ToggleButton value={1}>Checkbox 1 (pre-checked)</ToggleButton>
-                    <ToggleButton value={2}>Checkbox 2</ToggleButton>
-                    <ToggleButton value={3}>Checkbox 3 (pre-checked)</ToggleButton>
+                  <ToggleButtonGroup
+                    type="checkbox"
+                    defaultValue={[1, 3]}
+                    bsSize='small'
+                  >
+                    <ToggleButton value={1}>
+                      Checkbox 1 (pre-checked)
+                    </ToggleButton>
+                    <ToggleButton value={2}>
+                      Checkbox 2
+                    </ToggleButton>
+                    <ToggleButton value={3}>
+                      Checkbox 3 (pre-checked)
+                    </ToggleButton>
                   </ToggleButtonGroup>
                 </ButtonToolbar>
 
                 <ButtonToolbar>
-                  <ToggleButtonGroup type="radio" name="options" defaultValue={1}>
-                    <ToggleButton value={1}>
+                  <ToggleButtonGroup
+                    type="radio"
+                    name="options"
+                    defaultValue={1}
+                  >
+                    <ToggleButton
+                      value={1}
+                      bsSize='large'
+                    >
                       Radio 1 (pre-checked)
                     </ToggleButton>
-                    <ToggleButton value={2}>Radio 2</ToggleButton>
-                    <ToggleButton value={3}>Radio 3</ToggleButton>
+                    <ToggleButton
+                      value={2}
+                      bsSize='small'
+                    >
+                      Radio 2
+                    </ToggleButton>
+                    <ToggleButton
+                      value={3}
+                      bsSize='xsmall'
+                    >
+                      Radio 3
+                    </ToggleButton>
                   </ToggleButtonGroup>
                 </ButtonToolbar>
               </div>

From b11356877c7111c790af16f6efd00e17918dac1a Mon Sep 17 00:00:00 2001
From: Andrew Makarov <me@r3nya.ru>
Date: Fri, 15 Jun 2018 22:43:27 +0300
Subject: [PATCH 2/2] [react-bootstrap] refactoring

---
 types/react-bootstrap/lib/ToggleButton.d.ts            |  5 ++---
 types/react-bootstrap/lib/ToggleButtonGroup.d.ts       |  5 ++---
 .../react-bootstrap-individual-components-tests.tsx    |  4 ++--
 types/react-bootstrap/test/react-bootstrap-tests.tsx   | 10 +++++-----
 4 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/types/react-bootstrap/lib/ToggleButton.d.ts b/types/react-bootstrap/lib/ToggleButton.d.ts
index 3566ad2a4a..b199ea8119 100644
--- a/types/react-bootstrap/lib/ToggleButton.d.ts
+++ b/types/react-bootstrap/lib/ToggleButton.d.ts
@@ -1,13 +1,12 @@
 import * as React from 'react';
-import { Sizes } from 'react-bootstrap';
+import { Button } from 'react-bootstrap';
 
 declare namespace ToggleButton {
     export interface ToggleButtonProps extends React.HTMLProps<ToggleButton> {
         checked?: boolean;
         name?: string;
         value: number | string;
-        bsSize?: Sizes;
     }
 }
-declare class ToggleButton extends React.Component<ToggleButton.ToggleButtonProps> { }
+declare class ToggleButton extends React.Component<ToggleButton.ToggleButtonProps & Button.ButtonProps> { }
 export = ToggleButton;
diff --git a/types/react-bootstrap/lib/ToggleButtonGroup.d.ts b/types/react-bootstrap/lib/ToggleButtonGroup.d.ts
index a3ea325192..1c3f6f4020 100644
--- a/types/react-bootstrap/lib/ToggleButtonGroup.d.ts
+++ b/types/react-bootstrap/lib/ToggleButtonGroup.d.ts
@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { Sizes } from 'react-bootstrap';
+import { ButtonGroup } from 'react-bootstrap';
 import { Omit } from "../index";
 
 declare namespace ToggleButtonGroup {
@@ -14,7 +14,6 @@ declare namespace ToggleButtonGroup {
          * but you can technically use any|any[].
          */
         value?: any;
-        bsSize?: Sizes;
     }
 
     interface RadioProps {
@@ -36,5 +35,5 @@ declare namespace ToggleButtonGroup {
                                        & Omit<React.HTMLProps<ToggleButtonGroup>, "defaultValue" | "type" | "value" | "onChange">;
 
 }
-declare class ToggleButtonGroup extends React.Component<ToggleButtonGroup.ToggleButtonGroupProps> { }
+declare class ToggleButtonGroup extends React.Component<ToggleButtonGroup.ToggleButtonGroupProps & ButtonGroup.ButtonGroupProps> { }
 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 07d6a8a442..8c4237d22b 100644
--- a/types/react-bootstrap/test/react-bootstrap-individual-components-tests.tsx
+++ b/types/react-bootstrap/test/react-bootstrap-individual-components-tests.tsx
@@ -209,8 +209,8 @@ export class ReactBootstrapIndividualComponentsTest extends React.Component {
         <Table />
         <Tabs />
         <Thumbnail />
-        <ToggleButton value="foo" />
-        <ToggleButtonGroup type="checkbox" />
+        <ToggleButton value="foo" bsSize="small" />
+        <ToggleButtonGroup type="checkbox" bsSize="small" />
         <ToggleButtonGroup type="radio" name="foo" />
         <Tooltip />
         <Well />
diff --git a/types/react-bootstrap/test/react-bootstrap-tests.tsx b/types/react-bootstrap/test/react-bootstrap-tests.tsx
index bfe8f9f6ea..34692ce248 100644
--- a/types/react-bootstrap/test/react-bootstrap-tests.tsx
+++ b/types/react-bootstrap/test/react-bootstrap-tests.tsx
@@ -1459,9 +1459,9 @@ export class ReactBootstrapTest extends Component {
                   <ToggleButtonGroup
                     type="checkbox"
                     defaultValue={[1, 3]}
-                    bsSize='small'
+                    bsSize="small"
                   >
-                    <ToggleButton value={1}>
+                    <ToggleButton value={1} bsSize="small" active>
                       Checkbox 1 (pre-checked)
                     </ToggleButton>
                     <ToggleButton value={2}>
@@ -1481,19 +1481,19 @@ export class ReactBootstrapTest extends Component {
                   >
                     <ToggleButton
                       value={1}
-                      bsSize='large'
+                      bsSize="large"
                     >
                       Radio 1 (pre-checked)
                     </ToggleButton>
                     <ToggleButton
                       value={2}
-                      bsSize='small'
+                      bsSize="small"
                     >
                       Radio 2
                     </ToggleButton>
                     <ToggleButton
                       value={3}
-                      bsSize='xsmall'
+                      bsSize="xsmall"
                     >
                       Radio 3
                     </ToggleButton>