-
Notifications
You must be signed in to change notification settings - Fork 56
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* feat: add Slider component * chore: update test snapshots * chore: address PR feedback * fix: ensure marker and thumb align * fix: eliminate race condition in Slider * chore: clean up testing output * fix: cleanup build errors Co-authored-by: phrough <[email protected]>
- Loading branch information
1 parent
3bdb62c
commit 30a8229
Showing
15 changed files
with
686 additions
and
37 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| // Proxy for jest tests to convert css moodule class names. | ||
| // Based on https://medium.com/trabe/testing-css-modules-in-react-components-with-jest-enzyme-and-a-custom-modulenamemapper-8ff86c7d18a2 | ||
|
|
||
| module.exports = new Proxy( | ||
| {}, | ||
| { | ||
| get: function getter(target, key) { | ||
| if (key === '__esModule') { | ||
| return false; | ||
| } | ||
|
|
||
| // Convert camelCase to kebab-case for class selectors in unit tests. | ||
| return key.replace(/([A-Z])/g, (g) => `-${g[0].toLowerCase()}`); | ||
| }, | ||
| } | ||
| ); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,47 @@ | ||
| import React from 'react'; | ||
| import { ComponentMeta, ComponentStory } from '@storybook/react'; | ||
|
|
||
| import { Slider } from './'; | ||
|
|
||
| export default { | ||
| title: 'Slider', | ||
| component: Slider, | ||
| } as ComponentMeta<typeof Slider>; | ||
|
|
||
| const Slider_Story: ComponentStory<typeof Slider> = (args) => ( | ||
| <Slider {...args} /> | ||
| ); | ||
|
|
||
| const sliderArgs: Object = { | ||
| ariaLabel: 'Slider', | ||
| autoFocus: false, | ||
| classNames: 'my-slider', | ||
| disabled: false, | ||
| id: 'mySliderId', | ||
| min: 100, | ||
| max: 200, | ||
| name: 'mySlider', | ||
| onChange: () => { | ||
| // handle change. | ||
| }, | ||
| }; | ||
|
|
||
| export const StandardSlider = Slider_Story.bind({}); | ||
| StandardSlider.args = { | ||
| ...sliderArgs, | ||
| autoFocus: true, | ||
| min: 1, | ||
| max: 5, | ||
| showLabels: false, | ||
| value: 2, | ||
| }; | ||
|
|
||
| export const RangeSlider = Slider_Story.bind({}); | ||
| RangeSlider.args = { | ||
| ...sliderArgs, | ||
| min: 0, | ||
| showLabels: true, | ||
| showMarkers: true, | ||
| step: 10, | ||
| value: [110, 150], | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,88 @@ | ||
| import React from 'react'; | ||
| import Adapter from '@wojtekmaj/enzyme-adapter-react-17'; | ||
| import Enzyme, { mount, ReactWrapper } from 'enzyme'; | ||
| import MatchMediaMock from 'jest-matchmedia-mock'; | ||
|
|
||
| import { Slider } from './'; | ||
|
|
||
| Enzyme.configure({ adapter: new Adapter() }); | ||
|
|
||
| let matchMedia: any; | ||
|
|
||
| describe('Slider', () => { | ||
| let wrapper: ReactWrapper; | ||
|
|
||
| beforeAll(() => { | ||
| matchMedia = new MatchMediaMock(); | ||
| }); | ||
| afterEach(() => { | ||
| matchMedia.clear(); | ||
| }); | ||
|
|
||
| test('Should render', () => { | ||
| wrapper = mount(<Slider min={20} max={40} value={30} />); | ||
| expect(wrapper.children().length).toEqual(1); | ||
| }); | ||
|
|
||
| test('should correctly display markers and indicate when they are active', () => { | ||
| let markers; | ||
| let activeMarkers; | ||
|
|
||
| wrapper = mount( | ||
| <Slider min={20} max={40} value={30} showMarkers={true} /> | ||
| ); | ||
| markers = wrapper.find('.rail-marker'); | ||
| expect(markers.length).toEqual(19); | ||
| activeMarkers = wrapper.find('.rail-marker.active'); | ||
| expect(activeMarkers.length).toEqual(10); | ||
|
|
||
| wrapper = mount( | ||
| <Slider | ||
| min={0} | ||
| max={40} | ||
| step={10} | ||
| value={[10, 20]} | ||
| showMarkers={true} | ||
| /> | ||
| ); | ||
| markers = wrapper.find('.rail-marker'); | ||
| expect(markers.length).toEqual(3); | ||
| activeMarkers = wrapper.find('.rail-marker.active'); | ||
| expect(activeMarkers.length).toEqual(2); | ||
| }); | ||
|
|
||
| test('should update values correctly', () => { | ||
| let val = 1; | ||
| wrapper = mount( | ||
| <Slider | ||
| min={0} | ||
| max={10} | ||
| value={val} | ||
| onChange={(newVal: number) => (val = newVal)} | ||
| /> | ||
| ); | ||
|
|
||
| let thumb = wrapper.find('input[type="range"]').at(0); | ||
| expect(thumb.prop('value')).toEqual(1); | ||
| thumb.simulate('change', { target: { value: 3 } }); | ||
| expect(val).toEqual(3); | ||
|
|
||
| let vals = [0, 10]; | ||
| wrapper = mount( | ||
| <Slider | ||
| min={0} | ||
| max={20} | ||
| value={vals} | ||
| onChange={(newVal: number[]) => (vals = [...newVal])} | ||
| /> | ||
| ); | ||
| let thumb1 = wrapper.find('input[type="range"]').at(0); | ||
| let thumb2 = wrapper.find('input[type="range"]').at(1); | ||
| expect(thumb1.prop('value')).toEqual(0); | ||
| expect(thumb2.prop('value')).toEqual(10); | ||
| thumb1.simulate('change', { target: { value: 3 } }); | ||
| thumb2.simulate('change', { target: { value: 7 } }); | ||
| expect(vals[0]).toEqual(3); | ||
| expect(vals[1]).toEqual(7); | ||
| }); | ||
| }); |
Oops, something went wrong.