Rename to default and make it work better

RevenueCat · Feb 13, 2025 · d394e84 · d394e84
1 parent ab1be02
commit d394e84
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 12 deletions.
diff --git a/RevenueCatUI/Templates/V2/Components/Stack/StackComponentView.swift b/RevenueCatUI/Templates/V2/Components/Stack/StackComponentView.swift
@@ -111,16 +111,16 @@ struct StackComponentView: View {
         }
         .padding(style.padding)
         .padding(additionalPadding)
-        .scrollableIfEnabled(
-            style.dimension,
-            enabled: style.scrollable ?? self.isScrollableByDefault
-        )
         .shape(border: nil,
                shape: style.shape,
                background: style.backgroundStyle,
                uiConfigProvider: self.viewModel.uiConfigProvider)
         .apply(badge: style.badge, border: style.border, shadow: style.shadow, shape: style.shape)
         .padding(style.margin)
+        .scrollableIfEnabled(
+            style.dimension,
+            enabled: style.scrollable ?? self.isScrollableByDefault
+        )
     }
 
 }

diff --git a/RevenueCatUI/Templates/V2/Components/Stack/StackComponentViewModel.swift b/RevenueCatUI/Templates/V2/Components/Stack/StackComponentViewModel.swift
@@ -173,12 +173,12 @@ struct StackComponentStyle {
 
         self.scrollable = overflow.flatMap({ overflow in
             switch overflow {
-            case .none:
+            case .default:
                 return false
             case .scroll:
                 return true
             }
-        }) ?? false
+        })
     }
 
     var vstackStrategy: StackStrategy {

diff --git a/RevenueCatUI/Templates/V2/Previews/TemplateComponentsViewPreviews/Template1Preview.swift b/RevenueCatUI/Templates/V2/Previews/TemplateComponentsViewPreviews/Template1Preview.swift
@@ -95,6 +95,17 @@ private enum Template1Preview {
         stack: packageStack
     )
 
+    static let bodyStack = PaywallComponent.StackComponent(
+        components: [
+            .text(body),
+            .package(package)
+        ],
+        dimension: .vertical(.center, .start),
+        size: .init(width: .fill, height: .fit),
+        spacing: 30,
+        backgroundColor: nil
+    )
+
     static let purchaseButton = PaywallComponent.PurchaseButtonComponent(
         stack: .init(
             components: [
@@ -117,10 +128,11 @@ private enum Template1Preview {
     static let contentStack = PaywallComponent.StackComponent(
         components: [
             .text(title),
-            .text(body),
-            .package(package),
+            .stack(bodyStack),
             .purchaseButton(purchaseButton)
         ],
+        dimension: .vertical(.center, .spaceEvenly),
+        size: .init(width: .fill, height: .fill),
         spacing: 30,
         backgroundColor: nil,
         margin: .init(top: 0,
@@ -134,8 +146,9 @@ private enum Template1Preview {
             .image(catImage),
             .stack(contentStack)
         ],
-        spacing: 20,
-        backgroundColor: nil
+        dimension: .vertical(.center, .start),
+        size: .init(width: .fill, height: .fill),
+        spacing: 0
     )
 
     static let paywallComponents: Offering.PaywallComponents = .init(
@@ -161,7 +174,8 @@ private enum Template1Preview {
                 stack: .init(
                     components: [
                         .stack(stack)
-                    ]
+                    ],
+                    overflow: .default
                 ),
                 stickyFooter: nil,
                 background: .color(.init(

diff --git a/Sources/Paywalls/Components/PaywallStackComponent.swift b/Sources/Paywalls/Components/PaywallStackComponent.swift
@@ -19,7 +19,7 @@ public extension PaywallComponent {
     final class StackComponent: PaywallComponentBase {
 
         public enum Overflow: PaywallComponentBase {
-            case none
+            case `default`
             case scroll
         }