Skip to content

Commit a5fa0aa

Browse files
Backport PR #15957: Fix Theme color is not applied to Toolbar Button (#15995)
Co-authored-by: FoSuCloud <[email protected]>
1 parent 2b42e0f commit a5fa0aa

File tree

2 files changed

+40
-16
lines changed

2 files changed

+40
-16
lines changed

galata/test/jupyterlab/toolbars.test.ts

Lines changed: 39 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -37,23 +37,47 @@ toolbars.forEach(([plugin, parameter]) => {
3737
expect(missingCommands).toEqual([]);
3838
});
3939
});
40+
test.describe('Toolbar Button', () => {
41+
test.beforeEach(async ({ page, tmpPath }) => {
42+
await page.notebook.createNew();
43+
});
4044

41-
test('Render Switch Kernel ToolbarButton', async ({ page }) => {
42-
await page.notebook.createNew();
45+
test('Render Switch Kernel ToolbarButton in default theme', async ({
46+
page
47+
}) => {
48+
const label = await page.$(
49+
'jp-button.jp-Toolbar-kernelName .jp-ToolbarButtonComponent-label'
50+
);
51+
const labelColor = await page.evaluate(
52+
el => getComputedStyle(el).color,
53+
label
54+
);
4355

44-
const label = await page.$(
45-
'jp-button.jp-Toolbar-kernelName .jp-ToolbarButtonComponent-label'
46-
);
47-
const labelColor = await page.evaluate(
48-
el => getComputedStyle(el).color,
49-
label
50-
);
56+
const color = await page.evaluate(() =>
57+
getComputedStyle(document.body)
58+
.getPropertyValue('--jp-ui-font-color1')
59+
.trim()
60+
);
5161

52-
const color = await page.evaluate(() =>
53-
getComputedStyle(document.body)
54-
.getPropertyValue('--jp-ui-font-color1')
55-
.trim()
56-
);
62+
expect(labelColor).toEqual(color);
63+
});
5764

58-
expect(labelColor).toEqual(color);
65+
test('Render Switch Kernel ToolbarButton in dark theme', async ({ page }) => {
66+
await page.theme.setDarkTheme();
67+
const label = await page.$(
68+
'jp-button.jp-Toolbar-kernelName .jp-ToolbarButtonComponent-label'
69+
);
70+
const labelColor = await page.evaluate(
71+
el => getComputedStyle(el).color,
72+
label
73+
);
74+
75+
const color = await page.evaluate(() =>
76+
getComputedStyle(document.body)
77+
.getPropertyValue('--jp-ui-font-color1')
78+
.trim()
79+
);
80+
81+
expect(labelColor).toEqual(color);
82+
});
5983
});

packages/ui-components/style/toolbar.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ button.jp-ToolbarButtonComponent .jp-ToolbarButtonComponent-label {
7474
font-family: var(--jp-ui-font-family);
7575
}
7676

77-
jp-button.jp-Toolbar-kernelName {
77+
.jp-Toolbar .jp-ToolbarButtonComponent {
7878
color: var(--jp-ui-font-color1);
7979
}
8080

0 commit comments

Comments
 (0)