Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,7 @@ when possible and accept [props](https://facebook.github.io/react/docs/component
* Provide a storybook with your component named on the parent component with a `.stories.js` suffix (e.g., `ListGroup.stories.js`)
* When your stories contain multiple files, put them in a subfolder named `Stories`
* `src/**/*.stories.js` and `src/**/Stories/` are excluded from the package build output
* 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' `
* Exporting components from other libraries (without manipulating them)
to consumers is a common task, use:
```js
Expand Down
4 changes: 2 additions & 2 deletions src/components/AboutModal/AboutModalVersions.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import cx from 'classnames';
import classNames from 'classnames';
import React from 'react';
import PropTypes from 'prop-types';

const AboutModalVersions = ({ children, className, ...rest }) => {
const classes = cx('product-versions-pf', className);
const classes = classNames('product-versions-pf', className);

return (
<div className={classes} {...rest}>
Expand Down
4 changes: 2 additions & 2 deletions src/components/Alert/Alert.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import ClassNames from 'classnames';
import classNames from 'classnames';
import React from 'react';
import PropTypes from 'prop-types';
import { Button } from '../Button';
Expand All @@ -16,7 +16,7 @@ import {
const Alert = ({ children, className, onDismiss, type, ...props }) => {
warnIfDeprecatedType(type);

const alertClass = ClassNames('alert', className, getClassName(type), {
const alertClass = classNames('alert', className, getClassName(type), {
'alert-dismissable': onDismiss
});

Expand Down
4 changes: 2 additions & 2 deletions src/components/Breadcrumb/Breadcrumb.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import React from 'react';
import cx from 'classnames';
import classNames from 'classnames';
import PropTypes from 'prop-types';
import { Breadcrumb as BsBreadcrumb } from 'react-bootstrap';

const Breadcrumb = ({ title, ...props }) => {
const breadcrumbClass = cx({
const breadcrumbClass = classNames({
'breadcrumbs-pf-title': title
});
return <BsBreadcrumb className={breadcrumbClass} {...props} />;
Expand Down
4 changes: 2 additions & 2 deletions src/components/DropdownKebab/DropdownKebab.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import ClassNames from 'classnames';
import classNames from 'classnames';
import React from 'react';
import PropTypes from 'prop-types';
import { Icon } from '../Icon';
Expand All @@ -16,7 +16,7 @@ const DropdownKebab = ({
componentClass,
toggleStyle
}) => {
const kebabClass = ClassNames('dropdown-kebab-pf', className);
const kebabClass = classNames('dropdown-kebab-pf', className);
return (
<Dropdown
className={kebabClass}
Expand Down
4 changes: 2 additions & 2 deletions src/components/EmptyState/EmptyState.js
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import ClassNames from 'classnames';
import classNames from 'classnames';
import React from 'react';
import PropTypes from 'prop-types';

/**
* Empty State Component for Patternfly React
*/
const EmptyState = ({ children, className, ...props }) => {
const classes = ClassNames('blank-slate-pf', className);
const classes = classNames('blank-slate-pf', className);

return (
<div className={classes} {...props}>
Expand Down
4 changes: 2 additions & 2 deletions src/components/EmptyState/EmptyStateAction.js
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import ClassNames from 'classnames';
import classNames from 'classnames';
import React from 'react';
import PropTypes from 'prop-types';

/**
* EmptyStateAction renders contents of the element
*/
const EmptyStateAction = ({ children, className, secondary, ...props }) => {
const classes = ClassNames(
const classes = classNames(
{
'blank-slate-pf-main-action': !secondary,
'blank-slate-pf-secondary-action': secondary
Expand Down
4 changes: 2 additions & 2 deletions src/components/EmptyState/EmptyStateHelp.js
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import ClassNames from 'classnames';
import classNames from 'classnames';
import React from 'react';
import PropTypes from 'prop-types';

/**
* EmptyStateHelp renders contents of the element
*/
const EmptyStateHelp = ({ children, className, ...props }) => {
const classes = ClassNames('blank-slate-pf-helpLink', className);
const classes = classNames('blank-slate-pf-helpLink', className);

return (
<p className={classes} {...props}>
Expand Down
4 changes: 2 additions & 2 deletions src/components/EmptyState/EmptyStateIcon.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import ClassNames from 'classnames';
import classNames from 'classnames';
import React from 'react';
import PropTypes from 'prop-types';
import { Icon } from '../Icon';
Expand All @@ -7,7 +7,7 @@ import { Icon } from '../Icon';
* EmptyStateIcon renders element
*/
const EmptyStateIcon = ({ className, type, name, ...props }) => {
const classes = ClassNames('blank-slate-pf-icon', className);
const classes = classNames('blank-slate-pf-icon', className);

return (
<div className={classes}>
Expand Down
4 changes: 2 additions & 2 deletions src/components/EmptyState/EmptyStateInfo.js
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import ClassNames from 'classnames';
import classNames from 'classnames';
import React from 'react';
import PropTypes from 'prop-types';

/**
* EmptyStateInfo renders contents of the element
*/
const EmptyStateInfo = ({ children, className, ...props }) => {
const classes = ClassNames('blank-slate-pf-info', className);
const classes = classNames('blank-slate-pf-info', className);

return (
<p className={classes} {...props}>
Expand Down
4 changes: 2 additions & 2 deletions src/components/EmptyState/EmptyStateTitle.js
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import ClassNames from 'classnames';
import classNames from 'classnames';
import React from 'react';
import PropTypes from 'prop-types';

/**
* EmptyStateTitle renders contents of the element
*/
const EmptyStateTitle = ({ children, className, ...props }) => {
const classes = ClassNames('h1', 'blank-slate-pf-title', className);
const classes = classNames('h1', 'blank-slate-pf-title', className);
return (
<h4 className={classes} {...props}>
{children}
Expand Down
4 changes: 2 additions & 2 deletions src/components/Filter/Filter.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import cx from 'classnames';
import classNames from 'classnames';
import React from 'react';
import PropTypes from 'prop-types';
import { getContext } from 'recompose';
Expand All @@ -7,7 +7,7 @@ import { toolbarContextTypes } from '../Toolbar/ToolbarConstants';
// Disabled eslint due to `isDescendantOfToolbar` being a context property we don't want passed by consumers
// eslint-disable-next-line react/prop-types
const Filter = ({ children, className, isDescendantOfToolbar, ...rest }) => {
const classes = cx(
const classes = classNames(
{
'filter-pf form-group': true,
'toolbar-pf-filter': isDescendantOfToolbar
Expand Down
4 changes: 2 additions & 2 deletions src/components/Filter/FilterActiveLabel.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import cx from 'classnames';
import classNames from 'classnames';
import React from 'react';
import PropTypes from 'prop-types';

const FilterActiveLabel = ({ children, className, ...rest }) => {
const classes = cx('filter-pf-active-label', className);
const classes = classNames('filter-pf-active-label', className);
return <p className={classes}>{children}</p>;
};

Expand Down
4 changes: 2 additions & 2 deletions src/components/Filter/FilterCategorySelector.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react';
import PropTypes from 'prop-types';
import cx from 'classnames';
import classNames from 'classnames';
import { DropdownButton } from '../Button';
import { MenuItem } from '../MenuItem';
import { noop } from '../../common/helpers';
Expand All @@ -15,7 +15,7 @@ const FilterCategorySelector = ({
onFilterCategorySelected,
...rest
}) => {
const classes = cx('filter-pf-category-select', className);
const classes = classNames('filter-pf-category-select', className);

if (placeholder || (filterCategories && filterCategories.length > 1)) {
let title;
Expand Down
4 changes: 2 additions & 2 deletions src/components/Filter/FilterCategoryValueSelector.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react';
import PropTypes from 'prop-types';
import cx from 'classnames';
import classNames from 'classnames';
import { DropdownButton } from '../Button';
import { MenuItem } from '../MenuItem';
import { noop } from '../../common/helpers';
Expand All @@ -14,7 +14,7 @@ const FilterCategoryValueSelector = ({
onCategoryValueSelected,
...rest
}) => {
const classes = cx('filter-pf-select', className);
const classes = classNames('filter-pf-select', className);

if (placeholder || (categoryValues && categoryValues.length > 1)) {
let title;
Expand Down
4 changes: 2 additions & 2 deletions src/components/Filter/FilterItem.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import ClassNames from 'classnames';
import classNames from 'classnames';
import React from 'react';
import PropTypes from 'prop-types';
import { noop } from '../../common/helpers';
import { DisposableLabel } from '../Label';

const FilterItem = ({ children, className, onRemove, filterData, ...rest }) => {
const classes = ClassNames(className);
const classes = classNames(className);

return (
<li className={classes} {...rest}>
Expand Down
4 changes: 2 additions & 2 deletions src/components/Filter/FilterList.js
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import cx from 'classnames';
import classNames from 'classnames';
import React from 'react';
import PropTypes from 'prop-types';

const FilterList = ({ children, className, ...rest }) => {
if (!children) {
return null;
}
const classes = cx('list-inline', className);
const classes = classNames('list-inline', className);
return <ul className={classes}>{children}</ul>;
};

Expand Down
4 changes: 2 additions & 2 deletions src/components/Filter/FilterTypeSelector.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react';
import PropTypes from 'prop-types';
import cx from 'classnames';
import classNames from 'classnames';
import { DropdownButton } from '../Button';
import { MenuItem } from '../MenuItem';
import { noop } from '../../common/helpers';
Expand All @@ -14,7 +14,7 @@ const FilterTypeSelector = ({
onFilterTypeSelected,
...rest
}) => {
const classes = cx('input-group-btn', className);
const classes = classNames('input-group-btn', className);
if (placeholder || (filterTypes && filterTypes.length > 1)) {
let title;
if (currentFilterType) {
Expand Down
4 changes: 2 additions & 2 deletions src/components/Filter/FilterValueSelector.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react';
import PropTypes from 'prop-types';
import cx from 'classnames';
import classNames from 'classnames';
import { DropdownButton } from '../Button';
import { MenuItem } from '../MenuItem';
import { noop } from '../../common/helpers';
Expand All @@ -14,7 +14,7 @@ const FilterValueSelector = ({
onFilterValueSelected,
...rest
}) => {
const classes = cx('filter-pf-select', className);
const classes = classNames('filter-pf-select', className);

if (placeholder || (filterValues && filterValues.length > 1)) {
let title;
Expand Down
4 changes: 2 additions & 2 deletions src/components/Icon/InnerComponents/PatternflyIcon.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import cx from 'classnames';
import classNames from 'classnames';
import React from 'react';
import PropTypes from 'prop-types';

const PatternflyIcon = ({ name, className, ...props }) => (
<span
aria-hidden="true"
className={cx('pficon', `pficon-${name}`, className)}
className={classNames('pficon', `pficon-${name}`, className)}
{...props}
/>
);
Expand Down
4 changes: 2 additions & 2 deletions src/components/InfoTip/InfoTipMenu.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from 'react';
import ClassNames from 'classnames';
import classNames from 'classnames';
import PropTypes from 'prop-types';

// eslint-disable-next-line react/prefer-stateless-function
Expand All @@ -16,7 +16,7 @@ class InfoTipMenu extends React.Component {
...props
} = this.props;

const infoTipMenuClass = ClassNames(
const infoTipMenuClass = classNames(
'dropdown-menu',
'infotip',
'bottom-right',
Expand Down
4 changes: 2 additions & 2 deletions src/components/Label/RemoveButton.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import ClassNames from 'classnames';
import classNames from 'classnames';
import React from 'react';
import PropTypes from 'prop-types';
import { noop } from '../../common/helpers';

const RemoveButton = ({ className, title, onRemoveClick, ...rest }) => {
const classes = ClassNames('pficon pficon-close', className);
const classes = classNames('pficon pficon-close', className);

return (
<a
Expand Down
7 changes: 5 additions & 2 deletions src/components/ListView/ListView.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import cx from 'classnames';
import classNames from 'classnames';
import React from 'react';
import PropTypes from 'prop-types';

Expand Down Expand Up @@ -56,7 +56,10 @@ import PropTypes from 'prop-types';
* ListView component wraps ListViewItems
*/
const ListView = ({ children, className, ...rest }) => {
const classes = cx('list-group list-view-pf list-view-pf-view', className);
const classes = classNames(
'list-group list-view-pf list-view-pf-view',
className
);
return (
<div className={classes} {...rest}>
{children}
Expand Down
6 changes: 3 additions & 3 deletions src/components/ListView/ListView.stories.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import cx from 'classnames';
import classNames from 'classnames';
import React from 'react';
import { storiesOf } from '@storybook/react';
import { withKnobs, boolean } from '@storybook/addon-knobs';
Expand Down Expand Up @@ -37,15 +37,15 @@ const renderActions = () => (
const renderAdditionalInfoItems = itemProperties =>
itemProperties &&
Object.keys(itemProperties).map(prop => {
const classNames = cx('pficon', {
const cssClassNames = classNames('pficon', {
'pficon-flavor': prop === 'hosts',
'pficon-cluster': prop === 'clusters',
'pficon-container-node': prop === 'nodes',
'pficon-image': prop === 'images'
});
return (
<ListView.InfoItem key={prop}>
<span className={classNames} />
<span className={cssClassNames} />
<strong>{itemProperties[prop]}</strong> {prop}
</ListView.InfoItem>
);
Expand Down
6 changes: 4 additions & 2 deletions src/components/ListView/ListViewCheckbox.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import cx from 'classnames';
import classNames from 'classnames';
import React from 'react';
import PropTypes from 'prop-types';

Expand All @@ -8,7 +8,9 @@ import PropTypes from 'prop-types';
* in case of redux-form)
*/
const ListViewCheckbox = ({ children, className }) => (
<div className={cx('list-view-pf-checkbox', className)}>{children}</div>
<div className={classNames('list-view-pf-checkbox', className)}>
{children}
</div>
);

ListViewCheckbox.propTypes = {
Expand Down
Loading