Fix how ghost cells are shown

Author: kean

WordPress/Classes/ViewRelated/Reader/ReaderDiscoverViewController.swift

@@ -63,14 +63,16 @@ class ReaderDiscoverViewController: UIViewController, ReaderDiscoverHeaderViewDe
 
         self.streamVC = streamVC
 
+        if FeatureFlag.readerReset.enabled {
+            // Important to set before `viewDidLoad`
+            streamVC.isReaderResetDiscoverEnabled = true
+            streamVC.setHeaderView(headerView)
+        }
+
         addChild(streamVC)
         view.addSubview(streamVC.view)
         streamVC.view.pinEdges()
         streamVC.didMove(toParent: self)
-
-        if FeatureFlag.readerReset.enabled {
-            streamVC.setHeaderView(headerView)
-        }
     }
 
     /// TODO: (tech-debt) the app currently stores the responses from the `/discover`

WordPress/Classes/ViewRelated/Reader/ReaderStreamViewController+Ghost.swift

@@ -11,12 +11,22 @@ extension ReaderStreamViewController {
 
         ghostableTableView.translatesAutoresizingMaskIntoConstraints = false
         view.addSubview(ghostableTableView)
-        NSLayoutConstraint.activate([
-            ghostableTableView.widthAnchor.constraint(equalTo: tableView.widthAnchor, multiplier: 1),
-            ghostableTableView.heightAnchor.constraint(equalTo: tableView.heightAnchor, multiplier: 1),
-            ghostableTableView.centerXAnchor.constraint(equalTo: tableView.centerXAnchor),
-            ghostableTableView.centerYAnchor.constraint(equalTo: tableView.centerYAnchor)
-        ])
+        if isReaderResetDiscoverEnabled {
+            NSLayoutConstraint.activate([
+                ghostableTableView.topAnchor.constraint(equalTo: tableView.tableHeaderView?.bottomAnchor ?? view.topAnchor),
+                ghostableTableView.leadingAnchor.constraint(equalTo: view.leadingAnchor),
+                ghostableTableView.trailingAnchor.constraint(equalTo: view.trailingAnchor),
+                ghostableTableView.bottomAnchor.constraint(equalTo: view.bottomAnchor),
+            ])
+        } else {
+            view.addSubview(ghostableTableView)
+            NSLayoutConstraint.activate([
+                ghostableTableView.widthAnchor.constraint(equalTo: tableView.widthAnchor, multiplier: 1),
+                ghostableTableView.heightAnchor.constraint(equalTo: tableView.heightAnchor, multiplier: 1),
+                ghostableTableView.centerXAnchor.constraint(equalTo: tableView.centerXAnchor),
+                ghostableTableView.centerYAnchor.constraint(equalTo: tableView.centerYAnchor)
+            ])
+        }
 
         ghostableTableView.accessibilityIdentifier = "Reader Ghost Loading"
         ghostableTableView.cellLayoutMarginsFollowReadableWidth = true

WordPress/Classes/ViewRelated/Reader/ReaderStreamViewController.swift

@@ -260,6 +260,8 @@ import AutomatticTracks
 
     lazy var isSidebarModeEnabled = splitViewController?.isCollapsed == false
 
+    var isReaderResetDiscoverEnabled = false
+
     // MARK: - Factory Methods
 
     /// Convenience method for instantiating an instance of ReaderStreamViewController
@@ -540,6 +542,9 @@ import AutomatticTracks
     // MARK: - Configuration / Topic Presentation
 
     @objc private func configureStreamHeader() {
+        guard !isReaderResetDiscoverEnabled else {
+            return
+        }
         guard let headerView = headerForStream(readerTopic, isLoggedIn: isLoggedIn, container: tableViewController) else {
             tableView.tableHeaderView = nil
             return
@@ -1718,8 +1723,9 @@ extension ReaderStreamViewController {
         if content.contentCount > 0 {
             return
         }
-
-        tableView.tableHeaderView?.isHidden = true
+        if !isReaderResetDiscoverEnabled {
+            tableView.tableHeaderView?.isHidden = true
+        }
         configureResultsStatus(title: ResultsStatusText.fetchingPostsTitle, accessoryView: NoResultsViewController.loadingAccessoryView())
         displayResultsStatus()
         showGhost()
@@ -1739,7 +1745,9 @@ extension ReaderStreamViewController {
             return
         }
 
-        tableView.tableHeaderView?.isHidden = true
+        if !isReaderResetDiscoverEnabled {
+            tableView.tableHeaderView?.isHidden = true
+        }
 
         guard connectionAvailable() else {
             displayNoConnectionView()