Skip to content
Open
Changes from all commits
Commits
Show all changes
111 commits
Select commit Hold shift + click to select a range
e862aaf
Merge pull request #47 from entria/feature/multisliderImprovements
ptomasroos Dec 12, 2017
0a1ba6f
Fix valueToPosition converter
jakubzaba Jan 4, 2018
ad84f37
ignore termanation request
skv-headless Jan 5, 2018
7d88861
Merge pull request #51 from ptomasroos/ignore-termination-request
ptomasroos Jan 5, 2018
d6c6a64
Merge pull request #50 from jakubzaba/fix-value-to-position
ptomasroos Jan 6, 2018
8795037
return old createArray implementation
skv-headless Jan 9, 2018
b60e5fb
Merge pull request #52 from skv-headless/fix-android
ptomasroos Jan 9, 2018
4a726a5
Updated version to 0.0.11
ptomasroos Sep 5, 2017
b913572
Bumped version to 0.0.12
ptomasroos Feb 4, 2018
7a82c5c
Updated CHANGELOG
ptomasroos Feb 4, 2018
0f074d9
Add currentValue prop type to DefaultMarker component.
oleksii-trekhleb-epam Feb 15, 2018
325193f
Merge pull request #60 from trekhleb/master
ptomasroos Feb 15, 2018
efe6e60
Added ISSUE_TEMPLATE.md
ptomasroos Mar 25, 2018
9f02955
Added explicit ScrollView example
ptomasroos Apr 1, 2018
141f5e7
update
Apr 11, 2018
2e4cb32
update
Apr 11, 2018
3133b03
update
Apr 11, 2018
66a9573
update
Apr 11, 2018
ba8b614
Update MultiSlider.js
alexfoxy Apr 11, 2018
dbbc296
update
Apr 11, 2018
d77f046
update
Apr 11, 2018
5a608ca
update
Apr 11, 2018
43e4fc6
update
Apr 11, 2018
241de5b
update
Apr 11, 2018
b67bf8c
update
Apr 11, 2018
763e5e2
update
Apr 11, 2018
87f1d3e
update
Apr 11, 2018
42256ba
update
Apr 11, 2018
4d17a62
update
Apr 11, 2018
2559570
update
Apr 11, 2018
14cb823
update
Apr 11, 2018
29cbe5b
update
Apr 11, 2018
fa87a9d
update
Apr 11, 2018
92ab798
update
Apr 11, 2018
13fada8
Merge pull request #68 from alexfoxy/master
ptomasroos Apr 17, 2018
ef0d61a
customerMarker update doc
aligulen Apr 17, 2018
737f94a
ternary condition added in MultiSlider.js
aligulen Apr 17, 2018
0af0741
Improve closest function
Apr 19, 2018
5912c13
Merge pull request #67 from sadeghipour/master
ptomasroos Apr 20, 2018
531f436
Merge pull request #69 from elieteyssedou/master
ptomasroos Apr 20, 2018
932c022
add RTL support
iamsoorena Apr 23, 2018
f0830e5
Updated CHANGELOG
ptomasroos Apr 23, 2018
54bb59b
Bumped version number
ptomasroos Apr 23, 2018
cd6c298
refactoring
iamsoorena Apr 24, 2018
da67f07
Merge pull request #71 from iamsoorena/add-rtl-support
ptomasroos Apr 24, 2018
054dafe
Updated CHANGELOG
ptomasroos Apr 26, 2018
d69936c
Bumped version number
ptomasroos Apr 26, 2018
5996b07
Vertically centered slider
mrxrinc Apr 28, 2018
a5eec7a
Typo
ptomasroos Jun 5, 2018
a02e6b0
Added ability to make slider vertical
Kif11 Jun 28, 2018
9a1dc2c
Added vertical rotate to slider container
Kif11 Jun 28, 2018
eeec919
Merge pull request #74 from mrxrinc/patch-1
ptomasroos Jun 29, 2018
19efab3
Updated latest fix
ptomasroos Jun 29, 2018
dddcbd4
Bumped version to 1.0.0
ptomasroos Jun 29, 2018
d707af8
Changed slider rotation direction and added accumDistanceDisplacement
Kif11 Jun 29, 2018
c40ea82
Merge pull request #81 from Kif11/master
ptomasroos Jul 3, 2018
577a8df
Removed prop-types since they are going away from React
ptomasroos Oct 26, 2018
ef17c4a
Updated LICENSE file
ptomasroos Oct 26, 2018
32bf257
Removed dead code
ptomasroos Oct 26, 2018
e34da9f
Removed prop-types
ptomasroos Oct 26, 2018
a25e133
Replaced eslint with prettier and precommit hooks
ptomasroos Oct 26, 2018
7e8d0cc
Added new Basic example based on rn 0.57
ptomasroos Oct 26, 2018
b47ac43
Removed old example
ptomasroos Oct 26, 2018
5f63fd3
Updated props documentation
gbertoncelli Oct 31, 2018
fd52164
Merge pull request #93 from HighSoftWare96/master
ptomasroos Oct 31, 2018
6aeeaa8
Added original contributor Jack Rans
ptomasroos Oct 31, 2018
16ee2b8
Don’t wanna get sued for improving a project.
ptomasroos Nov 2, 2018
5fa3016
feat(docs): add docs for snapped props, fix #97 (#98)
sibelius Nov 14, 2018
818f77e
feat(docs): update description for optionsArray (#107)
julioxavierr Feb 12, 2019
2e3abbe
Fix path to Example in README (#109)
itinance Feb 20, 2019
8fc5107
Add prop minMarkerOverlapDistance to allow setting a custom value for…
dyihoon90 Mar 28, 2019
b2dba34
fixed marker error (#99)
vidit-bhatia Mar 28, 2019
8a8d9f9
Dynamic Label (#117)
olahat90 Jun 13, 2019
3e7b54e
Add support for ImageBackground (#120)
FrikkieSnyman Jun 14, 2019
8aa0756
Add touch support on selected track (#121)
FrikkieSnyman Jun 14, 2019
28a0edd
Remove `styles.marker` from Marker and MarkerLeft styles (#119)
FrikkieSnyman Jun 14, 2019
fab9f7a
add disabledMarkerStyle prop for custom styling of disabled marker (#…
stevenvz Jun 14, 2019
98b907e
improve styles for support web (react-native-web) (#126)
fardad-dev Jun 16, 2019
ada35ca
Bumped version to 2.0.0
ptomasroos Oct 28, 2019
20dc6f6
Remove duplicate track. (#139)
robwalkerco Oct 28, 2019
30ca821
Removed deprecated methods (#155)
mitaxe Feb 4, 2020
df901ec
Update example to 0.61.5 (#158)
baconcheese113 Feb 6, 2020
62ce469
Clarify example setup with metro resolving
ptomasroos Feb 7, 2020
7a7858e
valueOne was missing in the getDerivedStateFromProps func
ptomasroos Feb 7, 2020
19933d8
Closes #165
ptomasroos Feb 12, 2020
04ce297
Removed getDerivedState -> componentDidUpdate (#163)
ptomasroos Feb 20, 2020
77e77c7
Corrected path in npmignore
ptomasroos Feb 21, 2020
9d068dc
Bump version
ptomasroos Feb 21, 2020
f081c20
add types (#159)
FrikkieSnyman Feb 21, 2020
f3d782e
Add `types` property to package.json (#177)
darkwebdev Mar 22, 2020
befdf69
Add `vertical` to type definitions (#176)
darkwebdev Mar 22, 2020
453fd2d
Add `vertical` prop to readme (#178)
darkwebdev Mar 22, 2020
760be4b
update the docs (#175)
97thjingba Mar 23, 2020
14c68b5
Update README.md
ptomasroos Mar 23, 2020
ab64574
Bump version to 2.2.1
ptomasroos Mar 26, 2020
dd7752f
Fix labels (#180)
darkbasic Mar 27, 2020
1a42581
Bump version
ptomasroos Mar 27, 2020
8cd61a0
Allow creation of custom labels with personalized values for min/max …
darkbasic Mar 28, 2020
09f65b2
[Marker] Move markers on opposite directions by x offset (#188)
CareLuLu-Gabriel Apr 15, 2020
9436447
fixed converters/valueToPosition (#190)
rainst May 14, 2020
41e9329
Enabled usage of height and width props from Touch Dimensions on Mark…
thiagofsr97 May 15, 2020
48b2638
Clean up indentations (#197)
coreyar Jun 1, 2020
d8f18e8
Fix #45 (#196)
raynor85 Jul 3, 2020
0e537e2
Update README.md for Fix #45 and Fix #199 (#200)
raynor85 Aug 19, 2020
4dd53e8
Fix/reenable allow overlap for large sliders (#209)
AmauryLiet Sep 1, 2020
eaa42b0
Feat/enable expressing overlap distance in step (#210)
AmauryLiet Sep 1, 2020
07b89e1
Feat/Add testID prop for locating the view in end-to-end tests (#212)
jamesl1001 Oct 21, 2020
0000df7
Center default label above marker (#221)
ja-ka Jan 3, 2021
9f00ff1
Feature - Adding step labeling (#213)
gusolsso Feb 3, 2021
63e7b4a
feat: added props trackOneRender, support user deliver custom element…
itenl Jul 27, 2021
5a9957f
Merge branch 'master' into feat-add-props-trackOneRender
itenl Sep 7, 2021
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
21 changes: 13 additions & 8 deletions MultiSlider.js
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ export default class MultiSlider extends React.Component {
vertical: false,
minMarkerOverlapDistance: 0,
minMarkerOverlapStepDistance: 0,
trackOneRender: null,
testID: '',
};

Expand Down Expand Up @@ -486,6 +487,12 @@ export default class MultiSlider extends React.Component {
});
}

renderTrackOne(styles) {
const { trackOneRender } = this.props;
if (trackOneRender && typeof trackOneRender === 'function') return trackOneRender(styles)
return <View style={styles} />
}

render() {
const { positionOne, positionTwo } = this.state;
const {
Expand Down Expand Up @@ -548,14 +555,12 @@ export default class MultiSlider extends React.Component {
const body = (
<React.Fragment>
<View style={[styles.fullTrack, { width: sliderLength }]}>
<View
style={[
styles.track,
this.props.trackStyle,
trackOneStyle,
{ width: trackOneLength },
]}
/>
{this.renderTrackOne([
styles.track,
this.props.trackStyle,
trackOneStyle,
{ width: trackOneLength },
])}
<View
style={[
styles.track,
Expand Down