Conditional Visibility

RevenueCatUI/Templates/V2/Components/Carousel/CarouselComponentView.swift

@@ -48,12 +48,14 @@ struct CarouselComponentView: View {
         viewModel.styles(
             state: self.componentViewState,
             condition: self.screenCondition,
+            packageContext: self.packageContext,
             isEligibleForIntroOffer: self.introOfferEligibilityContext.isEligible(
                 package: self.packageContext.package
             ),
             isEligibleForPromoOffer: self.paywallPromoOfferCache.isMostLikelyEligible(
                 for: self.packageContext.package
             ),
+            anyPackageHasPromoOffer: self.packageContext.hasEligiblePromoOffer(using: self.paywallPromoOfferCache),
             colorScheme: colorScheme
         ) { style in
             if style.visible {

RevenueCatUI/Templates/V2/Components/Carousel/CarouselComponentViewModel.swift

@@ -48,8 +48,10 @@ class CarouselComponentViewModel {
     func styles(
         state: ComponentViewState,
         condition: ScreenCondition,
+        packageContext: PackageContext,
         isEligibleForIntroOffer: Bool,
         isEligibleForPromoOffer: Bool,
+        anyPackageHasPromoOffer: Bool,
         colorScheme: ColorScheme,
         @ViewBuilder apply: @escaping (CarouselComponentStyle) -> some View
     ) -> some View {
@@ -58,6 +60,9 @@ class CarouselComponentViewModel {
             condition: condition,
             isEligibleForIntroOffer: isEligibleForIntroOffer,
             isEligibleForPromoOffer: isEligibleForPromoOffer,
+            anyPackageHasIntroOffer: packageContext.variableContext.hasAnyIntroOffer,
+            anyPackageHasPromoOffer: anyPackageHasPromoOffer,
+            selectedPackage: packageContext.package,
             with: self.presentedOverrides
         )
 

RevenueCatUI/Templates/V2/Components/Icon/IconComponentView.swift

@@ -44,12 +44,14 @@ struct IconComponentView: View {
         self.viewModel.styles(
             state: self.componentViewState,
             condition: self.screenCondition,
+            packageContext: self.packageContext,
             isEligibleForIntroOffer: self.introOfferEligibilityContext.isEligible(
                 package: self.packageContext.package
             ),
             isEligibleForPromoOffer: self.paywallPromoOfferCache.isMostLikelyEligible(
                 for: self.packageContext.package
             ),
+            anyPackageHasPromoOffer: self.packageContext.hasEligiblePromoOffer(using: self.paywallPromoOfferCache),
             colorScheme: colorScheme
         ) { style in
             if style.visible {

RevenueCatUI/Templates/V2/Components/Icon/IconComponentViewModel.swift

@@ -90,8 +90,10 @@ class IconComponentViewModel {
     func styles(
         state: ComponentViewState,
         condition: ScreenCondition,
+        packageContext: PackageContext,
         isEligibleForIntroOffer: Bool,
         isEligibleForPromoOffer: Bool,
+        anyPackageHasPromoOffer: Bool,
         colorScheme: ColorScheme,
         @ViewBuilder apply: @escaping (IconComponentStyle) -> some View
     ) -> some View {
@@ -100,6 +102,9 @@ class IconComponentViewModel {
             condition: condition,
             isEligibleForIntroOffer: isEligibleForIntroOffer,
             isEligibleForPromoOffer: isEligibleForPromoOffer,
+            anyPackageHasIntroOffer: packageContext.variableContext.hasAnyIntroOffer,
+            anyPackageHasPromoOffer: anyPackageHasPromoOffer,
+            selectedPackage: packageContext.package,
             with: self.presentedOverrides
         )
 

RevenueCatUI/Templates/V2/Components/Image/ImageComponentView.swift

@@ -46,12 +46,14 @@ struct ImageComponentView: View {
         viewModel.styles(
             state: self.componentViewState,
             condition: self.screenCondition,
+            packageContext: self.packageContext,
             isEligibleForIntroOffer: self.introOfferEligibilityContext.isEligible(
                 package: self.packageContext.package
             ),
             isEligibleForPromoOffer: self.paywallPromoOfferCache.isMostLikelyEligible(
                 for: self.packageContext.package
             ),
+            anyPackageHasPromoOffer: self.packageContext.hasEligiblePromoOffer(using: self.paywallPromoOfferCache),
             colorScheme: colorScheme
         ) { style in
             if style.visible {

RevenueCatUI/Templates/V2/Components/Image/ImageComponentViewModel.swift

@@ -52,8 +52,10 @@ class ImageComponentViewModel {
     func styles(
         state: ComponentViewState,
         condition: ScreenCondition,
+        packageContext: PackageContext,
         isEligibleForIntroOffer: Bool,
         isEligibleForPromoOffer: Bool,
+        anyPackageHasPromoOffer: Bool,
         colorScheme: ColorScheme,
         @ViewBuilder apply: @escaping (ImageComponentStyle) -> some View
     ) -> some View {
@@ -62,6 +64,9 @@ class ImageComponentViewModel {
             condition: condition,
             isEligibleForIntroOffer: isEligibleForIntroOffer,
             isEligibleForPromoOffer: isEligibleForPromoOffer,
+            anyPackageHasIntroOffer: packageContext.variableContext.hasAnyIntroOffer,
+            anyPackageHasPromoOffer: anyPackageHasPromoOffer,
+            selectedPackage: packageContext.package,
             with: self.presentedOverrides
         )
         let partial = localizedPartial?.partial

RevenueCatUI/Templates/V2/Components/Stack/StackComponentView.swift

@@ -65,12 +65,14 @@ struct StackComponentView: View {
         viewModel.styles(
             state: self.componentViewState,
             condition: self.screenCondition,
+            packageContext: self.packageContext,
             isEligibleForIntroOffer: self.introOfferEligibilityContext.isEligible(
                 package: self.packageContext.package
             ),
             isEligibleForPromoOffer: self.paywallPromoOfferCache.isMostLikelyEligible(
                 for: self.packageContext.package
             ),
+            anyPackageHasPromoOffer: self.packageContext.hasEligiblePromoOffer(using: self.paywallPromoOfferCache),
             colorScheme: colorScheme
         ) { style in
             if style.visible {

RevenueCatUI/Templates/V2/Components/Stack/StackComponentViewModel.swift

@@ -59,8 +59,10 @@ class StackComponentViewModel {
     func styles(
         state: ComponentViewState,
         condition: ScreenCondition,
+        packageContext: PackageContext,
         isEligibleForIntroOffer: Bool,
         isEligibleForPromoOffer: Bool,
+        anyPackageHasPromoOffer: Bool,
         colorScheme: ColorScheme,
         @ViewBuilder apply: @escaping (StackComponentStyle) -> some View
     ) -> some View {
@@ -69,6 +71,9 @@ class StackComponentViewModel {
             condition: condition,
             isEligibleForIntroOffer: isEligibleForIntroOffer,
             isEligibleForPromoOffer: isEligibleForPromoOffer,
+            anyPackageHasIntroOffer: packageContext.variableContext.hasAnyIntroOffer,
+            anyPackageHasPromoOffer: anyPackageHasPromoOffer,
+            selectedPackage: packageContext.package,
             with: self.presentedOverrides
         )
 

RevenueCatUI/Templates/V2/Components/Tabs/TabsComponentViewModel.swift

@@ -58,7 +58,6 @@ class TabViewModel {
     let stackViewModel: StackComponentViewModel
     let defaultSelectedPackage: Package?
     let packages: [Package]
-
     init(
         tab: PaywallComponent.TabsComponent.Tab,
         stackViewModel: StackComponentViewModel,

RevenueCatUI/Templates/V2/Components/Text/TextComponentView.swift

@@ -55,6 +55,7 @@ struct TextComponentView: View {
                 package: self.packageContext.package
             ),
             promoOffer: self.paywallPromoOfferCache.get(for: self.packageContext.package),
+            anyPackageHasPromoOffer: self.packageContext.hasEligiblePromoOffer(using: self.paywallPromoOfferCache),
             countdownTime: countdownTime
         ) { style in
             if style.visible {
@@ -679,9 +680,7 @@ struct TextComponentView_Previews: PreviewProvider {
                     text: "id_1",
                     color: .init(light: .hex("#000000")),
                     overrides: [
-                        .init(conditions: [
-                            .medium
-                        ], properties: .init(
+                        .init(conditions: [ ], properties: .init(
                             text: "id_2"
                         ))
                     ]
@@ -710,9 +709,7 @@ struct TextComponentView_Previews: PreviewProvider {
                     text: "id_1",
                     color: .init(light: .hex("#000000")),
                     overrides: [
-                        .init(conditions: [
-                            .medium
-                        ], properties: .init(
+                        .init(conditions: [ .screenSize(.in, ["medium"]) ], properties: .init(
                             text: "id_2"
                         ))
                     ]

RevenueCatUI/Templates/V2/Components/Text/TextComponentViewModel.swift

@@ -51,6 +51,7 @@ class TextComponentViewModel {
         packageContext: PackageContext,
         isEligibleForIntroOffer: Bool,
         promoOffer: PromotionalOffer?,
+        anyPackageHasPromoOffer: Bool,
         countdownTime: CountdownTime? = nil,
         @ViewBuilder apply: @escaping (TextComponentStyle) -> some View
     ) -> some View {
@@ -59,6 +60,9 @@ class TextComponentViewModel {
             condition: condition,
             isEligibleForIntroOffer: isEligibleForIntroOffer,
             isEligibleForPromoOffer: promoOffer != nil,
+            anyPackageHasIntroOffer: packageContext.variableContext.hasAnyIntroOffer,
+            anyPackageHasPromoOffer: anyPackageHasPromoOffer,
+            selectedPackage: packageContext.package,
             with: self.presentedOverrides
         )
         let partial = localizedPartial?.partial

RevenueCatUI/Templates/V2/Components/Timeline/TimelineComponentView.swift

@@ -47,37 +47,43 @@ struct TimelineComponentView: View {
     @State private var maxIconWidth: CGFloat = 0
 
     var body: some View {
+        let anyPromoOffer = self.packageContext.hasEligiblePromoOffer(using: self.paywallPromoOfferCache)
         viewModel.styles(
             state: self.componentViewState,
             condition: self.screenCondition,
+            packageContext: self.packageContext,
             isEligibleForIntroOffer: self.introOfferEligibilityContext.isEligible(
                 package: self.packageContext.package
             ),
             isEligibleForPromoOffer: self.paywallPromoOfferCache.isMostLikelyEligible(
                 for: self.packageContext.package
-            )
+            ),
+            anyPackageHasPromoOffer: anyPromoOffer
         ) { style in
             if style.visible {
-                timeline(style: style)
+                timeline(style: style, anyPackageHasPromoOffer: anyPromoOffer)
             }
         }
     }
 
     @ViewBuilder
     private func timeline(
-        style: TimelineComponentStyle
+        style: TimelineComponentStyle,
+        anyPackageHasPromoOffer: Bool
     ) -> some View {
         VStack(alignment: .leading, spacing: style.itemSpacing ?? 0) {
             ForEach(viewModel.items, id: \.component) { item in
                 item.styles(
                     state: self.componentViewState,
                     condition: self.screenCondition,
+                    packageContext: self.packageContext,
                     isEligibleForIntroOffer: self.introOfferEligibilityContext.isEligible(
                         package: self.packageContext.package
                     ),
                     isEligibleForPromoOffer: self.paywallPromoOfferCache.isMostLikelyEligible(
                         for: self.packageContext.package
-                    )
+                    ),
+                    anyPackageHasPromoOffer: anyPackageHasPromoOffer
                 ) { itemStyle in
                     if itemStyle.visible {
                         timelineRow(itemStyle: itemStyle, style: style)
@@ -97,12 +103,14 @@ struct TimelineComponentView: View {
                     item.styles(
                         state: self.componentViewState,
                         condition: self.screenCondition,
+                        packageContext: self.packageContext,
                         isEligibleForIntroOffer: self.introOfferEligibilityContext.isEligible(
                             package: self.packageContext.package
                         ),
                         isEligibleForPromoOffer: self.paywallPromoOfferCache.isMostLikelyEligible(
                             for: self.packageContext.package
-                        )
+                        ),
+                        anyPackageHasPromoOffer: anyPackageHasPromoOffer
                     ) { itemStyle in
                         if itemStyle.visible {
                             let next = viewModel.items.indices.contains(index + 1) ? viewModel.items[index + 1] : nil

RevenueCatUI/Templates/V2/Components/Timeline/TimelineComponentViewModel.swift

@@ -44,18 +44,24 @@ class TimelineComponentViewModel {
     }
 
     @ViewBuilder
+    // swiftlint:disable:next function_parameter_count
     func styles(
         state: ComponentViewState,
         condition: ScreenCondition,
+        packageContext: PackageContext,
         isEligibleForIntroOffer: Bool,
         isEligibleForPromoOffer: Bool,
+        anyPackageHasPromoOffer: Bool,
         @ViewBuilder apply: @escaping (TimelineComponentStyle) -> some View
     ) -> some View {
         let partial = PresentedTimelinePartial.buildPartial(
             state: state,
             condition: condition,
             isEligibleForIntroOffer: isEligibleForIntroOffer,
             isEligibleForPromoOffer: isEligibleForPromoOffer,
+            anyPackageHasIntroOffer: packageContext.variableContext.hasAnyIntroOffer,
+            anyPackageHasPromoOffer: anyPackageHasPromoOffer,
+            selectedPackage: packageContext.package,
             with: self.presentedOverrides
         )
 
@@ -99,18 +105,24 @@ class TimelineItemViewModel {
     }
 
     @ViewBuilder
+    // swiftlint:disable:next function_parameter_count
     func styles(
         state: ComponentViewState,
         condition: ScreenCondition,
+        packageContext: PackageContext,
         isEligibleForIntroOffer: Bool,
         isEligibleForPromoOffer: Bool,
+        anyPackageHasPromoOffer: Bool,
         @ViewBuilder apply: @escaping (TimelineItemStyle) -> some View
     ) -> some View {
         let partial = PresentedTimelineItemPartial.buildPartial(
             state: state,
             condition: condition,
             isEligibleForIntroOffer: isEligibleForIntroOffer,
             isEligibleForPromoOffer: isEligibleForPromoOffer,
+            anyPackageHasIntroOffer: packageContext.variableContext.hasAnyIntroOffer,
+            anyPackageHasPromoOffer: anyPackageHasPromoOffer,
+            selectedPackage: packageContext.package,
             with: self.presentedOverrides
         )
 

RevenueCatUI/Templates/V2/Components/Video/VideoComponentView.swift

@@ -49,12 +49,14 @@ struct VideoComponentView: View {
             .styles(
                 state: componentViewState,
                 condition: screenCondition,
+                packageContext: self.packageContext,
                 isEligibleForIntroOffer: self.introOfferEligibilityContext.isEligible(
                     package: self.packageContext.package
                 ),
                 isEligibleForPromoOffer: self.paywallPromoOfferCache.isMostLikelyEligible(
                     for: self.packageContext.package
                 ),
+                anyPackageHasPromoOffer: self.packageContext.hasEligiblePromoOffer(using: self.paywallPromoOfferCache),
                 colorScheme: colorScheme
             ) { style in
                 if style.visible {

RevenueCatUI/Templates/V2/Components/Video/VideoComponentViewModel.swift

@@ -47,8 +47,10 @@ class VideoComponentViewModel {
     func styles(
         state: ComponentViewState,
         condition: ScreenCondition,
+        packageContext: PackageContext,
         isEligibleForIntroOffer: Bool,
         isEligibleForPromoOffer: Bool,
+        anyPackageHasPromoOffer: Bool,
         colorScheme: ColorScheme,
         @ViewBuilder apply: @escaping (VideoComponentStyle) -> some View
     ) -> some View {
@@ -57,6 +59,9 @@ class VideoComponentViewModel {
             condition: condition,
             isEligibleForIntroOffer: isEligibleForIntroOffer,
             isEligibleForPromoOffer: isEligibleForPromoOffer,
+            anyPackageHasIntroOffer: packageContext.variableContext.hasAnyIntroOffer,
+            anyPackageHasPromoOffer: anyPackageHasPromoOffer,
+            selectedPackage: packageContext.package,
             with: self.presentedOverrides
         )
         let partial = localizedPartial?.partial