Skip to content

Add primaryTextColor, a separate color for brand-colored text #682

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

Draft
n400 wants to merge 1 commit into
base: summer/dark-primary-color
Choose a base branch
from
Draft

Add primaryTextColor, a separate color for brand-colored text #682

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
41 changes: 41 additions & 0 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 @@ -55,4 +55,45 @@ describe('Layout brand color tokens', () => {
await renderLayout(<Layout colorScheme="dark" primaryColor={{ lightMode: '#00693E', darkMode: '#00B068' }} />);
expect(globalCss()).not.toContain('--mdhui-color-primary-mark: #00B068');
});

it('uses primaryTextColor for text and keeps the brand on fills', async () => {
await renderLayout(<Layout colorScheme="dark" primaryColor="#C2185B" primaryTextColor={{ lightMode: '#C2185B', darkMode: '#F48FB1' }} />);
expect(globalCss()).toContain('--mdhui-color-primary: #C2185B');
expect(globalCss()).toContain('--mdhui-color-primary-text: #F48FB1');
expect(globalCss()).toContain('--mdhui-color-primary-mark: #C2185B');
});

it('uses primaryTextColor without a brand and leaves marks on the scheme default', async () => {
await renderLayout(<Layout colorScheme="dark" primaryTextColor="#00693E" />);
expect(globalCss()).toContain('--mdhui-color-primary-text: #00693E');
expect(globalCss()).not.toContain('--mdhui-color-primary: #00693E');
expect(globalCss()).toContain('--mdhui-color-primary-mark: var(--mdh-blue-30)');
});

it('falls back to the brand for text in dark when the text color has no dark value', async () => {
await renderLayout(<Layout colorScheme="dark" primaryColor="#E91E63" primaryTextColor={{ lightMode: '#C2185B' }} />);
expect(globalCss()).toContain('--mdhui-color-primary-text: #E91E63');
expect(globalCss()).not.toContain('#C2185B');
});

it('falls back to the brand for text in light when the text color has no light value', async () => {
await renderLayout(<Layout colorScheme="light" primaryColor="#E91E63" primaryTextColor={{ darkMode: '#F48FB1' }} />);
expect(globalCss()).toContain('--mdhui-color-primary-text: #E91E63');
expect(globalCss()).not.toContain('#F48FB1');
});

it('does not pin marks when text falls back to the brand', async () => {
await renderLayout(<Layout colorScheme="dark" primaryColor="#E91E63" primaryTextColor={{ lightMode: '#C2185B' }} />);
expect(globalCss()).toContain('--mdhui-color-primary-mark: var(--mdhui-color-primary-text)');
expect(globalCss()).not.toContain('--mdhui-color-primary-mark: #');
});

it('falls back to the brand for an invalid or null text color', async () => {
await renderLayout(<Layout colorScheme="dark" primaryColor="#E91E63" primaryTextColor={'not-a-color'} />);
expect(globalCss()).toContain('--mdhui-color-primary-text: #E91E63');
cleanup();
document.querySelectorAll('style').forEach(s => s.remove());
await renderLayout(<Layout colorScheme="dark" primaryColor="#E91E63" primaryTextColor={null as any} />);
expect(globalCss()).toContain('--mdhui-color-primary-text: #E91E63');
});
});
16 changes: 12 additions & 4 deletions src/components/presentational/Layout/Layout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,14 @@ import React, { createContext } from 'react';
import MyDataHelps, { StatusBarStyle } from '@careevolution/mydatahelps-js';
import { Global as EmotionGlobal, css } from '@emotion/react';
import "./Layout.css"
import { darkColorScheme, lightColorScheme, global, core } from '../../../helpers/globalCss';
import { darkColorScheme, darkColorStyle, lightColorScheme, global, core } from '../../../helpers/globalCss';
import { ColorDefinition, resolveColor } from '../../../helpers/colors';

