Attempt to fix rendering tests

TokamakUI · Jun 15, 2022 · 52eba18 · 52eba18
1 parent 63a2526
commit 52eba18
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/Sources/TokamakStaticHTML/Shapes/Path.swift b/Sources/TokamakStaticHTML/Shapes/Path.swift
@@ -29,7 +29,7 @@ extension Path: _HTMLPrimitive {
   func svgFrom(
     storage: Storage,
     strokeStyle: StrokeStyle = .zero
-  ) -> HTML<EmptyView> {
+  ) -> HTML<EmptyView>? {
     let stroke: [HTMLAttribute: String] = [
       "stroke-width": "\(strokeStyle.lineWidth)",
     ]
@@ -40,7 +40,7 @@ extension Path: _HTMLPrimitive {
     let flexibleCenterY: String? = sizing == .flexible ? "50%" : nil
     switch storage {
     case .empty:
-      return HTML("g")
+      return nil
     case let .rect(rect):
       return HTML(
         "rect",
@@ -115,8 +115,8 @@ extension Path: _HTMLPrimitive {
   func svgFrom(
     elements: [Element],
     strokeStyle: StrokeStyle = .zero
-  ) -> HTML<EmptyView> {
-    if elements.isEmpty { return HTML("g") }
+  ) -> HTML<EmptyView>? {
+    if elements.isEmpty { return nil }
     var d = [String]()
     for element in elements {
       switch element {
@@ -143,7 +143,7 @@ extension Path: _HTMLPrimitive {
   @ViewBuilder
   func svgBody(
     strokeStyle: StrokeStyle = .zero
-  ) -> HTML<EmptyView> {
+  ) -> HTML<EmptyView>? {
     svgFrom(storage: storage, strokeStyle: strokeStyle)
   }
 
@@ -184,6 +184,6 @@ extension Path: HTMLConvertible {
   }
 
   public var innerHTML: String? {
-    svgBody().outerHTML(shouldSortAttributes: false, children: [])
+    svgBody()?.outerHTML(shouldSortAttributes: false, children: [])
   }
 }
diff --git a/Sources/TokamakStaticHTML/Shapes/_ShapeView.swift b/Sources/TokamakStaticHTML/Shapes/_ShapeView.swift
@@ -187,7 +187,7 @@ extension _ShapeView: _HTMLPrimitive {
       role: Content.role
     )
 
-    if let view = mapAnyView(path, transform: { (html: HTML<AnyView>) -> AnyView in
+    if let view = mapAnyView(path, transform: { (html: HTML<HTML<EmptyView>?>) -> AnyView in
       let uniqueKeys = { (first: String, second: String) in "\(first) \(second)" }
       let mergedAttributes = html.attributes.merging(
         attributes(resolvedStyle: resolvedStyle),