Add Environment to Layout API

meherkasam-square · Apr 12, 2023 · fed7d22 · fed7d22
1 parent 21a3cd5
commit fed7d22
Show file tree

Hide file tree

Showing 25 changed files with 360 additions and 112 deletions.
diff --git a/BlueprintUI/Sources/Element/ElementContent.swift b/BlueprintUI/Sources/Element/ElementContent.swift
@@ -304,32 +304,36 @@ fileprivate struct SingleChildLayoutHost<WrappedLayout: SingleChildLayout>: Layo
     func sizeThatFits(
         proposal: SizeConstraint,
         subelements: Subelements,
+        environment: Environment,
         cache: inout Cache
     ) -> CGSize {
         precondition(subelements.count == 1)
         return wrapped.sizeThatFits(
             proposal: proposal,
             subelement: subelements[0],
+            environment: environment,
             cache: &cache
         )
     }
 
     func placeSubelements(
         in size: CGSize,
         subelements: Subelements,
+        environment: Environment,
         cache: inout Cache
     ) {
         precondition(subelements.count == 1)
         wrapped.placeSubelement(
             in: size,
             subelement: subelements[0],
+            environment: environment,
             cache: &cache
         )
     }
 
-    func makeCache(subelements: Subelements) -> Cache {
+    func makeCache(subelements: Subelements, environment: Environment) -> Cache {
         precondition(subelements.count == 1)
-        return wrapped.makeCache(subelement: subelements[0])
+        return wrapped.makeCache(subelement: subelements[0], environment: environment)
     }
 }
 

