Skip to content

Commit

Permalink
remove customStyles from prop destrcturing
Browse files Browse the repository at this point in the history
  • Loading branch information
jbadan committed Oct 1, 2019
1 parent 62c1bc9 commit d1b8d8b
Show file tree
Hide file tree
Showing 53 changed files with 39 additions and 55 deletions.
2 changes: 1 addition & 1 deletion src/ActionBar/ActionBar.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import PropTypes from 'prop-types';
import React from 'react';
import withStyles from '../utils/WithStyles/WithStyles';

const ActionBar = React.forwardRef(({ children, className, customStyles, disableStyles, ...props }, ref) => {
const ActionBar = React.forwardRef(({ children, className, disableStyles, ...props }, ref) => {
const actionBarClasses = classnames(
'fd-action-bar',
className
Expand Down
1 change: 0 additions & 1 deletion src/ActionBar/_ActionBarBack.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ ActionBarBack.displayName = 'ActionBar.Back';
ActionBarBack.propTypes = {
buttonProps: PropTypes.object,
className: PropTypes.string,
customStyles: PropTypes.object,
disableStyles: PropTypes.bool,
onClick: PropTypes.func
};
Expand Down
2 changes: 1 addition & 1 deletion src/Badge/Badge.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import withStyles from '../utils/WithStyles/WithStyles';
import { BADGE_MODIFIERS, BADGE_TYPES } from '../utils/constants';


const Badge = React.forwardRef(({ type, modifier, children, className, customStyles, disableStyles, ...props }, ref) => {
const Badge = React.forwardRef(({ type, modifier, children, className, disableStyles, ...props }, ref) => {
const badgeClasses = classnames(
'fd-badge',
{
Expand Down
2 changes: 1 addition & 1 deletion src/Badge/Counter.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import PropTypes from 'prop-types';
import React from 'react';
import withStyles from '../utils/WithStyles/WithStyles';

const Counter = React.forwardRef(({ localizedText, notification, children, className, customStyles, disableStyles, ...props }, ref) => {
const Counter = React.forwardRef(({ localizedText, notification, children, className, disableStyles, ...props }, ref) => {
const counterClasses = classnames(
'fd-counter',
{
Expand Down
2 changes: 1 addition & 1 deletion src/Badge/Label.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import PropTypes from 'prop-types';
import React from 'react';
import withStyles from '../utils/WithStyles/WithStyles';

const Label = React.forwardRef(({ type, children, className, customStyles, disableStyles, ...props }, ref) => {
const Label = React.forwardRef(({ type, children, className, disableStyles, ...props }, ref) => {
const labelClasses = classnames(
'fd-label',
{
Expand Down
2 changes: 1 addition & 1 deletion src/Badge/Status.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import React from 'react';
import { STATUS_TYPES } from '../utils/constants';
import withStyles from '../utils/WithStyles/WithStyles';

const Status = React.forwardRef(({ type, glyph, children, className, customStyles, disableStyles, ...props }, ref) => {
const Status = React.forwardRef(({ type, glyph, children, className, disableStyles, ...props }, ref) => {
const statusClasses = classnames(
'fd-status-label',
{
Expand Down
2 changes: 1 addition & 1 deletion src/Breadcrumb/Breadcrumb.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
import React from 'react';
import withStyles from '../utils/WithStyles/WithStyles';

const Breadcrumb = React.forwardRef(({ children, customStyles, disableStyles, ...props }, ref) => {
const Breadcrumb = React.forwardRef(({ children, disableStyles, ...props }, ref) => {
return (<ul {...props}
className='fd-breadcrumb'
ref={ref}>{children}</ul>);
Expand Down
1 change: 0 additions & 1 deletion src/Button/Button.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ const Button = React.forwardRef(({
option,
type,
compact,
customStyles,
disableStyles,
glyph,
selected,
Expand Down
2 changes: 1 addition & 1 deletion src/Button/ButtonGroup.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import PropTypes from 'prop-types';
import React from 'react';
import withStyles from '../utils/WithStyles/WithStyles';

const ButtonGroup = React.forwardRef(({ children, customStyles, disableStyles, ...props }, ref) => {
const ButtonGroup = React.forwardRef(({ children, disableStyles, ...props }, ref) => {
return (
<div
{...props}
Expand Down
1 change: 0 additions & 1 deletion src/Calendar/Calendar.js
Original file line number Diff line number Diff line change
Expand Up @@ -545,7 +545,6 @@ class Calendar extends Component {

render() {
const {
customStyles,
enableRangeSelection,
disableStyles,
disableWeekends,
Expand Down
2 changes: 1 addition & 1 deletion src/ComboboxInput/ComboboxInput.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import PropTypes from 'prop-types';
import React from 'react';
import withStyles from '../utils/WithStyles/WithStyles';

const ComboboxInput = React.forwardRef(({ placeholder, menu, compact, className, customStyles, disableStyles, popoverProps, inputProps, buttonProps, ...props }, ref) => {
const ComboboxInput = React.forwardRef(({ placeholder, menu, compact, className, disableStyles, popoverProps, inputProps, buttonProps, ...props }, ref) => {
const comboboxPopoverClasses = classnames(
'fd-input-group'
);
Expand Down
5 changes: 2 additions & 3 deletions src/DatePicker/DatePicker.js
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,6 @@ class DatePicker extends Component {
buttonProps,
className,
compact,
customStyles,
disableAfterDate,
disableBeforeDate,
disabledDates,
Expand Down Expand Up @@ -336,7 +335,7 @@ class DatePicker extends Component {
<Button {...buttonProps}
className='fd-input-group__button'
compact={compact}
disableStyles={disableStyles || customStyles}
disableStyles={disableStyles}
glyph='calendar'
onClick={() => this.openCalendar()}
option='light' />
Expand All @@ -357,7 +356,7 @@ class DatePicker extends Component {
disableBeforeDate={disableBeforeDate}
disableFutureDates={disableFutureDates}
disablePastDates={disablePastDates}
disableStyles={disableStyles || customStyles}
disableStyles={disableStyles}
disableWeekday={disableWeekday}
disableWeekends={disableWeekends}
disabledDates={disabledDates}
Expand Down
2 changes: 1 addition & 1 deletion src/Dropdown/Dropdown.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
import React from 'react';
import withStyles from '../utils/WithStyles/WithStyles';

const Dropdown = React.forwardRef(({ children, className, customStyles, disableStyles, standard, ...props }, ref) => {
const Dropdown = React.forwardRef(({ children, className, disableStyles, standard, ...props }, ref) => {

const dropdownClasses = classnames(
'fd-dropdown',
Expand Down
2 changes: 1 addition & 1 deletion src/Forms/Checkbox.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ const getCheckStatus = (checked, indeterminate) => {
}
};

const Checkbox = React.forwardRef(({ checked, className, customStyles, defaultChecked, disabled, disableStyles, id, indeterminate, inline, inputProps, labelProps, name, onChange, value, ...props }, ref) => {
const Checkbox = React.forwardRef(({ checked, className, defaultChecked, disabled, disableStyles, id, indeterminate, inline, inputProps, labelProps, name, onChange, value, ...props }, ref) => {

const inputEl = useRef();

Expand Down
2 changes: 1 addition & 1 deletion src/Forms/FormFieldset.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
import React from 'react';
import withStyles from '../utils/WithStyles/WithStyles';

const FormFieldset = React.forwardRef(({ children, className, customStyles, disableStyles, ...props }, ref) => {
const FormFieldset = React.forwardRef(({ children, className, disableStyles, ...props }, ref) => {
const formFieldsetClasses = classnames(
'fd-fieldset',
className
Expand Down
2 changes: 1 addition & 1 deletion src/Forms/FormInput.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import PropTypes from 'prop-types';
import React from 'react';
import withStyles from '../utils/WithStyles/WithStyles';

const FormInput = React.forwardRef(({ state, className, compact, disabled, id, name, placeholder, readOnly, type, value, customStyles, disableStyles, ...props }, ref) => {
const FormInput = React.forwardRef(({ state, className, compact, disabled, id, name, placeholder, readOnly, type, value, disableStyles, ...props }, ref) => {
const formInputClasses = classnames(
'fd-input',
{
Expand Down
2 changes: 1 addition & 1 deletion src/Forms/FormItem.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
import React from 'react';
import withStyles from '../utils/WithStyles/WithStyles';

const FormItem = React.forwardRef(({ isInline, children, className, customStyles, disableStyles, ...props }, ref) => {
const FormItem = React.forwardRef(({ isInline, children, className, disableStyles, ...props }, ref) => {
const formItemClasses = classnames(
'fd-form-item',
{
Expand Down
2 changes: 1 addition & 1 deletion src/Forms/FormLabel.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
import React from 'react';
import withStyles from '../utils/WithStyles/WithStyles';

const FormLabel = React.forwardRef(({ required, children, className, disabled, customStyles, disableStyles, ...props }, ref) => {
const FormLabel = React.forwardRef(({ required, children, className, disabled, disableStyles, ...props }, ref) => {
const formLabelClasses = classnames(
'fd-form-label',
{ 'is-disabled': disabled },
Expand Down
2 changes: 1 addition & 1 deletion src/Forms/FormLegend.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
import React from 'react';
import withStyles from '../utils/WithStyles/WithStyles';

const FormLegend = React.forwardRef(({ children, className, customStyles, disableStyles, ...props }, ref) => {
const FormLegend = React.forwardRef(({ children, className, disableStyles, ...props }, ref) => {
const formLegendClasses = classnames(
'fd-fieldset__legend',
className
Expand Down
2 changes: 1 addition & 1 deletion src/Forms/FormMessage.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import PropTypes from 'prop-types';
import React from 'react';
import withStyles from '../utils/WithStyles/WithStyles';

const FormMessage = React.forwardRef(({ type, children, className, customStyles, disableStyles, ...props }, ref) => {
const FormMessage = React.forwardRef(({ type, children, className, disableStyles, ...props }, ref) => {
const formMessageClasses = classnames(
'fd-form-message',
{
Expand Down
2 changes: 1 addition & 1 deletion src/Forms/FormRadioGroup.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ class FormRadioGroup extends Component {
}

render() {
const { children, customStyles, disabled, disableStyles, inline, onChange, ...props } = this.props;
const { children, disabled, disableStyles, inline, onChange, ...props } = this.props;

return (
<div
Expand Down
2 changes: 1 addition & 1 deletion src/Forms/FormRadioItem.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import PropTypes from 'prop-types';
import React from 'react';
import withStyles from '../utils/WithStyles/WithStyles';

const FormRadioItem = React.forwardRef(({ checked, children, className, customStyles, defaultChecked, disabled, disableStyles, id, inline, inputProps, labelProps, name, value, ...props }, ref) => {
const FormRadioItem = React.forwardRef(({ checked, children, className, defaultChecked, disabled, disableStyles, id, inline, inputProps, labelProps, name, value, ...props }, ref) => {

return (
<FormItem
Expand Down
2 changes: 1 addition & 1 deletion src/Forms/FormSelect.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
import React from 'react';
import withStyles from '../utils/WithStyles/WithStyles';

const FormSelect = React.forwardRef(({ disabled, children, className, customStyles, disableStyles, ...props }, ref) => {
const FormSelect = React.forwardRef(({ disabled, children, className, disableStyles, ...props }, ref) => {
const formSelectClasses = classnames(
'fd-form-select',
className
Expand Down
2 changes: 1 addition & 1 deletion src/Forms/FormSet.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
import React from 'react';
import withStyles from '../utils/WithStyles/WithStyles';

const FormSet = React.forwardRef(({ children, className, customStyles, disableStyles, ...props }, ref) => {
const FormSet = React.forwardRef(({ children, className, disableStyles, ...props }, ref) => {
const formSetClasses = classnames(
'fd-form-group',
className
Expand Down
2 changes: 1 addition & 1 deletion src/Forms/FormTextarea.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
import React from 'react';
import withStyles from '../utils/WithStyles/WithStyles';

const FormTextarea = React.forwardRef(({ children, className, customStyles, disableStyles, ...props }, ref) => {
const FormTextarea = React.forwardRef(({ children, className, disableStyles, ...props }, ref) => {
const formTextAreaClasses = classnames(
'fd-textarea',
className
Expand Down
2 changes: 1 addition & 1 deletion src/Icon/Icon.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import PropTypes from 'prop-types';
import React from 'react';
import withStyles from '../utils/WithStyles/WithStyles';

const Icon = React.forwardRef(({ glyph, size, className, customStyles, disableStyles, ...props }, ref) => {
const Icon = React.forwardRef(({ glyph, size, className, disableStyles, ...props }, ref) => {
const iconClasses = classnames(
{
[`sap-icon--${glyph}`]: !!glyph,
Expand Down
2 changes: 1 addition & 1 deletion src/Identifier/Identifier.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import React from 'react';
import withStyles from '../utils/WithStyles/WithStyles';
import { IDENTIFIER_MODIFIERS, IDENTIFIER_SIZES } from '../utils/constants';

const Identifier = React.forwardRef(({ glyph, size, modifier, color, label, backgroundImageUrl, children, className, customStyles, disableStyles, ...props }, ref) => {
const Identifier = React.forwardRef(({ glyph, size, modifier, color, label, backgroundImageUrl, children, className, disableStyles, ...props }, ref) => {
const styles = {
backgroundImage: `url(${backgroundImageUrl})`
};
Expand Down
2 changes: 1 addition & 1 deletion src/Image/Image.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import React from 'react';
import withStyles from '../utils/WithStyles/WithStyles';
import { IMAGE_SIZES, IMAGE_TYPES } from '../utils/constants';

const Image = React.forwardRef(({ size, type, photo, className, customStyles, disableStyles, ...props }, ref) => {
const Image = React.forwardRef(({ size, type, photo, className, disableStyles, ...props }, ref) => {
const imageClasses = classnames(
{
[`fd-image--${size}`]: !!size,
Expand Down
2 changes: 1 addition & 1 deletion src/InlineHelp/InlineHelp.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import PropTypes from 'prop-types';
import React from 'react';
import withStyles from '../utils/WithStyles/WithStyles';

const InlineHelp = React.forwardRef(({ text, placement, className, contentClassName, customStyles, disableStyles, ...props }, ref) => {
const InlineHelp = React.forwardRef(({ text, placement, className, contentClassName, disableStyles, ...props }, ref) => {

const inlineHelpClasses = classnames(
'fd-inline-help',
Expand Down
2 changes: 1 addition & 1 deletion src/InputGroup/FormGroup.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import PropTypes from 'prop-types';
import React from 'react';
import withStyles from '../utils/WithStyles/WithStyles';

const FormGroup = React.forwardRef(({ children, customStyles, disableStyles, ...props }, ref) => {
const FormGroup = React.forwardRef(({ children, disableStyles, ...props }, ref) => {
return (<div {...props} className='fd-form-group'
ref={ref}>{children}</div>);
});
Expand Down
1 change: 0 additions & 1 deletion src/InputGroup/InputGroup.js
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@ class InputGroup extends Component {
children,
className,
compact,
customStyles,
disableStyles,
glyph,
inputClassName,
Expand Down
2 changes: 1 addition & 1 deletion src/LayoutGrid/LayoutGrid.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import PropTypes from 'prop-types';
import React from 'react';
import withStyles from '../utils/WithStyles/WithStyles';

const LayoutGrid = React.forwardRef(({ nogap, cols, children, className, colSpan, customStyles, disableStyles, ...props }, ref) => {
const LayoutGrid = React.forwardRef(({ nogap, cols, children, className, colSpan, disableStyles, ...props }, ref) => {

const layoutGridClasses = classnames(
'fd-layout-grid',
Expand Down
2 changes: 1 addition & 1 deletion src/Link/Link.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
import React from 'react';
import withStyles from '../utils/WithStyles/WithStyles';

const Link = React.forwardRef(({ className, children, disabled, customStyles, disableStyles, ...props }, ref) => {
const Link = React.forwardRef(({ className, children, disabled, disableStyles, ...props }, ref) => {
const imageClasses = classnames(
'fd-link',
{ 'is-disabled': !!disabled },
Expand Down
2 changes: 1 addition & 1 deletion src/ListGroup/ListGroup.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import PropTypes from 'prop-types';
import React from 'react';
import withStyles from '../utils/WithStyles/WithStyles';

const ListGroup = React.forwardRef(({ children, className, customStyles, disableStyles, ...props }, ref) => {
const ListGroup = React.forwardRef(({ children, className, disableStyles, ...props }, ref) => {
const listGroupClasses = classnames(
'fd-list-group',
className
Expand Down
2 changes: 1 addition & 1 deletion src/LocalizationEditor/LocalizationEditor.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import withStyles from '../utils/WithStyles/WithStyles';


const LocalizationEditor = React.forwardRef(({ control, menu, id, compact, textarea, className, inputClassName, listProps, popoverProps,
customStyles, disableStyles, ...props }, ref) => {
disableStyles, ...props }, ref) => {

const localizationEditorClasses = classnames(
'fd-localization-editor',
Expand Down
2 changes: 1 addition & 1 deletion src/Menu/Menu.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import PropTypes from 'prop-types';
import React from 'react';
import withStyles from '../utils/WithStyles/WithStyles';

const Menu = React.forwardRef(({ addonBefore, children, className, customStyles, disableStyles, ...props }, ref) => {
const Menu = React.forwardRef(({ addonBefore, children, className, disableStyles, ...props }, ref) => {
const menuClasses = classnames(
'fd-menu',
{
Expand Down
1 change: 0 additions & 1 deletion src/Modal/Modal.js
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ class Modal extends Component {
className,
closeProps,
contentProps,
customStyles,
disableStyles,
headerProps,
headingLevel,
Expand Down
1 change: 0 additions & 1 deletion src/MultiInput/MultiInput.js
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,6 @@ class MultiInput extends Component {
buttonProps,
compact,
className,
customStyles,
disableStyles,
data,
listProps,
Expand Down
1 change: 0 additions & 1 deletion src/Pagination/Pagination.js
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,6 @@ class Pagination extends Component {
displayTotal,
totalText,
className,
customStyles,
disableStyles,
linkProps,
localizedText,
Expand Down
2 changes: 1 addition & 1 deletion src/Panel/Panel.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import PropTypes from 'prop-types';
import React from 'react';
import withStyles from '../utils/WithStyles/WithStyles';

const Panel = React.forwardRef(({ colSpan, children, className, customStyles, disableStyles, ...props }, ref) => {
const Panel = React.forwardRef(({ colSpan, children, className, disableStyles, ...props }, ref) => {

const panelClasses = classnames(
'fd-panel',
Expand Down
1 change: 0 additions & 1 deletion src/Popover/Popover.js
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ class Popover extends Component {

render() {
const {
customStyles,
disableEdgeDetection,
disableStyles,
onClickOutside,
Expand Down
1 change: 0 additions & 1 deletion src/SearchInput/SearchInput.js
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,6 @@ class SearchInput extends Component {

render() {
const {
customStyles,
disableStyles,
placeholder,
inShellbar,
Expand Down
2 changes: 1 addition & 1 deletion src/SideNavigation/SideNav.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ class SideNav extends Component {
}

render() {
const { onItemSelect, children, className, customStyles, disableStyles, icons, selectedId, ...rest } = this.props;
const { onItemSelect, children, className, disableStyles, icons, selectedId, ...rest } = this.props;

const sideNavClasses = classnames(
className,
Expand Down
Loading

0 comments on commit d1b8d8b

Please sign in to comment.