diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 39ad4adb3b9..34831fe7710 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -196,20 +196,6 @@ Please ensure that all React UI components contributed meet the following guidel See how to write documentation in the [`react-docs` README](./packages/patternfly-4/react-docs/README.md) - When writing a component and you want to use the classnames package, be sure to import and name it `classNames`. For example - `import classNames from 'classnames'` - When destructuring or spreading expressions , use ...props as the variable name. -- Exporting components from other libraries (without manipulating them) - to consumers is a common task, use: - - ```js - # Badge/Badge.js - import { Badge } from 'react-bootstrap'; - export default Badge; - - # Badge/index.js - export { default as Badge } from './Badge'; - - # index.js - export * from './Badge'; - ``` **Please see the [Getting Started Readme](./GETTING-STARTED.md) for additional information in getting started with building PatterFly 4 react components.** diff --git a/packages/react-catalog-view-extension/src/components/CatalogTile/CatalogTile.tsx b/packages/react-catalog-view-extension/src/components/CatalogTile/CatalogTile.tsx index 8f0156d1101..94549d5a3d6 100644 --- a/packages/react-catalog-view-extension/src/components/CatalogTile/CatalogTile.tsx +++ b/packages/react-catalog-view-extension/src/components/CatalogTile/CatalogTile.tsx @@ -1,10 +1,5 @@ import * as React from 'react'; -import { Card } from '@patternfly/react-core/dist/js/components/Card/Card'; -import { CardActions } from '@patternfly/react-core/dist/js/components/Card/CardActions'; -import { CardHead } from '@patternfly/react-core/dist/js/components/Card/CardHead'; -import { CardHeader } from '@patternfly/react-core/dist/js/components/Card/CardHeader'; -import { CardBody } from '@patternfly/react-core/dist/js/components/Card/CardBody'; -import { CardFooter } from '@patternfly/react-core/dist/js/components/Card/CardFooter'; +import { Card, CardActions, CardHead, CardHeader, CardBody, CardFooter } from '@patternfly/react-core'; import classNames from 'classnames'; export interface CatalogTileProps extends Omit, 'title'> { diff --git a/packages/react-catalog-view-extension/src/components/FilterSidePanel/FilterSidePanelCategory.tsx b/packages/react-catalog-view-extension/src/components/FilterSidePanel/FilterSidePanelCategory.tsx index 400ff7beb62..8d119e39aa8 100644 --- a/packages/react-catalog-view-extension/src/components/FilterSidePanel/FilterSidePanelCategory.tsx +++ b/packages/react-catalog-view-extension/src/components/FilterSidePanel/FilterSidePanelCategory.tsx @@ -1,7 +1,7 @@ import * as React from 'react'; import classNames from 'classnames'; -import { Button } from '@patternfly/react-core/dist/js/components/Button'; -import { default as formStyles } from '@patternfly/react-styles/css/components/Form/form'; +import { Button } from '@patternfly/react-core'; +import formStyles from '@patternfly/react-styles/css/components/Form/form'; import { css } from '@patternfly/react-styles'; import { childrenToArray } from '../../helpers/util'; diff --git a/packages/react-catalog-view-extension/src/components/FilterSidePanel/FilterSidePanelCategoryItem.tsx b/packages/react-catalog-view-extension/src/components/FilterSidePanel/FilterSidePanelCategoryItem.tsx index e6413cd1566..d3e05b50c98 100644 --- a/packages/react-catalog-view-extension/src/components/FilterSidePanel/FilterSidePanelCategoryItem.tsx +++ b/packages/react-catalog-view-extension/src/components/FilterSidePanel/FilterSidePanelCategoryItem.tsx @@ -1,6 +1,6 @@ import * as React from 'react'; import classNames from 'classnames'; -import { Checkbox } from '@patternfly/react-core/dist/js/components/Checkbox/Checkbox'; +import { Checkbox } from '@patternfly/react-core'; import { getUniqueId } from '../../helpers/util'; diff --git a/packages/react-catalog-view-extension/src/components/PropertiesSidePanel/PropertyItem.tsx b/packages/react-catalog-view-extension/src/components/PropertiesSidePanel/PropertyItem.tsx index 0621e5ce4b8..2601fc391b1 100644 --- a/packages/react-catalog-view-extension/src/components/PropertiesSidePanel/PropertyItem.tsx +++ b/packages/react-catalog-view-extension/src/components/PropertiesSidePanel/PropertyItem.tsx @@ -1,7 +1,7 @@ import * as React from 'react'; import classNames from 'classnames'; -import { Text, TextVariants } from '@patternfly/react-core/dist/js/components/Text/Text'; +import { Text, TextVariants } from '@patternfly/react-core'; export interface PropertyItemProps extends Omit, 'label' | 'value'> { /** Additional css classes for the Property Item */ diff --git a/packages/react-core/src/components/ChipGroup/Chip.tsx b/packages/react-core/src/components/ChipGroup/Chip.tsx index 3e3d363c521..f348ff628b2 100644 --- a/packages/react-core/src/components/ChipGroup/Chip.tsx +++ b/packages/react-core/src/components/ChipGroup/Chip.tsx @@ -4,7 +4,7 @@ import { ChipButton } from './ChipButton'; import { Tooltip } from '../Tooltip'; import TimesCircleIcon from '@patternfly/react-icons/dist/js/icons/times-circle-icon'; import styles from '@patternfly/react-styles/css/components/Chip/chip'; -import GenerateId from '../../helpers/GenerateId/GenerateId'; +import { GenerateId } from '../../helpers/GenerateId/GenerateId'; import { getOUIAProps, OUIAProps } from '../../helpers'; export interface ChipProps extends React.HTMLProps { diff --git a/packages/react-core/src/components/ChipGroup/ChipGroupToolbarItem.tsx b/packages/react-core/src/components/ChipGroup/ChipGroupToolbarItem.tsx index 8d9966837e6..37519c7ebc9 100644 --- a/packages/react-core/src/components/ChipGroup/ChipGroupToolbarItem.tsx +++ b/packages/react-core/src/components/ChipGroup/ChipGroupToolbarItem.tsx @@ -5,7 +5,7 @@ import { ChipGroupContext } from './ChipGroup'; import { ChipButton } from './ChipButton'; import { Tooltip } from '../Tooltip'; import TimesIcon from '@patternfly/react-icons/dist/js/icons/times-icon'; -import GenerateId from '../../helpers/GenerateId/GenerateId'; +import { GenerateId } from '../../helpers/GenerateId/GenerateId'; export interface ChipGroupToolbarItemProps extends React.HTMLProps { /** Category name text */ diff --git a/packages/react-core/src/components/ClipboardCopy/ClipboardCopy.tsx b/packages/react-core/src/components/ClipboardCopy/ClipboardCopy.tsx index 22a50b5f08a..5c209149e09 100644 --- a/packages/react-core/src/components/ClipboardCopy/ClipboardCopy.tsx +++ b/packages/react-core/src/components/ClipboardCopy/ClipboardCopy.tsx @@ -5,7 +5,7 @@ import { PickOptional } from '../../helpers/typeUtils'; import { PopoverPosition } from '../Popover'; import { TextInput } from '../TextInput'; import { TooltipPosition } from '../Tooltip'; -import GenerateId from '../../helpers/GenerateId/GenerateId'; +import { GenerateId } from '../../helpers/GenerateId/GenerateId'; import { ClipboardCopyButton } from './ClipboardCopyButton'; import { ClipboardCopyToggle } from './ClipboardCopyToggle'; import { ClipboardCopyExpanded } from './ClipboardCopyExpanded'; diff --git a/packages/react-core/src/components/Popover/Popover.tsx b/packages/react-core/src/components/Popover/Popover.tsx index 093606f66cb..8f036144c00 100644 --- a/packages/react-core/src/components/Popover/Popover.tsx +++ b/packages/react-core/src/components/Popover/Popover.tsx @@ -11,7 +11,7 @@ import { PopoverBody } from './PopoverBody'; import { PopoverHeader } from './PopoverHeader'; import { PopoverFooter } from './PopoverFooter'; import { PopoverCloseButton } from './PopoverCloseButton'; -import GenerateId from '../../helpers/GenerateId/GenerateId'; +import { GenerateId } from '../../helpers/GenerateId/GenerateId'; import popoverMaxWidth from '@patternfly/react-tokens/dist/js/c_popover_MaxWidth'; import { ReactElement } from 'react'; import { PickOptional } from '../../helpers/typeUtils'; diff --git a/packages/react-core/src/components/Select/SelectMenu.tsx b/packages/react-core/src/components/Select/SelectMenu.tsx index 68af8aada3f..09d7bf42561 100644 --- a/packages/react-core/src/components/Select/SelectMenu.tsx +++ b/packages/react-core/src/components/Select/SelectMenu.tsx @@ -1,6 +1,6 @@ import * as React from 'react'; import styles from '@patternfly/react-styles/css/components/Select/select'; -import { default as formStyles } from '@patternfly/react-styles/css/components/Form/form'; +import formStyles from '@patternfly/react-styles/css/components/Form/form'; import { css } from '@patternfly/react-styles'; import { SelectOptionObject, SelectOption } from './SelectOption'; import { SelectConsumer, SelectVariant } from './selectConstants'; diff --git a/packages/react-core/src/components/Select/SelectOption.tsx b/packages/react-core/src/components/Select/SelectOption.tsx index 177703e9bc3..eb97687b719 100644 --- a/packages/react-core/src/components/Select/SelectOption.tsx +++ b/packages/react-core/src/components/Select/SelectOption.tsx @@ -1,6 +1,6 @@ import * as React from 'react'; import styles from '@patternfly/react-styles/css/components/Select/select'; -import { default as checkStyles } from '@patternfly/react-styles/css/components/Check/check'; +import checkStyles from '@patternfly/react-styles/css/components/Check/check'; import { css } from '@patternfly/react-styles'; import CheckIcon from '@patternfly/react-icons/dist/js/icons/check-icon'; import { SelectConsumer, SelectVariant, KeyTypes } from './selectConstants'; diff --git a/packages/react-core/src/components/Wizard/examples/SampleForm.js b/packages/react-core/src/components/Wizard/examples/SampleForm.js index 7cd7ceaa8a3..d758f94ed6d 100644 --- a/packages/react-core/src/components/Wizard/examples/SampleForm.js +++ b/packages/react-core/src/components/Wizard/examples/SampleForm.js @@ -1,8 +1,6 @@ import React from 'react'; import PropTypes from 'prop-types'; -import { Form } from '@patternfly/react-core/dist/js/components/Form/Form'; -import { FormGroup } from '@patternfly/react-core/dist/js/components/Form/FormGroup'; -import { TextInput } from '@patternfly/react-core/dist/js/components/TextInput/TextInput'; +import { Form, FormGroup, TextInput } from '@patternfly/react-core'; const propTypes = { formValue: PropTypes.string, diff --git a/packages/react-core/src/helpers/GenerateId/GenerateId.ts b/packages/react-core/src/helpers/GenerateId/GenerateId.ts index 9d256599e98..8007e5f3f8f 100644 --- a/packages/react-core/src/helpers/GenerateId/GenerateId.ts +++ b/packages/react-core/src/helpers/GenerateId/GenerateId.ts @@ -22,7 +22,7 @@ interface GenerateIdProps { children(id: string): React.ReactNode; } -class GenerateId extends React.Component { +export class GenerateId extends React.Component { static defaultProps = { prefix: 'pf-random-id-' }; @@ -32,5 +32,3 @@ class GenerateId extends React.Component { return this.props.children(this.id); } } - -export default GenerateId; diff --git a/packages/react-core/src/helpers/GenerateId/__tests__/GenerateId.test.tsx b/packages/react-core/src/helpers/GenerateId/__tests__/GenerateId.test.tsx index b1d44d65bee..bf3cc99a1e3 100644 --- a/packages/react-core/src/helpers/GenerateId/__tests__/GenerateId.test.tsx +++ b/packages/react-core/src/helpers/GenerateId/__tests__/GenerateId.test.tsx @@ -1,6 +1,6 @@ import React from 'react'; import { shallow } from 'enzyme'; -import GenerateId from '../GenerateId'; +import { GenerateId } from '../GenerateId'; test('generates id', () => { const view = shallow({id =>
div with random ID
}); diff --git a/packages/react-core/src/helpers/index.ts b/packages/react-core/src/helpers/index.ts index e5fb76b2e3c..6a779eba917 100644 --- a/packages/react-core/src/helpers/index.ts +++ b/packages/react-core/src/helpers/index.ts @@ -1,6 +1,6 @@ export * from './constants'; export * from './FocusTrap/FocusTrap'; -export { default as GenerateId } from './GenerateId/GenerateId'; +export * from './GenerateId/GenerateId'; export * from './htmlConstants'; export * from './typeUtils'; export * from './ouia'; diff --git a/packages/react-core/src/layouts/Toolbar/examples/SimpleToolbar.js b/packages/react-core/src/layouts/Toolbar/examples/SimpleToolbar.js index 4d1572ffaf7..eb648e883ab 100644 --- a/packages/react-core/src/layouts/Toolbar/examples/SimpleToolbar.js +++ b/packages/react-core/src/layouts/Toolbar/examples/SimpleToolbar.js @@ -1,7 +1,5 @@ import React from 'react'; -import { Toolbar } from '@patternfly/react-core/dist/js/layouts/Toolbar/Toolbar'; -import { ToolbarGroup } from '@patternfly/react-core/dist/js/layouts/Toolbar/ToolbarGroup'; -import { ToolbarItem } from '@patternfly/react-core/dist/js/layouts/Toolbar/ToolbarItem'; +import { Toolbar, ToolbarGroup, ToolbarItem } from '@patternfly/react-core'; class SimpleToolbar extends React.Component { render() { diff --git a/packages/react-core/src/layouts/Toolbar/examples/SimpleToolbarSection.js b/packages/react-core/src/layouts/Toolbar/examples/SimpleToolbarSection.js index 1c7866c3c73..aa6049a6d85 100644 --- a/packages/react-core/src/layouts/Toolbar/examples/SimpleToolbarSection.js +++ b/packages/react-core/src/layouts/Toolbar/examples/SimpleToolbarSection.js @@ -1,8 +1,5 @@ import React from 'react'; -import { Toolbar } from '@patternfly/react-core/dist/js/layouts/Toolbar/Toolbar'; -import { ToolbarGroup } from '@patternfly/react-core/dist/js/layouts/Toolbar/ToolbarGroup'; -import { ToolbarSection } from '@patternfly/react-core/dist/js/layouts/Toolbar/ToolbarSection'; -import { ToolbarItem } from '@patternfly/react-core/dist/js/layouts/Toolbar/ToolbarItem'; +import { Toolbar, ToolbarGroup, ToolbarSection, ToolbarItem } from '@patternfly/react-core'; class SimpleToolbarSection extends React.Component { render() { diff --git a/packages/react-docs/src/pages/icons.js b/packages/react-docs/src/pages/icons.js index f09c88e7280..34df799ee7b 100644 --- a/packages/react-docs/src/pages/icons.js +++ b/packages/react-docs/src/pages/icons.js @@ -1,11 +1,6 @@ import React from 'react'; import PropTypes from 'prop-types'; -import { Title } from '@patternfly/react-core/dist/js/components/Title/Title'; -import { Tooltip } from '@patternfly/react-core/dist/js/components/Tooltip/Tooltip'; -import { Text } from '@patternfly/react-core/dist/js/components/Text/Text'; -import { Grid } from '@patternfly/react-core/dist/js/layouts/Grid/Grid'; -import { GridItem } from '@patternfly/react-core/dist/js/layouts/Grid/GridItem'; -import { PageSection } from '@patternfly/react-core/dist/js/components/Page/PageSection'; +import { Title, Tooltip, Text, Grid, GridItem, PageSection } from '@patternfly/react-core'; import spacerMd from '@patternfly/react-tokens/dist/js/global_spacer_md'; import labelFontSize from '@patternfly/react-tokens/dist/js/global_FontSize_sm'; import * as IconsModule from '@patternfly/react-icons'; diff --git a/packages/react-docs/src/pages/index.js b/packages/react-docs/src/pages/index.js index 5fff2d6cb7e..d9d9f28376a 100644 --- a/packages/react-docs/src/pages/index.js +++ b/packages/react-docs/src/pages/index.js @@ -1,7 +1,6 @@ import React from 'react'; import { graphql } from 'gatsby'; -import { Title } from '@patternfly/react-core/dist/js/components/Title/Title'; -import { PageSection, PageSectionVariants } from '@patternfly/react-core/dist/js/components/Page/PageSection'; +import { Title, PageSection, PageSectionVariants } from '@patternfly/react-core'; import { SideNavLayout } from 'gatsby-theme-patternfly-org/layouts'; const containerStyle = { diff --git a/packages/react-inline-edit-extension/src/components/CancelButton/CancelButton.js b/packages/react-inline-edit-extension/src/components/CancelButton/CancelButton.js index 641a3c1d864..75656bd9a1a 100644 --- a/packages/react-inline-edit-extension/src/components/CancelButton/CancelButton.js +++ b/packages/react-inline-edit-extension/src/components/CancelButton/CancelButton.js @@ -1,8 +1,8 @@ import React from 'react'; import CloseIcon from '@patternfly/react-icons/dist/js/icons/close-icon'; -import { Button } from '@patternfly/react-core/dist/js/components/Button/Button'; +import { Button } from '@patternfly/react-core'; -const CancelButton = props => ( +export const CancelButton = props => ( @@ -16,5 +16,3 @@ CancelButton.defaultProps = { ...Button.defaultProps, variant: 'plain' }; - -export default CancelButton; diff --git a/packages/react-inline-edit-extension/src/components/CancelButton/index.js b/packages/react-inline-edit-extension/src/components/CancelButton/index.js index c4dc29a593a..886c5b01073 100644 --- a/packages/react-inline-edit-extension/src/components/CancelButton/index.js +++ b/packages/react-inline-edit-extension/src/components/CancelButton/index.js @@ -1 +1 @@ -export { default as CancelButton } from './CancelButton'; +export * from './CancelButton'; diff --git a/packages/react-inline-edit-extension/src/components/ConfirmButton/ConfirmButton.js b/packages/react-inline-edit-extension/src/components/ConfirmButton/ConfirmButton.js index b25e66199df..a3a3de1b2cd 100644 --- a/packages/react-inline-edit-extension/src/components/ConfirmButton/ConfirmButton.js +++ b/packages/react-inline-edit-extension/src/components/ConfirmButton/ConfirmButton.js @@ -1,8 +1,8 @@ import React from 'react'; import CheckIcon from '@patternfly/react-icons/dist/js/icons/check-icon'; -import { Button } from '@patternfly/react-core/dist/js/components/Button/Button'; +import { Button } from '@patternfly/react-core'; -const ConfirmButton = props => ( +export const ConfirmButton = props => ( @@ -16,5 +16,3 @@ ConfirmButton.defaultProps = { ...Button.defaultProps, variant: 'primary' }; - -export default ConfirmButton; diff --git a/packages/react-inline-edit-extension/src/components/ConfirmButton/index.js b/packages/react-inline-edit-extension/src/components/ConfirmButton/index.js index 4ccccc70087..8514cab990e 100644 --- a/packages/react-inline-edit-extension/src/components/ConfirmButton/index.js +++ b/packages/react-inline-edit-extension/src/components/ConfirmButton/index.js @@ -1 +1 @@ -export { default as ConfirmButton } from './ConfirmButton'; +export * from './ConfirmButton'; diff --git a/packages/react-inline-edit-extension/src/components/InlineEdit/ConfirmButtons.js b/packages/react-inline-edit-extension/src/components/InlineEdit/ConfirmButtons.js index 1ecd2323501..50b3339f5a3 100644 --- a/packages/react-inline-edit-extension/src/components/InlineEdit/ConfirmButtons.js +++ b/packages/react-inline-edit-extension/src/components/InlineEdit/ConfirmButtons.js @@ -22,7 +22,7 @@ const buttonsBottomPosition = (window, rowDimensions, bold) => { }; }; -const ConfirmButtons = ({ +export const ConfirmButtons = ({ messages: { confirmButtonLabel, cancelButtonLabel }, onConfirm, onCancel, @@ -90,5 +90,3 @@ ConfirmButtons.propTypes = { cancelButtonLabel: PropTypes.string }) }; - -export default ConfirmButtons; diff --git a/packages/react-inline-edit-extension/src/components/InlineEdit/ConfirmButtons.test.js b/packages/react-inline-edit-extension/src/components/InlineEdit/ConfirmButtons.test.js index ac12f4a72d7..f21d887efb7 100644 --- a/packages/react-inline-edit-extension/src/components/InlineEdit/ConfirmButtons.test.js +++ b/packages/react-inline-edit-extension/src/components/InlineEdit/ConfirmButtons.test.js @@ -1,7 +1,7 @@ import React from 'react'; import { mount } from 'enzyme/build'; -import { default as ConfirmButtons } from './ConfirmButtons'; +import { ConfirmButtons } from './ConfirmButtons'; const getConfirmButtons = () => ( tableConfirmationMapper[editConfig && editConfig.editConfirmationType] || tableConfirmationMapper[TableEditConfirmation.NONE]; -const editableRowWrapper = RowWrapperComponent => { +export const editableRowWrapper = RowWrapperComponent => { class RowWrapper extends React.Component { constructor(props) { super(props); @@ -230,5 +230,3 @@ const editableRowWrapper = RowWrapperComponent => { return RowWrapper; }; - -export default editableRowWrapper; diff --git a/packages/react-inline-edit-extension/src/components/InlineEdit/editableRowWrapper.test.js b/packages/react-inline-edit-extension/src/components/InlineEdit/editableRowWrapper.test.js index 0024bec2777..98896e2bc47 100644 --- a/packages/react-inline-edit-extension/src/components/InlineEdit/editableRowWrapper.test.js +++ b/packages/react-inline-edit-extension/src/components/InlineEdit/editableRowWrapper.test.js @@ -2,7 +2,7 @@ import React from 'react'; import PropTypes from 'prop-types'; import { mount } from 'enzyme/build'; -import { default as editableRowWrapper } from './editableRowWrapper'; +import { editableRowWrapper } from './editableRowWrapper'; import { TableEditConfirmation } from './constants'; import { mockClosest } from '../../test-helpers/helpers'; diff --git a/packages/react-inline-edit-extension/src/components/InlineEdit/editableTableBody.d.ts b/packages/react-inline-edit-extension/src/components/InlineEdit/editableTableBody.d.ts index cb23c427605..de186e05c21 100644 --- a/packages/react-inline-edit-extension/src/components/InlineEdit/editableTableBody.d.ts +++ b/packages/react-inline-edit-extension/src/components/InlineEdit/editableTableBody.d.ts @@ -26,4 +26,4 @@ export interface EditableTableBody { } // eslint-disable-next-line no-undef -export default EditableTableBody; +export const EditableTableBody; diff --git a/packages/react-inline-edit-extension/src/components/InlineEdit/editableTableBody.js b/packages/react-inline-edit-extension/src/components/InlineEdit/editableTableBody.js index d2c70477faa..49330e463e7 100644 --- a/packages/react-inline-edit-extension/src/components/InlineEdit/editableTableBody.js +++ b/packages/react-inline-edit-extension/src/components/InlineEdit/editableTableBody.js @@ -132,7 +132,7 @@ Body.defaultProps = { onRowClick: () => undefined }; -const editableTableBody = BodyComponent => { +export const editableTableBody = BodyComponent => { const InlineEditBody = ({ editConfig, onRowClick, ...props }) => ( {({ rows, ...consumedProps }) => ( @@ -153,5 +153,3 @@ const editableTableBody = BodyComponent => { return InlineEditBody; }; - -export default editableTableBody; diff --git a/packages/react-inline-edit-extension/src/components/InlineEdit/index.d.ts b/packages/react-inline-edit-extension/src/components/InlineEdit/index.d.ts index 4d7fa0ec40e..6af63047ce5 100644 --- a/packages/react-inline-edit-extension/src/components/InlineEdit/index.d.ts +++ b/packages/react-inline-edit-extension/src/components/InlineEdit/index.d.ts @@ -1,17 +1,6 @@ export { TableEditConfirmation } from './constants'; export * from './utils'; -export { - default as editableTableBody, - EditableTableBody, - InlineEditBodyProps, - EditConfig, - IEditedCellData -} from './editableTableBody'; +export * from './editableTableBody'; -export { - default as editableRowWrapper, - EditableRowWrapper, - EditableRowWrapperProps, - EditableRowWrapperRow -} from './editableRowWrapper'; +export * from './editableRowWrapper'; diff --git a/packages/react-inline-edit-extension/src/components/InlineEdit/index.js b/packages/react-inline-edit-extension/src/components/InlineEdit/index.js index 22cf35095f6..4b1f150c75b 100644 --- a/packages/react-inline-edit-extension/src/components/InlineEdit/index.js +++ b/packages/react-inline-edit-extension/src/components/InlineEdit/index.js @@ -1,4 +1,4 @@ export { TableEditConfirmation } from './constants'; export { inlineEditFormatterFactory } from './utils'; -export { default as editableTableBody } from './editableTableBody'; -export { default as editableRowWrapper } from './editableRowWrapper'; +export { editableTableBody } from './editableTableBody'; +export { editableRowWrapper } from './editableRowWrapper'; diff --git a/packages/react-inline-edit-extension/src/components/InlineEdit/utils/formatters.js b/packages/react-inline-edit-extension/src/components/InlineEdit/utils/formatters.js index 6129309cae6..e40660b5d4d 100644 --- a/packages/react-inline-edit-extension/src/components/InlineEdit/utils/formatters.js +++ b/packages/react-inline-edit-extension/src/components/InlineEdit/utils/formatters.js @@ -1 +1 @@ -export { default as inlineEditFormatterFactory } from './formatters/inlineEditFormatterFactory'; +export * from './formatters/inlineEditFormatterFactory'; diff --git a/packages/react-inline-edit-extension/src/components/InlineEdit/utils/formatters/index.d.ts b/packages/react-inline-edit-extension/src/components/InlineEdit/utils/formatters/index.d.ts index 102d7711d7e..1f995a5057a 100644 --- a/packages/react-inline-edit-extension/src/components/InlineEdit/utils/formatters/index.d.ts +++ b/packages/react-inline-edit-extension/src/components/InlineEdit/utils/formatters/index.d.ts @@ -1,8 +1 @@ -export { - default as inlineEditFormatterFactory, - InlineEditFormatterFactory, - InlineEditFormatterFactoryProps, - AdditionalData, - Formatter, - FormatterExtra -} from './inlineEditFormatterFactory'; +export * from './inlineEditFormatterFactory'; diff --git a/packages/react-inline-edit-extension/src/components/InlineEdit/utils/formatters/inlineEditFormatterFactory.d.ts b/packages/react-inline-edit-extension/src/components/InlineEdit/utils/formatters/inlineEditFormatterFactory.d.ts index c19124a4fc6..fc1dae2b039 100644 --- a/packages/react-inline-edit-extension/src/components/InlineEdit/utils/formatters/inlineEditFormatterFactory.d.ts +++ b/packages/react-inline-edit-extension/src/components/InlineEdit/utils/formatters/inlineEditFormatterFactory.d.ts @@ -31,5 +31,4 @@ export interface InlineEditFormatterFactory { (props: InlineEditFormatterFactoryProps): Formatter; } -// eslint-disable-next-line no-undef -export default InlineEditFormatterFactory; +export const InlineEditFormatterFactory; diff --git a/packages/react-inline-edit-extension/src/components/InlineEdit/utils/formatters/inlineEditFormatterFactory.js b/packages/react-inline-edit-extension/src/components/InlineEdit/utils/formatters/inlineEditFormatterFactory.js index 26f5ebf8ecd..d86ca0b596a 100644 --- a/packages/react-inline-edit-extension/src/components/InlineEdit/utils/formatters/inlineEditFormatterFactory.js +++ b/packages/react-inline-edit-extension/src/components/InlineEdit/utils/formatters/inlineEditFormatterFactory.js @@ -1,4 +1,4 @@ -const inlineEditFormatterFactory = ({ renderEdit, renderValue, resolveValue, isEditable = null } = {}) => ( +export const inlineEditFormatterFactory = ({ renderEdit, renderValue, resolveValue, isEditable = null } = {}) => ( value, additionalData ) => { @@ -19,5 +19,3 @@ const inlineEditFormatterFactory = ({ renderEdit, renderValue, resolveValue, isE return value; }; - -export default inlineEditFormatterFactory; diff --git a/packages/react-inline-edit-extension/src/components/InlineEdit/utils/formatters/inlineEditFormatterFactory.test.js b/packages/react-inline-edit-extension/src/components/InlineEdit/utils/formatters/inlineEditFormatterFactory.test.js index c203af249e9..bef98a2c474 100644 --- a/packages/react-inline-edit-extension/src/components/InlineEdit/utils/formatters/inlineEditFormatterFactory.test.js +++ b/packages/react-inline-edit-extension/src/components/InlineEdit/utils/formatters/inlineEditFormatterFactory.test.js @@ -1,4 +1,4 @@ -import { default as inlineEditFormatterFactory } from './inlineEditFormatterFactory'; +import { inlineEditFormatterFactory } from './inlineEditFormatterFactory'; const blue = 'blue'; const alteredValue = 'violet'; diff --git a/packages/react-inline-edit-extension/src/components/TableTextInput/TableTextInput.d.ts b/packages/react-inline-edit-extension/src/components/TableTextInput/TableTextInput.d.ts index 2571d51fef9..236ac325aec 100644 --- a/packages/react-inline-edit-extension/src/components/TableTextInput/TableTextInput.d.ts +++ b/packages/react-inline-edit-extension/src/components/TableTextInput/TableTextInput.d.ts @@ -1,5 +1,5 @@ import { SFC, FormEvent } from 'react'; -import { TextInputProps } from '@patternfly/react-core/dist/js/components/TextInput'; +import { TextInputProps } from '@patternfly/react-core'; export interface TableTextInputProps extends Omit { defaultValue?: string; @@ -7,6 +7,4 @@ export interface TableTextInputProps extends Omit): void; } -declare const TableTextInput: SFC; - -export default TableTextInput; +export const TableTextInput: SFC; diff --git a/packages/react-inline-edit-extension/src/components/TableTextInput/TableTextInput.js b/packages/react-inline-edit-extension/src/components/TableTextInput/TableTextInput.js index adada577b48..141abbc973d 100644 --- a/packages/react-inline-edit-extension/src/components/TableTextInput/TableTextInput.js +++ b/packages/react-inline-edit-extension/src/components/TableTextInput/TableTextInput.js @@ -1,5 +1,5 @@ import React from 'react'; -import { TextInput } from '@patternfly/react-core/dist/js/components/TextInput/TextInput'; +import { TextInput } from '@patternfly/react-core'; import PropTypes from 'prop-types'; const textInputProptypes = { ...TextInput.propTypes }; @@ -24,7 +24,7 @@ const defaultProps = { autoFocus: false }; -class TableTextInput extends React.Component { +export class TableTextInput extends React.Component { handleBlur = event => { this.props.onBlur(event.currentTarget.value, event); }; @@ -48,5 +48,3 @@ class TableTextInput extends React.Component { TableTextInput.propTypes = propTypes; TableTextInput.defaultProps = defaultProps; - -export default TableTextInput; diff --git a/packages/react-inline-edit-extension/src/components/TableTextInput/TableTextInput.test.js b/packages/react-inline-edit-extension/src/components/TableTextInput/TableTextInput.test.js index 40850c59566..68ecf599d69 100644 --- a/packages/react-inline-edit-extension/src/components/TableTextInput/TableTextInput.test.js +++ b/packages/react-inline-edit-extension/src/components/TableTextInput/TableTextInput.test.js @@ -1,6 +1,6 @@ import React from 'react'; import { shallow } from 'enzyme'; -import TableTextInput from './TableTextInput'; +import { TableTextInput } from './TableTextInput'; const props = { defaultValue: 'test', diff --git a/packages/react-inline-edit-extension/src/components/TableTextInput/index.ts b/packages/react-inline-edit-extension/src/components/TableTextInput/index.ts index c912d7e19e0..f0a4ac5021f 100644 --- a/packages/react-inline-edit-extension/src/components/TableTextInput/index.ts +++ b/packages/react-inline-edit-extension/src/components/TableTextInput/index.ts @@ -1 +1 @@ -export { default as TableTextInput, TableTextInputProps } from './TableTextInput'; +export * from './TableTextInput'; diff --git a/packages/react-integration/cypress/integration/tablesimpleactions.spec.ts b/packages/react-integration/cypress/integration/tablesimpleactions.spec.ts index 09ff008a0e8..03200308e61 100644 --- a/packages/react-integration/cypress/integration/tablesimpleactions.spec.ts +++ b/packages/react-integration/cypress/integration/tablesimpleactions.spec.ts @@ -22,8 +22,12 @@ describe('Table Simple Actions Test', () => { }); it('Verify dropdown toggle', () => { - cy.get('.pf-c-dropdown__toggle').should('exist'); - cy.get('#pf-toggle-id-0.pf-c-dropdown__toggle').click(); + cy.get('td .pf-c-dropdown__toggle') + .first() + .should('exist'); + cy.get('td .pf-c-dropdown__toggle') + .first() + .click(); cy.get('.pf-c-dropdown__menu').should('exist'); cy.get('.pf-c-dropdown__menu-item') .first() diff --git a/packages/react-integration/demo-app-ts/src/common/State.ts b/packages/react-integration/demo-app-ts/src/common/State.ts index 2c908626ee4..0ec539bc244 100644 --- a/packages/react-integration/demo-app-ts/src/common/State.ts +++ b/packages/react-integration/demo-app-ts/src/common/State.ts @@ -1,4 +1,4 @@ -import { SelectOptionObject } from '@patternfly/react-core/dist/js/components/Select/SelectOption'; +import { SelectOptionObject } from '@patternfly/react-core'; export class State implements SelectOptionObject { name: string; diff --git a/packages/react-table/src/components/Table/ActionsColumn.tsx b/packages/react-table/src/components/Table/ActionsColumn.tsx index 58d2ad829b7..79a0136625f 100644 --- a/packages/react-table/src/components/Table/ActionsColumn.tsx +++ b/packages/react-table/src/components/Table/ActionsColumn.tsx @@ -1,12 +1,12 @@ import * as React from 'react'; -import { Dropdown } from '@patternfly/react-core/dist/js/components/Dropdown/Dropdown'; import { + Dropdown, DropdownPosition, - DropdownDirection -} from '@patternfly/react-core/dist/js/components/Dropdown/dropdownConstants'; -import { KebabToggle } from '@patternfly/react-core/dist/js/components/Dropdown/KebabToggle'; -import { DropdownItem } from '@patternfly/react-core/dist/js/components/Dropdown/DropdownItem'; -import { DropdownSeparator } from '@patternfly/react-core/dist/js/components/Dropdown/DropdownSeparator'; + DropdownDirection, + KebabToggle, + DropdownItem, + DropdownSeparator +} from '@patternfly/react-core'; import { IAction, IExtraData, IRowData } from './Table'; diff --git a/packages/react-table/src/components/Table/CollapseColumn.tsx b/packages/react-table/src/components/Table/CollapseColumn.tsx index b90cf7c10c7..adbbb712994 100644 --- a/packages/react-table/src/components/Table/CollapseColumn.tsx +++ b/packages/react-table/src/components/Table/CollapseColumn.tsx @@ -1,7 +1,7 @@ import * as React from 'react'; import AngleDownIcon from '@patternfly/react-icons/dist/js/icons/angle-down-icon'; import { css } from '@patternfly/react-styles'; -import { Button } from '@patternfly/react-core/dist/js/components/Button/Button'; +import { Button } from '@patternfly/react-core'; import styles from '@patternfly/react-styles/css/components/Table/table'; export interface CollapseColumnProps { diff --git a/packages/react-table/src/components/Table/RowWrapper.tsx b/packages/react-table/src/components/Table/RowWrapper.tsx index a87647a9bfb..e6089ad410b 100644 --- a/packages/react-table/src/components/Table/RowWrapper.tsx +++ b/packages/react-table/src/components/Table/RowWrapper.tsx @@ -1,6 +1,5 @@ import * as React from 'react'; -import { getOUIAProps, OUIAProps } from '@patternfly/react-core/dist/js/helpers/ouia'; -import { debounce } from '@patternfly/react-core/dist/js/helpers/util'; +import { getOUIAProps, OUIAProps, debounce } from '@patternfly/react-core'; import styles from '@patternfly/react-styles/css/components/Table/table'; import inlineStyles from '@patternfly/react-styles/css/components/InlineEdit/inline-edit'; import { css } from '@patternfly/react-styles'; diff --git a/packages/react-table/src/components/Table/Table.tsx b/packages/react-table/src/components/Table/Table.tsx index c06ddce4cbe..8e04165b8c0 100644 --- a/packages/react-table/src/components/Table/Table.tsx +++ b/packages/react-table/src/components/Table/Table.tsx @@ -1,12 +1,13 @@ import * as React from 'react'; import styles from '@patternfly/react-styles/css/components/Table/table'; import stylesGrid from '@patternfly/react-styles/css/components/Table/table-grid'; -import { getOUIAProps, OUIAProps } from '@patternfly/react-core/dist/js/helpers/ouia'; import { + getOUIAProps, + OUIAProps, DropdownDirection, - DropdownPosition -} from '@patternfly/react-core/dist/js/components/Dropdown/dropdownConstants'; -import { DropdownItemProps } from '@patternfly/react-core/dist/js/components/Dropdown/DropdownItem'; + DropdownPosition, + DropdownItemProps +} from '@patternfly/react-core'; import inlineStyles from '@patternfly/react-styles/css/components/InlineEdit/inline-edit'; import { css } from '@patternfly/react-styles'; import { Provider } from './base'; diff --git a/packages/react-table/src/components/Table/utils/decorators/compoundExpand.tsx b/packages/react-table/src/components/Table/utils/decorators/compoundExpand.tsx index 39b6797df69..2acc617b8f9 100644 --- a/packages/react-table/src/components/Table/utils/decorators/compoundExpand.tsx +++ b/packages/react-table/src/components/Table/utils/decorators/compoundExpand.tsx @@ -1,6 +1,6 @@ import * as React from 'react'; import { css } from '@patternfly/react-styles'; -import { Button } from '@patternfly/react-core/dist/js/components/Button/Button'; +import { Button } from '@patternfly/react-core'; import styles from '@patternfly/react-styles/css/components/Table/table'; import { IExtra, IFormatterValueType, ITransform } from '../../Table'; diff --git a/packages/react-topology/src/components/TopologyView/TopologyView.tsx b/packages/react-topology/src/components/TopologyView/TopologyView.tsx index 6e2b5301e0d..3f1961cf4d8 100644 --- a/packages/react-topology/src/components/TopologyView/TopologyView.tsx +++ b/packages/react-topology/src/components/TopologyView/TopologyView.tsx @@ -1,6 +1,5 @@ import * as React from 'react'; -import { Stack } from '@patternfly/react-core/dist/js/layouts/Stack/Stack'; -import { StackItem } from '@patternfly/react-core/dist/js/layouts/Stack/StackItem'; +import { Stack, StackItem } from '@patternfly/react-core'; import '@patternfly/react-styles/css/components/Topology/topology-view.css'; export interface TopologyViewProps extends React.HTMLProps { diff --git a/packages/react-topology/src/components/TopologyView/examples/ItemDetails.js b/packages/react-topology/src/components/TopologyView/examples/ItemDetails.js index e6213d98e06..1d04614963e 100644 --- a/packages/react-topology/src/components/TopologyView/examples/ItemDetails.js +++ b/packages/react-topology/src/components/TopologyView/examples/ItemDetails.js @@ -1,6 +1,6 @@ import React from 'react'; import PropTypes from 'prop-types'; -import { Title, TitleSizes } from '@patternfly/react-core/dist/js/components/Title/Title'; +import { Title, TitleSizes } from '@patternfly/react-core'; import { TopologySideBar } from '@patternfly/react-topology'; export class ItemDetails extends React.Component { diff --git a/packages/react-topology/src/components/TopologyView/examples/ProjectToolbar.js b/packages/react-topology/src/components/TopologyView/examples/ProjectToolbar.js index 48c412eb652..78de77bbda9 100644 --- a/packages/react-topology/src/components/TopologyView/examples/ProjectToolbar.js +++ b/packages/react-topology/src/components/TopologyView/examples/ProjectToolbar.js @@ -1,13 +1,15 @@ import React from 'react'; -import { Dropdown } from '@patternfly/react-core/dist/js/components/Dropdown/Dropdown'; -import { DropdownItem } from '@patternfly/react-core/dist/js/components/Dropdown/DropdownItem'; -import { DropdownToggle } from '@patternfly/react-core/dist/js/components/Dropdown/DropdownToggle'; -import { DropdownPosition } from '@patternfly/react-core/dist/js/components/Dropdown/dropdownConstants'; -import { Stack } from '@patternfly/react-core/dist/js/layouts/Stack/Stack'; -import { StackItem } from '@patternfly/react-core/dist/js/layouts/Stack/StackItem'; -import { Toolbar } from '@patternfly/react-core/dist/js/layouts/Toolbar/Toolbar'; -import { ToolbarGroup } from '@patternfly/react-core/dist/js/layouts/Toolbar/ToolbarGroup'; -import { ToolbarItem } from '@patternfly/react-core/dist/js/layouts/Toolbar/ToolbarItem'; +import { + Dropdown, + DropdownItem, + DropdownToggle, + DropdownPosition, + Stack, + StackItem, + Toolbar, + ToolbarGroup, + ToolbarItem +} from '@patternfly/react-core'; const projects = [ { id: 1, name: 'Project 1' }, diff --git a/packages/react-virtualized-extension/src/components/Virtualized/VirtualGrid.ts b/packages/react-virtualized-extension/src/components/Virtualized/VirtualGrid.ts index b06e6ccc09d..dbb58438db2 100644 --- a/packages/react-virtualized-extension/src/components/Virtualized/VirtualGrid.ts +++ b/packages/react-virtualized-extension/src/components/Virtualized/VirtualGrid.ts @@ -257,7 +257,7 @@ interface State { * Renders tabular data with virtualization along the vertical and horizontal axes. * Row heights and column widths must be known ahead of time and specified as properties. */ -class VirtualGrid extends React.PureComponent { +export class VirtualGrid extends React.PureComponent { static defaultProps = { 'aria-label': 'grid', 'aria-readonly': true, @@ -1476,4 +1476,3 @@ class VirtualGrid extends React.PureComponent { } polyfill(VirtualGrid as any); -export default VirtualGrid; diff --git a/packages/react-virtualized-extension/src/components/Virtualized/VirtualTableBody.tsx b/packages/react-virtualized-extension/src/components/Virtualized/VirtualTableBody.tsx index b1d6d1c69c6..20530522053 100644 --- a/packages/react-virtualized-extension/src/components/Virtualized/VirtualTableBody.tsx +++ b/packages/react-virtualized-extension/src/components/Virtualized/VirtualTableBody.tsx @@ -14,7 +14,7 @@ import { } from './types'; import accessibilityOverscanIndicesGetter from './accessibilityOverscanIndicesGetter'; -import VirtualGrid from './VirtualGrid'; +import { VirtualGrid } from './VirtualGrid'; import clsx from 'clsx'; /** @@ -103,7 +103,7 @@ interface Props { rows: any[]; } -export default class VirtualTableBody extends React.PureComponent { +export class VirtualTableBody extends React.PureComponent { static defaultProps = { autoHeight: false, estimatedRowSize: 30, diff --git a/packages/react-virtualized-extension/src/components/Virtualized/index.ts b/packages/react-virtualized-extension/src/components/Virtualized/index.ts index 2497d4618e3..ada4b4e0187 100644 --- a/packages/react-virtualized-extension/src/components/Virtualized/index.ts +++ b/packages/react-virtualized-extension/src/components/Virtualized/index.ts @@ -1,3 +1,3 @@ export { AutoSizer, WindowScroller } from 'react-virtualized'; -export { default as VirtualGrid } from './VirtualGrid'; -export { default as VirtualTableBody } from './VirtualTableBody'; +export { VirtualGrid } from './VirtualGrid'; +export { VirtualTableBody } from './VirtualTableBody'; diff --git a/scripts/generators/patternfly-4-component/templates/component/index.ts.hbs b/scripts/generators/patternfly-4-component/templates/component/index.ts.hbs index 919a020cc73..e415366775c 100644 --- a/scripts/generators/patternfly-4-component/templates/component/index.ts.hbs +++ b/scripts/generators/patternfly-4-component/templates/component/index.ts.hbs @@ -1 +1 @@ -export { default as {{componentName}} } from './{{componentName}}'; +export * from './{{componentName}}';