Skip to content

Commit 1ca597d

Browse files
committed
Invert boolean argument on OrderedElements set()
As @xymostech pointed out in code review > I'd assume that preserveOrder would be the default in something called > OrderedElements This makes sense to me, so I am inverting this boolean and explicitly passing it in everywhere it is used now.
1 parent a60aaa8 commit 1ca597d

3 files changed

Lines changed: 14 additions & 14 deletions

File tree

src/generate.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ export const generateCSS = (
177177
// If none of the handlers handled it, add it to the list of plain
178178
// style declarations.
179179
if (!foundHandler) {
180-
plainDeclarations.set(key, val);
180+
plainDeclarations.set(key, val, true);
181181
}
182182
});
183183

@@ -224,7 +224,7 @@ const runStringHandlers = (
224224
// Preserve order here, since we are really replacing an
225225
// unprocessed style with a processed style, not overriding an
226226
// earlier style
227-
true
227+
false
228228
);
229229
}
230230
}

src/ordered-elements.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ export default class OrderedElements {
1919
}
2020
}
2121

22-
set(key /* : string */, value /* : any */, preserveOrder /* : ?boolean */) {
22+
set(key /* : string */, value /* : any */, shouldReorder /* : ?boolean */) {
2323
if (!this.elements.hasOwnProperty(key)) {
2424
this.keyOrder.push(key);
25-
} else if (!preserveOrder) {
25+
} else if (shouldReorder) {
2626
const index = this.keyOrder.indexOf(key);
2727
this.keyOrder.splice(index, 1);
2828
this.keyOrder.push(key);
@@ -40,7 +40,7 @@ export default class OrderedElements {
4040
? this.elements[key]
4141
: new OrderedElements();
4242
value.forEach((value, key) => {
43-
nested.set(key, value);
43+
nested.set(key, value, shouldReorder);
4444
});
4545
this.elements[key] = nested;
4646
return;
@@ -54,7 +54,7 @@ export default class OrderedElements {
5454
: new OrderedElements();
5555
const keys = Object.keys(value);
5656
for (let i = 0; i < keys.length; i += 1) {
57-
nested.set(keys[i], value[keys[i]]);
57+
nested.set(keys[i], value[keys[i]], shouldReorder);
5858
}
5959
this.elements[key] = nested;
6060
return;
@@ -74,12 +74,12 @@ export default class OrderedElements {
7474
addStyleType(styleType /* : any */) /* : void */ {
7575
if ((MAP_EXISTS && styleType instanceof Map) || styleType instanceof OrderedElements) {
7676
styleType.forEach((value, key) => {
77-
this.set(key, value);
77+
this.set(key, value, true);
7878
});
7979
} else {
8080
const keys = Object.keys(styleType);
8181
for (let i = 0; i < keys.length; i++) {
82-
this.set(keys[i], styleType[keys[i]]);
82+
this.set(keys[i], styleType[keys[i]], true);
8383
}
8484
}
8585
}

tests/ordered-elements_test.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ describe("OrderedElements", () => {
5353
}, elems);
5454
});
5555

56-
it('moves overridden elements to the end', () => {
56+
it('preserves original order when overriding', () => {
5757
const elems = new OrderedElements();
5858

5959
elems.set("a", 1);
@@ -62,14 +62,14 @@ describe("OrderedElements", () => {
6262

6363
assert.deepEqual({
6464
elements: {
65-
b: 1,
6665
a: 2,
66+
b: 1,
6767
},
68-
keyOrder: ["b", "a"],
68+
keyOrder: ["a", "b"],
6969
}, elems);
7070
});
7171

72-
it('can preserve order when setting', () => {
72+
it('can reorder when overriding', () => {
7373
const elems = new OrderedElements();
7474

7575
elems.set("a", 1);
@@ -78,10 +78,10 @@ describe("OrderedElements", () => {
7878

7979
assert.deepEqual({
8080
elements: {
81-
a: 2,
8281
b: 1,
82+
a: 2,
8383
},
84-
keyOrder: ["a", "b"],
84+
keyOrder: ["b", "a"],
8585
}, elems);
8686
});
8787

0 commit comments

Comments
 (0)