Skip to content

Filter __mediaQueries for output #15

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

Merged
merged 3 commits into from
Jul 4, 2018
Merged

Filter __mediaQueries for output #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f97d268
Filter __mediaQueries for output
jhen0409 Jul 4, 2018
50343e4
Remove omit in tests
jhen0409 Jul 4, 2018
0dd380e
Update perf-tests
jhen0409 Jul 4, 2018
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
57 changes: 24 additions & 33 deletions src/__tests__/index.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,5 @@
import memoize from "micro-memoize";

function omit(obj, omitKey) {
return Object.keys(obj).reduce((result, key) => {
if (key !== omitKey) {
result[key] = obj[key];
}
return result;
}, {});
}

const win = {
width: 110,
height: 100
Expand Down Expand Up @@ -72,7 +63,7 @@ describe("media queries", () => {
d: 5
}
};
const result = omit(process(obj, matchObject), "__mediaQueries");
const result = process(obj, matchObject);
expect(result).toEqual({
a: 2,
b: 2,
Expand Down Expand Up @@ -118,7 +109,7 @@ describe("media queries", () => {
}
};

const result = omit(process(styles, matchObject), "__mediaQueries");
const result = process(styles, matchObject);

expect(result).toEqual({ a: 1 });
expect(styles).toEqual({
Expand Down Expand Up @@ -189,7 +180,7 @@ describe("media queries", () => {
};

const mstyles = memoize(styles);
const result = omit(process(mstyles(0), matchObject), "__mediaQueries");
const result = process(mstyles(0), matchObject);
expect(result).toEqual({ a: 1 });
});

Expand Down Expand Up @@ -224,7 +215,7 @@ describe("media queries", () => {
a: 2
}
};
const result = omit(process(styles, matchObject), "__mediaQueries");
const result = process(styles, matchObject);
expect(result).toEqual({ a: 1 });
});

Expand Down Expand Up @@ -259,7 +250,7 @@ describe("media queries", () => {
a: 2
}
};
const result = omit(process(styles, matchObject), "__mediaQueries");
const result = process(styles, matchObject);
expect(result).toEqual({ a: 1 });
});

Expand Down Expand Up @@ -294,7 +285,7 @@ describe("media queries", () => {
a: 2
}
};
const result1 = omit(process(styles1, matchObject), "__mediaQueries");
const result1 = process(styles1, matchObject);
expect(result1).toEqual({ a: 1 });

const styles2 = {
Expand Down Expand Up @@ -329,7 +320,7 @@ describe("media queries", () => {
}
};

const result2 = omit(process(styles2, matchObject), "__mediaQueries");
const result2 = process(styles2, matchObject);
expect(result2).toEqual({ a: 2 });
});

Expand Down Expand Up @@ -365,7 +356,7 @@ describe("media queries", () => {
a: 2
}
};
const result = omit(process(styles, matchObject), "__mediaQueries");
const result = process(styles, matchObject);
expect(result).toEqual({ a: 1 });
});

Expand Down Expand Up @@ -401,7 +392,7 @@ describe("media queries", () => {
a: 2
}
};
const result = omit(process(styles, matchObject), "__mediaQueries");
const result = process(styles, matchObject);
expect(result).toEqual({ a: 2 });
});

Expand Down Expand Up @@ -460,7 +451,7 @@ describe("media queries", () => {
d: 5
}
};
const result = omit(process(styles, matchObject), "__mediaQueries");
const result = process(styles, matchObject);
expect(result).toEqual({ a: 1, b: 3, c: 4, d: 5 });
});

Expand Down Expand Up @@ -508,7 +499,7 @@ describe("media queries", () => {
a: 2
}
};
const result1 = omit(process(styles1, matchObject), "__mediaQueries");
const result1 = process(styles1, matchObject);
expect(result1).toEqual({ a: 2 });

const styles2 = {
Expand Down Expand Up @@ -543,7 +534,7 @@ describe("media queries", () => {
a: 2
}
};
const result2 = omit(process(styles2, matchObject), "__mediaQueries");
const result2 = process(styles2, matchObject);
expect(result2).toEqual({ a: 2 });
});

