Make virtualised tableview use EditorView as default scrollview if no…

…t provided via delegatre
rajdeep · Aug 8, 2024 · df71fce · df71fce
1 parent b8d59a2
commit df71fce
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 5 deletions.
diff --git a/ExampleApp/ExampleApp/AdvancedFeatures/CommandsExampleViewController.swift b/ExampleApp/ExampleApp/AdvancedFeatures/CommandsExampleViewController.swift
@@ -492,7 +492,8 @@ extension CommandsExampleViewController: TableViewDelegate {
     }
 
     var containerScrollView: UIScrollView? {
-        editor.scrollView
+        nil
+//        editor.scrollView
     }
 
     func tableView(_ tableView: TableView, didReceiveKey key: EditorKey, at range: NSRange, in cell: TableCell) { }

diff --git a/Proton/Sources/Swift/Table/TableView.swift b/Proton/Sources/Swift/Table/TableView.swift
@@ -392,8 +392,15 @@ public class TableView: UIView {
         }
     }
 
+    public override func didMoveToWindow() {
+        guard window != nil,
+            observation == nil else { return }
+
+        setupScrollObserver()
+    }
+
     private func setupScrollObserver() {
-        observation = delegate?.containerScrollView?.observe(\.bounds, options: [.new, .old]) { [weak self] container, change in
+        observation = self.containerScrollView?.observe(\.bounds, options: [.new, .old]) { [weak self] container, change in
             self?.viewportChanged()
         }
     }
@@ -438,7 +445,7 @@ public class TableView: UIView {
               // ensure editor is not hidden e.g. inside an Expand in collapsed state
               attachmentContentView.attachment?.containerEditorView?.isHidden == false,
               tableView.bounds != .zero,
-              let containerScrollView = delegate?.containerScrollView,
+              let containerScrollView = self.containerScrollView,
               let rootEditorView = containerAttachment?.containerEditorView?.rootEditor else {
             cellsInViewport = []
             return
@@ -812,7 +819,7 @@ extension TableView: UIScrollViewDelegate {
 
 extension TableView: TableContentViewDelegate {
     var containerScrollView: UIScrollView? {
-        delegate?.containerScrollView
+        delegate?.containerScrollView ?? containerAttachment?.containerEditorView?.rootEditor.scrollView
     }
 
     var viewport: CGRect? {

diff --git a/Proton/Tests/Table/TableViewAttachmentSnapshotTests.swift b/Proton/Tests/Table/TableViewAttachmentSnapshotTests.swift
@@ -34,7 +34,7 @@ class TableViewAttachmentSnapshotTests: SnapshotTestCase {
         delegate = MockTableViewDelegate()
         viewController = EditorTestViewController()
         editor = viewController.editor
-        delegate.containerScrollView = editor.scrollView
+        // Not setting delegate.containerScrollview expects the editor.scrollview as default scrollview
     }
 
     func testRendersTableViewAttachment() {