Skip to content

✨RSP-629 - Fill Slider - with Offset #96

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

Closed
wants to merge 5 commits into from
Closed

✨RSP-629 - Fill Slider - with Offset #96

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
40ab459
RSP-629 - Fill Slider - with Offset
edify17 Oct 31, 2018
2a9000c
RSP-629 - Adding example of fill slider with offset
edify17 Nov 2, 2018
4efb96a
Merge pull request #646 from sakshgup/RSP-629
GarthDB Nov 17, 2018
9fea3cf
Merge branch 'master' into RSP-629
GarthDB Feb 2, 2019
72c2958
Adding back removed code while migration
edify17 Feb 5, 2019
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
32 changes: 32 additions & 0 deletions docs/slider/slider-filled-offset.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
---
name: Slider - Filled-Offset
description: With fill and offset.
markup: |
<div class="spectrum-Slider spectrum-Slider--filledOffset">
<div class="spectrum-Slider-labelContainer">
<label class="spectrum-Slider-label" id="spectrum-Slider-label-18" for="spectrum-Slider-input-18">Slider Label</label>
<div class="spectrum-Slider-value" role="textbox" aria-readonly="true" aria-labelledby="spectrum-Slider-label-18">14</div>
</div>
<div class="spectrum-Slider-controls">
<div class="spectrum-Slider-track" style="width: 25%;"></div>
<div class="spectrum-Slider-track" style="left: 25%; width: 25%;"></div>
<div class="spectrum-Slider-handle" style="left: 50%;">
<input type="range" class="spectrum-Slider-input" value="14" min="10" max="20" id="spectrum-Slider-input-18">
</div>
<div class="spectrum-Slider-track" style="width: 50%;"></div>
</div>
</div>
<div class="spectrum-Slider spectrum-Slider--filledOffset is-disabled">
<div class="spectrum-Slider-labelContainer">
<label class="spectrum-Slider-label" id="spectrum-Slider-label-19" for="spectrum-Slider-input-19">Slider Label</label>
<div class="spectrum-Slider-value" role="textbox" aria-readonly="true" aria-labelledby="spectrum-Slider-label-19">14</div>
</div>
<div class="spectrum-Slider-controls">
<div class="spectrum-Slider-track" style="width: 25%;"></div>
<div class="spectrum-Slider-track" style="left: 25%; width: 25%;"></div>
<div class="spectrum-Slider-handle" style="left: 50%;">
<input type="range" class="spectrum-Slider-input" value="14" min="10" max="20" id="spectrum-Slider-input-19">
</div>
<div class="spectrum-Slider-track" style="width: 50%;"></div>
</div>
</div>
43 changes: 43 additions & 0 deletions src/slider/index.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,49 @@
}
}

.spectrum-Slider--filledOffset {
.spectrum-Slider-handle {
& + .spectrum-Slider-track {
padding: 0 0 0 var(--spectrum-slider-track-handleoffset);
}
}
.spectrum-Slider-track {
&:first-of-type {
padding: 0 var(--spectrum-slider-track-handleoffset) 0 0;
left: var(--spectrum-slider-range-track-reset);
right: auto;
margin-left: var(--spectrum-slider-track-margin-offset);
&.extend-right {
margin-left: 0;
padding-right: 0;
}
}
& {
padding: 0 var(--spectrum-slider-track-middle-handleoffset);
left: auto;
right: auto;
margin: var(--spectrum-slider-range-track-reset);
&.extend-left {
margin-left: 0;
padding-left: 0;
}
&.extend-right {
margin-right: 0;
padding-right: 0;
}
}
&:last-of-type {
left: auto;
right: var(--spectrum-slider-range-track-reset);
margin-right: var(--spectrum-slider-track-margin-offset);
&.extend-left {
margin-right: 0;
padding-left: 0;
}
}
}
}

