fix: useParentScroll related bug (#51)

* fix: useParentScroll related bug Signed-off-by: Daniel Tes Carrasque <daniel@zup.com.br> * testCodableListView changes Signed-off-by: Daniel Tes Carrasque <daniel@zup.com.br> Signed-off-by: Daniel Tes Carrasque <daniel@zup.com.br>
ZupIT · Dec 16, 2022 · e3a36ca · e3a36ca
1 parent 9753f65
commit e3a36ca
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 3 deletions.
diff --git a/...ivenComponent/ListView/__Snapshots__/ListViewTests/testCodableListViewWithTemplate.1.json b/...ivenComponent/ListView/__Snapshots__/ListViewTests/testCodableListViewWithTemplate.1.json
@@ -29,5 +29,6 @@
         }
       }
     }
-  ]
+  ],
+  "useParentScroll" : true
 }
diff --git a/Sources/Beagle/Sources/Components/Widget/GridView/GridView+Extensions.swift b/Sources/Beagle/Sources/Components/Widget/GridView/GridView+Extensions.swift
@@ -31,7 +31,8 @@ extension GridView {
                 onScrollEnd: onScrollEnd,
                 scrollEndThreshold: CGFloat(scrollEndThreshold ?? 100),
                 isScrollIndicatorVisible: isScrollIndicatorVisible ?? false,
-                dataSourceExpression: dataSource
+                dataSourceExpression: dataSource,
+                useParentScroll: useParentScroll
             ),
             renderer: renderer
         )

diff --git a/Sources/Beagle/Sources/Components/Widget/GridView/GridView.swift b/Sources/Beagle/Sources/Components/Widget/GridView/GridView.swift
@@ -58,6 +58,8 @@ public struct GridView: Widget, HasContext, InitiableComponent {
 
     /// This attribute enables or disables the scroll indicator.
     public var isScrollIndicatorVisible: Bool?
+
+    public var useParentScroll: Bool?
 
     public var id: String?
     public var style: Style?

diff --git a/Sources/Beagle/Sources/Components/Widget/ListView/ListView+Extensions.swift b/Sources/Beagle/Sources/Components/Widget/ListView/ListView+Extensions.swift
@@ -29,7 +29,8 @@ extension ListView {
                 onScrollEnd: onScrollEnd,
                 scrollEndThreshold: CGFloat(scrollEndThreshold ?? 100),
                 isScrollIndicatorVisible: isScrollIndicatorVisible ?? false,
-                dataSourceExpression: dataSource
+                dataSourceExpression: dataSource,
+                useParentScroll: useParentScroll
             ),
             renderer: renderer
         )

diff --git a/Sources/Beagle/Sources/Components/Widget/ListView/ListView.swift b/Sources/Beagle/Sources/Components/Widget/ListView/ListView.swift
@@ -55,6 +55,8 @@ public struct ListView: Widget, HasContext, InitiableComponent {
 
     /// This attribute enables or disables the scroll indicator.
     public var isScrollIndicatorVisible: Bool?
+
+    public var useParentScroll: Bool?
 
     public var id: String?
     public var style: Style?
@@ -88,6 +90,7 @@ extension ListView {
         case id
         case style
         case accessibility
+        case useParentScroll
     }
 
     public init(from decoder: Decoder) throws {
@@ -106,6 +109,7 @@ extension ListView {
         id = try container.decodeIfPresent(String.self, forKey: .id)
         style = try container.decodeIfPresent(Style.self, forKey: .style) ?? Style()
         accessibility = try container.decodeIfPresent(Accessibility.self, forKey: .accessibility)
+        useParentScroll = try container.decodeIfPresent(Bool.self, forKey: .useParentScroll)
 
         self.templates = try container.decodeIfPresent([Template].self, forKey: .templates) ?? []
         self.dataSource = try container.decode(Expression<[DynamicObject]>.self, forKey: .dataSource)

diff --git a/Sources/Beagle/Sources/Components/Widget/ListView/ListViewUIComponent.swift b/Sources/Beagle/Sources/Components/Widget/ListView/ListViewUIComponent.swift
@@ -107,6 +107,10 @@ final class ListViewUIComponent: UIView {
         collection.delegate = self
         collection.showsHorizontalScrollIndicator = model.isScrollIndicatorVisible
         collection.showsVerticalScrollIndicator = model.isScrollIndicatorVisible
+
+        if model.useParentScroll == true {
+            collection.isScrollEnabled = false
+        }
 
         let parentController = listController.renderer.controller
         parentController?.addChild(listController)
@@ -244,6 +248,7 @@ extension ListViewUIComponent {
         var scrollEndThreshold: CGFloat
         var isScrollIndicatorVisible: Bool
         var dataSourceExpression: Expression<[DynamicObject]>
+        var useParentScroll: Bool?
     }
 }