Try to solve #94 (#95)

pointfreeco · Feb 23, 2023 · 57d9359 · 57d9359
1 parent 05dcfbf
commit 57d9359
Show file tree

Hide file tree

Showing 4 changed files with 61 additions and 1 deletion.
diff --git a/Html.playground/Contents.swift b/Html.playground/Contents.swift
@@ -115,6 +115,28 @@ render(unexclaim(document))
   )
 )
 
+// Based on https://html.spec.whatwg.org/multipage/grouping-content.html#the-dl-element
+let dl_exmaple_with_div: Node = .dl(
+    .div(
+        .dt("Last modified time"),
+        .dd("2004-12-23T23:33Z")
+    ),
+    .div(
+        .dt("Recommended update interval"),
+        .dd("60s")
+    ),
+    .div(
+        .dt("Authors"),
+        .dt("Editors"),
+        .dd("Robert Rothman"),
+        .dd("Daniel Jackson")
+    )
+)
+
+render(dl_exmaple_with_div)
+
+
+
 /// A function that "redacts" an HTML document by transforming all text nodes
 /// into █-sequences of characters.
 func redacted(node: Node) -> Node {

diff --git a/Html.playground/contents.xcplayground b/Html.playground/contents.xcplayground
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<playground version='5.0' target-platform='macos' executeOnSourceChanges='false'>
+<playground version='5.0' target-platform='macos'>
     <timeline fileName='timeline.xctimeline'/>
 </playground>
diff --git a/Sources/Html/ChildOf.swift b/Sources/Html/ChildOf.swift
@@ -89,6 +89,18 @@ extension ChildOf where Element == Tag.Dl {
   }
 }
 
+// https://html.spec.whatwg.org/multipage/grouping-content.html#the-dl-element
+extension ChildOf where Element == Tag.Dl {
+  /// The `<div>` element wraps a group, that is part of a term-description group in a description list (`<dl>` element).
+  ///
+  /// - Parameters:
+  ///   - attributes: Attributes.
+  ///   - content: Child nodes (`<dl>` or `dd` elements).
+    public static func div(attributes: [Attribute<Tag.Div>] = [], _ content: ChildOf<Tag.Dl>...) -> ChildOf {
+    return .init(.element("div", attributes: attributes, ChildOf.fragment(content).rawValue))
+  }
+}
+
 extension ChildOf where Element == Tag.Fieldset {
   /// The `<legend>` element represents a caption for the rest of the contents of the `<legend>` element's parent `<fieldset>` element, if any.
   ///

diff --git a/Tests/HtmlTests/ElementsTests.swift b/Tests/HtmlTests/ElementsTests.swift
@@ -21,4 +21,30 @@ final class ElementsTests: XCTestCase {
       )
     )
   }
+
+    func testDlwithDiv() {
+        let dl_exmaple_with_div: Node = .dl(
+            .div(
+                .dt("Last modified time"),
+                .dd("2004-12-23T23:33Z")
+            ),
+            .div(
+                .dt("Recommended update interval"),
+                .dd("60s")
+            ),
+            .div(
+                .dt("Authors"),
+                .dt("Editors"),
+                .dd("Robert Rothman"),
+                .dd("Daniel Jackson")
+            )
+        )
+
+        XCTAssertEqual(
+            """
+            <dl><div><dt>Last modified time</dt><dd>2004-12-23T23:33Z</dd></div><div><dt>Recommended update interval</dt><dd>60s</dd></div><div><dt>Authors</dt><dt>Editors</dt><dd>Robert Rothman</dd><dd>Daniel Jackson</dd></div></dl>
+            """,
+            render(dl_exmaple_with_div)
+        )
+    }
 }