Expand Down Expand Up @@ -584,7 +575,7 @@ describe("media queries", () => {
a: 2
}
};
const result = omit(process(styles, matchObject), "__mediaQueries");
const result = process(styles, matchObject);
expect(result).toEqual({ a: 1 });
});

Expand Down Expand Up @@ -613,7 +604,7 @@ describe("media queries", () => {
a: 2
}
};
const result1 = omit(process(styles1, matchObject), "__mediaQueries");
const result1 = process(styles1, matchObject);
expect(result1).toEqual({ a: 1 });

const styles2 = {
Expand All @@ -640,7 +631,7 @@ describe("media queries", () => {
a: 2
}
};
const result2 = omit(process(styles2, matchObject), "__mediaQueries");
const result2 = process(styles2, matchObject);
expect(result2).toEqual({ a: 2 });
});

Expand Down Expand Up @@ -670,7 +661,7 @@ describe("media queries", () => {
a: 3
}
};
const result = omit(process(styles, matchObject), "__mediaQueries");
const result = process(styles, matchObject);
expect(result).toEqual({ a: 2 });
});

Expand Down Expand Up @@ -711,7 +702,7 @@ describe("media queries", () => {
a: 3
}
};
const result1 = omit(process(styles1, matchObject), "__mediaQueries");
const result1 = process(styles1, matchObject);
expect(result1).toEqual({ a: 2 });

const styles2 = {
Expand Down Expand Up @@ -750,7 +741,7 @@ describe("media queries", () => {
a: 3
}
};
const result2 = omit(process(styles2, matchObject), "__mediaQueries");
const result2 = process(styles2, matchObject);
expect(result2).toEqual({ a: 2 });

const styles3 = {
Expand Down Expand Up @@ -789,7 +780,7 @@ describe("media queries", () => {
a: 3
}
};
const result3 = omit(process(styles3, matchObject), "__mediaQueries");
const result3 = process(styles3, matchObject);
expect(result3).toEqual({ a: 1 });
});

Expand Down Expand Up @@ -825,7 +816,7 @@ describe("media queries", () => {
a: 3
}
};
const result1 = omit(process(styles1, matchObject), "__mediaQueries");
const result1 = process(styles1, matchObject);

expect(result1).toEqual({ a: 1 });

Expand Down Expand Up @@ -860,7 +851,7 @@ describe("media queries", () => {
a: 4
}
};
const result2 = omit(process(styles2, matchObject), "__mediaQueries");
const result2 = process(styles2, matchObject);
expect(result2).toEqual({ a: 4 });

const styles3 = {
Expand Down Expand Up @@ -894,7 +885,7 @@ describe("media queries", () => {
a: 3
}
};
const result3 = omit(process(styles3, matchObject), "__mediaQueries");
const result3 = process(styles3, matchObject);

expect(result3).toEqual({ a: 3 });
});
Expand Down Expand Up @@ -925,7 +916,7 @@ describe("media queries", () => {
a: 3
}
};
const result = omit(process(styles, matchObject), "__mediaQueries");
const result = process(styles, matchObject);
expect(result).toEqual({ a: 3 });
});

Expand All @@ -945,7 +936,7 @@ describe("media queries", () => {
a: 1
}
};
const result = omit(process(styles, matchObject), "__mediaQueries");
const result = process(styles, matchObject);
expect(result).toEqual({ a: 0 });
});
});
Expand Down
10 changes: 5 additions & 5 deletions src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@ function filterMq(obj) {
}

function filterNonMq(obj) {
return Object.keys(obj)
.filter(key => !isMediaQuery(key))
.reduce((out, key) => {
return Object.keys(obj).reduce((out, key) => {
if (!isMediaQuery(key) && key !== "__mediaQueries") {
out[key] = obj[key];
return out;
}, {});
}
return out;
}, {});
}

const mFilterMq = memoize(filterMq);
Expand Down
10 changes: 5 additions & 5 deletions src/perf-tests/current.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ function filterMq(obj) {
}

function filterNonMq(obj) {
return Object.keys(obj)
.filter(key => !isMediaQuery(key))
.reduce((out, key) => {
return Object.keys(obj).reduce((out, key) => {
if (!isMediaQuery(key) && key !== "__mediaQueries") {
out[key] = obj[key];
return out;
}, {});
}
return out;
}, {});
}

const mFilterMq = memoize(filterMq);
Expand Down