Skip to content
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

EuiDualRange: Add possibility to set input properties for min and max inputs #2738

Merged
merged 11 commits into from
Jan 9, 2020
Merged

EuiDualRange: Add possibility to set input properties for min and max inputs #2738

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
d33506d
Adds possibility to set aria-label for inputs
ffknob Jan 7, 2020
996e266
Adds PR number to CHANGELOG
ffknob Jan 7, 2020
ae062d6
Changes from only having the aria-label property to any input property
ffknob Jan 7, 2020
caab63a
Corrects the test doc file
ffknob Jan 7, 2020
b1d6e3b
Merge branch 'master' into accesibility-EuiDualRange-aria-labels
ffknob Jan 7, 2020
5a1f801
Merges with master
ffknob Jan 8, 2020
5e1e5bb
Fixes what was requested in the review
ffknob Jan 8, 2020
7e7c91f
Merge branch 'master' into accesibility-EuiDualRange-aria-labels
ffknob Jan 8, 2020
61f6a7e
Helping with dual range input props
Jan 8, 2020
25a7e5a
Merge pull request #2 from cchaos/accesibility-EuiDualRange-aria-labe…
ffknob Jan 8, 2020
fa4251e
Merge branch 'master' into accesibility-EuiDualRange-aria-labels
ffknob Jan 8, 2020
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 CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
## [`master`](https://github.com/elastic/eui/tree/master)