export interface LayoutProps {
children?: React.ReactNode;
bodyBackgroundColor?: ColorDefinition;
primaryColor?: ColorDefinition;
primaryTextColor?: ColorDefinition;
statusBarStyle?: StatusBarStyle;
className?: string;
noGlobalStyles?: boolean;
Expand Down Expand Up @@ -62,10 +63,17 @@ export default function Layout(props: LayoutProps) {
// scheme toggle would land the scheme tag after a separate brand tag and clobber it.
const schemeStyles = context.colorScheme == "dark" ? darkColorScheme : lightColorScheme;
const brand = props.primaryColor ? resolveColor(colorScheme, props.primaryColor) : undefined;
const brandStyles = brand ? css`
const textColor = props.primaryTextColor && typeof props.primaryTextColor === "object"
? (colorScheme === "dark" ? props.primaryTextColor.darkMode : props.primaryTextColor.lightMode)
: props.primaryTextColor;
const brandText = resolveColor(colorScheme, textColor) ?? brand;
const schemeText = colorScheme === "dark" ? (darkColorStyle as Record<string, string>)['--mdhui-color-primary-text'] : "var(--mdhui-color-primary)";
const markColor = brand ?? schemeText;
const brandStyles = brand || brandText ? css`
:root {
--mdhui-color-primary: ${brand};
--mdhui-color-primary-text: ${brand};
${brand ? `--mdhui-color-primary: ${brand};` : ""}
${brandText ? `--mdhui-color-primary-text: ${brandText};` : ""}
${brandText !== brand ? `--mdhui-color-primary-mark: ${markColor};` : ""}
}` : undefined;

return (
Expand Down
3 changes: 2 additions & 1 deletion src/components/view/BlankView/BlankView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ export interface BlankViewProps {
showBackButton?: boolean
colorScheme?: "auto" | "light" | "dark"
primaryColor?: ColorDefinition
primaryTextColor?: ColorDefinition
bodyBackgroundColor?: ColorDefinition
titleColor?: ColorDefinition;
subtitleColor?: ColorDefinition;
Expand All @@ -19,7 +20,7 @@ export interface BlankViewProps {

export default function (props: BlankViewProps) {
return (
<Layout bodyBackgroundColor={props.bodyBackgroundColor} colorScheme={props.colorScheme ?? "auto"} primaryColor={props.primaryColor} flex={props.flexLayout}>
<Layout bodyBackgroundColor={props.bodyBackgroundColor} colorScheme={props.colorScheme ?? "auto"} primaryColor={props.primaryColor} primaryTextColor={props.primaryTextColor} flex={props.flexLayout}>
{(props.showBackButton || props.showCloseButton) &&
<NavigationBar title={props.title}
showBackButton={props.showBackButton}
Expand Down
3 changes: 2 additions & 1 deletion src/components/view/NewBadgeView/NewBadgeView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ export interface NewBadgeViewProps {
text?: string;
colorScheme?: 'auto' | 'light' | 'dark';
primaryColor?: ColorDefinition;
primaryTextColor?: ColorDefinition;
customField: string;
previewState?: "default";
showBadgePoints?: boolean;
Expand Down Expand Up @@ -41,7 +42,7 @@ export default function (props: NewBadgeViewProps) {
return null;
}

return <Layout bodyBackgroundColor={props.colorScheme === 'dark' ? '' : '#fff'} colorScheme={props.colorScheme ?? 'auto'} primaryColor={props.primaryColor}>
return <Layout bodyBackgroundColor={props.colorScheme === 'dark' ? '' : '#fff'} colorScheme={props.colorScheme ?? 'auto'} primaryColor={props.primaryColor} primaryTextColor={props.primaryTextColor}>
<div className="mdhui-new-badge-view">
{badges == null && <LoadingIndicator />}
{badges != null && <>
Expand Down
3 changes: 2 additions & 1 deletion src/components/view/NewPointsView/NewPointsView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ export interface NewPointsViewProps {
pointsToNextReward?: number;
colorScheme?: 'auto' | 'light' | 'dark';
primaryColor?: ColorDefinition;
primaryTextColor?: ColorDefinition;
doneButtonText?: string;
}

Expand All @@ -37,7 +38,7 @@ export default function NewPointsView(props: NewPointsViewProps) {
}, totalBonusPoints);

return (
<Layout bodyBackgroundColor="var(--mdhui-background-color-0)" colorScheme={props.colorScheme ?? 'auto'} primaryColor={props.primaryColor}>
<Layout bodyBackgroundColor="var(--mdhui-background-color-0)" colorScheme={props.colorScheme ?? 'auto'} primaryColor={props.primaryColor} primaryTextColor={props.primaryTextColor}>
<div className="mdhui-new-points">
<ProgressRing animate={true}>
<div className="mdhui-new-points-total">
Expand Down
Loading