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

Jump to bottom

chore: updating doc components and helpers #706

Merged
merged 1 commit into from
May 29, 2024
Merged

chore: updating doc components and helpers #706

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
17 changes: 15 additions & 2 deletions docs/BrandColors.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
import React from 'react';
import type { Meta, StoryObj } from '@storybook/react';
import { brandColor as brandColorJS } from '../src/js';
import { getCSSVariablesFromStylesheet, useJsonColor } from './utils';
import {
getCSSVariablesFromStylesheet,
getContrastYIQ,
useJsonColor,
} from './utils';
import { ColorSwatchGroup, ColorSwatch } from './components';
import README from './BrandColors.mdx';

Expand All @@ -22,6 +26,7 @@ type Story = StoryObj<typeof ColorSwatchGroup>;
export const Figma: Story = {
render: () => {
const { brandColor } = useJsonColor();
console.log('brandColor JSON', brandColor);
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Going to retain console logs until we finish the brand evolution work it's quite hepful

return <ColorSwatchGroup swatchData={brandColor} />;
},
};
Expand All @@ -43,6 +48,8 @@ export const CSS: Story = {
key={name}
color={color}
backgroundColor={name}
textBackgroundColor="transparent"
textColor={getContrastYIQ(color, color)}
name={name}
/>
))}
Expand All @@ -62,7 +69,13 @@ export const JS: Story = {
>
{/* Mapping through each brand color and rendering a ColorSwatch component for it */}
{Object.entries(brandColorJS).map(([name, color]) => (
<ColorSwatch key={name} color={color} name={`brandColor.${name}`} />
<ColorSwatch
key={name}
color={color}
textBackgroundColor="transparent"
textColor={getContrastYIQ(color, color)}
name={`brandColor.${name}`}
/>
))}
</div>
),
Expand Down
108 changes: 58 additions & 50 deletions docs/ThemeColors.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,14 @@
import React from 'react';

import { lightTheme as lightThemeJS, darkTheme as darkThemeJS } from '../src';
import brandColor from '../src/figma/brandColors.json';
import { ColorSwatch, ColorSwatchGroup } from './components';
import README from './ThemeColors.mdx';
import { getCSSVariablesFromStylesheet, useJsonColor } from './utils';
import {
getCSSVariablesFromStylesheet,
getContrastYIQ,
getJSColors,
useJsonColor,
} from './utils';

export default {
title: 'Colors/Theme Colors',
Expand Down Expand Up @@ -43,9 +47,7 @@ export const FigmaDarkTheme = {
>
<ColorSwatchGroup
swatchData={darkTheme}
borderColor={darkTheme.border.muted.value}
textBackgroundColor={darkTheme.background.default.value}
textColor={darkTheme.text.default.value}
theme={darkTheme?.background?.default?.value}
/>
</div>
);
Expand Down Expand Up @@ -74,6 +76,11 @@ export const CSSLightTheme = {
<ColorSwatch
key={name}
color={color}
textBackgroundColor="transparent"
textColor={getContrastYIQ(
color,
lightThemeJS.colors.background.default, // TODO Use CSS instead of JS object once CSS object is cleaned up
)}
backgroundColor={colorName}
name={colorName}
/>
Expand Down Expand Up @@ -110,8 +117,11 @@ export const CSSDarkTheme = {
name={colorName}
backgroundColor={colorName}
borderColor="var(--color-border-muted)"
textBackgroundColor="var(--color-background-default)"
textColor="var(--color-text-default)"
textBackgroundColor="transparent"
textColor={getContrastYIQ(
color,
darkThemeJS.colors.background.default, // TODO Use CSS instead of JS object once CSS object is cleaned up
)}
/>
),
)}
Expand All @@ -137,62 +147,60 @@ export const CSSDarkTheme = {
};

export const JSLightTheme = {
render: () => (
<div
style={{
display: 'grid',
gap: '16px',
gridTemplateColumns: 'repeat(auto-fill, 300px)',
}}
>
{Object.entries(lightThemeJS.colors).flatMap(([category, colorObj]) =>
Object.entries(colorObj).map(([name, color]) => (
render: () => {
const colors = getJSColors(lightThemeJS.colors);
return (
<div
style={{
display: 'grid',
gap: '16px',
gridTemplateColumns: 'repeat(auto-fill, 300px)',
}}
>
{colors.map(({ name, color }) => (
<ColorSwatch
key={`${category}-${name}`}
key={name}
color={color}
name={`color.${category}.${name}`}
textBackgroundColor="transparent"
textColor={getContrastYIQ(
color,
lightThemeJS.colors.background.default,
)}
name={name}
/>
)),
)}
</div>
),
))}
</div>
);
},
};

export const JSDarkTheme = {
render: () => (
<div
style={{
backgroundColor: darkThemeJS.colors.background.default,
margin: '-1rem',
padding: '1rem',
}}
>
render: () => {
const colors = getJSColors(darkThemeJS.colors);
return (
<div
style={{
display: 'grid',
gap: '16px',
gridTemplateColumns: 'repeat(auto-fill, 300px)',
padding: '1rem',
margin: '-1rem', // negates storybook padding and removes white border
backgroundColor: darkThemeJS.colors.background.default,
}}
>
{Object.entries(darkThemeJS.colors).flatMap(([category, colorObj]) =>
Object.entries(colorObj).map(([name, color]) => (
<ColorSwatch
key={`${category}-${name}`}
color={color}
name={`color.${category}.${name}`}
borderColor={darkThemeJS.colors.border.muted}
textBackgroundColor={darkThemeJS.colors.background.default}
textColor={darkThemeJS.colors.text.default}
/>
)),
)}
{colors.map(({ name, color }) => (
<ColorSwatch
key={name}
color={color}
textBackgroundColor="transparent"
textColor={getContrastYIQ(
color,
darkThemeJS.colors.background.default,
)}
name={name}
/>
))}
</div>
</div>
),
parameters: {
backgrounds: {
default: 'dark',
values: [{ name: 'dark', value: darkThemeJS.colors.background.default }],
},
);
},
};
Loading