Fix #4463 / #4464: Fixes the interaction of Favourites reordering wit…

…h default browser modal (#4469)
brave · Nov 5, 2021 · f1c5010 · f1c5010
1 parent 1cce427
commit f1c5010
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/Client/Frontend/Browser/New Tab Page/NewTabCenteredCollectionViewCell.swift b/Client/Frontend/Browser/New Tab Page/NewTabCenteredCollectionViewCell.swift
@@ -17,6 +17,8 @@ class NewTabCenteredCollectionViewCell<View: UIView>: UICollectionViewCell, Coll
         view.snp.remakeConstraints {
             $0.top.bottom.equalToSuperview()
             $0.centerX.equalToSuperview()
+            $0.leading.greaterThanOrEqualToSuperview()
+            $0.trailing.lessThanOrEqualToSuperview()
         }
     }
 

diff --git a/Client/Frontend/Browser/New Tab Page/Sections/NTPDefaultBrowserCalloutProvider.swift b/Client/Frontend/Browser/New Tab Page/Sections/NTPDefaultBrowserCalloutProvider.swift
@@ -10,6 +10,7 @@ import BraveShared
 
 class NTPDefaultBrowserCalloutProvider: NSObject, NTPObservableSectionProvider {
     var sectionDidChange: (() -> Void)?
+    private var defaultCalloutView = DefaultBrowserCalloutView()
 
     private typealias DefaultBrowserCalloutCell = NewTabCenteredCollectionViewCell<DefaultBrowserCalloutView>
 
@@ -43,7 +44,10 @@ class NTPDefaultBrowserCalloutProvider: NSObject, NTPObservableSectionProvider {
                         layout collectionViewLayout: UICollectionViewLayout,
                         sizeForItemAt indexPath: IndexPath) -> CGSize {
 
-        return fittingSizeForCollectionView(collectionView, section: indexPath.section)
+        var size = fittingSizeForCollectionView(collectionView, section: indexPath.section)
+        size.height = defaultCalloutView.systemLayoutSizeFitting(size).height
+
+        return size
     }
 
     func collectionView(_ collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, insetForSectionAt section: Int) -> UIEdgeInsets {