From 82da8837c02fdd2b34734180d8433df24b36b3b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Buczek?= <michal.buczek@protonmail.com>
Date: Fri, 15 Dec 2023 01:10:51 +0100
Subject: [PATCH] Fix #8547: Page zoom freeze (#8570)

Fix autolayout issue

Co-authored-by: Brandon T <JustBrandonT@gmail.com>
---
 .../Brave/Frontend/Browser/BrowserViewController.swift    | 8 ++------
 .../Brave/Frontend/Browser/PageZoom/PageZoomView.swift    | 2 ++
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/Sources/Brave/Frontend/Browser/BrowserViewController.swift b/Sources/Brave/Frontend/Browser/BrowserViewController.swift
index e922adac645..a9ccbbc0605 100644
--- a/Sources/Brave/Frontend/Browser/BrowserViewController.swift
+++ b/Sources/Brave/Frontend/Browser/BrowserViewController.swift
@@ -1537,7 +1537,7 @@ public class BrowserViewController: UIViewController {
       toolbar?.line.isHidden = isUsingBottomBar
     }
     
-    header.expandedBarStackView.removeArrangedSubview(tabsBar.view)
+    tabsBar.view.removeFromSuperview()
     if isUsingBottomBar {
       header.expandedBarStackView.insertArrangedSubview(tabsBar.view, at: 0)
     } else {
@@ -2340,11 +2340,6 @@ public class BrowserViewController: UIViewController {
   func displayPageZoom(visible: Bool) {
     if !visible || pageZoomBar != nil {
       pageZoomBar?.view.removeFromSuperview()
-
-      if let zoomBarView = pageZoomBar?.view {
-        alertStackView.removeArrangedSubview(zoomBarView)
-      }
-        
       updateViewConstraints()
       pageZoomBar = nil
       
@@ -2379,6 +2374,7 @@ public class BrowserViewController: UIViewController {
 
     pageZoomBar.view.snp.makeConstraints { make in
       make.height.greaterThanOrEqualTo(UIConstants.toolbarHeight)
+      make.height.equalTo(UIConstants.toolbarHeight).priority(.high)
       make.edges.equalTo(alertStackView)
     }
     
diff --git a/Sources/Brave/Frontend/Browser/PageZoom/PageZoomView.swift b/Sources/Brave/Frontend/Browser/PageZoom/PageZoomView.swift
index cac212e6e1f..455f37d46bd 100644
--- a/Sources/Brave/Frontend/Browser/PageZoom/PageZoomView.swift
+++ b/Sources/Brave/Frontend/Browser/PageZoom/PageZoomView.swift
@@ -104,6 +104,7 @@ struct PageZoomView: View {
       HStack(spacing: 0.0) {
         Text(Strings.PageZoom.zoomViewText)
           .font(.system(.subheadline))
+          .fixedSize(horizontal: false, vertical: true)
           .frame(maxWidth: .infinity, alignment: .leading)
         ZoomView(
           isPrivateBrowsing: isPrivateBrowsing,
@@ -127,6 +128,7 @@ struct PageZoomView: View {
       .padding(.vertical, 6.0)
     }
     .background(Color(UIColor.braveBackground))
+    .ignoresSafeArea()
   }
   
   private func increment() {