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

feat: adds support for vw, vh unit for maxHeight, maxWidth #526

Merged
merged 2 commits into from
Sep 27, 2019
Merged

feat: adds support for vw, vh unit for maxHeight, maxWidth #526

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
53b512b
feat: adds support for vw, vh unit for maxHeight, maxWidth
Sep 25, 2019
5f544e1
chore: updated README
Sep 26, 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
36 changes: 20 additions & 16 deletions src/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,22 @@ const getStringSize = memoize(
},
);

const getPixelSize = (size: undefined | string | number, parentSize: number) => {
if (size && typeof size === 'string') {
if (endsWith(size, '%')) {
const ratio = Number(size.replace('%', '')) / 100;
return parentSize * ratio;
} else if (endsWith(size, 'vw')) {
const ratio = Number(size.replace('vw', '')) / 100;
return window.innerWidth * ratio;
} else if (endsWith(size, 'vh')) {
const ratio = Number(size.replace('vh', '')) / 100;
return window.innerHeight * ratio;
}
}
return size;
};

const calculateNewMax = memoize(
(
parentSize: { width: number; height: number },
Expand All @@ -182,22 +198,10 @@ const calculateNewMax = memoize(
minWidth?: string | number,
minHeight?: string | number,
) => {
if (maxWidth && typeof maxWidth === 'string' && endsWith(maxWidth, '%')) {
const ratio = Number(maxWidth.replace('%', '')) / 100;
maxWidth = parentSize.width * ratio;
}
if (maxHeight && typeof maxHeight === 'string' && endsWith(maxHeight, '%')) {
const ratio = Number(maxHeight.replace('%', '')) / 100;
maxHeight = parentSize.height * ratio;
}
if (minWidth && typeof minWidth === 'string' && endsWith(minWidth, '%')) {
const ratio = Number(minWidth.replace('%', '')) / 100;
minWidth = parentSize.width * ratio;
}
if (minHeight && typeof minHeight === 'string' && endsWith(minHeight, '%')) {
const ratio = Number(minHeight.replace('%', '')) / 100;
minHeight = parentSize.height * ratio;
}
maxWidth = getPixelSize(maxWidth, parentSize.width);
maxHeight = getPixelSize(maxHeight, parentSize.height);
minWidth = getPixelSize(minWidth, parentSize.width);
minHeight = getPixelSize(minHeight, parentSize.height);
return {
maxWidth: typeof maxWidth === 'undefined' ? undefined : Number(maxWidth),
maxHeight: typeof maxHeight === 'undefined' ? undefined : Number(maxHeight),
Expand Down