@@ -392,8 +392,15 @@ public class TableView: UIView {
392
392
}
393
393
}
394
394
395
+ public override func didMoveToWindow( ) {
396
+ guard window != nil ,
397
+ observation == nil else { return }
398
+
399
+ setupScrollObserver ( )
400
+ }
401
+
395
402
private func setupScrollObserver( ) {
396
- observation = delegate ? . containerScrollView? . observe ( \. bounds, options: [ . new, . old] ) { [ weak self] container, change in
403
+ observation = self . containerScrollView? . observe ( \. bounds, options: [ . new, . old] ) { [ weak self] container, change in
397
404
self ? . viewportChanged ( )
398
405
}
399
406
}
@@ -438,7 +445,7 @@ public class TableView: UIView {
438
445
// ensure editor is not hidden e.g. inside an Expand in collapsed state
439
446
attachmentContentView. attachment? . containerEditorView? . isHidden == false ,
440
447
tableView. bounds != . zero,
441
- let containerScrollView = delegate ? . containerScrollView,
448
+ let containerScrollView = self . containerScrollView,
442
449
let rootEditorView = containerAttachment? . containerEditorView? . rootEditor else {
443
450
cellsInViewport = [ ]
444
451
return
@@ -812,7 +819,7 @@ extension TableView: UIScrollViewDelegate {
812
819
813
820
extension TableView : TableContentViewDelegate {
814
821
var containerScrollView : UIScrollView ? {
815
- delegate? . containerScrollView
822
+ delegate? . containerScrollView ?? containerAttachment ? . containerEditorView ? . rootEditor . scrollView
816
823
}
817
824
818
825
var viewport : CGRect ? {
0 commit comments