Update for iOS 17.

App/Titlebar and URL Bar/ToolbarViewController.swift

@@ -66,10 +66,13 @@ class ToolbarViewController: UIViewController
         newTabButton.setImage(UIImage(systemName: "plus"), for: .normal)
         
         let toolbarAnimationDuration: TimeInterval = 0.3
-        urlBar.textField.addAction(.init(handler: { [traitCollection, toolbarView, urlBar] _ in
-            if traitCollection.horizontalSizeClass == .compact {
-                UIView.animate(withDuration: toolbarAnimationDuration) {
-                    toolbarView.cancelButtonVisible = urlBar.textField.isFirstResponder
+        urlBar.textField.addAction(.init(handler: { [weak self] _ in
+            guard let self, let parent else { return }
+            
+            // xxx: Not sure why I need to refer to parent here. This view controller isn't inheriting anything.
+            if parent.traitCollection.horizontalSizeClass == .compact {
+                UIView.animate(withDuration: toolbarAnimationDuration) { [unowned self] in
+                    self.toolbarView.cancelButtonVisible = self.urlBar.textField.isFirstResponder
                 }
             }
         }), for: [ .editingDidBegin, .editingDidEnd ])
@@ -78,12 +81,10 @@ class ToolbarViewController: UIViewController
             urlBar.textField.resignFirstResponder()
         }), for: .touchUpInside)
         
-        traitCollectionDidChange(nil)
+        reconfigureButtons(for: traitCollection.horizontalSizeClass)
     }
     
-    override func traitCollectionDidChange(_ previousTraitCollection: UITraitCollection?) {
-        super.traitCollectionDidChange(previousTraitCollection)
-        
+    public func reconfigureButtons(for horizontalSizeClass: UIUserInterfaceSizeClass) {
         toolbarView.leadingButtonsView.removeAllButtonViews()
         toolbarView.trailingButtonsView.removeAllButtonViews()
         
@@ -92,7 +93,7 @@ class ToolbarViewController: UIViewController
         }
         
         // Setup toolbar based on trait collection
-        if traitCollection.horizontalSizeClass == .compact {
+        if horizontalSizeClass == .compact {
             toolbarView.trailingButtonsView.addButtonView(scriptControllerIconView)
             toolbarView.trailingButtonsView.addButtonView(newTabButton)
             toolbarView.trailingButtonsView.addButtonView(windowButton)