Skip to content

Commit 29146fe

Browse files
giuseppegnecolas
authored andcommitted
[fix] StyleSheet group sorting
Close necolas#1356
1 parent 33dc3cb commit 29146fe

File tree

3 files changed

+12
-3
lines changed

3 files changed

+12
-3
lines changed

packages/react-native-web/src/exports/StyleSheet/__tests__/__snapshots__/createOrderedCSSStyleSheet-test.js.snap

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,13 @@ exports[`createOrderedCSSStyleSheet #insert insertion order for different groups
2424
.four-2 {}
2525
[stylesheet-group=\\"9.9\\"]{}
2626
.nine-1 {}
27-
.nine-2 {}"
27+
.nine-2 {}
28+
[stylesheet-group=\\"10\\"]{}
29+
.ten {}
30+
[stylesheet-group=\\"20\\"]{}
31+
.twenty {}
32+
[stylesheet-group=\\"20.2\\"]{}
33+
.twenty-point2 {}"
2834
`;
2935

3036
exports[`createOrderedCSSStyleSheet #insert insertion order for same group 1`] = `""`;

packages/react-native-web/src/exports/StyleSheet/__tests__/createOrderedCSSStyleSheet-test.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,9 @@ describe('createOrderedCSSStyleSheet', () => {
5454
sheet.insert('.two {}', 2.2);
5555
sheet.insert('.four-1 {}', 4);
5656
sheet.insert('.four-2 {}', 4);
57+
sheet.insert('.twenty {}', 20);
58+
sheet.insert('.ten {}', 10);
59+
sheet.insert('.twenty-point2 {}', 20.2);
5760

5861
expect(sheet.getTextContent()).toMatchSnapshot();
5962
});

packages/react-native-web/src/exports/StyleSheet/createOrderedCSSStyleSheet.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -148,8 +148,8 @@ function decodeGroupRule(cssRule) {
148148

149149
function getOrderedGroups(obj: { [key: number]: any }) {
150150
return Object.keys(obj)
151-
.sort()
152-
.map(k => Number(k));
151+
.map(Number)
152+
.sort((a, b) => (a > b ? 1 : -1));
153153
}
154154

155155
const pattern = /\s*([,])\s*/g;

0 commit comments

Comments
 (0)