Skip to content

Commit d867603

Browse files
fix: color picker icons (BLO-1189) (#2762)
1 parent d0e5c3e commit d867603

8 files changed

Lines changed: 55 additions & 0 deletions

packages/react/src/editor/styles.css

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,91 +141,109 @@
141141

142142
/* Highlight color styling */
143143
[data-style-type="textColor"][data-value="gray"],
144+
.bn-color-icon[data-text-color="gray"],
144145
.bn-block:has(> .bn-block-content[data-text-color="gray"]) {
145146
color: var(--bn-colors-highlights-gray-text);
146147
}
147148

148149
[data-style-type="textColor"][data-value="brown"],
150+
.bn-color-icon[data-text-color="brown"],
149151
.bn-block:has(> .bn-block-content[data-text-color="brown"]) {
150152
color: var(--bn-colors-highlights-brown-text);
151153
}
152154

153155
[data-style-type="textColor"][data-value="red"],
156+
.bn-color-icon[data-text-color="red"],
154157
.bn-block:has(> .bn-block-content[data-text-color="red"]) {
155158
color: var(--bn-colors-highlights-red-text);
156159
}
157160

158161
[data-style-type="textColor"][data-value="orange"],
162+
.bn-color-icon[data-text-color="orange"],
159163
.bn-block:has(> .bn-block-content[data-text-color="orange"]) {
160164
color: var(--bn-colors-highlights-orange-text);
161165
}
162166

163167
[data-style-type="textColor"][data-value="yellow"],
168+
.bn-color-icon[data-text-color="yellow"],
164169
.bn-block:has(> .bn-block-content[data-text-color="yellow"]) {
165170
color: var(--bn-colors-highlights-yellow-text);
166171
}
167172

168173
[data-style-type="textColor"][data-value="green"],
174+
.bn-color-icon[data-text-color="green"],
169175
.bn-block:has(> .bn-block-content[data-text-color="green"]) {
170176
color: var(--bn-colors-highlights-green-text);
171177
}
172178

173179
[data-style-type="textColor"][data-value="blue"],
180+
.bn-color-icon[data-text-color="blue"],
174181
.bn-block:has(> .bn-block-content[data-text-color="blue"]) {
175182
color: var(--bn-colors-highlights-blue-text);
176183
}
177184

178185
[data-style-type="textColor"][data-value="purple"],
186+
.bn-color-icon[data-text-color="purple"],
179187
.bn-block:has(> .bn-block-content[data-text-color="purple"]) {
180188
color: var(--bn-colors-highlights-purple-text);
181189
}
182190

183191
[data-style-type="textColor"][data-value="pink"],
192+
.bn-color-icon[data-text-color="pink"],
184193
.bn-block:has(> .bn-block-content[data-text-color="pink"]) {
185194
color: var(--bn-colors-highlights-pink-text);
186195
}
187196

188197
[data-style-type="backgroundColor"][data-value="gray"],
198+
.bn-color-icon[data-background-color="gray"],
189199
.bn-block:has(> .bn-block-content[data-background-color="gray"]) {
190200
background-color: var(--bn-colors-highlights-gray-background);
191201
}
192202

193203
[data-style-type="backgroundColor"][data-value="brown"],
204+
.bn-color-icon[data-background-color="brown"],
194205
.bn-block:has(> .bn-block-content[data-background-color="brown"]) {
195206
background-color: var(--bn-colors-highlights-brown-background);
196207
}
197208

198209
[data-style-type="backgroundColor"][data-value="red"],
210+
.bn-color-icon[data-background-color="red"],
199211
.bn-block:has(> .bn-block-content[data-background-color="red"]) {
200212
background-color: var(--bn-colors-highlights-red-background);
201213
}
202214

203215
[data-style-type="backgroundColor"][data-value="orange"],
216+
.bn-color-icon[data-background-color="orange"],
204217
.bn-block:has(> .bn-block-content[data-background-color="orange"]) {
205218
background-color: var(--bn-colors-highlights-orange-background);
206219
}
207220

208221
[data-style-type="backgroundColor"][data-value="yellow"],
222+
.bn-color-icon[data-background-color="yellow"],
209223
.bn-block:has(> .bn-block-content[data-background-color="yellow"]) {
210224
background-color: var(--bn-colors-highlights-yellow-background);
211225
}
212226

213227
[data-style-type="backgroundColor"][data-value="green"],
228+
.bn-color-icon[data-background-color="green"],
214229
.bn-block:has(> .bn-block-content[data-background-color="green"]) {
215230
background-color: var(--bn-colors-highlights-green-background);
216231
}
217232

218233
[data-style-type="backgroundColor"][data-value="blue"],
234+
.bn-color-icon[data-background-color="blue"],
219235
.bn-block:has(> .bn-block-content[data-background-color="blue"]) {
220236
background-color: var(--bn-colors-highlights-blue-background);
221237
}
222238

223239
[data-style-type="backgroundColor"][data-value="purple"],
240+
.bn-color-icon[data-background-color="purple"],
224241
.bn-block:has(> .bn-block-content[data-background-color="purple"]) {
225242
background-color: var(--bn-colors-highlights-purple-background);
226243
}
227244

228245
[data-style-type="backgroundColor"][data-value="pink"],
246+
.bn-color-icon[data-background-color="pink"],
229247
.bn-block:has(> .bn-block-content[data-background-color="pink"]) {
230248
background-color: var(--bn-colors-highlights-pink-background);
231249
}

tests/src/end-to-end/colors/colors.test.ts

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import {
66
COLORS_BUTTON_SELECTOR,
77
DRAG_HANDLE_MENU_SELECTOR,
88
DRAG_HANDLE_SELECTOR,
9+
H_ONE_BLOCK_SELECTOR,
910
H_TWO_BLOCK_SELECTOR,
1011
TABLE_SELECTOR,
1112
TEXT_COLOR_SELECTOR,
@@ -19,6 +20,42 @@ test.beforeEach(async ({ page }) => {
1920
});
2021

2122
test.describe("Check Background & Text Color Functionality", () => {
23+
test("Should be able to open the color picker from the formatting toolbar", async ({
24+
page,
25+
}) => {
26+
await focusOnEditor(page);
27+
28+
await insertHeading(page, 1);
29+
await page.keyboard.press("Shift+ArrowLeft");
30+
31+
await page.locator(COLORS_BUTTON_SELECTOR).click();
32+
33+
// Waits for the color picker dropdown to open & its animation to finish.
34+
await page.waitForSelector(TEXT_COLOR_SELECTOR("red"));
35+
await page.waitForTimeout(500);
36+
37+
expect(await page.screenshot()).toMatchSnapshot(
38+
"colorPickerFormattingToolbar.png",
39+
);
40+
});
41+
test("Should be able to open the color picker from the side menu", async ({
42+
page,
43+
}) => {
44+
await focusOnEditor(page);
45+
46+
await insertHeading(page, 1);
47+
48+
await page.hover(H_ONE_BLOCK_SELECTOR);
49+
await page.click(DRAG_HANDLE_SELECTOR);
50+
await page.waitForSelector(DRAG_HANDLE_MENU_SELECTOR);
51+
await page.hover("text=Colors");
52+
53+
// Waits for the color picker submenu to open & its animation to finish.
54+
await page.waitForSelector(TEXT_COLOR_SELECTOR("red"));
55+
await page.waitForTimeout(500);
56+
57+
expect(await page.screenshot()).toMatchSnapshot("colorPickerSideMenu.png");
58+
});
2259
test("Should be able to apply a text color mark", async ({ page }) => {
2360
await focusOnEditor(page);
2461

32.7 KB
Loading
55.8 KB
Loading
94 KB
Loading
37.1 KB
Loading
56.5 KB
Loading
96.7 KB
Loading

0 commit comments

Comments
 (0)