Skip to content

chore(react-theme): refactor global shared colors #24435

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

Merged
Miroslav Stastny (miroslavstastny) merged 3 commits into from
Aug 23, 2022
Merged

chore(react-theme): refactor global shared colors #24435

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e2e174a
chore(react-theme): Refactor global shared colors
miroslavstastny Aug 19, 2022
ee88898
Change file
miroslavstastny Aug 19, 2022
6f0f10d
Refactor to fix bundle size regression
miroslavstastny Aug 22, 2022
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
7 changes: 7 additions & 0 deletions change/@fluentui-react-theme-54c0704a-5974-4449-b128-7629e3c0566b.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "none",

@miroslavstastny Miroslav Stastny (miroslavstastny) Aug 19, 2022

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

Does not affect public API surface.

"comment": "chore: Refactor global shared color tokens",
"packageName": "@fluentui/react-theme",
"email": "miroslav.stastny@microsoft.com",
"dependentChangeType": "none"
}
60 changes: 60 additions & 0 deletions packages/react-components/react-theme/src/alias/colorPalette.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
/* Names of colors used in shared color palette alias tokens for status. */
export const statusSharedColorNames = [
'red',
'green',
'darkOrange',
'yellow',
'berry',
'lightGreen',
'marigold',
] as const;

/* Names of colors used in shared color palette alias tokens for persona. */
export const personaSharedColorNames = [
'darkRed',
'cranberry',
'pumpkin',
'peach',
'gold',
'brass',
'brown',
'forest',
'seafoam',
'darkGreen',
'lightTeal',
'teal',
'steel',
'blue',
'royalBlue',
'cornflower',
'navy',
'lavender',
'purple',
'grape',
'lilac',
'pink',
'magenta',
'plum',
'beige',
'mink',
'platinum',
'anchor',
] as const;

/* Names of colors not used in alias tokens but produced by token pipeline as global color tokens. */
export const unusedSharedColorNames = [
'burgundy',
'bronze',
'orange',
'darkBrown',
'lime',
'darkTeal',
'cyan',
'lightBlue',
'darkBlue',
'darkPurple',
'orchid',
'hotPink',
'silver',
'charcoal',
] as const;
37 changes: 17 additions & 20 deletions packages/react-components/react-theme/src/alias/darkColorPalette.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,33 +1,30 @@
import { statusSharedColors, personaSharedColors, StatusSharedColors, PersonaSharedColors } from '../global/colors';
import { ColorPaletteTokens, GlobalSharedColors, PersonaColorPaletteTokens, StatusColorPaletteTokens } from '../types';
import { sharedColors } from '../global/colors';
import { statusSharedColorNames, personaSharedColorNames } from './colorPalette';
import { ColorPaletteTokens, PersonaColorPaletteTokens, StatusColorPaletteTokens } from '../types';

