Merge pull request #8277 from NYPL-Simplified/master

react-bootstrap: Added FormControls.Static.
This commit is contained in:
Masahiro Wakame
2016-03-04 22:11:39 +09:00
2 changed files with 19 additions and 2 deletions
+9 -1
View File
@@ -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 } 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, Label, Badge, Jumbotron, PageHeader, Glyphicon, Table, Input, ButtonInput, FormControls } from 'react-bootstrap';
export class ReactBootstrapTest extends Component<any, any> {
@@ -851,6 +851,14 @@ export class ReactBootstrapTest extends Component<any, any> {
</form>
</div>
<div style={style}>
<form>
<FormControls.Static className="col-xs-10 col-xs-offset-2" value="I'm in a form" />
<FormControls.Static label="First Name" labelClassName="col-xs-2" wrapperClassName="col-xs-10" value="Billy" />
<FormControls.Static label="Last Name" labelClassName="col-xs-2" wrapperClassName="col-xs-10">Bob</FormControls.Static>
</form>
</div>
<div style={style}>
<form>
<Input type='text' addonBefore='@' />
+10 -1
View File
@@ -823,7 +823,16 @@ declare module "react-bootstrap" {
}
// TODO: FormControls.Static
// <FormControls.Static />
// ----------------------------------------
interface StaticProps extends React.Props<StaticClass> { }
interface Static extends React.ReactElement<StaticProps> { }
interface StaticClass extends React.ComponentClass<StaticProps> { }
interface FormControlsClass {
Static: StaticClass;
}
var FormControls: FormControlsClass;
// <Portal />