Merge branch 'hotfix/1.9.8' into master

element-hq · Oct 13, 2022 · 9b489db · 9b489db
1 parent 7f48870
commit 9b489db
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 6 deletions.
diff --git a/Riot/Categories/UIViewController+RiotSearch.m b/Riot/Categories/UIViewController+RiotSearch.m
@@ -89,8 +89,12 @@ - (void)showSearch:(BOOL)animated
         self.navigationItem.leftBarButtonItem = nil;
 
         // Add the search bar
-        self.navigationItem.titleView = self.searchBar;
-
+        UIView *searchBarContainer = [[UIView alloc] initWithFrame:CGRectMake(0, 0, [UIScreen mainScreen].bounds.size.width, 44)];
+        searchBarContainer.backgroundColor = [UIColor clearColor];
+        searchBarContainer.autoresizingMask = UIViewAutoresizingFlexibleWidth;
+
+        self.navigationItem.titleView = searchBarContainer;
+        [searchBarContainer addSubview:self.searchBar];
         self.extendedLayoutIncludesOpaqueBars = YES;
 
         // On iPad, there is no cancel button inside the UISearchBar
@@ -177,8 +181,9 @@ - (UIViewControllerRiotSearchInternals *)searchInternals
         // Initialise internal data at the first call
         searchInternals = [[UIViewControllerRiotSearchInternals alloc] init];
 
-        UISearchBar *searchBar = [[UISearchBar alloc] init];
+        UISearchBar *searchBar = [[UISearchBar alloc] initWithFrame:CGRectMake(0, 0, [UIScreen mainScreen].bounds.size.width, 44)];
         searchBar.showsCancelButton = YES;
+        searchBar.autoresizingMask = UIViewAutoresizingFlexibleWidth;
         searchBar.delegate = (id<UISearchBarDelegate>)self;
         searchInternals.searchBar = searchBar;
 

diff --git a/Riot/Modules/Common/SwiftUI/VectorHostingController.swift b/Riot/Modules/Common/SwiftUI/VectorHostingController.swift
@@ -88,9 +88,13 @@ class VectorHostingController: UIHostingController<AnyView> {
     override func viewWillLayoutSubviews() {
         super.viewWillLayoutSubviews()
 
-        if let navigationController = navigationController, navigationController.isNavigationBarHidden != isNavigationBarHidden {
-            navigationController.isNavigationBarHidden = isNavigationBarHidden
-        }
+        guard
+            let navigationController = navigationController,
+            navigationController.topViewController == self,
+            navigationController.isNavigationBarHidden != isNavigationBarHidden
+        else { return }
+
+        navigationController.isNavigationBarHidden = isNavigationBarHidden
     }
 
     override func viewDidLayoutSubviews() {

diff --git a/changelog.d/6762.bugfix b/changelog.d/6762.bugfix
@@ -0,0 +1 @@
+Element freezes after searching in a room.
diff --git a/changelog.d/6833.bugfix b/changelog.d/6833.bugfix
@@ -0,0 +1 @@
+All Chats: Fix a header glitch when aborting a pop gesture.
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		All Chats: Fix a header glitch when aborting a pop gesture.