Skip to content

Commit 4bbd6f6

Browse files
committed
Merge branch 'felix-kaestner-master'
2 parents 316593d + 54ee3a8 commit 4bbd6f6

25 files changed

+765
-68
lines changed

.storybook/example.stories.js

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,18 @@ import BasicWithBorder from '../examples/BasicWithBorder';
55
import Disabled from '../examples/Disabled';
66
import SuperSimple from '../examples/SuperSimple';
77
import TwoThumbs from '../examples/TwoThumbs';
8+
import TwoThumbsDraggableTrack from '../examples/TwoThumbsDraggableTrack';
9+
import TwoThumbsDraggableTrackDownDirection from '../examples/TwoThumbsDraggableTrackDownDirection';
810
import Marks from '../examples/Marks';
911
import MarksVertical from '../examples/MarksVertical';
1012
import Rtl from '../examples/Rtl';
1113
import RtlTwoThumbs from '../examples/RtlTwoThumbs';
14+
import RtlTwoThumbsDraggableTrack from '../examples/RtlTwoThumbsDraggableTrack';
1215
import UpDirection from '../examples/UpDirection';
1316
import DownDirection from '../examples/DownDirection';
1417
import LeftDirection from '../examples/LeftDirection';
1518
import MultipleThumbs from '../examples/MultipleThumbs';
19+
import MultipleThumbsDraggableTrack from '../examples/MultipleThumbsDraggableTrack';
1620
import AllowOverlap from '../examples/AllowOverlap';
1721
import BigSteps from '../examples/BigSteps';
1822
import Labeled from '../examples/Labeled';
@@ -31,14 +35,24 @@ storiesOf('Range', module)
3135
.add('Disabled', () => <Disabled />)
3236
.add('Super simple', () => <SuperSimple />)
3337
.add('Two thumbs', () => <TwoThumbs />)
38+
.add('Two thumbs with draggable track', () => <TwoThumbsDraggableTrack />)
39+
.add('Two thumbs with draggable track and Down direction', () => (
40+
<TwoThumbsDraggableTrackDownDirection />
41+
))
3442
.add('Marks', () => <Marks />)
3543
.add('Marks vertical', () => <MarksVertical />)
3644
.add('Rtl', () => <Rtl />)
3745
.add('Rtl Two Thumbs', () => <RtlTwoThumbs />)
46+
.add('Rtl Two Thumbs with draggable track', () => (
47+
<RtlTwoThumbsDraggableTrack />
48+
))
3849
.add('Up direction', () => <UpDirection />)
3950
.add('Down direction', () => <DownDirection />)
4051
.add('Left direction', () => <LeftDirection />)
4152
.add('Multiple thumbs', () => <MultipleThumbs />)
53+
.add('Multiple thumbs with draggable track', () => (
54+
<MultipleThumbsDraggableTrack />
55+
))
4256
.add('Allow overlap', () => <AllowOverlap />)
4357
.add('Big steps', () => <BigSteps />)
4458
.add('Labeled', () => <Labeled />)

README.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -217,6 +217,14 @@ allowOverlap: boolean;
217217

218218
When there are multiple thumbs on a single track, should they be allowed to overlap? Default is `false`.
219219

220+
### draggableTrack (optional)
221+
222+
```ts
223+
draggableTrack: boolean;
224+
```
225+
226+
When there are multiple thumbs on a single track, should it be possible to drag all thumbs at once? Default is `false`.
227+
220228
### direction (optional)
221229

222230
```ts
2.68 KB
Loading
2.32 KB
Loading
2.25 KB
Loading
2.11 KB
Loading
2.11 KB
Loading
2.24 KB
Loading
4.22 KB
Loading
4.22 KB
Loading

0 commit comments

Comments
 (0)