Merge remote-tracking branch 'upstream/master' into reactstrap-exportProps

# Conflicts:
#	types/reactstrap/index.d.ts
#	types/reactstrap/lib/PopoverBody.d.ts
#	types/reactstrap/lib/PopoverHeader.d.ts
This commit is contained in:
FaithForHumans
2017-11-10 19:56:01 -06:00
80 changed files with 7668 additions and 207 deletions

View File

@@ -68,8 +68,8 @@ export { Pagination, PaginationProps } from '
export { PaginationItem, PaginationItemProps } from './lib/PaginationItem';
export { PaginationLink, PaginationLinkProps } from './lib/PaginationLink';
export { Popover, PopoverProps } from './lib/Popover';
export { PopoverContent, PopoverContentProps } from './lib/PopoverContent';
export { PopoverTitle, PopoverTitleProps } from './lib/PopoverTitle';
export { PopoverBody, PopoverBodyProps } from './lib/PopoverBody';
export { PopoverHeader, PopoverHeaderProps } from './lib/PopoverHeader';
export { Progress, ProgressProps } from './lib/Progress';
export { Row, RowProps } from './lib/Row';
export { TabContent, TabContentProps } from './lib/TabContent';

10
types/reactstrap/lib/PopoverBody.d.ts vendored Normal file
View File

@@ -0,0 +1,10 @@
import { CSSModule } from '../index';
export interface PopoverBodyProps {
tag?: React.ReactType;
className?: string;
cssModule?: CSSModule;
}
export const PopoverBody: React.StatelessComponent<PopoverBodyProps>;
export default PopoverBody;

View File

@@ -1,10 +0,0 @@
import { CSSModule } from '../index';
export interface PopoverContentProps {
tag?: React.ReactType;
className?: string;
cssModule?: CSSModule;
}
export const PopoverContent: React.StatelessComponent<PopoverContentProps>;
export default PopoverContent;

10
types/reactstrap/lib/PopoverHeader.d.ts vendored Normal file
View File

@@ -0,0 +1,10 @@
import { CSSModule } from '../index';
export interface PopoverHeaderProps {
tag?: React.ReactType;
className?: string;
cssModule?: CSSModule;
}
export const PopoverHeader: React.StatelessComponent<PopoverHeaderProps>;
export default PopoverHeader;

View File

@@ -1,10 +0,0 @@
import { CSSModule } from '../index';
export interface PopoverTitleProps {
tag?: React.ReactType;
className?: string;
cssModule?: CSSModule;
}
export const PopoverTitle: React.StatelessComponent<PopoverTitleProps>;
export default PopoverTitle;

View File

@@ -62,8 +62,8 @@ import {
PaginationItem,
PaginationLink,
Popover,
PopoverContent,
PopoverTitle,
PopoverBody,
PopoverHeader,
Progress,
TabPane,
UncontrolledButtonDropdown,
@@ -2480,8 +2480,8 @@ class Example85 extends React.Component<any, any> {
Launch Popover
</Button>
<Popover placement="bottom" isOpen={this.state.popoverOpen} target="Popover1" toggle={this.toggle}>
<PopoverTitle>Popover Title</PopoverTitle>
<PopoverContent>Sed posuere consectetur est at lobortis. Aenean eu leo quam. Pellentesque ornare sem lacinia quam venenatis vestibulum.</PopoverContent>
<PopoverHeader>Popover Title</PopoverHeader>
<PopoverBody>Sed posuere consectetur est at lobortis. Aenean eu leo quam. Pellentesque ornare sem lacinia quam venenatis vestibulum.</PopoverBody>
</Popover>
</div>
);
@@ -2511,8 +2511,8 @@ class PopoverItem extends React.Component<any, any> {
{this.props.item.text}
</Button>
<Popover placement={this.props.item.placement} isOpen={this.state.popoverOpen} target={'Popover-' + this.props.id} toggle={this.toggle}>
<PopoverTitle>Popover Title</PopoverTitle>
<PopoverContent>Sed posuere consectetur est at lobortis. Aenean eu leo quam. Pellentesque ornare sem lacinia quam venenatis vestibulum.</PopoverContent>
<PopoverHeader>Popover Title</PopoverHeader>
<PopoverBody>Sed posuere consectetur est at lobortis. Aenean eu leo quam. Pellentesque ornare sem lacinia quam venenatis vestibulum.</PopoverBody>
</Popover>
</span>
);