allow spec builders in overlay() and background() (#77)

FluidGroup · Feb 10, 2022 · b86e101 · b86e101
1 parent 14db8e3
commit b86e101
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 2 deletions.
diff --git a/Sources/LayoutSpecBuilders/Layout/BackgroundLayout.swift b/Sources/LayoutSpecBuilders/Layout/BackgroundLayout.swift
@@ -13,7 +13,10 @@ public struct BackgroundLayout<BackgroundContnt, Content> : _ASLayoutElementType
 
   public func tss_make() -> [ASLayoutElement] {
     [
-      ASBackgroundLayoutSpec(child: content.tss_make().first!, background: background.tss_make().first!)
+      ASBackgroundLayoutSpec(
+        child: content.tss_make().first!,
+        background: background.tss_make().first ?? ASLayoutSpec()
+      )
     ]
   }
 

diff --git a/Sources/LayoutSpecBuilders/Layout/OverlayLayout.swift b/Sources/LayoutSpecBuilders/Layout/OverlayLayout.swift
@@ -12,7 +12,10 @@ public struct OverlayLayout<OverlayContnt, Content> : _ASLayoutElementType where
 
   public func tss_make() -> [ASLayoutElement] {
     [
-      ASOverlayLayoutSpec(child: content.tss_make().first!, overlay: overlay.tss_make().first!)
+      ASOverlayLayoutSpec(
+        child: content.tss_make().first!,
+        overlay: overlay.tss_make().first ?? ASLayoutSpec()
+      )
     ]
   }
 

diff --git a/Sources/LayoutSpecBuilders/Modifiers.swift b/Sources/LayoutSpecBuilders/Modifiers.swift
@@ -138,10 +138,18 @@ extension _ASLayoutElementType {
   public func background<Background: _ASLayoutElementType>(_ backgroundContent: Background) -> BackgroundLayout<Background, Self> {
     BackgroundLayout(content: { self }, background: { backgroundContent })
   }
+
+  public func background<Background: _ASLayoutElementType>(@ASLayoutSpecBuilder _ backgroundContent: () -> Background) -> BackgroundLayout<Background, Self> {
+    BackgroundLayout(content: { self }, background: backgroundContent)
+  }
 
   public func overlay<Overlay: _ASLayoutElementType>(_ overlayContent: Overlay) -> OverlayLayout<Overlay, Self> {
     OverlayLayout(content: { self }, overlay: { overlayContent })
   }
+
+  public func overlay<Overlay: _ASLayoutElementType>(@ASLayoutSpecBuilder _ overlayContent: () -> Overlay) -> OverlayLayout<Overlay, Self> {
+    OverlayLayout(content: { self }, overlay: overlayContent)
+  }
 
   /// Make aspectRatio
   ///