Skip to content

fix: DH-16461: Preload --dh-color-text-highlight (#1780) #1781

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
bmingles merged 1 commit into from
Feb 8, 2024
Merged

fix: DH-16461: Preload --dh-color-text-highlight (#1780) #1781

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
19 changes: 13 additions & 6 deletions packages/components/src/theme/ThemeModel.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,11 @@ export type BaseThemeKey = `default-${BaseThemeType}`;
export type CssVariableStyleContent = `:root{${string}`;
export type ThemeCssVariableName = `--dh-${string}`;

// DHC should only need to preload variables that are required by the empty page
// with loading spinner that shows while plugins are loading. The rest of the
// preload variables defined here are required by DHE due to theme plugins
// loading after login. We should consider moving most of these to the DHE
// codebase. To be addressed by #1679
export type ThemePreloadColorVariable =
| '--dh-color-accent-contrast'
| '--dh-color-accent-bg'
Expand All @@ -20,9 +25,7 @@ export type ThemePreloadColorVariable =
| '--dh-color-input-border'
| '--dh-color-input-placeholder'
| '--dh-color-input-focus-border'
// Preloading login specific variables should only be needed in DHE. Including
// them for now until we have a way for DHE to configure them. To be addressed
// by #1679
| '--dh-color-text-highlight'
| '--dh-color-login-form-bg'
| '--dh-color-login-status-message'
| '--dh-color-login-logo-bg'
Expand All @@ -48,6 +51,7 @@ export const DEFAULT_DARK_THEME_PALETTE = {
500: '#2f5bc0',
400: '#254ba4',
600: '#3b6bda', // accent color
700: '#4c7dee',
},
red: {
600: '#c73f61',
Expand All @@ -66,6 +70,11 @@ export const DEFAULT_DARK_THEME_PALETTE = {
} as const;

// Css properties that are used in preload data with default values.
// DHC should only need to preload variables that are required by the empty page
// with loading spinner that shows while plugins are loading. The rest of the
// preload variables defined here are required by DHE due to theme plugins
// loading after login. We should consider moving most of these to the DHE
// codebase. To be addressed by #1679
export const DEFAULT_PRELOAD_DATA_VARIABLES: Record<
ThemePreloadColorVariable,
string
Expand All @@ -86,9 +95,7 @@ export const DEFAULT_PRELOAD_DATA_VARIABLES: Record<
'--dh-color-input-border': DEFAULT_DARK_THEME_PALETTE.gray[600],
'--dh-color-input-placeholder': DEFAULT_DARK_THEME_PALETTE.gray[600],
'--dh-color-input-focus-border': `${DEFAULT_DARK_THEME_PALETTE.blue[600]}d9`, // 85% opacity
// Preloading login specific variables should only be needed in DHE. Including
// them for now until we have a way for DHE to configure them. To be addressed
// by #1679
'--dh-color-text-highlight': `${DEFAULT_DARK_THEME_PALETTE.blue[700]}4d`, // 30% opacity
'--dh-color-login-form-bg': DEFAULT_DARK_THEME_PALETTE.gray[400],
'--dh-color-login-status-message': DEFAULT_DARK_THEME_PALETTE.gray[600],
'--dh-color-login-logo-bg': DEFAULT_DARK_THEME_PALETTE.gray[900],
Expand Down
1 change: 1 addition & 0 deletions packages/components/src/theme/__snapshots__/ThemeUtils.test.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ exports[`DEFAULT_PRELOAD_DATA_VARIABLES should match snapshot 1`] = `
"--dh-color-random-area-plot-animation-fg-fill": "#3b6bda14",
"--dh-color-random-area-plot-animation-fg-stroke": "#3b6bda33",
"--dh-color-random-area-plot-animation-grid": "#373438",
"--dh-color-text-highlight": "#4c7dee4d",
}
`;

Expand Down
⚡