Skip to content

A view's own dark primary color drives chart and progress marks #680

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

Open
n400 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

A view's own dark primary color drives chart and progress marks #680

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 12 additions & 6 deletions __tests__/components/presentational/Layout/Layout.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,21 +32,27 @@ describe('Layout brand color tokens', () => {
expect(globalCss()).toContain('--mdhui-color-primary-text: #00693E');
});

it('drives only the fill in dark for a plain-string brand', async () => {
it('drives fill and foreground in dark for a plain-string brand', async () => {
await renderLayout(<Layout colorScheme="dark" primaryColor="#00693E" />);
expect(globalCss()).toContain('--mdhui-color-primary: #00693E');
expect(globalCss()).not.toContain('--mdhui-color-primary-text: #00693E');
expect(globalCss()).toContain('--mdhui-color-primary-text: #00693E');
});

it('puts an explicit dark value on fills only — dark links keep the scheme grade', async () => {
it('uses the dark value for both tokens in dark', async () => {
await renderLayout(<Layout colorScheme="dark" primaryColor={{ lightMode: '#00693E', darkMode: '#00B068' }} />);
expect(globalCss()).toContain('--mdhui-color-primary: #00B068');
expect(globalCss()).not.toContain('--mdhui-color-primary-text: #00B068');
expect(globalCss()).toContain('--mdhui-color-primary-text: #00B068');
expect(globalCss()).not.toContain('#00693E');
});

it('treats an object without a dark value the same way in dark', async () => {
it('falls back to the light value in dark when no dark value is given', async () => {
await renderLayout(<Layout colorScheme="dark" primaryColor={{ lightMode: '#00693E' }} />);
expect(globalCss()).toContain('--mdhui-color-primary: #00693E');
expect(globalCss()).not.toContain('--mdhui-color-primary-text: #00693E');
expect(globalCss()).toContain('--mdhui-color-primary-text: #00693E');
});

it('leaves marks to follow text', async () => {
await renderLayout(<Layout colorScheme="dark" primaryColor={{ lightMode: '#00693E', darkMode: '#00B068' }} />);
expect(globalCss()).not.toContain('--mdhui-color-primary-mark: #00B068');
});
});
6 changes: 1 addition & 5 deletions src/components/presentational/Layout/Layout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,15 +61,11 @@ export default function Layout(props: LayoutProps) {
// One Global for scheme + brand: Emotion orders tags by mount order, so a runtime
// scheme toggle would land the scheme tag after a separate brand tag and clobber it.
const schemeStyles = context.colorScheme == "dark" ? darkColorScheme : lightColorScheme;
// The brand color renders exactly as given; the library never alters it. In light it
// drives both tokens, as it always has. In dark it drives only fills, and links keep
// the scheme's readable grade: no single dark value can be both a fill under white
// text and legible text on the card, so text needs its own color, not this one.
const brand = props.primaryColor ? resolveColor(colorScheme, props.primaryColor) : undefined;
const brandStyles = brand ? css`
:root {
--mdhui-color-primary: ${brand};
${colorScheme === "light" ? `--mdhui-color-primary-text: ${brand};` : ""}
--mdhui-color-primary-text: ${brand};
}` : undefined;

return (
Expand Down
Loading