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

fix(otion): properly insert keyframe rule with multiple properties #62

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

fix(otion): properly insert keyframe rule with multiple properties #62

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
537ab02
test(otion): add failing test case for multiple keyframe properties
wyze Jun 18, 2021
f85872c
fix(otion): properly insert keyframe rule with multiple properties
wyze Jun 18, 2021
e0e6b52
refactor(otion): revert to for..in implementation
wyze Jun 19, 2021
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
21 changes: 20 additions & 1 deletion packages/otion/src/createInstance.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
import { css as CSSData } from "mdn-data";

import { PRECEDENCE_GROUP_COUNT } from "./createInstance";
import { createInstance, PRECEDENCE_GROUP_COUNT } from "./createInstance";
import { PRECEDENCES_BY_PSEUDO_CLASS } from "./pseudos";

// eslint-disable-next-line @typescript-eslint/no-explicit-any
const cssProperties = Object.entries<any>(CSSData.properties);

jest.mock("@emotion/hash", () => () => `1f0cb2`);

test("number of precedence groups is correct", () => {
const pseudoClassPrecedenceGroupCount = new Set(
PRECEDENCES_BY_PSEUDO_CLASS.values(),
Expand Down Expand Up @@ -34,3 +36,20 @@ test("number of precedence groups is correct", () => {
conditionalPrecedenceGroupExistenceMultiplier,
);
});

test.each([
["single", { margin: "50%" }, "{margin:50%}"],
["multiple", { margin: "50%", width: "50%" }, "{margin:50%;width:50%}"],
])("keyframes works correctly with %s properties", (_, rules, output) => {
const defaultInstance = createInstance();
const injector = { insert: jest.fn() };

defaultInstance.setup({ injector });

defaultInstance.keyframes({ "0%": rules }).toString();

expect(injector.insert).toHaveBeenCalledWith(
`@keyframes _1f0cb2{0%${output}}`,
0,
);
});
3 changes: 2 additions & 1 deletion packages/otion/src/createInstance.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -386,10 +386,11 @@ export function createInstance(): OtionInstance {

if (value != null) {
const property = normalizeProperty(key);
cssText += serializeDeclarationList(property, value);
cssText += `;${serializeDeclarationList(property, value)}`;
}
}

cssText = cssText.replace("{;", "{");
cssText += "}";
}

Expand Down