Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
a51e270
ActionBar
cjskillingstad Jan 24, 2019
2e76203
Alert
cjskillingstad Jan 24, 2019
8e48224
Button
cjskillingstad Jan 25, 2019
a19970b
Calendar
cjskillingstad Jan 25, 2019
91e4877
DatePicker
cjskillingstad Jan 25, 2019
655b005
Dropdown
cjskillingstad Jan 25, 2019
f1e2f19
FormRadio
cjskillingstad Jan 25, 2019
7af0680
InputGroup
cjskillingstad Jan 28, 2019
ae68a4e
LocalizationEditor
cjskillingstad Jan 28, 2019
595a223
Menu
cjskillingstad Jan 28, 2019
f3a2d1b
Modal
cjskillingstad Jan 28, 2019
9c8bc5b
MultiInput
cjskillingstad Jan 28, 2019
55a0c81
Pagination
cjskillingstad Jan 28, 2019
2a2b718
SearchInput
cjskillingstad Jan 28, 2019
c87a10d
Shellbar
cjskillingstad Jan 28, 2019
502c0b9
SideNavigation
cjskillingstad Jan 28, 2019
cc027d5
Table
cjskillingstad Jan 28, 2019
79c33a7
Tabs
cjskillingstad Jan 29, 2019
c1f24c2
Tile
cjskillingstad Jan 29, 2019
ea61328
Tile
cjskillingstad Jan 29, 2019
4201a6a
Time
cjskillingstad Jan 29, 2019
9a7d309
TimePicker
cjskillingstad Jan 29, 2019
bf92ab1
Toggle
cjskillingstad Jan 29, 2019
1bd8d05
Merge master
cjskillingstad Jan 29, 2019
af7bd50
Remove false default props
cjskillingstad Jan 30, 2019
9f50097
Make description optional
cjskillingstad Jan 31, 2019
5083710
Merge branch 'master' into fix/required-default-props
cjskillingstad Jan 31, 2019
bdbca88
Add default prop for funcs
cjskillingstad Jan 31, 2019
e09cb71
Default prop consts
cjskillingstad Jan 31, 2019
93300e3
Remove static proptypes
cjskillingstad Jan 31, 2019
8666112
Remove last false default prop
cjskillingstad Jan 31, 2019
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
16 changes: 11 additions & 5 deletions src/ActionBar/ActionBar.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ export const ActionBar = ({ mobile, width, children, className, ...props }) => {
return (
<React.Fragment>
{mobile ? (
<div style={{ width: width ? width : '319px' }}>
<div style={{width}}>
<div {...props} className={actionBarClasses}>{children}</div>
</div>
) : (
Expand All @@ -27,6 +27,10 @@ ActionBar.propTypes = {
width: PropTypes.string
};

ActionBar.defaultProps = {
width: '319px'
};

ActionBar.propDescriptions = {
mobile: 'Set to **true** for mobile view of the Action Bar.',
width: 'The width of the Action Bar in mobile view.'
Expand Down Expand Up @@ -65,18 +69,20 @@ export const ActionBarHeader = ({ className, description, descriptionProps, titl
<h1
{...titleProps}
className='fd-action-bar__title'>{title}</h1>
<p
{...descriptionProps}
className='fd-action-bar__description'>{description} </p>
{description &&
<p
{...descriptionProps}
className='fd-action-bar__description'>{description}</p>
}
</div>
);
};

ActionBarHeader.propTypes = {
title: PropTypes.string.isRequired,
className: PropTypes.string,
description: PropTypes.string,
descriptionProps: PropTypes.object,
title: PropTypes.string,
titleProps: PropTypes.object
};

Expand Down
21 changes: 18 additions & 3 deletions src/ActionBar/ActionBar.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -114,23 +114,38 @@ describe('<ActionBar />', () => {
});

test('should allow props to be spread to the ActionBarHeader component', () => {
const element = mount(<ActionBarHeader data-sample='Sample' />);
const element = mount(
<ActionBarHeader
data-sample='Sample'
description=''
title='' />
);

expect(
element.getDOMNode().attributes['data-sample'].value
).toBe('Sample');
});

test('should allow props to be spread to the ActionBarHeader component\'s h1 element', () => {
const element = mount(<ActionBarHeader titleProps={{'data-sample': 'Sample'}} />);
const element = mount(
<ActionBarHeader
description=''
title=''
titleProps={{'data-sample': 'Sample'}} />
);

expect(
element.find('h1').getDOMNode().attributes['data-sample'].value
).toBe('Sample');
});

test('should allow props to be spread to the ActionBarHeader component\'s p element', () => {
const element = mount(<ActionBarHeader descriptionProps={{'data-sample': 'Sample'}} />);
const element = mount(
<ActionBarHeader
description='Sample Description'
descriptionProps={{'data-sample': 'Sample'}}
title='' />
);

expect(
element.find('p').getDOMNode().attributes['data-sample'].value
Expand Down
4 changes: 0 additions & 4 deletions src/ActionBar/__snapshots__/ActionBar.test.js.snap
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ exports[`<ActionBar /> create basic Action Bar 1`] = `
className="fd-action-bar__description"
>
Action Bar Description

</p>
</div>
<div
Expand Down Expand Up @@ -59,7 +58,6 @@ exports[`<ActionBar /> create basic Action Bar 2`] = `
className="fd-action-bar__description"
>
Action Bar Description

</p>
</div>
<div
Expand Down Expand Up @@ -102,7 +100,6 @@ exports[`<ActionBar /> create basic mobile Action Bar 1`] = `
className="fd-action-bar__description"
>
Action Bar Description

</p>
</div>
<div
Expand Down Expand Up @@ -146,7 +143,6 @@ exports[`<ActionBar /> create basic mobile Action Bar 2`] = `
className="fd-action-bar__description"
>
Action Bar Description

</p>
</div>
<div
Expand Down
2 changes: 1 addition & 1 deletion src/Alert/Alert.Component.js
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ export const AlertComponent = () => {
}
]}>
<Alert dismissible={false} link='#'
linkText='link' type=''>
linkText='link'>
Default alert with a{' '}
</Alert>
</Playground>
Expand Down
4 changes: 2 additions & 2 deletions src/Badge/Badge.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import classnames from 'classnames';
import PropTypes from 'prop-types';
import React from 'react';
import {BADGE_TYPES, LABEL_TYPES, STATUS_TYPES} from '../utils/constants';
import {BADGE_MODIFIERS, BADGE_TYPES, LABEL_TYPES, STATUS_TYPES} from '../utils/constants';


export const Badge = ({ type, modifier, children, className, ...props }) => {
Expand All @@ -23,7 +23,7 @@ export const Badge = ({ type, modifier, children, className, ...props }) => {

Badge.propTypes = {
className: PropTypes.string,
modifier: PropTypes.oneOf(['', 'pill', 'filled']),
modifier: PropTypes.oneOf(BADGE_MODIFIERS),
type: PropTypes.oneOf(BADGE_TYPES)
};

Expand Down
6 changes: 4 additions & 2 deletions src/Button/Button.js
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,15 @@ export const Button = ({
);

return (<button {...props} className={buttonClasses}
disabled={disabled ? disabled : false} onClick={onClick}
selected={selected ? selected : false} type={typeAttr}>
disabled={disabled} onClick={onClick}
selected={selected} type={typeAttr}>
{children}
</button>);
};

Button.propTypes = {
children: PropTypes.node,
className: PropTypes.string,
compact: PropTypes.bool,
disabled: PropTypes.bool,
dropdown: PropTypes.bool,
Expand Down
21 changes: 0 additions & 21 deletions src/Button/__snapshots__/Button.test.js.snap
Original file line number Diff line number Diff line change
Expand Up @@ -8,27 +8,20 @@ exports[`<Button /> create button group 1`] = `
>
<button
className="fd-button sap-icon--survey blue"
disabled={false}
selected={false}
/>
<button
className="fd-button sap-icon--pie-chart is-selected"
disabled={false}
selected={true}
/>
<button
className="fd-button sap-icon--pool"
disabled={false}
selected={false}
/>
</div>
`;

exports[`<Button /> create buttons 1`] = `
<button
className="fd-button"
disabled={false}
selected={false}
>
Regular Button
</button>
Expand All @@ -37,8 +30,6 @@ exports[`<Button /> create buttons 1`] = `
exports[`<Button /> create buttons 2`] = `
<button
className="fd-button--emphasized"
disabled={false}
selected={false}
>
Emphasized Button
</button>
Expand All @@ -47,8 +38,6 @@ exports[`<Button /> create buttons 2`] = `
exports[`<Button /> create buttons 3`] = `
<button
className="fd-button fd-button--positive"
disabled={false}
selected={false}
>
Positive Button
</button>
Expand All @@ -57,8 +46,6 @@ exports[`<Button /> create buttons 3`] = `
exports[`<Button /> create buttons 4`] = `
<button
className="fd-button sap-icon--cart"
disabled={false}
selected={false}
>
Icon Button
</button>
Expand All @@ -67,8 +54,6 @@ exports[`<Button /> create buttons 4`] = `
exports[`<Button /> create buttons 5`] = `
<button
className="fd-button fd-button--compact"
disabled={false}
selected={false}
>
Compact
</button>
Expand All @@ -77,7 +62,6 @@ exports[`<Button /> create buttons 5`] = `
exports[`<Button /> create buttons 6`] = `
<button
className="fd-button--emphasized is-selected"
disabled={false}
selected={true}
>
Selected State
Expand All @@ -88,7 +72,6 @@ exports[`<Button /> create buttons 7`] = `
<button
className="fd-button--emphasized is-disabled"
disabled={true}
selected={false}
>
Disabled State
</button>
Expand All @@ -97,8 +80,6 @@ exports[`<Button /> create buttons 7`] = `
exports[`<Button /> create buttons 8`] = `
<button
className="fd-button fd-dropdown__control"
disabled={false}
selected={false}
>
Dropdown Button
</button>
Expand All @@ -107,8 +88,6 @@ exports[`<Button /> create buttons 8`] = `
exports[`<Button /> create buttons 9`] = `
<button
className="fd-button fd-global-nav__btn"
disabled={false}
selected={false}
>
Navbar button
</button>
Expand Down
15 changes: 7 additions & 8 deletions src/Calendar/Calendar.js
Original file line number Diff line number Diff line change
Expand Up @@ -373,13 +373,7 @@ export class Calendar extends Component {
}

returnDateSelected = (dates) => {
if (typeof this.props.onChange !== 'undefined') {
if (this.props.enableRangeSelection === true) {
this.props.onChange(dates);
} else {
this.props.onChange(dates);
}
}
this.props.onChange(dates);
}

generateNavigation = () => {
Expand Down Expand Up @@ -559,7 +553,12 @@ Calendar.propTypes = {
tableBodyProps: PropTypes.object,
tableHeaderProps: PropTypes.object,
tableProps: PropTypes.object,
yearListProps: PropTypes.object
yearListProps: PropTypes.object,
onChange: PropTypes.func
};

Calendar.defaultProps = {
onChange: () => {}
};

Calendar.propDescriptions = {
Expand Down
5 changes: 0 additions & 5 deletions src/ComboboxInput/ComboboxInput.js
Original file line number Diff line number Diff line change
Expand Up @@ -60,11 +60,6 @@ ComboboxInput.propTypes = {
popoverProps: PropTypes.object
};

ComboboxInput.defaultTypes = {
compact: false,
placeholder: ''
};

ComboboxInput.propDescriptions = {
menu: 'An object containing a `Menu` component.'
};
1 change: 0 additions & 1 deletion src/DatePicker/DatePicker.js
Original file line number Diff line number Diff line change
Expand Up @@ -439,7 +439,6 @@ export class DatePicker extends Component {

DatePicker.propTypes = {
...Calendar.basePropTypes,

buttonProps: PropTypes.object,
compact: PropTypes.bool,
enableRangeSelection: PropTypes.bool,
Expand Down
9 changes: 0 additions & 9 deletions src/Dropdown/__snapshots__/Dropdown.test.js.snap
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@ exports[`<Dropdown /> create dropdown component 1`] = `
>
<button
className="fd-button fd-dropdown__control"
disabled={false}
selected={false}
>
Select
</button>
Expand Down Expand Up @@ -83,8 +81,6 @@ exports[`<Dropdown /> create dropdown component 2`] = `
>
<button
className="fd-button fd-dropdown__control fd-button--compact"
disabled={false}
selected={false}
>
Select
</button>
Expand Down Expand Up @@ -152,8 +148,6 @@ exports[`<Dropdown /> create dropdown component 3`] = `
>
<button
className="fd-button fd-button--standard fd-dropdown__control"
disabled={false}
selected={false}
>
Select
</button>
Expand Down Expand Up @@ -222,8 +216,6 @@ exports[`<Dropdown /> create dropdown component 4`] = `
>
<button
className="fd-button fd-dropdown__control sap-icon--filter"
disabled={false}
selected={false}
>
Select
</button>
Expand Down Expand Up @@ -295,7 +287,6 @@ exports[`<Dropdown /> create dropdown component 5`] = `
<button
className="fd-button fd-dropdown__control sap-icon--filter is-disabled"
disabled={true}
selected={false}
>
Select
</button>
Expand Down
Loading