.spectrum-Slider-buffer {
/* Appear above track */
z-index: 2;
Expand Down
23 changes: 23 additions & 0 deletions src/slider/skin.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@
{{ slider/slider-filled.yml }}
*/
/* topdoc
{{ slider/slider-filled-offset.yml }}
*/
/* topdoc
{{ slider/slider-player.yml }}
*/
/* topdoc
Expand Down Expand Up @@ -38,6 +41,16 @@
}
}

.spectrum-Slider--filledOffset {
.spectrum-Slider-track {
&:not(:first-of-type):not(:last-of-type) {
&:before {
background: var(--spectrum-slider-fill-track-color);
}
}
}
}

.spectrum-Slider-buffer {
&::before,
&::after {
Expand Down Expand Up @@ -300,5 +313,15 @@
}
}
}

&.spectrum-Slider--filledOffset {
.spectrum-Slider-track {
&:not(:first-of-type):not(:last-of-type) {
&:before {
background: var(--spectrum-slider-fill-track-color-disabled);
}
}
}
}
}
}
45 changes: 35 additions & 10 deletions topdoc/resources/js/docs.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -355,23 +355,55 @@ function makeDoubleSlider(slider) {
function makeSlider(slider) {
var tracks = slider.querySelectorAll('.spectrum-Slider-track');
var leftTrack = tracks[0];
var rightTrack = tracks[1];
var rightTrack = tracks[tracks.length - 1];
var handles = slider.querySelectorAll('.spectrum-Slider-handle');
var handle = handles[0];
var isColor = slider.classList.contains('spectrum-Slider--color');
var sliderOffsetWidth = slider.offsetWidth;

if (handles.length > 1) {
makeDoubleSlider(slider);
return;
}

if (tracks.length > 2) {
var middleTrack = tracks[1];
var filledOffset = middleTrack.offsetLeft;
var filledOffsetPercent = (filledOffset / sliderOffsetWidth) * 100;
}

var buffers = slider.querySelectorAll('.spectrum-Slider-buffer');
if (buffers.length) {
var leftBuffer = buffers[0];
var rightBuffer = buffers[1];
var bufferedAmount = parseInt(handle.style.left, 10) + parseInt(rightBuffer.style.width, 10);
}

function setTracksWidth(percent) {
if (leftTrack && rightTrack && !middleTrack && !isColor) {
leftTrack.style.width = percent + '%';
rightTrack.style.width = (100 - percent) + '%';
}
else if (leftTrack && middleTrack && rightTrack && !isColor) {
leftTrack.style.width = Math.min(percent, filledOffsetPercent) + '%';
middleTrack.style.left = Math.min(percent, filledOffsetPercent) + '%';
middleTrack.style.width = Math.abs(percent - filledOffsetPercent) + '%';
rightTrack.style.width = (100 - Math.max(percent, filledOffsetPercent)) + '%';
if (filledOffsetPercent < percent) {
leftTrack.classList.add('extend-right');
middleTrack.classList.remove('extend-right');
middleTrack.classList.add('extend-left');
rightTrack.classList.remove('extend-left');
}
else {
leftTrack.classList.remove('extend-right');
middleTrack.classList.remove('extend-left');
middleTrack.classList.add('extend-right');
rightTrack.classList.add('extend-left');
}
}
}

function onMouseDown(e, sliderHandle) {
window.addEventListener('mouseup', onMouseUp);
window.addEventListener('mousemove', onMouseMove);
Expand All @@ -381,15 +413,11 @@ function makeSlider(slider) {
window.removeEventListener('mousemove', onMouseMove);
}
function onMouseMove(e, sliderHandle) {
var sliderOffsetWidth = slider.offsetWidth;
var sliderOffsetLeft = slider.offsetLeft + slider.offsetParent.offsetLeft;

var x = Math.max(Math.min(e.x-sliderOffsetLeft, sliderOffsetWidth), 0);
var percent = (x / sliderOffsetWidth) * 100;
if (leftTrack && rightTrack && !isColor) {
leftTrack.style.width = percent + '%';
rightTrack.style.width = (100 - percent) + '%';
}
setTracksWidth(percent);
handle.style.left = percent + '%';

if (buffers.length) {
Expand All @@ -411,10 +439,7 @@ function makeSlider(slider) {

// Set initial track position
var percent = parseInt(handle.style.left, 10);
if (leftTrack && rightTrack && !isColor) {
leftTrack.style.width = percent + '%';
rightTrack.style.width = (100 - percent) + '%';
}
setTracksWidth(percent);

if (!slider.classList.contains('is-disabled')) {
slider.addEventListener('mousedown', onMouseDown);
Expand Down