Skip to content

Commit

Permalink
Add support for vw/vh/vmin/vmax units
Browse files Browse the repository at this point in the history
  • Loading branch information
bramus committed Apr 22, 2022
1 parent 3233112 commit 2b92863
Show file tree
Hide file tree
Showing 4 changed files with 39 additions and 8 deletions.
2 changes: 1 addition & 1 deletion dist/scroll-timeline.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/scroll-timeline.js.map

Large diffs are not rendered by default.

41 changes: 36 additions & 5 deletions src/scroll-timeline-base.js
Original file line number Diff line number Diff line change
Expand Up @@ -114,9 +114,43 @@ export function calculateMaxScrollOffset(source, orientation) {
return source.scrollWidth - source.clientWidth;
}

/**
* Calculates the maximum pixel value to use
* @param cssValue {CSSUnitValue}
* @param source {DOMElement}
* @param orientation {String}
* @returns {number}
*/
function calculateMaxValue(cssValue, source, orientation) {
if (cssValue instanceof CSSUnitValue) {
switch (cssValue.unit) {
case 'vw':
return Math.max(document.documentElement.clientWidth || 0, window.innerWidth || 0);
case 'vh':
return Math.max(document.documentElement.clientHeight || 0, window.innerHeight || 0);
case 'vmin':
return Math.min(
Math.max(document.documentElement.clientWidth || 0, window.innerWidth || 0),
Math.max(document.documentElement.clientHeight || 0, window.innerHeight || 0),
);
case 'vmax':
return Math.max(
Math.max(document.documentElement.clientWidth || 0, window.innerWidth || 0),
Math.max(document.documentElement.clientHeight || 0, window.innerHeight || 0),
);
default:
// NOOP
}
}

return orientation === "vertical"
? source.scrollHeight - source.clientHeight
: source.scrollWidth - source.clientWidth;
}

function resolvePx(cssValue, resolvedLength) {
if (cssValue instanceof CSSUnitValue) {
if (cssValue.unit == "percent")
if (['percent', 'vmin', 'vmax', 'vw', 'vh'].includes(cssValue.unit))
return cssValue.value * resolvedLength / 100;
else if (cssValue.unit == "px")
return cssValue.value;
Expand Down Expand Up @@ -150,10 +184,7 @@ export function calculateScrollOffset(
if (orientation === "block") orientation = "vertical";
else if (orientation === "inline") orientation = "horizontal";

let maxValue =
orientation === "vertical"
? source.scrollHeight - source.clientHeight
: source.scrollWidth - source.clientWidth;
const maxValue = calculateMaxValue(offset, source, orientation);
let parsed = parseLength(offset === AUTO ? autoValue : offset);
return resolvePx(parsed, maxValue);
}
Expand Down
2 changes: 1 addition & 1 deletion src/utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ export function parseLength(obj, acceptStr) {
return obj;
if (!acceptStr)
return null;
let matches = obj.trim().match(/^(-?[0-9]*\.?[0-9]*)(px|%)$/);
let matches = obj.trim().match(/^(-?[0-9]*\.?[0-9]*)(px|%|vw|vh|vmin|vmax)$/);
if (matches) {
let value = matches[1];
// The unit for % is percent.
Expand Down

0 comments on commit 2b92863

Please sign in to comment.