- Added possibility to set `aria-label` for both `min` and `max` inputs of `EuiDualRange` ([#2738](https://github.com/elastic/eui/pull/2738))
- Converted `EuiRange` to TypeScript ([#2732](https://github.com/elastic/eui/pull/2732))
- Converted `EuiDualRange` to TypeScript ([#2732](https://github.com/elastic/eui/pull/2732))
- Converted `EuiRangeInput` to TypeScript ([#2732](https://github.com/elastic/eui/pull/2732))
Expand Down
2 changes: 2 additions & 0 deletions src-docs/src/views/range/input.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@ export default class extends Component {
value={this.state.dualValue}
onChange={this.onDualChange}
showInput
minInputProps={{ 'aria-label': 'Min value' }}
maxInputProps={{ 'aria-label': 'Max value' }}
/>
</Fragment>
);
Expand Down
231 changes: 227 additions & 4 deletions src/components/form/range/__snapshots__/dual_range.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,6 @@ exports[`EuiDualRange props inputs should render 1`] = `
class="euiFormControlLayout__childrenWrapper"
>
<input
aria-label="aria-label"
class="euiFieldNumber euiRangeInput euiRangeInput--min"
max="8"
min="0"
Expand Down Expand Up @@ -327,7 +326,6 @@ exports[`EuiDualRange props inputs should render 1`] = `
class="euiFormControlLayout__childrenWrapper"
>
<input
aria-label="aria-label"
class="euiFieldNumber euiRangeInput euiRangeInput--max"
max="100"
min="1"
Expand Down Expand Up @@ -484,7 +482,6 @@ exports[`EuiDualRange props slider should display in popover 1`] = `
class="euiFormControlLayout__childrenWrapper"
>
<input
aria-label="aria-label"
class="euiFieldNumber euiFormControlLayoutDelimited__input"
max="8"
min="0"
Expand All @@ -503,7 +500,6 @@ exports[`EuiDualRange props slider should display in popover 1`] = `
</div>
</div>
<input
aria-label="aria-label"
class="euiFieldNumber euiFormControlLayoutDelimited__input"
max="100"
min="1"
Expand Down Expand Up @@ -613,3 +609,230 @@ exports[`EuiDualRange props ticks should render 1`] = `
/>
</div>
`;

exports[`EuiDualRange aria labels should be set for both min and max inputs 1`] = `
<div
class="euiRangeWrapper euiDualRange testClass1 testClass2"
>
<div
class="euiFormControlLayout"
>
<div
class="euiFormControlLayout__childrenWrapper"
>
<input
aria-label="Min value"
class="euiFieldNumber euiRangeInput euiRangeInput--min"
max="8"
min="1"
name="name-minValue"
step="1"
style="width:3.6em"
type="number"
value="1"
/>
</div>
</div>
<div
class="euiRange__horizontalSpacer"
/>
<div
class="euiRangeTrack"
>
<div
class="euiRangeHighlight"
>
<div
class="euiRangeHighlight__progress"
style="margin-left:0%;width:77.77777777777779%"
/>
</div>
<input
aria-hidden="true"
aria-label="aria-label"
class="euiRangeSlider euiRangeSlider--hasRange euiDualRange__slider"
data-test-subj="test subject string"
id="id"
max="10"
min="1"
name="name"
step="1"
tabindex="-1"
type="range"
/>
</div>
<div
class="euiRange__horizontalSpacer"
/>
<div
class="euiFormControlLayout"
>
<div
class="euiFormControlLayout__childrenWrapper"
>
<input
aria-label="Max value"
class="euiFieldNumber euiRangeInput euiRangeInput--max"
max="10"
min="1"
name="name-maxValue"
step="1"
style="width:3.6em"
type="number"
value="8"
/>
</div>
</div>
</div>
`;

exports[`EuiDualRange aria labels should be set only for the min input 1`] = `
<div
class="euiRangeWrapper euiDualRange testClass1 testClass2"
>
<div
class="euiFormControlLayout"
>
<div
class="euiFormControlLayout__childrenWrapper"
>
<input
aria-label="Min value"
class="euiFieldNumber euiRangeInput euiRangeInput--min"
max="8"
min="1"
name="name-minValue"
step="1"
style="width:3.6em"
type="number"
value="1"
/>
</div>
</div>
<div
class="euiRange__horizontalSpacer"
/>
<div
class="euiRangeTrack"
>
<div
class="euiRangeHighlight"
>
<div
class="euiRangeHighlight__progress"
style="margin-left:0%;width:77.77777777777779%"
/>
</div>
<input
aria-hidden="true"
aria-label="aria-label"
class="euiRangeSlider euiRangeSlider--hasRange euiDualRange__slider"
data-test-subj="test subject string"
id="id"
max="10"
min="1"
name="name"
step="1"
tabindex="-1"
type="range"
/>
</div>
<div
class="euiRange__horizontalSpacer"
/>
<div
class="euiFormControlLayout"
>
<div
class="euiFormControlLayout__childrenWrapper"
>
<input
class="euiFieldNumber euiRangeInput euiRangeInput--max"
max="10"
min="1"
name="name-maxValue"
step="1"
style="width:3.6em"
type="number"
value="8"
/>
</div>
</div>
</div>
`;

exports[`EuiDualRange aria labels should be set only for the max input 1`] = `
<div
class="euiRangeWrapper euiDualRange testClass1 testClass2"
>
<div
class="euiFormControlLayout"
>
<div
class="euiFormControlLayout__childrenWrapper"
>
<input
class="euiFieldNumber euiRangeInput euiRangeInput--min"
max="8"
min="1"
name="name-minValue"
step="1"
style="width:3.6em"
type="number"
value="1"
/>
</div>
</div>
<div
class="euiRange__horizontalSpacer"
/>
<div
class="euiRangeTrack"
>
<div
class="euiRangeHighlight"
>
<div
class="euiRangeHighlight__progress"
style="margin-left:0%;width:77.77777777777779%"
/>
</div>
<input
aria-hidden="true"
aria-label="aria-label"
class="euiRangeSlider euiRangeSlider--hasRange euiDualRange__slider"
data-test-subj="test subject string"
id="id"
max="10"
min="1"
name="name"
step="1"
tabindex="-1"
type="range"
/>
</div>
<div
class="euiRange__horizontalSpacer"
/>
<div
class="euiFormControlLayout"
>
<div
class="euiFormControlLayout__childrenWrapper"
>
<input
aria-label="Max value"
class="euiFieldNumber euiRangeInput euiRangeInput--max"
max="10"
min="1"
name="name-maxValue"
step="1"
style="width:3.6em"
type="number"
value="8"
/>
</div>
</div>
</div>
`;

57 changes: 57 additions & 0 deletions src/components/form/range/dual_range.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,4 +157,61 @@ describe('EuiDualRange', () => {

expect(component).toMatchSnapshot();
});

describe('aria labels', () => {
test('should be set for both min and max inputs', () => {
const component = render(
<EuiDualRange
name="name"
id="id"
min={1}
max={10}
value={['1', '8']}
onChange={() => {}}
showInput
minInputProps={{ 'aria-label': 'Min value' }}
maxInputProps={{ 'aria-label': 'Max value' }}
{...requiredProps}
/>
);

expect(component).toMatchSnapshot();
});

test('should be set only for the min input', () => {
const component = render(
<EuiDualRange
name="name"
id="id"
min={1}
max={10}
value={['1', '8']}
onChange={() => {}}
showInput
minInputProps={{ 'aria-label': 'Min value' }}
{...requiredProps}
/>
);

expect(component).toMatchSnapshot();
});

test('should be set only for the max input', () => {
const component = render(
<EuiDualRange
name="name"
id="id"
min={1}
max={10}
value={['1', '8']}
onChange={() => {}}
showInput
maxInputProps={{ 'aria-label': 'Max value' }}
{...requiredProps}
/>
);

expect(component).toMatchSnapshot();
});
});
});
Loading