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.

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

Removing Material from slider #1244

Merged
merged 27 commits into from Sep 21, 2022
Merged
Show file tree
Hide file tree
Changes from 22 commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
d4a4803
removing Material from slider
Jialecl Aug 22, 2022
20dcf91
Changing styles to make it more similar
Jialecl Aug 22, 2022
0eb7539
repositioning slider
Jialecl Aug 23, 2022
6d05d87
adding disabled andfixing event test
Jialecl Aug 24, 2022
e0fb413
fixing hover on disable
Jialecl Aug 25, 2022
0c5bd2a
repositioning marks
Jialecl Aug 25, 2022
4afda22
testing slider positioning
Jialecl Aug 26, 2022
da907e6
Merge branch 'master' of https://github.com/dxc-technology/halstack-r…
Jialecl Aug 26, 2022
c63be4b
adding min witdh to slider
Jialecl Aug 26, 2022
535442a
Adding states to firefox
Jialecl Aug 31, 2022
c63cb88
fixing some firefox styles
Jialecl Aug 31, 2022
e0add00
fixing firefox marks container styles
Jialecl Sep 1, 2022
e9c8f72
Merge branch 'master' of https://github.com/dxc-technology/halstack-r…
Jialecl Sep 2, 2022
db651b9
Positioning of the slider
Jialecl Sep 2, 2022
9500a34
Adding typing to styled components
Jialecl Sep 2, 2022
8208a77
Merge branch 'master' of https://github.com/dxc-technology/halstack-r…
Jialecl Sep 12, 2022
38968dc
Merge branch 'master' of https://github.com/dxc-technology/halstack-r…
Jialecl Sep 14, 2022
83fe1a9
Merge from master
Jialecl Sep 15, 2022
16c1906
Adding changes in tsx based on the review
Jialecl Sep 15, 2022
711a559
Adding types to TickMark elements
Jialecl Sep 15, 2022
aa4087e
Merge branch 'master' of https://github.com/dxc-technology/halstack-r…
Jialecl Sep 19, 2022
921dfba
Improving accessibility and interaction tests
Jialecl Sep 19, 2022
514d696
Merge branch 'master' of https://github.com/dxc-technology/halstack-r…
Jialecl Sep 20, 2022
8e48317
rename types + tests + remove uuid + disabled active thumb fix
Jialecl Sep 20, 2022
27df01f
adding accesibility check test
Jialecl Sep 20, 2022
80784d7
added more info in test title
Jialecl Sep 21, 2022
220419c
Merge branch 'master' into jialecl-removingMaterial-slider
Jialecl Sep 21, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 7 additions & 1 deletion lib/src/slider/Slider.stories.tsx
Expand Up @@ -171,7 +171,13 @@ export const Chromatic = () => (
</ExampleContainer>
<ExampleContainer>
<Title title="Large limit values labels" theme="light" level={4} />
<DxcSlider label="Slider" helperText="Help message" showLimitsValues labelFormatCallback={labelFormat} size="large" />
<DxcSlider
label="Slider"
helperText="Help message"
showLimitsValues
labelFormatCallback={labelFormat}
size="large"
/>
</ExampleContainer>
</>
);
29 changes: 22 additions & 7 deletions lib/src/slider/Slider.test.js
Expand Up @@ -18,6 +18,19 @@ describe("Slider component tests", () => {
expect(slider.getAttribute("aria-valuenow")).toBe("30");
expect(input.value).toBe("30");
});
test("Slider correct limit values", () => {
const { getByRole, getByText } = render(
<DxcSlider defaultValue={125} minValue={30} maxValue={125} showLimitsValues />
);
const slider = getByRole("slider");
expect(slider.getAttribute("aria-valuemin")).toBe("30");
expect(slider.getAttribute("aria-valuemax")).toBe("125");
userEvent.tab();
fireEvent.keyDown(slider, { key: "ArrowRight", code: "ArrowRight", keyCode: 39, charCode: 39 });
expect(slider.getAttribute("aria-valuenow")).toBe("125");
expect(getByText("30")).toBeTruthy();
expect(getByText("125")).toBeTruthy();
});
test("Calls correct function onChange in controlled slider", () => {
const onChange = jest.fn();
const { getByRole } = render(
Expand All @@ -44,7 +57,7 @@ describe("Slider component tests", () => {
expect(getByRole("slider").getAttribute("aria-valuenow")).toBe("25");
expect(getByRole("textbox").value).toBe("25");
});
test("Disabled slider have disabled input", () => {
test("Disabled slider have disabled input and slider", () => {
const onChange = jest.fn();
const { getByRole } = render(
<DxcSlider minValue={0} maxValue={100} onChange={onChange} showLimitsValues disabled showInput value={13} />
Expand All @@ -54,17 +67,19 @@ describe("Slider component tests", () => {
});
expect(getByRole("textbox").hasAttribute("disabled")).toBeTruthy();
expect(getByRole("textbox").value).toBe("13");
expect(getByRole("slider").hasAttribute("disabled")).toBeTruthy();
});
test("Calls correct function onDragEnd", () => {
Jialecl marked this conversation as resolved.
Show resolved Hide resolved
Jialecl marked this conversation as resolved.
Show resolved Hide resolved
const onDragEnd = jest.fn();
const { getByRole } = render(
<DxcSlider minValue={0} maxValue={100} showLimitsValues showInput onDragEnd={onDragEnd} value={25} />
);
const { getByRole } = render(<DxcSlider minValue={0} maxValue={150} onDragEnd={onDragEnd} showInput />);
const slider = getByRole("slider");
act(() => {
fireEvent.mouseDown(slider);
});
act(() => {
fireEvent.mouseDown(getByRole("slider"));
fireEvent.mouseUp(getByRole("slider"));
fireEvent.mouseUp(slider, { target: { value: 120 } });
});
expect(onDragEnd).toHaveBeenCalled();
expect(onDragEnd).toHaveBeenCalledWith("120");
});
test("Calls correct function labelFormatCallback", () => {
const labelFormatCallback = jest.fn((x) => `${x}$`);
Expand Down