Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
30 changes: 30 additions & 0 deletions src/__tests__/native/variables.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -241,3 +241,33 @@ test("VariableContextProvider", () => {
const component = screen.getByTestId(testID);
expect(component.props.style).toStrictEqual({ color: "red" });
});

test("variable overriding with classes", () => {
registerCSS(`
:root {
--tier-red-500: red;
--tier-red-700: red;

--tier-blue-500: blue;
--tier-blue-700: blue;
}

.tier-red {
--tier-500: var(--tier-red-500);
--tier-700: var(--tier-red-700);
}

.test {
color: var(--tier-500)
}
`);

render(
<View className="tier-red">
<View testID={testID} className="test" />
</View>,
);

const component = screen.getByTestId(testID);
expect(component.props.style).toStrictEqual({ color: "red" });
});
2 changes: 1 addition & 1 deletion src/runtime/native/styles/variables.ts
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ export function varResolver(

if (name in variables) {
renderGuards?.push(["v", name, variables[name]]);
return variables[name];
return resolve(variables[name]);
}

variableHistory.add(name);
Expand Down