Merge pull request #2427 from CruGlobal/develop

Merge develop into master
CruGlobal · Jan 29, 2025 · 87d8b2a · 87d8b2a
2 parents 1e947fe + 414fdd9
commit 87d8b2a
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 2 deletions.
diff --git a/...App/Services/Renderer/Views/MobileContent/Views/ContentStack/MobileContentStackView.swift b/...App/Services/Renderer/Views/MobileContent/Views/ContentStack/MobileContentStackView.swift
@@ -473,9 +473,17 @@ extension MobileContentStackView {
 
         for childView in childViews {
 
-            let isSpacerView: Bool = childView is MobileContentSpacerView
+            let isAutoSpacer: Bool
+            let spacerView: MobileContentSpacerView? = childView as? MobileContentSpacerView
 
-            if !isSpacerView && childView.visibilityState != .gone {
+            if let spacerView = spacerView {
+                isAutoSpacer = spacerView.isAuto
+            }
+            else {
+                isAutoSpacer = false
+            }
+
+            if !isAutoSpacer && childView.visibilityState != .gone {
 
                 heightOfChildrenAndItemSpacing += childView.frame.size.height
             }

diff --git a/...ools/App/Services/Renderer/Views/MobileContent/Views/Spacer/MobileContentSpacerView.swift b/...ools/App/Services/Renderer/Views/MobileContent/Views/Spacer/MobileContentSpacerView.swift
@@ -44,6 +44,10 @@ class MobileContentSpacerView: MobileContentView {
         fatalError("init(coder:) has not been implemented")
     }
 
+    var isAuto: Bool {
+        return viewModel.isAuto
+    }
+
     var height: MobileContentSpacerHeight {
         return viewModel.height
     }

diff --git a/...App/Services/Renderer/Views/MobileContent/Views/Spacer/MobileContentSpacerViewModel.swift b/...App/Services/Renderer/Views/MobileContent/Views/Spacer/MobileContentSpacerViewModel.swift
@@ -30,4 +30,14 @@ class MobileContentSpacerViewModel: MobileContentViewModel {
 
         super.init(baseModel: spacerModel, renderedPageContext: renderedPageContext, mobileContentAnalytics: mobileContentAnalytics)
     }
+
+    var isAuto: Bool {
+
+        switch spacerModel.mode {
+        case .auto_:
+            return true
+        default:
+            return false
+        }
+    }
 }