diff --git a/packages/patternfly-3/patternfly-react/src/components/Button/Button.js b/packages/patternfly-3/patternfly-react/src/components/Button/Button.js index 8f0f1f94cf6..d012fbfc5d6 100644 --- a/packages/patternfly-3/patternfly-react/src/components/Button/Button.js +++ b/packages/patternfly-3/patternfly-react/src/components/Button/Button.js @@ -1,3 +1,10 @@ import { Button } from 'react-bootstrap'; +import ButtonGroup from './ButtonGroup'; +import DropdownButton from './DropdownButton'; +import SplitButton from './SplitButton'; + +Button.Dropdown = DropdownButton; +Button.Group = ButtonGroup; +Button.Split = SplitButton; export default Button; diff --git a/packages/patternfly-3/patternfly-react/src/components/Cards/Card.js b/packages/patternfly-3/patternfly-react/src/components/Cards/Card.js index 08e3ea52927..b1144b2adfe 100644 --- a/packages/patternfly-3/patternfly-react/src/components/Cards/Card.js +++ b/packages/patternfly-3/patternfly-react/src/components/Cards/Card.js @@ -7,8 +7,19 @@ import CardBody from './CardBody'; import CardHeading from './CardHeading'; import CardFooter from './CardFooter'; import CardLink from './CardLink'; +import CardGrid from './CardGrid'; import CardDropdownButton from './CardDropdownButton'; import CardHeightMatching from './CardHeightMatching'; +import { + UtilizationCard, + UtilizationCardDetails, + UtilizationCardDetailsCount, + UtilizationCardDetailsDesc, + UtilizationCardDetailsLine1, + UtilizationCardDetailsLine2 +} from './UtilizationTrendCard'; + +import { AggregateStatusCount, AggregateStatusNotifications, AggregateStatusNotification } from './AggregateStatusCard'; /** * Card Component for PatternFly React @@ -63,7 +74,17 @@ Card.Body = CardBody; Card.Heading = CardHeading; Card.Footer = CardFooter; Card.Link = CardLink; +Card.Grid = CardGrid; Card.DropdownButton = CardDropdownButton; Card.HeightMatching = CardHeightMatching; +Card.UtilizationCard = UtilizationCard; +Card.UtilizationCardDetails = UtilizationCardDetails; +Card.UtilizationCardDetailsCount = UtilizationCardDetailsCount; +Card.UtilizationCardDetailsDesc = UtilizationCardDetailsDesc; +Card.UtilizationCardDetailsLine1 = UtilizationCardDetailsLine1; +Card.UtilizationCardDetailsLine2 = UtilizationCardDetailsLine2; +Card.AggregateStatusCount = AggregateStatusCount; +Card.AggregateStatusNotifications = AggregateStatusNotifications; +Card.AggregateStatusNotification = AggregateStatusNotification; export default Card; diff --git a/packages/patternfly-3/patternfly-react/src/components/Chart/Chart.js b/packages/patternfly-3/patternfly-react/src/components/Chart/Chart.js new file mode 100644 index 00000000000..9aca1cf84b9 --- /dev/null +++ b/packages/patternfly-3/patternfly-react/src/components/Chart/Chart.js @@ -0,0 +1,27 @@ +import { default as AreaChart } from './AreaChart'; +import { default as BarChart } from './BarChart'; +import { BulletChart } from './BulletChart/index'; +import { default as DonutChart } from './DonutChart'; +import { default as GroupedBarChart } from './GroupedBarChart'; +import { default as LineChart } from './LineChart'; +import { default as PieChart } from './PieChart'; +import { default as SingleAreaChart } from './SingleAreaChart'; +import { default as SingleLineChart } from './SingleLineChart'; +import { default as SparklineChart } from './SparklineChart'; +import { default as StackedBarChart } from './StackedBarChart'; + +const Chart = { + AreaChart, + BarChart, + BulletChart, + DonutChart, + GroupedBarChart, + LineChart, + PieChart, + SingleAreaChart, + SingleLineChart, + SparklineChart, + StackedBarChart +}; + +export default Chart; diff --git a/packages/patternfly-3/patternfly-react/src/components/Dropdown/Dropdown.js b/packages/patternfly-3/patternfly-react/src/components/Dropdown/Dropdown.js index ab537f03296..afdf0d4874c 100644 --- a/packages/patternfly-3/patternfly-react/src/components/Dropdown/Dropdown.js +++ b/packages/patternfly-3/patternfly-react/src/components/Dropdown/Dropdown.js @@ -1,3 +1,6 @@ +import { default as NavDropdown } from './NavDropdown'; import { Dropdown } from 'react-bootstrap'; +Dropdown.NavDropdown = NavDropdown; + export default Dropdown; diff --git a/packages/patternfly-3/patternfly-react/src/components/HorizontalNav/HorizontalNav.js b/packages/patternfly-3/patternfly-react/src/components/HorizontalNav/HorizontalNav.js index 43df9d81bdb..c40e26d91bc 100644 --- a/packages/patternfly-3/patternfly-react/src/components/HorizontalNav/HorizontalNav.js +++ b/packages/patternfly-3/patternfly-react/src/components/HorizontalNav/HorizontalNav.js @@ -1,5 +1,7 @@ import React from 'react'; import PropTypes from 'prop-types'; +import { default as HorizontalNavMenu } from './HorizontalNavMenu'; +import { default as HorizontalNavMenuItem } from './HorizontalNavMenuItem'; const HorizontalNav = props => { const { children } = props; @@ -15,4 +17,7 @@ HorizontalNav.defaultProps = { children: null }; +HorizontalNav.Menu = HorizontalNavMenu; +HorizontalNav.MenuItem = HorizontalNavMenuItem; + export default HorizontalNav; diff --git a/packages/patternfly-3/patternfly-react/src/components/InlineEdit/InlineEdit.js b/packages/patternfly-3/patternfly-react/src/components/InlineEdit/InlineEdit.js index c05058e2494..11ec09a16e2 100644 --- a/packages/patternfly-3/patternfly-react/src/components/InlineEdit/InlineEdit.js +++ b/packages/patternfly-3/patternfly-react/src/components/InlineEdit/InlineEdit.js @@ -1,4 +1,6 @@ import PropTypes from 'prop-types'; +import { default as ConfirmButton } from './ConfirmButton'; +import { default as CancelButton } from './CancelButton'; const InlineEdit = ({ value, isEditing, additionalData, renderValue, renderEdit }) => { if (isEditing(additionalData)) { @@ -19,4 +21,7 @@ InlineEdit.propTypes = { renderEdit: PropTypes.func }; +InlineEdit.ConfirmButton = ConfirmButton; +InlineEdit.CancelButton = CancelButton; + export default InlineEdit; diff --git a/packages/patternfly-3/patternfly-react/src/components/Label/DisposableLabel.js b/packages/patternfly-3/patternfly-react/src/components/Label/DisposableLabel.js index 6d640f6e773..4e088bf489d 100644 --- a/packages/patternfly-3/patternfly-react/src/components/Label/DisposableLabel.js +++ b/packages/patternfly-3/patternfly-react/src/components/Label/DisposableLabel.js @@ -1,15 +1,26 @@ import React from 'react'; -import Label from './Label'; +import PropTypes from 'prop-types'; import { noop } from '../../common/helpers'; +import { Label as BsLabel } from 'react-bootstrap'; +import Label from './Label'; const DisposableLabel = props =>