diff --git a/BlueprintUI/Sources/Element/LayoutStorage.swift b/BlueprintUI/Sources/Element/LayoutStorage.swift
@@ -151,12 +151,13 @@ extension LayoutStorage: CaffeinatedContentStorage {
         let subelements = subelements(from: context.node, environment: context.environment)
 
         var associatedCache = context.node.associatedCache {
-            layout.makeCache(subelements: subelements)
+            layout.makeCache(subelements: subelements, environment: environment)
         }
 
         let size = layout.sizeThatFits(
             proposal: proposal,
             subelements: subelements,
+            environment: context.environment,
             cache: &associatedCache
         )
 
@@ -174,12 +175,13 @@ extension LayoutStorage: CaffeinatedContentStorage {
         let subelements = subelements(from: context.node, environment: context.environment)
 
         var associatedCache = context.node.associatedCache {
-            layout.makeCache(subelements: subelements)
+            layout.makeCache(subelements: subelements, environment: environment)
         }
 
         layout.placeSubelements(
             in: frame.size,
             subelements: subelements,
+            environment: context.environment,
             cache: &associatedCache
         )
 

diff --git a/BlueprintUI/Sources/Layout/Aligned.swift b/BlueprintUI/Sources/Layout/Aligned.swift
@@ -114,11 +114,21 @@ public struct Aligned: Element {
             return attributes
         }
 
-        func sizeThatFits(proposal: SizeConstraint, subelement: LayoutSubelement, cache: inout Cache) -> CGSize {
+        func sizeThatFits(
+            proposal: SizeConstraint,
+            subelement: Subelement,
+            environment: Environment,
+            cache: inout Cache
+        ) -> CGSize {
             subelement.sizeThatFits(proposal)
         }
 
-        func placeSubelement(in size: CGSize, subelement: LayoutSubelement, cache: inout ()) {
+        func placeSubelement(
+            in size: CGSize,
+            subelement: Subelement,
+            environment: Environment,
+            cache: inout ()
+        ) {
             let x: CGFloat
             let y: CGFloat
 

diff --git a/BlueprintUI/Sources/Layout/ConstrainedAspectRatio.swift b/BlueprintUI/Sources/Layout/ConstrainedAspectRatio.swift
@@ -159,7 +159,12 @@ public struct ConstrainedAspectRatio: Element {
             LayoutAttributes(size: size)
         }
 
-        func sizeThatFits(proposal: SizeConstraint, subelement: LayoutSubelement, cache: inout Cache) -> CGSize {
+        func sizeThatFits(
+            proposal: SizeConstraint,
+            subelement: Subelement,
+            environment: Environment,
+            cache: inout Cache
+        ) -> CGSize {
             let contentSize = subelement.sizeThatFits(proposal)
             return contentMode.constrain(
                 contentSize: contentSize,
@@ -168,7 +173,12 @@ public struct ConstrainedAspectRatio: Element {
             )
         }
 
-        func placeSubelement(in size: CGSize, subelement: LayoutSubelement, cache: inout ()) {
+        func placeSubelement(
+            in size: CGSize,
+            subelement: Subelement,
+            environment: Environment,
+            cache: inout ()
+        ) {
             subelement.place(filling: size)
         }
     }

diff --git a/BlueprintUI/Sources/Layout/ConstrainedSize.swift b/BlueprintUI/Sources/Layout/ConstrainedSize.swift
@@ -208,7 +208,12 @@ extension ConstrainedSize {
             LayoutAttributes(size: size)
         }
 
-        func sizeThatFits(proposal: SizeConstraint, subelement: LayoutSubelement, cache: inout Cache) -> CGSize {
+        func sizeThatFits(
+            proposal: SizeConstraint,
+            subelement: Subelement,
+            environment: Environment,
+            cache: inout Cache
+        ) -> CGSize {
             if case let .absolute(width) = width, case let .absolute(height) = height {
                 return CGSize(width: width, height: height)
             }
@@ -225,7 +230,12 @@ extension ConstrainedSize {
             )
         }
 
-        func placeSubelement(in size: CGSize, subelement: LayoutSubelement, cache: inout ()) {
+        func placeSubelement(
+            in size: CGSize,
+            subelement: Subelement,
+            environment: Environment,
+            cache: inout ()
+        ) {
             subelement.place(filling: size)
         }
     }

diff --git a/BlueprintUI/Sources/Layout/EqualStack.swift b/BlueprintUI/Sources/Layout/EqualStack.swift
@@ -153,7 +153,12 @@ extension EqualStack {
             return result
         }
 
-        func sizeThatFits(proposal: SizeConstraint, subelements: Subelements, cache: inout Cache) -> CGSize {
+        func sizeThatFits(
+            proposal: SizeConstraint,
+            subelements: Subelements,
+            environment: Environment,
+            cache: inout Cache
+        ) -> CGSize {
             guard subelements.count > 0 else { return .zero }
 
             let totalSpacing = (spacing * CGFloat(subelements.count - 1))
@@ -192,7 +197,12 @@ extension EqualStack {
             return totalSize
         }
 
-        func placeSubelements(in size: CGSize, subelements: Subelements, cache: inout ()) {
+        func placeSubelements(
+            in size: CGSize,
+            subelements: Subelements,
+            environment: Environment,
+            cache: inout ()
+        ) {
             guard subelements.count > 0 else { return }
 
             let totalSpacing = (spacing * CGFloat(subelements.count - 1))

diff --git a/BlueprintUI/Sources/Layout/GridRow.swift b/BlueprintUI/Sources/Layout/GridRow.swift
@@ -130,7 +130,12 @@ extension GridRow {
             }
         }
 
-        func sizeThatFits(proposal: SizeConstraint, subelements: Subelements, cache: inout Cache) -> CGSize {
+        func sizeThatFits(
+            proposal: SizeConstraint,
+            subelements: Subelements,
+            environment: Environment,
+            cache: inout Cache
+        ) -> CGSize {
             guard subelements.count > 0 else {
                 return .zero
             }
@@ -147,7 +152,12 @@ extension GridRow {
             return size
         }
 
-        func placeSubelements(in size: CGSize, subelements: Subelements, cache: inout ()) {
+        func placeSubelements(
+            in size: CGSize,
+            subelements: Subelements,
+            environment: Environment,
+            cache: inout ()
+        ) {
             guard subelements.count > 0 else {
                 return
             }

diff --git a/BlueprintUI/Sources/Layout/Hidden.swift b/BlueprintUI/Sources/Layout/Hidden.swift
@@ -33,11 +33,21 @@ public struct Hidden: Element {
             return attributes
         }
 
-        func sizeThatFits(proposal: SizeConstraint, subelement: LayoutSubelement, cache: inout Cache) -> CGSize {
+        func sizeThatFits(
+            proposal: SizeConstraint,
+            subelement: Subelement,
+            environment: Environment,
+            cache: inout Cache
+        ) -> CGSize {
             subelement.sizeThatFits(proposal)
         }
 
-        func placeSubelement(in size: CGSize, subelement: LayoutSubelement, cache: inout ()) {
+        func placeSubelement(
+            in size: CGSize,
+            subelement: Subelement,
+            environment: Environment,
+            cache: inout ()
+        ) {
             subelement.attributes.isHidden = isHidden
         }
     }

diff --git a/BlueprintUI/Sources/Layout/Inset.swift b/BlueprintUI/Sources/Layout/Inset.swift
@@ -159,13 +159,23 @@ extension Inset {
             return LayoutAttributes(frame: frame)
         }
 
-        func sizeThatFits(proposal: SizeConstraint, subelement: LayoutSubelement, cache: inout ()) -> CGSize {
+        func sizeThatFits(
+            proposal: SizeConstraint,
+            subelement: Subelement,
+            environment: Environment,
+            cache: inout ()
+        ) -> CGSize {
             let insetProposal = proposal.inset(by: edgeInsets)
             let childSize = subelement.sizeThatFits(insetProposal)
             return childSize + CGSize(width: left + right, height: top + bottom)
         }
 
-        func placeSubelement(in size: CGSize, subelement: LayoutSubelement, cache: inout ()) {
+        func placeSubelement(
+            in size: CGSize,
+            subelement: Subelement,
+            environment: Environment,
+            cache: inout ()
+        ) {
             let insetSize = size.inset(by: edgeInsets)
 
             subelement.place(

diff --git a/BlueprintUI/Sources/Layout/Keyed.swift b/BlueprintUI/Sources/Layout/Keyed.swift
@@ -70,11 +70,21 @@ public struct Keyed: Element {
             LayoutAttributes(size: size)
         }
 
-        func sizeThatFits(proposal: SizeConstraint, subelement: LayoutSubelement, cache: inout Cache) -> CGSize {
+        func sizeThatFits(
+            proposal: SizeConstraint,
+            subelement: Subelement,
+            environment: Environment,
+            cache: inout Cache
+        ) -> CGSize {
             subelement.sizeThatFits(proposal)
         }
 
-        func placeSubelement(in size: CGSize, subelement: LayoutSubelement, cache: inout ()) {
+        func placeSubelement(
+            in size: CGSize,
+            subelement: Subelement,
+            environment: Environment,
+            cache: inout ()
+        ) {
             subelement.place(at: .zero, size: size)
         }
     }