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

Jump to bottom

refactor: Bootstrap to AntD - Slider #13989

Merged
merged 1 commit into from
Apr 12, 2021
Merged

refactor: Bootstrap to AntD - Slider #13989

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
47 changes: 37 additions & 10 deletions ...mponents/BootstrapSliderWrapper/index.jsx → .../src/components/Slider/Slider.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,41 @@
* under the License.
*/
import React from 'react';
import ReactBootstrapSlider from 'react-bootstrap-slider';
import 'bootstrap-slider/dist/css/bootstrap-slider.min.css';
import './BootstrapSliderWrapper.less';
import Slider, { SliderSingleProps } from '.';

export default function BootstrapSliderWrapper(props) {
return (
<span className="BootstrapSliderWrapper">
<ReactBootstrapSlider {...props} />
</span>
);
}
export default {
title: 'Slider',
component: Slider,
};

export const InteractiveSlider = (args: SliderSingleProps) => (
<Slider {...args} style={{ width: 400, height: 400 }} />
);

InteractiveSlider.args = {
min: 0,
max: 100,
defaultValue: 70,
step: 1,
};

InteractiveSlider.argTypes = {
onChange: { action: 'onChange' },
disabled: {
control: { type: 'boolean' },
},
reverse: {
control: { type: 'boolean' },
},
vertical: {
control: { type: 'boolean' },
},
};

InteractiveSlider.story = {
parameters: {
knobs: {
disable: true,
},
},
};
14 changes: 8 additions & 6 deletions ...SliderWrapper/BootstrapSliderWrapper.less → ...-frontend/src/components/Slider/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,14 @@
* specific language governing permissions and limitations
* under the License.
*/
@import '../../../stylesheets/less/variables.less';
import React from 'react';
import AntDSlider, {
SliderSingleProps,
SliderRangeProps,
} from 'antd/lib/slider';

.BootstrapSliderWrapper .slider-selection {
background: @gray-bg;
}
export { SliderSingleProps, SliderRangeProps };

.BootstrapSliderWrapper .slider-handle {
background: @gray-light;
export default function Slider(props: SliderSingleProps | SliderRangeProps) {
return <AntDSlider {...props} css={{ marginLeft: 0, marginRight: 0 }} />;
}
15 changes: 4 additions & 11 deletions superset-frontend/src/explore/components/controls/SliderControl.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,7 @@
*/
import React from 'react';
import PropTypes from 'prop-types';

import BootstrapSliderWrapper from 'src/components/BootstrapSliderWrapper';
import Slider from 'src/components/Slider';
import ControlHeader from 'src/explore/components/ControlHeader';

const propTypes = {
Expand All @@ -32,17 +31,11 @@ const defaultProps = {
};

export default function SliderControl(props) {
// This wouldn't be necessary but might as well
return (
<div>
<>
<ControlHeader {...props} />
<BootstrapSliderWrapper
{...props}
change={obj => {
props.onChange(obj.target.value);
}}
/>
</div>
<Slider {...props} defaultValue={props.default} />
</>
);
}

Expand Down