Fix form field spacings.

kiwicom · Mar 21, 2022 · 3e4aa30 · 3e4aa30
1 parent beff6b0
commit 3e4aa30
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 9 deletions.
diff --git a/Sources/Orbit/Components/InputField.swift b/Sources/Orbit/Components/InputField.swift
@@ -32,7 +32,7 @@ public struct InputField: View {
     let suffixAction: () -> Void
 
     public var body: some View {
-        VStack(alignment: .leading, spacing: 1) {
+        VStack(alignment: .leading, spacing: .xxSmall) {
             FormFieldLabel(label)
 
             InputContent(
@@ -50,8 +50,10 @@ public struct InputField: View {
                 }
             }
 
-            ContentHeightReader(height: $messageHeight.animation(.easeOut(duration: 0.2))) {
-                FormFieldMessage(message)
+            if message.isEmpty == false {
+                ContentHeightReader(height: $messageHeight.animation(.easeOut(duration: 0.2))) {
+                    FormFieldMessage(message)
+                }
             }
         }
     }

diff --git a/Sources/Orbit/Components/Select.swift b/Sources/Orbit/Components/Select.swift
@@ -22,7 +22,7 @@ public struct Select: View {
     let action: () -> Void
 
     public var body: some View {
-        VStack(alignment: .leading, spacing: 1) {
+        VStack(alignment: .leading, spacing: .xxSmall) {
             FormFieldLabel(label)
 
             SwiftUI.Button(

diff --git a/Sources/Orbit/Support/Forms/FormFieldLabel.swift b/Sources/Orbit/Support/Forms/FormFieldLabel.swift
@@ -7,7 +7,7 @@ public struct FormFieldLabel: View {
 
     public var body: some View {
         Text(label, size: .normal, weight: .medium)
-            .padding(.bottom, .xxSmall)
+            .padding(.bottom, 1)
     }
 
     public init(_ label: String) {

diff --git a/Sources/Orbit/Support/Forms/FormFieldMessage.swift b/Sources/Orbit/Support/Forms/FormFieldMessage.swift
@@ -12,15 +12,14 @@ public struct FormFieldMessage: View {
                 Icon(message.icon, size: .small, color: message.color)
                 Text(message.description, color: .custom(message.uiColor))
                     .alignmentGuide(.firstTextBaseline) { _ in
-                        Text.Size.normal.value * 1.2
+                        Text.Size.small.value * 1.1
                     }
             }
-            .padding(.top, .xxSmall)
             .transition(.opacity.animation(.easeOut(duration: 0.2)))
         }
     }
 
-    public init(_ message: MessageType, spacing: CGFloat = 5) {
+    public init(_ message: MessageType, spacing: CGFloat = .xxSmall) {
         self.message = message
         self.spacing = spacing
     }

diff --git a/Sources/Orbit/Support/Views/TagGroup.swift b/Sources/Orbit/Support/Views/TagGroup.swift
@@ -28,7 +28,7 @@ public struct TagGroup<TM: TagModel>: View {
     private let layout: Layout
 
     public var body: some View {
-        VStack(alignment: .leading, spacing: 1) {
+        VStack(alignment: .leading, spacing: .xxSmall) {
             if label.isEmpty == false {
                 FormFieldLabel(label)
             }