Ref #3838: Fix overall menu height on smaller devices (#3850)

PanModal uses `topOffset` to determine the height of the presenting controller rather than the `longFormHeight`, so adjusting where I add that 32pt's for accessibility to fix the bug caused by adding that 32pt's in the wrong location.
brave · Jun 25, 2021 · e417f20 · e417f20
1 parent a970e62
commit e417f20
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/Client.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Client.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -41,7 +41,7 @@
         "package": "PanModal",
         "repositoryURL": "https://github.com/brave/PanModal",
         "state": {
-          "branch": "master",
+          "branch": null,
           "revision": "e4c07f8e6c5df937051fabc47e1e92901e1d068b",
           "version": null
         }

diff --git a/Client/Frontend/Browser/Toolbars/BottomToolbar/Menu/MenuViewController.swift b/Client/Frontend/Browser/Toolbars/BottomToolbar/Menu/MenuViewController.swift
@@ -215,11 +215,15 @@ extension MenuViewController: PanModalPresentable {
         topVC.view.layoutIfNeeded()
         return _scrollViewChild(in: topVC.view)
     }
+    var topOffset: CGFloat {
+        let topInset = view.window?.safeAreaInsets.top ?? 0
+        return topInset + 32
+    }
     var longFormHeight: PanModalHeight {
-        .maxHeightWithTopInset(32)
+        .maxHeight
     }
     var shortFormHeight: PanModalHeight {
-        isPresentingInnerMenu ? .maxHeightWithTopInset(32) : .contentHeight(initialHeight)
+        isPresentingInnerMenu ? .maxHeight : .contentHeight(initialHeight)
     }
     var allowsExtendedPanScrolling: Bool {
         true