From 6dd839beff34361903f444f1a143d0e639f40004 Mon Sep 17 00:00:00 2001 From: Pedro Poveda Date: Fri, 24 Jun 2016 10:35:51 -0400 Subject: [PATCH 1/3] Added Image type --- react-bootstrap/react-bootstrap-tests.tsx | 4 ++++ react-bootstrap/react-bootstrap.d.ts | 11 +++++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/react-bootstrap/react-bootstrap-tests.tsx b/react-bootstrap/react-bootstrap-tests.tsx index 44d4e98f74..49e54798ec 100644 --- a/react-bootstrap/react-bootstrap-tests.tsx +++ b/react-bootstrap/react-bootstrap-tests.tsx @@ -722,6 +722,10 @@ export class ReactBootstrapTest extends Component { +
+ +
+
Example page header Subtext for header
diff --git a/react-bootstrap/react-bootstrap.d.ts b/react-bootstrap/react-bootstrap.d.ts index 3d97b01679..79df2e52a8 100644 --- a/react-bootstrap/react-bootstrap.d.ts +++ b/react-bootstrap/react-bootstrap.d.ts @@ -623,7 +623,7 @@ declare module "react-bootstrap" { } type Tab = TabClass; var Tab: TabClass; - + // // ---------------------------------------- interface TabContainerProps extends React.HTMLAttributes { @@ -632,7 +632,7 @@ declare module "react-bootstrap" { generateChildId?: (eventKey: any, type: any) => string; } type TabContainer = React.ClassicComponentClass; - + // // ---------------------------------------- interface TabPaneProps extends React.HTMLAttributes { @@ -847,6 +847,13 @@ declare module "react-bootstrap" { type Jumbotron = React.ClassicComponent; var Jumbotron: React.ClassicComponentClass; + // + interface ImageProps extends React.HTMLProps { + componentClass?: React.ReactType; + } + type Image = React.ClassicComponent; + var Image: React.ClassicComponentClass; + // interface PageHeaderProps extends React.HTMLProps { } From d574b26d8bd779bd16ae399fd37d0fe6a1061094 Mon Sep 17 00:00:00 2001 From: Pedro Poveda Date: Fri, 24 Jun 2016 14:58:19 -0400 Subject: [PATCH 2/3] fixed typing --- react-bootstrap/react-bootstrap.d.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/react-bootstrap/react-bootstrap.d.ts b/react-bootstrap/react-bootstrap.d.ts index 79df2e52a8..2766e55140 100644 --- a/react-bootstrap/react-bootstrap.d.ts +++ b/react-bootstrap/react-bootstrap.d.ts @@ -849,7 +849,10 @@ declare module "react-bootstrap" { // interface ImageProps extends React.HTMLProps { - componentClass?: React.ReactType; + circle?: boolean; + responsive?: boolean; + rounded?: boolean; + thumbnail?: boolean; } type Image = React.ClassicComponent; var Image: React.ClassicComponentClass; From bc9029be8a76b7d2b90cbf2dbadc17910e960f39 Mon Sep 17 00:00:00 2001 From: Pedro Poveda Date: Fri, 24 Jun 2016 17:06:43 -0400 Subject: [PATCH 3/3] added Image import --- react-bootstrap/react-bootstrap-tests.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/react-bootstrap/react-bootstrap-tests.tsx b/react-bootstrap/react-bootstrap-tests.tsx index 49e54798ec..439fe1b96b 100644 --- a/react-bootstrap/react-bootstrap-tests.tsx +++ b/react-bootstrap/react-bootstrap-tests.tsx @@ -7,7 +7,7 @@ // -------------------------------------------------------------------------------- import * as React from 'react'; import { Component, CSSProperties } from 'react'; -import { Button, ButtonToolbar, Modal, Well, ButtonGroup, DropdownButton, MenuItem, Panel, ListGroup, ListGroupItem, Accordion, Tooltip, OverlayTrigger, Popover, ProgressBar, Nav, NavItem, Navbar, NavDropdown, Tabs, Tab, Pager, PageItem, Pagination, Alert, Carousel, CarouselItem, Grid, Row, Col, Thumbnail, Label, Badge, Jumbotron, PageHeader, Glyphicon, Table, Input, ButtonInput, Form, FormGroup, ControlLabel, FormControl, HelpBlock, Radio, Checkbox } from 'react-bootstrap'; +import { Button, ButtonToolbar, Modal, Well, ButtonGroup, DropdownButton, MenuItem, Panel, ListGroup, ListGroupItem, Accordion, Tooltip, OverlayTrigger, Popover, ProgressBar, Nav, NavItem, Navbar, NavDropdown, Tabs, Tab, Pager, PageItem, Pagination, Alert, Carousel, CarouselItem, Grid, Row, Col, Thumbnail, Image, Label, Badge, Jumbotron, PageHeader, Glyphicon, Table, Input, ButtonInput, Form, FormGroup, ControlLabel, FormControl, HelpBlock, Radio, Checkbox } from 'react-bootstrap'; export class ReactBootstrapTest extends Component {