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

Add support for negative number in interpolate styles #3418

Merged
merged 6 commits into from
Jan 26, 2024
Merged

Add support for negative number in interpolate styles #3418

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
912763b
add support for negative number with units
ChetanKarwa Jan 25, 2024
4c8a1cb
add test for negative number with unit
ChetanKarwa Jan 25, 2024
c3164c2
fix comment
ChetanKarwa Jan 25, 2024
df67f72
Revert "fix comment"
ChetanKarwa Jan 25, 2024
97e84a8
fix comment
ChetanKarwa Jan 25, 2024
41857a8
Merge branch 'main' into pr/3418
JonnyBurger Jan 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
19 changes: 19 additions & 0 deletions packages/animation-utils/src/test/interpolate-styles.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,3 +267,22 @@ test('Should interpolate between 0 and values with units', () => {
padding: '5px',
});
});

test('Should interpolate between negative values with units', () => {
expect(
interpolateStyles(
0.5,
[0, 1],
[
{
left: '-10px',
},
{
left: '-20px',
},
],
),
).toEqual({
left: '-15px',
});
});
8 changes: 4 additions & 4 deletions packages/animation-utils/src/transformation-helpers/interpolate-styles/utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,16 +143,16 @@ const classifyParts = (parts: string[]) => {
return {function: {name: functionName, values: functionValues}};
}

// Check for a number possibly followed by a unit
const numberUnitMatch = part.match(/^(\d+(?:\.\d+)?)([a-zA-Z%]*)$/);
// Check for a number possibly followed by a unit like '10px' or '10' or '-10px'
const numberUnitMatch = part.match(/^(-?\d+(?:\.\d+)?)([a-zA-Z%]*)$/);
if (numberUnitMatch) {
const number = parseFloat(numberUnitMatch[1]);
const unit = numberUnitMatch[2];
return unit ? {number, unit} : {number};
}

// Check for a number without a unit
const numberMatch = part.match(/^(\d+(?:\.\d+)?)$/);
// Check for a number without a unit like '10' or '-10'
const numberMatch = part.match(/^(-?\d+(?:\.\d+)?)$/);
if (numberMatch) {
const number = parseFloat(numberMatch[1]);
return {number};
Expand Down