darkreader 4.9.81 → 4.9.82

package/darkreader.js

@@ -1,5 +1,5 @@
 /**
- * Dark Reader v4.9.81
+ * Dark Reader v4.9.82
  * https://darkreader.org/
  */
 
@@ -1005,26 +1005,33 @@
             cssText.includes("background-color: ;") &&
             !style.getPropertyValue("background")
         ) {
-            const parentRule = style.parentRule;
-            if (isStyleRule(parentRule)) {
-                const sourceCSSText =
-                    parentRule.parentStyleSheet?.ownerNode?.textContent;
-                if (sourceCSSText) {
-                    let escapedSelector = escapeRegExpSpecialChars(
-                        parentRule.selectorText
-                    );
-                    escapedSelector = escapedSelector.replaceAll(
-                        /\s+/g,
-                        "\\s*"
-                    );
-                    escapedSelector = escapedSelector.replaceAll(/::/g, "::?");
-                    const regexp = new RegExp(
-                        `${escapedSelector}\\s*{[^}]*?background:\\s*([^;}]+)`
-                    );
-                    const match = sourceCSSText.match(regexp);
-                    if (match) {
-                        iterate("background", match[1]);
-                    }
+            handleEmptyShorthand("background", style, iterate);
+        }
+        if (
+            cssText.includes("border-") &&
+            cssText.includes("-color: ;") &&
+            !style.getPropertyValue("border")
+        ) {
+            handleEmptyShorthand("border", style, iterate);
+        }
+    }
+    function handleEmptyShorthand(shorthand, style, iterate) {
+        const parentRule = style.parentRule;
+        if (isStyleRule(parentRule)) {
+            const sourceCSSText =
+                parentRule.parentStyleSheet?.ownerNode?.textContent;
+            if (sourceCSSText) {
+                let escapedSelector = escapeRegExpSpecialChars(
+                    parentRule.selectorText
+                );
+                escapedSelector = escapedSelector.replaceAll(/\s+/g, "\\s*");
+                escapedSelector = escapedSelector.replaceAll(/::/g, "::?");
+                const regexp = new RegExp(
+                    `${escapedSelector}\\s*{[^}]*?${shorthand}:\\s*([^;}]+)`
+                );
+                const match = sourceCSSText.match(regexp);
+                if (match) {
+                    iterate(shorthand, match[1]);
                 }
             }
         }
@@ -1120,7 +1127,7 @@
         if (supportsRules.has(rule)) {
             return true;
         }
-        if (rule.cssText.startsWith("@supports")) {
+        if (rule instanceof CSSSupportsRule) {
             supportsRules.add(rule);
             return true;
         }
@@ -1136,7 +1143,7 @@
         if (layerRules.has(rule)) {
             return true;
         }
-        if (rule.cssText.startsWith("@layer") && rule.cssRules) {
+        if (rule instanceof CSSLayerBlockRule) {
             layerRules.add(rule);
             return true;
         }
@@ -2628,7 +2635,29 @@
             property === "stroke" ||
             property === "stop-color"
         ) {
-            modifier = getColorModifier(property, value, rule);
+            if (
+                property.startsWith("border") &&
+                property !== "border-color" &&
+                value === "initial"
+            ) {
+                const borderSideProp = property.substring(
+                    0,
+                    property.length - 6
+                );
+                const borderSideVal =
+                    rule.style.getPropertyValue(borderSideProp);
+                if (
+                    borderSideVal.startsWith("0px") ||
+                    borderSideVal === "none"
+                ) {
+                    property = borderSideProp;
+                    modifier = borderSideVal;
+                } else {
+                    modifier = value;
+                }
+            } else {
+                modifier = getColorModifier(property, value, rule);
+            }
         } else if (
             property === "background-image" ||
             property === "list-style-image"
@@ -2664,11 +2693,12 @@
             );
             lines.push("}");
         }
-        if (isCSSColorSchemePropSupported) {
+        if (isCSSColorSchemePropSupported && !isIFrame && theme.mode === 1) {
             lines.push("html {");
-            lines.push(
-                `    color-scheme: ${theme.mode === 1 ? "dark" : "dark light"} !important;`
-            );
+            lines.push(`    color-scheme: dark !important;`);
+            lines.push("}");
+            lines.push("iframe {");
+            lines.push(`    color-scheme: initial;`);
             lines.push("}");
         }
         const bgSelectors = joinSelectors(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "darkreader",
-  "version": "4.9.81",
+  "version": "4.9.82",
   "description": "Dark mode for every website",
   "scripts": {
     "api": "node --max-old-space-size=3072 tasks/cli.js build --api",