Merge pull request #460 from SimonBackx/fixed-counter-reset

Fixed counter-reset not working in combination with inline styles
Automattic · May 6, 2023 · a9d920f · a9d920f
2 parents 56a996a + 169739a
commit a9d920f
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 6 deletions.
diff --git a/lib/inline.js b/lib/inline.js
@@ -124,6 +124,12 @@ function inlineDocument($, css, options) {
         return;
       }
 
+      if (!el.counterProps) {
+        el.counterProps = el.parent && el.parent.counterProps
+          ? Object.create(el.parent.counterProps)
+          : {};
+      }
+
       if (pseudoElementType) {
         var pseudoElPropName = 'pseudo' + pseudoElementType;
         var pseudoEl = el[pseudoElPropName];
@@ -150,12 +156,6 @@ function inlineDocument($, css, options) {
         editedElements.push(el);
       }
 
-      if (!el.counterProps) {
-        el.counterProps = el.parent && el.parent.counterProps
-          ? Object.create(el.parent.counterProps)
-          : {};
-      }
-
       function resetCounter(el, value) {
         var tokens = value.split(/\s+/);
 

diff --git a/test/cases/juice-content/counter-reset.css b/test/cases/juice-content/counter-reset.css
diff --git a/test/cases/juice-content/counter-reset.html b/test/cases/juice-content/counter-reset.html
@@ -0,0 +1,12 @@
+<html>
+  <head>
+      <style>
+        p {
+          color: red;
+        }
+      </style>
+  </head>
+  <body>
+    <p style="counter-reset: li;">Cool!</p>
+  </body>
+</html>
diff --git a/test/cases/juice-content/counter-reset.json b/test/cases/juice-content/counter-reset.json
@@ -0,0 +1,4 @@
+{
+  "removeStyleTags": true,
+  "inlinePseudoElements": true
+}
diff --git a/test/cases/juice-content/counter-reset.out b/test/cases/juice-content/counter-reset.out
@@ -0,0 +1,8 @@
+<html>
+  <head>
+
+  </head>
+  <body>
+    <p style="color: red; counter-reset: li;">Cool!</p>
+  </body>
+</html>