Remove isTrailingIconSeparated parameter replaceable by a call site…

… icon content
kiwicom · Nov 21, 2023 · 8c4f62b · 8c4f62b
1 parent 9b806bd
commit 8c4f62b
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 37 deletions.
diff --git a/Sources/Orbit/Components/Button.swift b/Sources/Orbit/Components/Button.swift
@@ -10,7 +10,6 @@ public struct Button<LeadingIcon: View, TrailingIcon: View>: View, PotentiallyEm
 
     private let label: String
     private let type: ButtonType
-    private let isTrailingIconSeparated: Bool
     private let action: () -> Void
     @ViewBuilder private let leadingIcon: LeadingIcon
     @ViewBuilder private let trailingIcon: TrailingIcon
@@ -21,7 +20,7 @@ public struct Button<LeadingIcon: View, TrailingIcon: View>: View, PotentiallyEm
         } else {
             button
                 .buttonStyle(
-                    OrbitButtonStyle(type: type, isTrailingIconSeparated: isTrailingIconSeparated) {
+                    OrbitButtonStyle(type: type) {
                         leadingIcon
                     } trailingIcon: {
                         trailingIcon
@@ -59,14 +58,9 @@ public extension Button {
         icon: Icon.Symbol? = nil,
         disclosureIcon: Icon.Symbol? = nil,
         type: ButtonType = .primary,
-        isTrailingIconSeparated: Bool = false,
         action: @escaping () -> Void
     ) where LeadingIcon == Icon, TrailingIcon == Icon {
-        self.init(
-            label,
-            type: type,
-            isTrailingIconSeparated: isTrailingIconSeparated
-        ) {
+        self.init(label, type: type) {
             action()
         } icon: {
             Icon(icon)
@@ -84,14 +78,12 @@ public extension Button {
     init(
         _ label: String = "",
         type: ButtonType = .primary,
-        isTrailingIconSeparated: Bool = false,
         action: @escaping () -> Void,
         @ViewBuilder icon: () -> LeadingIcon,
         @ViewBuilder disclosureIcon: () -> TrailingIcon = { EmptyView() }
     ) {
         self.label = label
         self.type = type
-        self.isTrailingIconSeparated = isTrailingIconSeparated
         self.action = action
         self.leadingIcon = icon()
         self.trailingIcon = disclosureIcon()

diff --git a/Sources/Orbit/Support/ButtonStyles/OrbitButtonStyle.swift b/Sources/Orbit/Support/ButtonStyles/OrbitButtonStyle.swift
@@ -11,7 +11,6 @@ public struct OrbitButtonStyle<LeadingIcon: View, TrailingIcon: View>: Primitive
     @Environment(\.textColor) private var textColor
 
     private var type: ButtonType
-    private var isTrailingIconSeparated: Bool
     @ViewBuilder private let icon: LeadingIcon
     @ViewBuilder private let disclosureIcon: TrailingIcon
 
@@ -20,7 +19,6 @@ public struct OrbitButtonStyle<LeadingIcon: View, TrailingIcon: View>: Primitive
             configuration: configuration,
             horizontalPadding: padding,
             verticalPadding: padding,
-            isTrailingIconSeparated: isTrailingIconSeparated,
             hapticFeedback: hapticFeedback
         ) {
             icon
@@ -106,12 +104,10 @@ public struct OrbitButtonStyle<LeadingIcon: View, TrailingIcon: View>: Primitive
     /// Create button style for Orbit ``Button`` component.
     public init(
         type: ButtonType = .primary,
-        isTrailingIconSeparated: Bool = false,
         @ViewBuilder icon: () -> LeadingIcon = { EmptyView() },
         @ViewBuilder trailingIcon: () -> TrailingIcon = { EmptyView() }
     ) {
         self.type = type
-        self.isTrailingIconSeparated = isTrailingIconSeparated
         self.icon = icon()
         self.disclosureIcon = trailingIcon()
     }

diff --git a/Sources/Orbit/Support/Components/OrbitCustomButtonContent.swift b/Sources/Orbit/Support/Components/OrbitCustomButtonContent.swift
@@ -21,7 +21,6 @@ struct OrbitCustomButtonContent<LeadingIcon: View, TrailingIcon: View>: View {
     var verticalBackgroundPadding: CGFloat = 0
     var cornerRadius: CGFloat = BorderRadius.default
     var spacing: CGFloat = .xxSmall
-    var isTrailingIconSeparated = false
     var hapticFeedback: HapticsProvider.HapticFeedbackType = .light()
     @ViewBuilder let icon: LeadingIcon
     @ViewBuilder let disclosureIcon: TrailingIcon
@@ -31,24 +30,16 @@ struct OrbitCustomButtonContent<LeadingIcon: View, TrailingIcon: View>: View {
             // Maintain height to allow button with no content
             TextStrut()
 
-            if shouldExpand {
-                Spacer(minLength: 0)
-            }
-
             HStack(spacing: spacing) {
                 icon
                 label
                     .padding(.horizontal, horizontalLabelPadding)
                     .layoutPriority(1)
                 disclosureIcon
-                    .frame(maxWidth: disclosureIconMaxWidth, alignment: .trailing)
-            }
-
-            if shouldExpand {
-                Spacer(minLength: 0)
+                    .fixedSize(horizontal: idealSize.horizontal == true, vertical: false)
             }
+            .frame(maxWidth: idealSize.horizontal == true ? nil : .infinity)
         }
-        .frame(maxWidth: idealSize.horizontal == true ? nil : .infinity)
         .padding(.horizontal, horizontalPadding)
         .padding(.vertical, verticalPadding)
         .padding(.horizontal, horizontalBackgroundPadding)
@@ -91,16 +82,6 @@ struct OrbitCustomButtonContent<LeadingIcon: View, TrailingIcon: View>: View {
             backgroundShape?.inactiveView
         }
     }
-
-    var shouldExpand: Bool {
-        idealSize.horizontal != true && isTrailingIconSeparated == false
-    }
-
-    var disclosureIconMaxWidth: CGFloat? {
-        idealSize.horizontal != true && isTrailingIconSeparated
-            ? .infinity
-            : nil
-    }
 }
 
 // MARK: Previews
@@ -159,12 +140,12 @@ struct OrbitCustomButtonContentPreviews: PreviewProvider {
                 horizontalBackgroundPadding: .small,
                 verticalBackgroundPadding: .xSmall,
                 cornerRadius: BorderRadius.default,
-                spacing: .medium,
-                isTrailingIconSeparated: true
+                spacing: .xSmall
             ) {
                 Icon(.grid)
             } disclosureIcon: {
                 Icon(.chevronForward)
+                    .frame(maxWidth: .infinity, alignment: .trailing)
             }
             .textColor(.blueDark)
             .backgroundStyle(.orangeLight, active: .greenLight)