-
Notifications
You must be signed in to change notification settings - Fork 94
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #578 from ONLYOFFICE/feature/slider-redesign
Feature/slider redesign
- Loading branch information
Showing
7 changed files
with
253 additions
and
140 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
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,60 @@ | ||
| import React, { useState } from "react"; | ||
| import PropTypes from "prop-types"; | ||
| import { StyledSlider } from "./styled-slider"; | ||
|
|
||
| const Slider = ({ | ||
| id, | ||
| type, | ||
| className, | ||
| onChange, | ||
| min, | ||
| max, | ||
| step, | ||
| value, | ||
| withPouring, | ||
| style, | ||
| }) => { | ||
| const [size, setSize] = useState("0%"); | ||
|
|
||
| const handleChange = (e) => { | ||
| let target = e.target; | ||
|
|
||
| const max = target.max; | ||
| const min = target.min; | ||
| const val = target.value; | ||
|
|
||
| setSize(((val - min) * 100) / (max - min) + "%"); | ||
| onChange && onChange(e); | ||
| }; | ||
|
|
||
| return ( | ||
| <StyledSlider | ||
| style={style} | ||
| id={id} | ||
| type={type} | ||
| className={className} | ||
| min={min} | ||
| max={max} | ||
| step={step} | ||
| value={value} | ||
| size={value && withPouring ? size : "0%"} | ||
| withPouring={withPouring} | ||
| onChange={handleChange} | ||
| /> | ||
| ); | ||
| }; | ||
|
|
||
| Slider.propTypes = { | ||
| id: PropTypes.string, | ||
| type: PropTypes.string, | ||
| className: PropTypes.string, | ||
| onChange: PropTypes.func, | ||
| min: PropTypes.oneOfType([PropTypes.number, PropTypes.string]), | ||
| max: PropTypes.oneOfType([PropTypes.number, PropTypes.string]), | ||
| step: PropTypes.oneOfType([PropTypes.number, PropTypes.string]), | ||
| value: PropTypes.number, | ||
| withPouring: PropTypes.bool, | ||
| style: PropTypes.oneOfType([PropTypes.object, PropTypes.array]), | ||
| }; | ||
|
|
||
| export default Slider; |
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,33 @@ | ||
| import React, { useState } from "react"; | ||
| import Slider from "."; | ||
|
|
||
| export default { | ||
| title: "Components/Slider", | ||
| component: Slider, | ||
| parameters: { | ||
| docs: { description: { component: "Components/Slider" } }, | ||
| }, | ||
| }; | ||
|
|
||
| const Template = ({ ...args }) => { | ||
| const [value, setValue] = useState(0); | ||
|
|
||
| const handleChange = (e) => { | ||
| const target = e.target; | ||
| setValue(target.value); | ||
| }; | ||
|
|
||
| return ( | ||
| <div style={{ width: "400px", height: "50px" }}> | ||
| <Slider {...args} value={value} onChange={handleChange} /> | ||
| </div> | ||
| ); | ||
| }; | ||
|
|
||
| export const Default = Template.bind({}); | ||
| Default.args = { | ||
| min: 0, | ||
| max: 5, | ||
| step: 0.1, | ||
| withPouring: false, | ||
| }; |
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,23 @@ | ||
| import React from "react"; | ||
| import { mount } from "enzyme"; | ||
| import Slider from "."; | ||
|
|
||
| describe("<Textarea />", () => { | ||
| it("renders without error", () => { | ||
| const wrapper = mount(<Slider />); | ||
|
|
||
| expect(wrapper).toExist(); | ||
| }); | ||
|
|
||
| it("accepts id", () => { | ||
| const wrapper = mount(<Slider id="testId" />); | ||
|
|
||
| expect(wrapper.prop("id")).toEqual("testId"); | ||
| }); | ||
|
|
||
| it("accepts className", () => { | ||
| const wrapper = mount(<Slider className="test" />); | ||
|
|
||
| expect(wrapper.prop("className")).toEqual("test"); | ||
| }); | ||
| }); |
Oops, something went wrong.