From 9f0e62c22fe83800d314291e8c7457ba6d76687b Mon Sep 17 00:00:00 2001 From: Pedro Poveda Date: Thu, 7 Jul 2016 16:08:42 -0400 Subject: [PATCH 1/3] added Media Type --- react-bootstrap/react-bootstrap-tests.tsx | 15 ++++++- react-bootstrap/react-bootstrap.d.ts | 55 +++++++++++++++++++++++ 2 files changed, 69 insertions(+), 1 deletion(-) diff --git a/react-bootstrap/react-bootstrap-tests.tsx b/react-bootstrap/react-bootstrap-tests.tsx index 439fe1b96b..2712853f28 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, Image, 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, Media } from 'react-bootstrap'; export class ReactBootstrapTest extends Component { @@ -965,6 +965,19 @@ export class ReactBootstrapTest extends Component { + +
+ + + Image + + + Top aligned media +

Cras sit amet nibh libero, in gravida nulla. Nulla vel metus scelerisque ante sollicitudin commodo. Cras purus odio, vestibulum in vulputate at, tempus viverra turpis. Fusce condimentum nunc ac nisi vulputate fringilla. Donec lacinia congue felis in faucibus.

+

Donec sed odio dui. Nullam quis risus eget urna mollis ornare vel eu leo. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus.

+ + +
); } diff --git a/react-bootstrap/react-bootstrap.d.ts b/react-bootstrap/react-bootstrap.d.ts index 8d75e82f93..443232ce57 100644 --- a/react-bootstrap/react-bootstrap.d.ts +++ b/react-bootstrap/react-bootstrap.d.ts @@ -1071,5 +1071,60 @@ declare module "react-bootstrap" { } class Position extends React.Component { } + // + interface MediaLeftProps { + align?: string; + } + type MediaLeft = React.ClassicComponent; + var MediaLeft: React.ClassicComponentClass; + + // + interface MediaRightProps { + align?: string; + } + type MediaRight = React.ClassicComponent; + var MediaRight: React.ClassicComponentClass; + + // + interface MediaHeadingProps { + componentClass?: React.ReactType; + } + type MediaHeading = React.ClassicComponent; + var MediaHeading: React.ClassicComponentClass; + + // + interface MediaBodyProps { + componentClass?: React.ReactType; + } + type MediaBody = React.ClassicComponent; + var MediaBody: React.ClassicComponentClass; + + // + interface MediaListProps { + } + type MediaList = React.ClassicComponent; + var MediaList: React.ClassicComponentClass; + + // + interface MediaListItemProps { + componentClass?: React.ReactType; + } + type MediaListItem = React.ClassicComponent; + var MediaListItem: React.ClassicComponentClass; + + // + interface MediaProps extends React.HTMLProps { + componentClass?: React.ReactType; + } + interface MediaClass extends React.ClassicComponentClass { + Left?: typeof MediaLeft; + Right?: typeof MediaRight; + Heading?: typeof MediaHeading; + Body?: typeof MediaBody; + List?: typeof MediaList; + ListItem?: typeof MediaListItem; + } + type Media = React.ClassicComponent; + var Media: MediaClass; } From 5ea018ec971715eef2e9de088511eb2f625ded1c Mon Sep 17 00:00:00 2001 From: Pedro Poveda Date: Thu, 7 Jul 2016 17:03:46 -0400 Subject: [PATCH 2/3] fixed indenting and made MediaClass attributes mandatory --- react-bootstrap/react-bootstrap.d.ts | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/react-bootstrap/react-bootstrap.d.ts b/react-bootstrap/react-bootstrap.d.ts index 443232ce57..04da49e1b9 100644 --- a/react-bootstrap/react-bootstrap.d.ts +++ b/react-bootstrap/react-bootstrap.d.ts @@ -1071,7 +1071,7 @@ declare module "react-bootstrap" { } class Position extends React.Component { } - // + // interface MediaLeftProps { align?: string; } @@ -1117,12 +1117,12 @@ declare module "react-bootstrap" { componentClass?: React.ReactType; } interface MediaClass extends React.ClassicComponentClass { - Left?: typeof MediaLeft; - Right?: typeof MediaRight; - Heading?: typeof MediaHeading; - Body?: typeof MediaBody; - List?: typeof MediaList; - ListItem?: typeof MediaListItem; + Left: typeof MediaLeft; + Right: typeof MediaRight; + Heading: typeof MediaHeading; + Body: typeof MediaBody; + List: typeof MediaList; + ListItem: typeof MediaListItem; } type Media = React.ClassicComponent; var Media: MediaClass; From 6c0118ed5f0c4781249556498c5ff4f78c73b672 Mon Sep 17 00:00:00 2001 From: Pedro Poveda Date: Mon, 11 Jul 2016 10:29:24 -0400 Subject: [PATCH 3/3] Fixed indentation --- react-bootstrap/react-bootstrap.d.ts | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/react-bootstrap/react-bootstrap.d.ts b/react-bootstrap/react-bootstrap.d.ts index 04da49e1b9..a4e70260f3 100644 --- a/react-bootstrap/react-bootstrap.d.ts +++ b/react-bootstrap/react-bootstrap.d.ts @@ -1058,7 +1058,6 @@ declare module "react-bootstrap" { type Portal = React.ClassicComponent; var Portal: React.ClassicComponentClass; - // interface PositionProps extends TransitionCallbacks, React.Props { dimension?: string | Function; @@ -1073,28 +1072,28 @@ declare module "react-bootstrap" { } // interface MediaLeftProps { - align?: string; + align?: string; } type MediaLeft = React.ClassicComponent; var MediaLeft: React.ClassicComponentClass; // interface MediaRightProps { - align?: string; + align?: string; } type MediaRight = React.ClassicComponent; var MediaRight: React.ClassicComponentClass; // interface MediaHeadingProps { - componentClass?: React.ReactType; + componentClass?: React.ReactType; } type MediaHeading = React.ClassicComponent; var MediaHeading: React.ClassicComponentClass; // interface MediaBodyProps { - componentClass?: React.ReactType; + componentClass?: React.ReactType; } type MediaBody = React.ClassicComponent; var MediaBody: React.ClassicComponentClass; @@ -1107,7 +1106,7 @@ declare module "react-bootstrap" { // interface MediaListItemProps { - componentClass?: React.ReactType; + componentClass?: React.ReactType; } type MediaListItem = React.ClassicComponent; var MediaListItem: React.ClassicComponentClass; @@ -1126,5 +1125,4 @@ declare module "react-bootstrap" { } type Media = React.ClassicComponent; var Media: MediaClass; - }