fix(m2h): don't delete p's in li's (#11930)

* fix(m2h): don't delete p's in li's but hide them In order to have more predictable html we keep the p's (expect for empty ones) and "hide" them via display: contents. * fix curriculum * use margin 0
mdn · Oct 9, 2024 · 41e892e · 41e892e
1 parent 72c4f53
commit 41e892e
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 2 deletions.
diff --git a/client/src/curriculum/index.scss b/client/src/curriculum/index.scss
@@ -192,6 +192,13 @@
         color: var(--text-visited);
       }
     }
+
+    ol,
+    ul {
+      li > p {
+        margin: 0;
+      }
+    }
   }
 
   &.with-sidebar {

diff --git a/client/src/document/index.scss b/client/src/document/index.scss
@@ -110,6 +110,10 @@
 
     li {
       margin: 0.5rem 0;
+
+      > p {
+        margin: 0;
+      }
     }
   }
 

diff --git a/markdown/m2h/handlers/index.ts b/markdown/m2h/handlers/index.ts
@@ -191,8 +191,10 @@ export function buildLocalizedHandlers(locale: Locale): Handlers {
         children:
           "children" in item
             ? item.children.flatMap((child) =>
-                "tagName" in child && child.tagName == "p"
-                  ? child.children
+                "tagName" in child &&
+                child.tagName == "p" &&
+                child.children?.length === 0
+                  ? []
                   : [child]
               )
             : [],