Some work to match UITableView's defaults even better

square · Jan 5, 2024 · 1b6c352 · 1b6c352
1 parent aea7f4c
commit 1b6c352
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/ListableUI/Sources/Internal/SwipeActionsView.swift b/ListableUI/Sources/Internal/SwipeActionsView.swift
@@ -182,7 +182,8 @@ final class SwipeActionsView: UIView {
 
         case .sizeThatFits:
             return buttons.map {
-                max($0.sizeThatFits(UIView.layoutFittingCompressedSize).width, style.minWidth)
+                let minWidth = max($0.sizeThatFits(UIView.layoutFittingCompressedSize).width, style.minWidth)
+                return min(style.maxItemWidth, minWidth)
             }
             .reduce(0, +) + spacingWidth
         }
@@ -265,6 +266,10 @@ private class DefaultSwipeActionButton: UIButton {
 
         titleLabel?.font = .systemFont(ofSize: 15, weight: .medium)
         titleLabel?.lineBreakMode = .byTruncatingTail
+        titleLabel?.numberOfLines = 2
+        titleLabel?.minimumScaleFactor = 0.8
+        titleLabel?.adjustsFontSizeToFitWidth = true
+        titleLabel?.textAlignment = .center
         contentEdgeInsets = UIEdgeInsets(top: 0, left: inset, bottom: 0, right: inset)
         addTarget(self, action: #selector(onTap), for: .primaryActionTriggered)
     }

diff --git a/ListableUI/Sources/Internal/SwipeActionsViewStyle.swift b/ListableUI/Sources/Internal/SwipeActionsViewStyle.swift
@@ -32,7 +32,10 @@ public struct SwipeActionsViewStyle: Equatable {
     public var containerCornerRadius: CGFloat
     public var buttonSizing: ButtonSizing
     public var minWidth: CGFloat
-
+
+    /// The maximum width of individual items. Defaults to 120, matching `UITableView`
+    public var maxItemWidth: CGFloat
+
     /// The percentage of the row content width that is available for laying out swipe action buttons.
     ///
     /// For example, a value of `0.8` represents that the swipe action buttons should occupy no more than
@@ -48,7 +51,8 @@ public struct SwipeActionsViewStyle: Equatable {
         containerCornerRadius: CGFloat = 0,
         buttonSizing: ButtonSizing = .sizeThatFits,
         minWidth: CGFloat = 0,
-        maxWidthRatio: CGFloat = 0.8
+        maxWidthRatio: CGFloat = 0.8,
+        maxItemWidth: CGFloat = 120
     ) {
         self.actionShape = actionShape
         self.interActionSpacing = interActionSpacing
@@ -57,6 +61,7 @@ public struct SwipeActionsViewStyle: Equatable {
         self.containerCornerRadius = containerCornerRadius
         self.buttonSizing = buttonSizing
         self.minWidth = minWidth
+        self.maxItemWidth = maxItemWidth
         self.maxWidthRatio = maxWidthRatio
     }