Skip to content

Make Slider a controlled component #1426

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
Jul 6, 2018
Merged

Make Slider a controlled component #1426

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
f81396f
Fixes salesforce/design-system-react#1398
dlferro Jun 19, 2018
6f026b8
Merge branch 'slider-value-fix' of https://github.com/DanFerro/design…
interactivellama Jun 25, 2018
0fb7dd2
Update examples to make Slider a controlled component
interactivellama Jun 25, 2018
3c0eed9
Update examples to make Slider a controlled component
interactivellama Jun 25, 2018
f3a2d8c
Merge branch 'slider-value-fix' of github.com:DanFerro/design-system-…
interactivellama Jun 25, 2018
a8414f0
Merge branch '1423-synchronous-http-request' of https://github.com/ce…
interactivellama Jun 25, 2018
7391a12
Lint fix slider
interactivellama Jun 26, 2018
ba700b3
Update Slider snapshots
interactivellama Jun 26, 2018
2a7da17
Merge branch 'master' of github.com:salesforce/design-system-react in…
interactivellama Jul 5, 2018
42fb6d5
Slider: Convert using Number
interactivellama Jul 5, 2018
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
9 changes: 5 additions & 4 deletions components/slider/__examples__/base.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ const DemoSlider = createReactClass({

getInitialState () {
return {
value: this.props.defaultValue,
value: this.props.value,
};
},

Expand Down Expand Up @@ -37,7 +37,7 @@ const Example = createReactClass({
<h1 className="slds-text-title_caps slds-p-vertical--medium">
1. Base Input with label
</h1>
<DemoSlider id="base-id" label="My Label" />
<DemoSlider id="base-id" label="My Label" value={0} />
</li>
<li className="slds-p-bottom--large">
<h1 className="slds-text-title_caps slds-p-vertical--medium">
Expand All @@ -46,6 +46,7 @@ const Example = createReactClass({
<DemoSlider
id="assistiveText-id"
assistiveText={{ label: 'My Label' }}
value={0}
/>
</li>
<li className="slds-p-bottom--large">
Expand All @@ -57,7 +58,7 @@ const Example = createReactClass({
label="My Label"
min={0}
max={400}
defaultValue={200}
value={200}
/>
</li>
<li className="slds-p-bottom--large">
Expand All @@ -70,7 +71,7 @@ const Example = createReactClass({
min={0}
max={400}
step={100}
defaultValue={200}
value={200}
/>
</li>
</ol>
Expand Down
29 changes: 11 additions & 18 deletions components/slider/__tests__/__snapshots__/slider.snapshot-test.jsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,14 +43,14 @@ exports[`Base label, no label, min/max, min/max/step DOM Snapshot 1`] = `
>
<input
className="slds-slider__range"
defaultValue={0}
id="base-id"
max={100}
min={0}
onChange={[Function]}
onInput={[Function]}
step={1}
type="range"
value={0}
/>
<span
aria-hidden="true"
Expand Down Expand Up @@ -102,14 +102,14 @@ exports[`Base label, no label, min/max, min/max/step DOM Snapshot 1`] = `
>
<input
className="slds-slider__range"
defaultValue={0}
id="assistiveText-id"
max={100}
min={0}
onChange={[Function]}
onInput={[Function]}
step={1}
type="range"
value={0}
/>
<span
aria-hidden="true"
Expand Down Expand Up @@ -161,14 +161,14 @@ exports[`Base label, no label, min/max, min/max/step DOM Snapshot 1`] = `
>
<input
className="slds-slider__range"
defaultValue={200}
id="min-max-id"
max={400}
min={0}
onChange={[Function]}
onInput={[Function]}
step={1}
type="range"
value={200}
/>
<span
aria-hidden="true"
Expand Down Expand Up @@ -220,14 +220,14 @@ exports[`Base label, no label, min/max, min/max/step DOM Snapshot 1`] = `
>
<input
className="slds-slider__range"
defaultValue={200}
id="min-max-step-id"
max={400}
min={0}
onChange={[Function]}
onInput={[Function]}
step={100}
type="range"
value={200}
/>
<span
aria-hidden="true"
Expand Down Expand Up @@ -315,7 +315,6 @@ exports[`Disabled DOM Snapshot 1`] = `
>
<input
className="slds-slider__range"
defaultValue={0}
disabled={true}
id="disabled-id"
max={100}
Expand All @@ -339,7 +338,7 @@ exports[`Disabled DOM Snapshot 1`] = `
exports[`Disabled HTML Snapshot 1`] = `
"<div class=\\"slds-form-element\\"><label class=\\"slds-form-element__label\\" for=\\"disabled-id\\"><span class=\\"slds-slider-label\\"><span class=\\"slds-slider-label__label\\">Slider Label</span><span class=\\"slds-slider-label__range\\">0 - 100</span></span></label>
<div class=\\"slds-form-element__control\\">
<div class=\\"slds-slider\\"><input type=\\"range\\" step=\\"1\\" min=\\"0\\" max=\\"100\\" id=\\"disabled-id\\" class=\\"slds-slider__range\\" disabled=\\"\\" value=\\"0\\" /><span class=\\"slds-slider__value\\" aria-hidden=\\"true\\">0</span></div>
<div class=\\"slds-slider\\"><input type=\\"range\\" step=\\"1\\" min=\\"0\\" max=\\"100\\" id=\\"disabled-id\\" class=\\"slds-slider__range\\" disabled=\\"\\" /><span class=\\"slds-slider__value\\" aria-hidden=\\"true\\">0</span></div>
</div>
</div>"
`;
Expand Down Expand Up @@ -378,7 +377,6 @@ exports[`Error DOM Snapshot 1`] = `
<input
aria-describedby="error message"
className="slds-slider__range"
defaultValue={0}
id="error-id"
max={100}
min={0}
Expand Down Expand Up @@ -407,7 +405,7 @@ exports[`Error DOM Snapshot 1`] = `
exports[`Error HTML Snapshot 1`] = `
"<div class=\\"slds-form-element slds-has-error\\"><label class=\\"slds-form-element__label\\" for=\\"error-id\\"><span class=\\"slds-slider-label\\"><span class=\\"slds-slider-label__label\\">Slider Label</span><span class=\\"slds-slider-label__range\\">0 - 100</span></span></label>
<div class=\\"slds-form-element__control\\">
<div class=\\"slds-slider\\"><input type=\\"range\\" step=\\"1\\" min=\\"0\\" max=\\"100\\" id=\\"error-id\\" class=\\"slds-slider__range\\" aria-describedby=\\"error message\\" value=\\"0\\" /><span class=\\"slds-slider__value\\" aria-hidden=\\"true\\">0</span></div>
<div class=\\"slds-slider\\"><input type=\\"range\\" step=\\"1\\" min=\\"0\\" max=\\"100\\" id=\\"error-id\\" class=\\"slds-slider__range\\" aria-describedby=\\"error message\\" /><span class=\\"slds-slider__value\\" aria-hidden=\\"true\\">0</span></div>
<div id=\\"error message\\" class=\\"slds-form-element__help\\">There is a problem with this field</div>
</div>
</div>"
Expand Down Expand Up @@ -452,7 +450,6 @@ exports[`Sizes DOM Snapshot 1`] = `
>
<input
className="slds-slider__range"
defaultValue={0}
id="x-small-id"
max={100}
min={0}
Expand Down Expand Up @@ -506,7 +503,6 @@ exports[`Sizes DOM Snapshot 1`] = `
>
<input
className="slds-slider__range"
defaultValue={0}
id="small-id"
max={100}
min={0}
Expand Down Expand Up @@ -560,7 +556,6 @@ exports[`Sizes DOM Snapshot 1`] = `
>
<input
className="slds-slider__range"
defaultValue={0}
id="medium-id"
max={100}
min={0}
Expand Down Expand Up @@ -614,7 +609,6 @@ exports[`Sizes DOM Snapshot 1`] = `
>
<input
className="slds-slider__range"
defaultValue={0}
id="large-id"
max={100}
min={0}
Expand All @@ -641,28 +635,28 @@ exports[`Sizes HTML Snapshot 1`] = `
<div class=\\"slds-col--padded\\">
<div class=\\"slds-form-element\\"><label class=\\"slds-form-element__label\\" for=\\"x-small-id\\"><span class=\\"slds-slider-label\\"><span class=\\"slds-slider-label__label\\">Slider Label</span><span class=\\"slds-slider-label__range\\">0 - 100</span></span></label>
<div class=\\"slds-form-element__control\\">
<div class=\\"slds-slider slds-size_x-small\\"><input type=\\"range\\" step=\\"1\\" min=\\"0\\" max=\\"100\\" id=\\"x-small-id\\" class=\\"slds-slider__range\\" value=\\"0\\" /><span class=\\"slds-slider__value\\" aria-hidden=\\"true\\">0</span></div>
<div class=\\"slds-slider slds-size_x-small\\"><input type=\\"range\\" step=\\"1\\" min=\\"0\\" max=\\"100\\" id=\\"x-small-id\\" class=\\"slds-slider__range\\" /><span class=\\"slds-slider__value\\" aria-hidden=\\"true\\">0</span></div>
</div>
</div>
</div>
<div class=\\"slds-col--padded\\">
<div class=\\"slds-form-element\\"><label class=\\"slds-form-element__label\\" for=\\"small-id\\"><span class=\\"slds-slider-label\\"><span class=\\"slds-slider-label__label\\">Slider Label</span><span class=\\"slds-slider-label__range\\">0 - 100</span></span></label>
<div class=\\"slds-form-element__control\\">
<div class=\\"slds-slider slds-size_small\\"><input type=\\"range\\" step=\\"1\\" min=\\"0\\" max=\\"100\\" id=\\"small-id\\" class=\\"slds-slider__range\\" value=\\"0\\" /><span class=\\"slds-slider__value\\" aria-hidden=\\"true\\">0</span></div>
<div class=\\"slds-slider slds-size_small\\"><input type=\\"range\\" step=\\"1\\" min=\\"0\\" max=\\"100\\" id=\\"small-id\\" class=\\"slds-slider__range\\" /><span class=\\"slds-slider__value\\" aria-hidden=\\"true\\">0</span></div>
</div>
</div>
</div>
<div class=\\"slds-col--padded\\">
<div class=\\"slds-form-element\\"><label class=\\"slds-form-element__label\\" for=\\"medium-id\\"><span class=\\"slds-slider-label\\"><span class=\\"slds-slider-label__label\\">Slider Label</span><span class=\\"slds-slider-label__range\\">0 - 100</span></span></label>
<div class=\\"slds-form-element__control\\">
<div class=\\"slds-slider slds-size_medium\\"><input type=\\"range\\" step=\\"1\\" min=\\"0\\" max=\\"100\\" id=\\"medium-id\\" class=\\"slds-slider__range\\" value=\\"0\\" /><span class=\\"slds-slider__value\\" aria-hidden=\\"true\\">0</span></div>
<div class=\\"slds-slider slds-size_medium\\"><input type=\\"range\\" step=\\"1\\" min=\\"0\\" max=\\"100\\" id=\\"medium-id\\" class=\\"slds-slider__range\\" /><span class=\\"slds-slider__value\\" aria-hidden=\\"true\\">0</span></div>
</div>
</div>
</div>
<div class=\\"slds-col--padded\\">
<div class=\\"slds-form-element\\"><label class=\\"slds-form-element__label\\" for=\\"large-id\\"><span class=\\"slds-slider-label\\"><span class=\\"slds-slider-label__label\\">Slider Label</span><span class=\\"slds-slider-label__range\\">0 - 100</span></span></label>
<div class=\\"slds-form-element__control\\">
<div class=\\"slds-slider slds-size_large\\"><input type=\\"range\\" step=\\"1\\" min=\\"0\\" max=\\"100\\" id=\\"large-id\\" class=\\"slds-slider__range\\" value=\\"0\\" /><span class=\\"slds-slider__value\\" aria-hidden=\\"true\\">0</span></div>
<div class=\\"slds-slider slds-size_large\\"><input type=\\"range\\" step=\\"1\\" min=\\"0\\" max=\\"100\\" id=\\"large-id\\" class=\\"slds-slider__range\\" /><span class=\\"slds-slider__value\\" aria-hidden=\\"true\\">0</span></div>
</div>
</div>
</div>
Expand Down Expand Up @@ -702,7 +696,6 @@ exports[`Vertical DOM Snapshot 1`] = `
>
<input
className="slds-slider__range"
defaultValue={0}
id="vertical-id"
max={100}
min={0}
Expand All @@ -725,7 +718,7 @@ exports[`Vertical DOM Snapshot 1`] = `
exports[`Vertical HTML Snapshot 1`] = `
"<div class=\\"slds-form-element\\"><label class=\\"slds-form-element__label\\" for=\\"vertical-id\\"><span class=\\"slds-slider-label\\"><span class=\\"slds-slider-label__label\\">Slider Label</span><span class=\\"slds-slider-label__range\\">0 - 100</span></span></label>
<div class=\\"slds-form-element__control\\">
<div class=\\"slds-slider slds-slider_vertical\\"><input type=\\"range\\" step=\\"1\\" min=\\"0\\" max=\\"100\\" id=\\"vertical-id\\" class=\\"slds-slider__range\\" value=\\"0\\" /><span class=\\"slds-slider__value\\" aria-hidden=\\"true\\">0</span></div>
<div class=\\"slds-slider slds-slider_vertical\\"><input type=\\"range\\" step=\\"1\\" min=\\"0\\" max=\\"100\\" id=\\"vertical-id\\" class=\\"slds-slider__range\\" /><span class=\\"slds-slider__value\\" aria-hidden=\\"true\\">0</span></div>
</div>
</div>"
`;
12 changes: 6 additions & 6 deletions components/slider/__tests__/slider.browser-test.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ describe('SLDSSlider', () => {
component = getSlider({
label: 'Slider Label',
id: 'custom-id',
defaultValue: 200,
value: 200,
min: 0,
max: 400,
step: 100,
Expand Down Expand Up @@ -192,30 +192,30 @@ describe('SLDSSlider', () => {
it('onChange trigged callback', function (done) {
wrapper = mount(
<Slider
defaultValue={200}
value={200}
min={0}
max={400}
step={100}
onChange={(e, { value }) => {
expect(value).to.equal('300');
expect(value).to.equal(300);
done();
}}
/>,
{ attachTo: mountNode }
);
const trigger = wrapper.find('input');
trigger.simulate('change', { target: { value: '300' } });
trigger.simulate('change', { target: { value: 300 } });
});

it('onInput trigged callback', function (done) {
wrapper = mount(
<Slider
defaultValue={200}
value={200}
min={0}
max={400}
step={100}
onInput={(e, { value }) => {
expect(value).to.equal('300');
expect(value).to.equal(300);
done();
}}
/>,
Expand Down
10 changes: 5 additions & 5 deletions components/slider/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ const propTypes = {
*/
step: PropTypes.number,
/**
* The Slider is a controlled component, and will always display this value.
* The Slider should be a controlled component, and will always display this value. This should always be used if you are using a Flux/Redux framework.
*/
value: PropTypes.number,
/**
Expand All @@ -106,7 +106,6 @@ const propTypes = {
};

const defaultProps = {
defaultValue: 0,
min: 0,
max: 100,
step: 1,
Expand Down Expand Up @@ -140,13 +139,13 @@ class Slider extends React.Component {

handleChange = (event) => {
if (isFunction(this.props.onChange)) {
this.props.onChange(event, { value: event.target.value });
this.props.onChange(event, { value: Number(event.target.value) });
}
};

handleInput = (event) => {
if (isFunction(this.props.onInput)) {
this.props.onInput(event, { value: event.target.value });
this.props.onInput(event, { value: Number(event.target.value) });
}
};

Expand Down Expand Up @@ -201,12 +200,13 @@ class Slider extends React.Component {
max={this.props.max}
step={this.props.step}
aria-describedby={this.getErrorId()}
value={this.props.value}
disabled={this.props.disabled}
onChange={this.handleChange}
onInput={this.handleInput}
/>
<span className="slds-slider__value" aria-hidden="true">
{this.props.value || this.props.defaultValue}
{this.props.value || this.props.defaultValue || '0'}
</span>
</div>
{this.props.errorText ? (
Expand Down
2 changes: 1 addition & 1 deletion components/utilities/dialog/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -400,7 +400,7 @@ const Dialog = createReactClass({
}

if (this.props.style) {
style = Object.assign(style, this.props.style);
style = { ...style, ...this.props.style };
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

}

const contents = (
Expand Down