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

Fix crash by conditional value of aspectRatio style value (#35858) #35859

Closed
wants to merge 6 commits into from
Closed

Fix crash by conditional value of aspectRatio style value (#35858) #35859

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
66278fc
Fix crash by conditional value of aspectRatio style value (#35858)
mym0404 Jan 17, 2023
ed5a0de
Add more `processAspectRatio` tests
mym0404 Jan 17, 2023
1839593
Filter out only not string and falsy value in processAspectRatio
mym0404 Jan 18, 2023
b855ea4
Handle not string truthy values of `aspectRatio` and Add more tests
mym0404 Jan 18, 2023
07fc573
Update Libraries/StyleSheet/__tests__/processAspectRatio-test.js
mym0404 Jan 20, 2023
62b764a
fix typo
NickGerleman Jan 20, 2023
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
7 changes: 7 additions & 0 deletions Libraries/StyleSheet/__tests__/processAspectRatio-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,4 +47,11 @@ describe('processAspectRatio', () => {
expect(() => processAspectRatio('1 / 1 1')).toThrowErrorMatchingSnapshot();
expect(() => processAspectRatio('auto 1/1')).toThrowErrorMatchingSnapshot();
});

it('should not accept non number | string type', () => {
const invalidThings = [undefined, null, () => {}, [1, 2, 3]];
invalidThings.forEach(thing => {
expect(processAspectRatio(thing)).toBe(undefined);
});
});
});
5 changes: 4 additions & 1 deletion Libraries/StyleSheet/processAspectRatio.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,13 @@

const invariant = require('invariant');

function processAspectRatio(aspectRatio: number | string): ?number {
function processAspectRatio(aspectRatio?: number | string): ?number {
if (typeof aspectRatio === 'number') {
return aspectRatio;
}
if (typeof aspectRatio !== 'string') {
NickGerleman marked this conversation as resolved.
Show resolved Hide resolved
return;
}
mym0404 marked this conversation as resolved.
Show resolved Hide resolved

const matches = aspectRatio.split('/').map(s => s.trim());

Expand Down