From 86f64206260a36c1211529cf67d6cc38e105fe08 Mon Sep 17 00:00:00 2001 From: Mikhail Date: Fri, 28 Mar 2025 11:15:11 +0100 Subject: [PATCH] force modal's content take all available width --- .../Helpers/ModalPreview+Helpers.swift | 20 +++++++++++-------- .../Modal/SwiftUI/ModalContent.swift | 2 +- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/Examples/DemosApp/DemosApp/ComponentsPreview/Helpers/ModalPreview+Helpers.swift b/Examples/DemosApp/DemosApp/ComponentsPreview/Helpers/ModalPreview+Helpers.swift index 2b27dd5c..eb8fccea 100644 --- a/Examples/DemosApp/DemosApp/ComponentsPreview/Helpers/ModalPreview+Helpers.swift +++ b/Examples/DemosApp/DemosApp/ComponentsPreview/Helpers/ModalPreview+Helpers.swift @@ -203,16 +203,20 @@ Enim habitant laoreet inceptos scelerisque senectus, tellus molestie ut. Eros ri } static func suBody(body: ContentBody) -> some View { - Group { - switch body { - case .shortText: - Text(self.bodyShortText) - case .longText: - Text(self.bodyLongText) + HStack { + Group { + switch body { + case .shortText: + Text(self.bodyShortText) + case .longText: + Text(self.bodyLongText) + } } + .font(self.bodyFont.font) + .multilineTextAlignment(.leading) + + Spacer() } - .font(self.bodyFont.font) - .multilineTextAlignment(.leading) } static func suFooter( diff --git a/Sources/ComponentsKit/Components/Modal/SwiftUI/ModalContent.swift b/Sources/ComponentsKit/Components/Modal/SwiftUI/ModalContent.swift index 1f379c1e..50b7fa55 100644 --- a/Sources/ComponentsKit/Components/Modal/SwiftUI/ModalContent.swift +++ b/Sources/ComponentsKit/Components/Modal/SwiftUI/ModalContent.swift @@ -43,7 +43,7 @@ struct ModalContent: View { .padding(.top, self.bodyTopPadding) .padding(.bottom, self.bodyBottomPadding) } - .frame(maxHeight: self.scrollViewMaxHeight) + .frame(maxWidth: .infinity, maxHeight: self.scrollViewMaxHeight) .disableScrollWhenContentFits() self.contentFooter()