fixing crash

Parra-Inc · Nov 20, 2024 · f17185d · f17185d
1 parent 3383bb2
commit f17185d
Show file tree

Hide file tree

Showing 2 changed files with 52 additions and 27 deletions.
diff --git a/ios/Sources/Parra/Containers/Widgets/Paywall/ParraPaywallConfig.swift b/ios/Sources/Parra/Containers/Widgets/Paywall/ParraPaywallConfig.swift
@@ -5,6 +5,7 @@
 //  Created by Mick MacCallum on 11/12/24.
 //
 
+import StoreKit
 import SwiftUI
 
 public final class ParraPaywallConfig: ParraContainerConfig {
@@ -13,10 +14,12 @@ public final class ParraPaywallConfig: ParraContainerConfig {
     public init(
         defaultTitle: String = "Premium Membership",
         defaultSubtitle: String =
-            "Start a subscription to our premium membership to access this premium content."
+            "Start a subscription to our premium membership to access this premium content.",
+        visibleRelationships: Product.SubscriptionRelationship = .all
     ) {
         self.defaultTitle = defaultTitle
         self.defaultSubtitle = defaultSubtitle
+        self.visibleRelationships = visibleRelationships
     }
 
     // MARK: - Public
@@ -25,4 +28,10 @@ public final class ParraPaywallConfig: ParraContainerConfig {
 
     public let defaultTitle: String
     public let defaultSubtitle: String
+
+    /// The kinds of subscription option relationships the view makes visible
+    /// when someone is already subscribed to the subscription. This option is
+    /// only relevant when your paywall is configured in the Parra dashboard
+    /// to use a subscription Group ID and not a list of products.
+    public let visibleRelationships: Product.SubscriptionRelationship
 }
diff --git a/ios/Sources/Parra/Containers/Widgets/Paywall/PaywallWidget.swift b/ios/Sources/Parra/Containers/Widgets/Paywall/PaywallWidget.swift
@@ -54,7 +54,48 @@ struct PaywallWidget: ParraContainer {
 
     @Environment(\.parraComponentFactory) private var componentFactory
 
-    @ViewBuilder private var marketingContent: some View {
+    @ViewBuilder
+    @MainActor private var subscriptionStoreView: some View {
+        // capture before passing to Apple's subscription store view to avoid
+        // rendering crash.
+        let marketing = marketingContent()
+
+        if ParraAppEnvironment.isDebugParraDevApp {
+            // Hard-coded to match the group id in the Configuration.storekit file.
+            SubscriptionStoreView(groupID: "4EEAFE70") {
+                marketing
+            }
+        } else {
+            switch contentObserver.initialParams.paywallProducts {
+            case .groupId(let groupId):
+                SubscriptionStoreView(
+                    groupID: groupId,
+                    visibleRelationships: config.visibleRelationships,
+                    marketingContent: {
+                        marketing
+                    }
+                )
+            case .productIds(let productIds):
+                SubscriptionStoreView(
+                    productIDs: productIds,
+                    marketingContent: {
+                        marketing
+                    }
+                )
+            case .products(let products):
+                SubscriptionStoreView(
+                    subscriptions: products,
+                    marketingContent: {
+                        marketing
+                    }
+                )
+            }
+        }
+    }
+
+    @ViewBuilder
+    @MainActor
+    private func marketingContent() -> some View {
         VStack(alignment: .center) {
             withContent(content: contentObserver.content.image) { content in
                 componentFactory.buildAsyncImage(
@@ -78,31 +119,6 @@ struct PaywallWidget: ParraContainer {
         }
         .padding(.top, 34)
     }
-
-    @ViewBuilder
-    @MainActor private var subscriptionStoreView: some View {
-        if ParraAppEnvironment.isDebugParraDevApp {
-            // Hard-coded to match the group id in the Configuration.storekit file.
-            SubscriptionStoreView(groupID: "4EEAFE70") {
-                marketingContent
-            }
-        } else {
-            switch contentObserver.initialParams.paywallProducts {
-            case .groupId(let groupId):
-                SubscriptionStoreView(
-                    groupID: groupId
-                )
-            case .productIds(let productIds):
-                SubscriptionStoreView(
-                    productIDs: productIds
-                )
-            case .products(let products):
-                SubscriptionStoreView(
-                    subscriptions: products
-                )
-            }
-        }
-    }
 }
 
 private extension View {