From f84405c46609108bcf1350a59e480adac697b21e Mon Sep 17 00:00:00 2001 From: Denis Chaschin Date: Sun, 25 Jul 2021 21:34:08 +1000 Subject: [PATCH 1/2] GeometryReader alignment issue fixed --- .../WrappingStack/Helpers/TightHeightGeometryReader.swift | 8 +++++++- Sources/WrappingStack/WrappingHStack.swift | 6 ++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/Sources/WrappingStack/Helpers/TightHeightGeometryReader.swift b/Sources/WrappingStack/Helpers/TightHeightGeometryReader.swift index c407e84..20aac2f 100644 --- a/Sources/WrappingStack/Helpers/TightHeightGeometryReader.swift +++ b/Sources/WrappingStack/Helpers/TightHeightGeometryReader.swift @@ -4,11 +4,16 @@ import SwiftUI @available(iOS 14, macOS 11, *) struct TightHeightGeometryReader: View { + var alignment: Alignment @State private var height: CGFloat = 0 var content: (GeometryProxy) -> Content - init(@ViewBuilder content: @escaping (GeometryProxy) -> Content) { + init( + alignment: Alignment = .topLeading, + @ViewBuilder content: @escaping (GeometryProxy) -> Content + ) { + self.alignment = alignment self.content = content } @@ -20,6 +25,7 @@ struct TightHeightGeometryReader: View { self.height = size.height } } + .frame(maxWidth: .infinity, alignment: alignment) } .frame(height: height) } diff --git a/Sources/WrappingStack/WrappingHStack.swift b/Sources/WrappingStack/WrappingHStack.swift index a3690a5..756b43b 100644 --- a/Sources/WrappingStack/WrappingHStack.swift +++ b/Sources/WrappingStack/WrappingHStack.swift @@ -87,7 +87,7 @@ public struct WrappingHStack Date: Sun, 25 Jul 2021 21:52:26 +1000 Subject: [PATCH 2/2] unnecessary change reverted --- Sources/WrappingStack/WrappingHStack.swift | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Sources/WrappingStack/WrappingHStack.swift b/Sources/WrappingStack/WrappingHStack.swift index 756b43b..530e018 100644 --- a/Sources/WrappingStack/WrappingHStack.swift +++ b/Sources/WrappingStack/WrappingHStack.swift @@ -159,8 +159,7 @@ struct WrappingHStack_Previews: PreviewProvider { } } .padding() - .frame(maxWidth: .infinity) -// .frame(width: 300) + .frame(width: 300) .background(Color.white) } }