Fix hints not being shown with new color spaces in CSS Colors v4

david-tejada · Dec 7, 2023 · 36af841 · 36af841
1 parent 770e581
commit 36af841
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/src/content/hints/HintClass.ts b/src/content/hints/HintClass.ts
@@ -404,9 +404,12 @@ export class HintClass implements Hint {
 			} else {
 				const elementToGetColorFrom =
 					this.firstTextNodeDescendant?.parentElement;
-				const colorString = window.getComputedStyle(
+				let colorString = window.getComputedStyle(
 					elementToGetColorFrom ?? this.target
 				).color;
+				colorString = colorString.startsWith("rgb")
+					? colorString
+					: "rgb(0, 0, 0)";
 				color = rgbaToRgb(new Color(colorString || "black"), backgroundColor);
 
 				if (!elementToGetColorFrom) {

diff --git a/src/content/utils/getEffectiveBackgroundColor.ts b/src/content/utils/getEffectiveBackgroundColor.ts
@@ -44,7 +44,11 @@ export function getEffectiveBackgroundColor(element: Element) {
 	let current: Element | null = element;
 
 	while (current) {
-		const { backgroundColor } = window.getComputedStyle(current);
+		let { backgroundColor } = window.getComputedStyle(current);
+
+		if (!backgroundColor.startsWith("rgb")) {
+			backgroundColor = "rgb(255, 255, 255)";
+		}
 
 		if (backgroundColor && backgroundColor !== "rgba(0, 0, 0, 0)") {
 			if (isRgb(backgroundColor)) {