const statusColorPaletteTokens = (Object.keys(statusSharedColors) as Array<
keyof Pick<GlobalSharedColors, StatusSharedColors>
>).reduce((acc, sharedColor) => {
const statusColorPaletteTokens = statusSharedColorNames.reduce((acc, sharedColor) => {
const color = sharedColor.slice(0, 1).toUpperCase() + sharedColor.slice(1);
const sharedColorTokens = {
[`colorPalette${color}Background1`]: statusSharedColors[sharedColor].shade40,
[`colorPalette${color}Background2`]: statusSharedColors[sharedColor].shade30,
[`colorPalette${color}Background3`]: statusSharedColors[sharedColor].primary,
[`colorPalette${color}Foreground1`]: statusSharedColors[sharedColor].tint30,
[`colorPalette${color}Foreground2`]: statusSharedColors[sharedColor].tint40,
[`colorPalette${color}Foreground3`]: statusSharedColors[sharedColor].tint20,
[`colorPalette${color}BorderActive`]: statusSharedColors[sharedColor].tint30,
[`colorPalette${color}Border1`]: statusSharedColors[sharedColor].primary,
[`colorPalette${color}Border2`]: statusSharedColors[sharedColor].tint20,
[`colorPalette${color}Background1`]: sharedColors[sharedColor].shade40,
[`colorPalette${color}Background2`]: sharedColors[sharedColor].shade30,
[`colorPalette${color}Background3`]: sharedColors[sharedColor].primary,
[`colorPalette${color}Foreground1`]: sharedColors[sharedColor].tint30,
[`colorPalette${color}Foreground2`]: sharedColors[sharedColor].tint40,
[`colorPalette${color}Foreground3`]: sharedColors[sharedColor].tint20,
[`colorPalette${color}BorderActive`]: sharedColors[sharedColor].tint30,
[`colorPalette${color}Border1`]: sharedColors[sharedColor].primary,
[`colorPalette${color}Border2`]: sharedColors[sharedColor].tint20,
};

return { ...acc, ...sharedColorTokens };
}, {} as StatusColorPaletteTokens);

const personaColorPaletteTokens = (Object.keys(personaSharedColors) as Array<
keyof Pick<GlobalSharedColors, PersonaSharedColors>
>).reduce((acc, sharedColor) => {
const personaColorPaletteTokens = personaSharedColorNames.reduce((acc, sharedColor) => {
const color = sharedColor.slice(0, 1).toUpperCase() + sharedColor.slice(1);
const sharedColorTokens = {
[`colorPalette${color}Background2`]: personaSharedColors[sharedColor].shade30,
[`colorPalette${color}Foreground2`]: personaSharedColors[sharedColor].tint40,
[`colorPalette${color}BorderActive`]: personaSharedColors[sharedColor].tint30,
[`colorPalette${color}Background2`]: sharedColors[sharedColor].shade30,
[`colorPalette${color}Foreground2`]: sharedColors[sharedColor].tint40,
[`colorPalette${color}BorderActive`]: sharedColors[sharedColor].tint30,
};

return { ...acc, ...sharedColorTokens };
Expand Down
21 changes: 5 additions & 16 deletions packages/react-components/react-theme/src/alias/highContrastColorPalette.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,8 @@
import {
statusSharedColors,
personaSharedColors,
hcHighlight,
white,
black,
StatusSharedColors,
PersonaSharedColors,
} from '../global/colors';
import { ColorPaletteTokens, GlobalSharedColors, PersonaColorPaletteTokens, StatusColorPaletteTokens } from '../types';
import { hcHighlight, white, black } from '../global/colors';
import { statusSharedColorNames, personaSharedColorNames } from './colorPalette';
import { ColorPaletteTokens, PersonaColorPaletteTokens, StatusColorPaletteTokens } from '../types';

const statusColorPaletteTokens = (Object.keys(statusSharedColors) as Array<
keyof Pick<GlobalSharedColors, StatusSharedColors>
>).reduce((acc, sharedColor) => {
const statusColorPaletteTokens = statusSharedColorNames.reduce((acc, sharedColor) => {
const color = sharedColor.slice(0, 1).toUpperCase() + sharedColor.slice(1);
const sharedColorTokens = {
[`colorPalette${color}Background1`]: white,
Expand All @@ -28,9 +19,7 @@ const statusColorPaletteTokens = (Object.keys(statusSharedColors) as Array<
return { ...acc, ...sharedColorTokens };
}, {} as StatusColorPaletteTokens);

const personaColorPaletteTokens = (Object.keys(personaSharedColors) as Array<
keyof Pick<GlobalSharedColors, PersonaSharedColors>
>).reduce((acc, sharedColor) => {
const personaColorPaletteTokens = personaSharedColorNames.reduce((acc, sharedColor) => {
const color = sharedColor.slice(0, 1).toUpperCase() + sharedColor.slice(1);
const sharedColorTokens = {
[`colorPalette${color}Background2`]: black,
Expand Down
37 changes: 17 additions & 20 deletions packages/react-components/react-theme/src/alias/lightColorPalette.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,33 +1,30 @@
import { statusSharedColors, personaSharedColors, StatusSharedColors, PersonaSharedColors } from '../global/colors';
import { ColorPaletteTokens, GlobalSharedColors, PersonaColorPaletteTokens, StatusColorPaletteTokens } from '../types';
import { sharedColors } from '../global/colors';
import { statusSharedColorNames, personaSharedColorNames } from './colorPalette';
import { ColorPaletteTokens, PersonaColorPaletteTokens, StatusColorPaletteTokens } from '../types';

const statusColorPaletteTokens = (Object.keys(statusSharedColors) as Array<
keyof Pick<GlobalSharedColors, StatusSharedColors>
>).reduce((acc, sharedColor) => {
const statusColorPaletteTokens = statusSharedColorNames.reduce((acc, sharedColor) => {
const color = sharedColor.slice(0, 1).toUpperCase() + sharedColor.slice(1);
const sharedColorTokens = {
[`colorPalette${color}Background1`]: statusSharedColors[sharedColor].tint60,
[`colorPalette${color}Background2`]: statusSharedColors[sharedColor].tint40,
[`colorPalette${color}Background3`]: statusSharedColors[sharedColor].primary,
[`colorPalette${color}Foreground1`]: statusSharedColors[sharedColor].shade10,
[`colorPalette${color}Foreground2`]: statusSharedColors[sharedColor].shade30,
[`colorPalette${color}Foreground3`]: statusSharedColors[sharedColor].primary,
[`colorPalette${color}BorderActive`]: statusSharedColors[sharedColor].primary,
[`colorPalette${color}Border1`]: statusSharedColors[sharedColor].tint40,
[`colorPalette${color}Border2`]: statusSharedColors[sharedColor].primary,
[`colorPalette${color}Background1`]: sharedColors[sharedColor].tint60,
[`colorPalette${color}Background2`]: sharedColors[sharedColor].tint40,
[`colorPalette${color}Background3`]: sharedColors[sharedColor].primary,
[`colorPalette${color}Foreground1`]: sharedColors[sharedColor].shade10,
[`colorPalette${color}Foreground2`]: sharedColors[sharedColor].shade30,
[`colorPalette${color}Foreground3`]: sharedColors[sharedColor].primary,
[`colorPalette${color}BorderActive`]: sharedColors[sharedColor].primary,
[`colorPalette${color}Border1`]: sharedColors[sharedColor].tint40,
[`colorPalette${color}Border2`]: sharedColors[sharedColor].primary,
};

return { ...acc, ...sharedColorTokens };
}, {} as StatusColorPaletteTokens);

const personaColorPaletteTokens = (Object.keys(personaSharedColors) as Array<
keyof Pick<GlobalSharedColors, PersonaSharedColors>
>).reduce((acc, sharedColor) => {
const personaColorPaletteTokens = personaSharedColorNames.reduce((acc, sharedColor) => {
const color = sharedColor.slice(0, 1).toUpperCase() + sharedColor.slice(1);
const sharedColorTokens = {
[`colorPalette${color}Background2`]: personaSharedColors[sharedColor].tint40,
[`colorPalette${color}Foreground2`]: personaSharedColors[sharedColor].shade30,
[`colorPalette${color}BorderActive`]: personaSharedColors[sharedColor].primary,
[`colorPalette${color}Background2`]: sharedColors[sharedColor].tint40,
[`colorPalette${color}Foreground2`]: sharedColors[sharedColor].shade30,
[`colorPalette${color}BorderActive`]: sharedColors[sharedColor].primary,
};

return { ...acc, ...sharedColorTokens };
Expand Down
37 changes: 17 additions & 20 deletions packages/react-components/react-theme/src/alias/teamsDarkColorPalette.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,33 +1,30 @@
import { statusSharedColors, personaSharedColors, StatusSharedColors, PersonaSharedColors } from '../global/colors';
import { ColorPaletteTokens, GlobalSharedColors, PersonaColorPaletteTokens, StatusColorPaletteTokens } from '../types';
import { sharedColors } from '../global/colors';
import { statusSharedColorNames, personaSharedColorNames } from './colorPalette';
import { ColorPaletteTokens, PersonaColorPaletteTokens, StatusColorPaletteTokens } from '../types';

const statusColorPaletteTokens = (Object.keys(statusSharedColors) as Array<
keyof Pick<GlobalSharedColors, StatusSharedColors>
>).reduce((acc, sharedColor) => {
const statusColorPaletteTokens = statusSharedColorNames.reduce((acc, sharedColor) => {
const color = sharedColor.slice(0, 1).toUpperCase() + sharedColor.slice(1);
const sharedColorTokens = {
[`colorPalette${color}Background1`]: statusSharedColors[sharedColor].shade40,
[`colorPalette${color}Background2`]: statusSharedColors[sharedColor].shade30,
[`colorPalette${color}Background3`]: statusSharedColors[sharedColor].primary,
[`colorPalette${color}Foreground1`]: statusSharedColors[sharedColor].tint30,
[`colorPalette${color}Foreground2`]: statusSharedColors[sharedColor].tint40,
[`colorPalette${color}Foreground3`]: statusSharedColors[sharedColor].tint20,
[`colorPalette${color}BorderActive`]: statusSharedColors[sharedColor].tint30,
[`colorPalette${color}Border1`]: statusSharedColors[sharedColor].primary,
[`colorPalette${color}Border2`]: statusSharedColors[sharedColor].tint20,
[`colorPalette${color}Background1`]: sharedColors[sharedColor].shade40,
[`colorPalette${color}Background2`]: sharedColors[sharedColor].shade30,
[`colorPalette${color}Background3`]: sharedColors[sharedColor].primary,
[`colorPalette${color}Foreground1`]: sharedColors[sharedColor].tint30,
[`colorPalette${color}Foreground2`]: sharedColors[sharedColor].tint40,
[`colorPalette${color}Foreground3`]: sharedColors[sharedColor].tint20,
[`colorPalette${color}BorderActive`]: sharedColors[sharedColor].tint30,
[`colorPalette${color}Border1`]: sharedColors[sharedColor].primary,
[`colorPalette${color}Border2`]: sharedColors[sharedColor].tint20,
};

return { ...acc, ...sharedColorTokens };
}, {} as StatusColorPaletteTokens);

const personaColorPaletteTokens = (Object.keys(personaSharedColors) as Array<
keyof Pick<GlobalSharedColors, PersonaSharedColors>
>).reduce((acc, sharedColor) => {
const personaColorPaletteTokens = personaSharedColorNames.reduce((acc, sharedColor) => {
const color = sharedColor.slice(0, 1).toUpperCase() + sharedColor.slice(1);
const sharedColorTokens = {
[`colorPalette${color}Background2`]: personaSharedColors[sharedColor].shade30,
[`colorPalette${color}Foreground2`]: personaSharedColors[sharedColor].tint40,
[`colorPalette${color}BorderActive`]: personaSharedColors[sharedColor].tint30,
[`colorPalette${color}Background2`]: sharedColors[sharedColor].shade30,
[`colorPalette${color}Foreground2`]: sharedColors[sharedColor].tint40,
[`colorPalette${color}BorderActive`]: sharedColors[sharedColor].tint30,
};

return { ...acc, ...sharedColorTokens };
Expand Down
82 changes: 21 additions & 61 deletions packages/react-components/react-theme/src/global/colors.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -848,94 +848,54 @@ const charcoal: ColorVariants = {
tint60: '#f7f7f7',
};

export type StatusSharedColors = 'red' | 'green' | 'darkOrange' | 'yellow' | 'berry' | 'lightGreen' | 'marigold';

export const statusSharedColors: Pick<GlobalSharedColors, StatusSharedColors> = {
red,
green,
darkOrange,
yellow,
berry,
lightGreen,
marigold,
};

export type PersonaSharedColors =
| 'darkRed'
| 'cranberry'
| 'pumpkin'
| 'peach'
| 'gold'
| 'brass'
| 'brown'
| 'forest'
| 'seafoam'
| 'darkGreen'
| 'lightTeal'
| 'teal'
| 'steel'
| 'blue'
| 'royalBlue'
| 'cornflower'
| 'navy'
| 'lavender'
| 'purple'
| 'grape'
| 'lilac'
| 'pink'
| 'magenta'
| 'plum'
| 'beige'
| 'mink'
| 'platinum'
| 'anchor';

export const personaSharedColors: Pick<GlobalSharedColors, PersonaSharedColors> = {
export const sharedColors: GlobalSharedColors = {
darkRed,
burgundy,
cranberry,
red,
darkOrange,
bronze,
pumpkin,
orange,
peach,
marigold,
yellow,
gold,
brass,
brown,
darkBrown,
lime,
forest,
seafoam,
lightGreen,
green,
darkGreen,
lightTeal,
teal,
darkTeal,
cyan,
steel,
lightBlue,
blue,
royalBlue,
darkBlue,
cornflower,
navy,
lavender,
purple,
darkPurple,
orchid,
grape,
berry,
lilac,
pink,
hotPink,
magenta,
plum,
beige,
mink,
silver,
platinum,
anchor,
};

// These shared colors are currently not used in themes
// Not exported from the package, we can consider removing them
export const unusedSharedColors = {
burgundy,
bronze,
orange,
darkBrown,
lime,
darkTeal,
cyan,
lightBlue,
darkBlue,
darkPurple,
orchid,
hotPink,
silver,
charcoal,
};
Loading