Skip to content

Commit 641159f

Browse files
mgadewollmgadewoll
committed
refactor: remove TEMP_INTERNAL key
1 parent 33cfad3 commit 641159f

File tree

38 files changed

+385
-396
lines changed

38 files changed

+385
-396
lines changed

‎packages/eui-theme-borealis/src/variables/_components.ts

Lines changed: 89 additions & 125 deletions
Original file line numberDiff line numberDiff line change
@@ -24,20 +24,7 @@ import {
2424
text_colors,
2525
} from './colors/_colors_light';
2626

27-
const temporary_components = {
28-
shared: {
29-
backgroundTransparent: PRIMITIVE_COLORS.transparent.white['0'],
30-
backgroundTransparentPrimary: background_colors.backgroundBasePrimary,
31-
backgroundTransparentAccent: background_colors.backgroundBaseAccent,
32-
backgroundTransparentAccentSecondary:
33-
background_colors.backgroundBaseAccentSecondary,
34-
backgroundTransparentSuccess: background_colors.backgroundBaseSuccess,
35-
backgroundTransparentWarning: background_colors.backgroundBaseWarning,
36-
backgroundTransparentDanger: background_colors.backgroundBaseDanger,
37-
backgroundTransparentSubdued: SEMANTIC_COLORS.shade15,
38-
backgroundTransparentPlain: SEMANTIC_COLORS.shade15,
39-
},
40-
27+
const _components = {
4128
buttonGroupBorderColor: border_colors.borderBasePlain,
4229
buttonGroupBorderColorSelected: border_colors.borderBasePlain,
4330

@@ -115,121 +102,98 @@ const temporary_components = {
115102

116103
tourFooterBackground: background_colors.backgroundBaseSubdued,
117104

118-
treeViewItembackgroundHover: background_colors.backgroundBaseHover,
105+
treeViewItemBackgroundHover: background_colors.backgroundBaseHover,
119106
};
120107

121108
export const components: _EuiThemeComponents = {
122109
buttons,
123110
forms,
124-
__TEMP_INTERNAL__: {
125-
LIGHT: temporary_components,
126-
DARK: {
127-
...temporary_components,
128-
129-
shared: {
130-
backgroundTransparent: PRIMITIVE_COLORS.transparent.white['0'],
131-
backgroundTransparentPrimary:
132-
dark_background_colors.backgroundBasePrimary,
133-
backgroundTransparentAccent:
134-
dark_background_colors.backgroundBaseAccent,
135-
backgroundTransparentAccentSecondary:
136-
dark_background_colors.backgroundBaseAccent,
137-
backgroundTransparentSuccess:
138-
dark_background_colors.backgroundBaseSuccess,
139-
backgroundTransparentWarning:
140-
dark_background_colors.backgroundBaseWarning,
141-
backgroundTransparentDanger:
142-
dark_background_colors.backgroundBaseDanger,
143-
backgroundTransparentSubdued:
144-
dark_background_colors.backgroundBaseSubdued,
145-
backgroundTransparentPlain: dark_background_colors.backgroundBasePlain,
146-
},
147-
148-
buttonGroupBorderColor: dark_border_colors.borderBasePlain,
149-
buttonGroupBorderColorSelected: dark_border_colors.borderBasePlain,
150-
151-
badgeBackgroundSubdued: dark_background_colors.backgroundBaseSubdued,
152-
badgeBorderColorHollow: dark_border_colors.borderBasePlain,
153-
badgeIconButtonBackgroundHover:
154-
dark_background_colors.backgroundBaseHoverTransparent,
155-
156-
breadcrumbsApplicationBackground:
157-
dark_background_colors.backgroundLightText,
158-
breadcrumbsApplicationColor: dark_text_colors.textSubdued,
159-
160-
collapsibleNavGroupBackground: dark_background_colors.backgroundBasePage,
161-
collapsibleNavGroupBackgroundDark:
162-
dark_background_colors.backgroundBasePage,
163-
164-
dataGridVerticalLineBorderColor: dark_border_colors.borderBasePlain,
165-
dataGridRowBackgroundStriped:
166-
dark_background_colors.backgroundBaseSubdued,
167-
dataGridRowBackgroundHover: dark_background_colors.backgroundBaseHover,
168-
169-
dragDropDraggingBackground: dark_background_colors.backgroundBaseSuccess,
170-
dragDropDraggingOverBackground:
171-
dark_background_colors.backgroundLightSuccess,
172-
173-
filterSelectItemBackgroundFocusDisabled:
174-
dark_background_colors.backgroundBaseDisabled,
175-
176-
flyoutCloseButtonInsideBackground:
177-
dark_background_colors.backgroundBasePlain,
178-
179-
headerBackground: dark_background_colors.backgroundBasePlain,
180-
181-
keyPadMenuItemBackgroundDisabledSelect:
182-
dark_background_colors.backgroundBaseDisabled,
183-
184-
listGroupItemBackgroundPrimaryActive:
185-
dark_background_colors.backgroundBaseSelect,
186-
listGroupItemBackgroundSubduedActive:
187-
dark_background_colors.backgroundBaseSelect,
188-
listGroupItemBackgroundHover: dark_background_colors.backgroundBaseHover,
189-
listGroupItemBackgroundPrimaryHover:
190-
dark_background_colors.backgroundBaseHover,
191-
192-
markBackground: dark_background_colors.backgroundLightPrimary,
193-
194-
markdownFormatTableBorderColor: dark_border_colors.borderBasePlain,
195-
196-
popoverPanelBackground: dark_background_colors.backgroundBasePlain,
197-
popoverFooterBorderColor: dark_border_colors.borderBaseSubdued,
198-
199-
scrollbarTrackColor: SEMANTIC_COLORS.shade145,
200-
201-
sideNavItemEmphasizedBackground:
202-
dark_background_colors.backgroundBaseSelect,
203-
204-
selectableListItemBorderColor: dark_border_colors.borderBaseSubdued,
205-
206-
switchBackgroundOff: dark_background_colors.backgroundFilledText,
207-
switchUncompressedBackgroundDisabled:
208-
dark_background_colors.backgroundBaseDisabled,
209-
switchCompressedBackgroundDisabled:
210-
dark_background_colors.backgroundBaseDisabled,
211-
switchMiniBackgroundDisabled:
212-
dark_background_colors.backgroundBaseDisabled,
213-
switchThumbBackgroundDisabled: dark_background_colors.backgroundBasePlain,
214-
215-
superDatePickerBackgroundSuccees:
216-
dark_background_colors.backgroundBaseSuccess,
217-
218-
tableRowBackgroundHover: dark_background_colors.backgroundBaseHover,
219-
tableRowBackgroundSelected: dark_background_colors.backgroundBaseSelect,
220-
tableRowBackgroundSelectedHover:
221-
dark_background_colors.backgroundBaseSelect,
222-
tableRowInteractiveBackgroundHover:
223-
dark_background_colors.backgroundBaseHover,
224-
tableRowInteractiveBackgroundFocus:
225-
dark_background_colors.backgroundBaseHover,
226-
tableCellSortableIconColor: dark_background_colors.backgroundFilledText,
227-
228-
tooltipBorderFloating: dark_border_colors.borderBaseFloating,
229-
230-
tourFooterBackground: dark_background_colors.backgroundBaseSubdued,
231-
232-
treeViewItembackgroundHover: dark_background_colors.backgroundBaseHover,
233-
},
111+
LIGHT: _components,
112+
DARK: {
113+
..._components,
114+
115+
buttonGroupBorderColor: dark_border_colors.borderBasePlain,
116+
buttonGroupBorderColorSelected: dark_border_colors.borderBasePlain,
117+
118+
badgeBackgroundSubdued: dark_background_colors.backgroundBaseSubdued,
119+
badgeBorderColorHollow: dark_border_colors.borderBasePlain,
120+
badgeIconButtonBackgroundHover:
121+
dark_background_colors.backgroundBaseHoverTransparent,
122+
123+
breadcrumbsApplicationBackground:
124+
dark_background_colors.backgroundLightText,
125+
breadcrumbsApplicationColor: dark_text_colors.textSubdued,
126+
127+
collapsibleNavGroupBackground: dark_background_colors.backgroundBasePage,
128+
collapsibleNavGroupBackgroundDark:
129+
dark_background_colors.backgroundBasePage,
130+
131+
dataGridVerticalLineBorderColor: dark_border_colors.borderBasePlain,
132+
dataGridRowBackgroundStriped: dark_background_colors.backgroundBaseSubdued,
133+
dataGridRowBackgroundHover: dark_background_colors.backgroundBaseHover,
134+
135+
dragDropDraggingBackground: dark_background_colors.backgroundBaseSuccess,
136+
dragDropDraggingOverBackground:
137+
dark_background_colors.backgroundLightSuccess,
138+
139+
filterSelectItemBackgroundFocusDisabled:
140+
dark_background_colors.backgroundBaseDisabled,
141+
142+
flyoutCloseButtonInsideBackground:
143+
dark_background_colors.backgroundBasePlain,
144+
145+
headerBackground: dark_background_colors.backgroundBasePlain,
146+
147+
keyPadMenuItemBackgroundDisabledSelect:
148+
dark_background_colors.backgroundBaseDisabled,
149+
150+
listGroupItemBackgroundPrimaryActive:
151+
dark_background_colors.backgroundBaseSelect,
152+
listGroupItemBackgroundSubduedActive:
153+
dark_background_colors.backgroundBaseSelect,
154+
listGroupItemBackgroundHover: dark_background_colors.backgroundBaseHover,
155+
listGroupItemBackgroundPrimaryHover:
156+
dark_background_colors.backgroundBaseHover,
157+
158+
markBackground: dark_background_colors.backgroundLightPrimary,
159+
160+
markdownFormatTableBorderColor: dark_border_colors.borderBasePlain,
161+
162+
popoverPanelBackground: dark_background_colors.backgroundBasePlain,
163+
popoverFooterBorderColor: dark_border_colors.borderBaseSubdued,
164+
165+
scrollbarTrackColor: SEMANTIC_COLORS.shade145,
166+
167+
sideNavItemEmphasizedBackground:
168+
dark_background_colors.backgroundBaseSelect,
169+
170+
selectableListItemBorderColor: dark_border_colors.borderBaseSubdued,
171+
172+
switchBackgroundOff: dark_background_colors.backgroundFilledText,
173+
switchUncompressedBackgroundDisabled:
174+
dark_background_colors.backgroundBaseDisabled,
175+
switchCompressedBackgroundDisabled:
176+
dark_background_colors.backgroundBaseDisabled,
177+
switchMiniBackgroundDisabled: dark_background_colors.backgroundBaseDisabled,
178+
switchThumbBackgroundDisabled: dark_background_colors.backgroundBasePlain,
179+
180+
superDatePickerBackgroundSuccees:
181+
dark_background_colors.backgroundBaseSuccess,
182+
183+
tableRowBackgroundHover: dark_background_colors.backgroundBaseHover,
184+
tableRowBackgroundSelected: dark_background_colors.backgroundBaseSelect,
185+
tableRowBackgroundSelectedHover:
186+
dark_background_colors.backgroundBaseSelect,
187+
tableRowInteractiveBackgroundHover:
188+
dark_background_colors.backgroundBaseHover,
189+
tableRowInteractiveBackgroundFocus:
190+
dark_background_colors.backgroundBaseHover,
191+
tableCellSortableIconColor: dark_background_colors.backgroundFilledText,
192+
193+
tooltipBorderFloating: dark_border_colors.borderBaseFloating,
194+
195+
tourFooterBackground: dark_background_colors.backgroundBaseSubdued,
196+
197+
treeViewItemBackgroundHover: dark_background_colors.backgroundBaseHover,
234198
},
235199
};

‎packages/eui-theme-borealis/src/variables/colors/_colors_dark.ts

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ import {
1515
type _EuiThemeColorsMode,
1616
_EuiThemeBackgroundColors,
1717
_EuiThemeBorderColors,
18+
_EuiThemeTransparentBackgroundColors,
1819
} from '@elastic/eui-theme-common';
1920

2021
import { PRIMITIVE_COLORS } from './_primitive_colors';
@@ -65,9 +66,6 @@ export const dark_text_colors: _EuiThemeTextColors = {
6566
textInverse: SEMANTIC_COLORS.plainDark,
6667
};
6768

68-
/* TODO: These are not finalized yet.
69-
These tokens won't be used in the new theme specifically,
70-
but we want to support them until fully deprecated */
7169
export const dark_shades: _EuiThemeShadeColors = {
7270
emptyShade: SEMANTIC_COLORS.plainDark,
7371
lightestShade: SEMANTIC_COLORS.shade135,
@@ -115,6 +113,25 @@ export const dark_background_colors: _EuiThemeBackgroundColors = {
115113
backgroundFilledText: SEMANTIC_COLORS.shade70,
116114
};
117115

116+
/**
117+
* NOTE: temp values for migration - these should not be used,
118+
* use backgroundBase tokens instead
119+
* TODO: remove once obsolete
120+
*/
121+
export const dark_transparent_background_colors: _EuiThemeTransparentBackgroundColors =
122+
{
123+
backgroundTransparent: PRIMITIVE_COLORS.transparent.white['0'],
124+
backgroundTransparentPrimary: dark_background_colors.backgroundBasePrimary,
125+
backgroundTransparentAccent: dark_background_colors.backgroundBaseAccent,
126+
backgroundTransparentAccentSecondary:
127+
dark_background_colors.backgroundBaseAccent,
128+
backgroundTransparentSuccess: dark_background_colors.backgroundBaseSuccess,
129+
backgroundTransparentWarning: dark_background_colors.backgroundBaseWarning,
130+
backgroundTransparentDanger: dark_background_colors.backgroundBaseDanger,
131+
backgroundTransparentSubdued: dark_background_colors.backgroundBaseSubdued,
132+
backgroundTransparentPlain: dark_background_colors.backgroundBasePlain,
133+
};
134+
118135
export const dark_border_colors: _EuiThemeBorderColors = {
119136
borderBasePrimary: SEMANTIC_COLORS.primary60,
120137
borderBaseAccent: SEMANTIC_COLORS.accent60,
@@ -146,5 +163,6 @@ export const dark_colors: _EuiThemeColorsMode = {
146163
...dark_brand_text_colors,
147164
...dark_text_colors,
148165
...dark_background_colors,
166+
...dark_transparent_background_colors,
149167
...dark_border_colors,
150168
};

‎packages/eui-theme-borealis/src/variables/colors/_colors_light.ts

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ import {
1515
type _EuiThemeColorsMode,
1616
_EuiThemeBackgroundColors,
1717
_EuiThemeBorderColors,
18+
_EuiThemeTransparentBackgroundColors,
1819
} from '@elastic/eui-theme-common';
1920

2021
import { PRIMITIVE_COLORS } from './_primitive_colors';
@@ -112,6 +113,25 @@ export const background_colors: _EuiThemeBackgroundColors = {
112113
backgroundFilledText: SEMANTIC_COLORS.shade90,
113114
};
114115

116+
/**
117+
* NOTE: temp values for migration - these should not be used,
118+
* use backgroundBase tokens instead
119+
* TODO: remove once obsolete
120+
*/
121+
export const transparent_background_colors: _EuiThemeTransparentBackgroundColors =
122+
{
123+
backgroundTransparent: PRIMITIVE_COLORS.transparent.white['0'],
124+
backgroundTransparentPrimary: background_colors.backgroundBasePrimary,
125+
backgroundTransparentAccent: background_colors.backgroundBaseAccent,
126+
backgroundTransparentAccentSecondary:
127+
background_colors.backgroundBaseAccentSecondary,
128+
backgroundTransparentSuccess: background_colors.backgroundBaseSuccess,
129+
backgroundTransparentWarning: background_colors.backgroundBaseWarning,
130+
backgroundTransparentDanger: background_colors.backgroundBaseDanger,
131+
backgroundTransparentSubdued: SEMANTIC_COLORS.shade15,
132+
backgroundTransparentPlain: SEMANTIC_COLORS.shade15,
133+
};
134+
115135
export const border_colors: _EuiThemeBorderColors = {
116136
borderBasePrimary: SEMANTIC_COLORS.primary100,
117137
borderBaseAccent: SEMANTIC_COLORS.accent100,
@@ -143,5 +163,6 @@ export const light_colors: _EuiThemeColorsMode = {
143163
...brand_text_colors,
144164
...text_colors,
145165
...background_colors,
166+
...transparent_background_colors,
146167
...border_colors,
147168
};

‎packages/eui-theme-common/src/global_styling/variables/colors.ts

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -207,6 +207,28 @@ export type _EuiThemeBackgroundColors = {
207207
backgroundFilledText: ColorModeSwitch;
208208
};
209209

210+
/** TODO: remove once usages are re-mapped */
211+
export type _EuiThemeTransparentBackgroundColors = {
212+
/** @deprecated */
213+
backgroundTransparent: string;
214+
/** @deprecated */
215+
backgroundTransparentPrimary: ColorModeSwitch;
216+
/** @deprecated */
217+
backgroundTransparentAccent: ColorModeSwitch;
218+
/** @deprecated */
219+
backgroundTransparentAccentSecondary: ColorModeSwitch;
220+
/** @deprecated */
221+
backgroundTransparentSuccess: ColorModeSwitch;
222+
/** @deprecated */
223+
backgroundTransparentWarning: ColorModeSwitch;
224+
/** @deprecated */
225+
backgroundTransparentDanger: ColorModeSwitch;
226+
/** @deprecated */
227+
backgroundTransparentSubdued: ColorModeSwitch;
228+
/** @deprecated */
229+
backgroundTransparentPlain: ColorModeSwitch;
230+
};
231+
210232
export type _EuiThemeBorderColors = {
211233
borderBasePrimary: ColorModeSwitch;
212234
borderBaseAccent: ColorModeSwitch;
@@ -241,6 +263,7 @@ export type _EuiThemeColorsMode = _EuiThemeBrandColors &
241263
_EuiThemeSpecialColors &
242264
_EuiThemeTextColors &
243265
_EuiThemeBackgroundColors &
266+
_EuiThemeTransparentBackgroundColors &
244267
_EuiThemeBorderColors;
245268

246269
export type _EuiThemeColors = StrictColorModeSwitch<_EuiThemeColorsMode> &

‎packages/eui-theme-common/src/global_styling/variables/components.ts

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -10,19 +10,7 @@ import { ColorModeSwitch, StrictColorModeSwitch } from '../types';
1010
import { _EuiThemeButtonColors } from './buttons';
1111
import { _EuiThemeFormColors } from './forms';
1212

13-
type _InternalOnlyComponentTokens = {
14-
shared: {
15-
backgroundTransparent: ColorModeSwitch;
16-
backgroundTransparentPrimary: ColorModeSwitch;
17-
backgroundTransparentAccent: ColorModeSwitch;
18-
backgroundTransparentAccentSecondary: ColorModeSwitch;
19-
backgroundTransparentSuccess: ColorModeSwitch;
20-
backgroundTransparentWarning: ColorModeSwitch;
21-
backgroundTransparentDanger: ColorModeSwitch;
22-
backgroundTransparentSubdued: ColorModeSwitch;
23-
backgroundTransparentPlain: ColorModeSwitch;
24-
};
25-
13+
type _EuiThemeComponentColors = {
2614
buttonGroupBorderColor: ColorModeSwitch;
2715
buttonGroupBorderColorSelected: ColorModeSwitch;
2816

@@ -95,7 +83,7 @@ type _InternalOnlyComponentTokens = {
9583

9684
tourFooterBackground: ColorModeSwitch;
9785

98-
treeViewItembackgroundHover: ColorModeSwitch;
86+
treeViewItemBackgroundHover: ColorModeSwitch;
9987
};
10088

10189
export type _EuiThemeComponents = {
@@ -104,5 +92,6 @@ export type _EuiThemeComponents = {
10492
/**
10593
* internal-only key that holds temporary tokens used while migrating themes
10694
*/
107-
__TEMP_INTERNAL__: StrictColorModeSwitch<_InternalOnlyComponentTokens>;
95+
LIGHT: _EuiThemeComponentColors;
96+
DARK: _EuiThemeComponentColors;
10897
};

0 commit comments

Comments
 (0)