Fix disableKeyboardAvoidance for iOS 26 (#178)

* Fix disableKeyboardAvoidance for iOS 26

* Fix tvOS check

* Newer Xcode versions

Update simulator

Try 15.4

* Only test on Xcode 16.2 for now

Author: ladd

.github/workflows/main.yml

@@ -8,12 +8,11 @@ on:
 
 jobs:
   build-package:
-    runs-on: macos-latest
+    runs-on: macos-15
     strategy:
       matrix:
         xcode:
-        - '14.3.1' # Swift 5.8 (lowest)
-        - '15.4' # Swift 5.10 (highest)
+        - '16.2' # Swift 6.0.3 (highest)
     steps:
       - uses: actions/checkout@v2
       - uses: ./.github/actions/setup
@@ -23,11 +22,11 @@ jobs:
         run: bundle exec rake build:package
 
   build-epoxy-core:
-    runs-on: macos-latest
+    runs-on: macos-15
     strategy:
       matrix:
         xcode:
-        - '15.4' # Swift 5.10 (highest)
+        - '16.2' # Swift 6.0.3 (highest)
     steps:
       - uses: actions/checkout@v2
       - uses: ./.github/actions/setup
@@ -37,12 +36,11 @@ jobs:
         run: bundle exec rake build:EpoxyCore
 
   build-example:
-    runs-on: macos-latest
+    runs-on: macos-15
     strategy:
       matrix:
         xcode:
-        - '14.3.1' # Swift 5.8 (lowest)
-        - '15.4' # Swift 5.10 (highest)
+        - '16.2' # Swift 6.0.3 (highest)
     steps:
       - uses: actions/checkout@v2
       - uses: ./.github/actions/setup
@@ -52,12 +50,11 @@ jobs:
         run: bundle exec rake build:example
 
   test-package:
-    runs-on: macos-latest
+    runs-on: macos-15
     strategy:
       matrix:
         xcode:
-        - '14.3.1' # Swift 5.8 (lowest)
-        - '15.4' # Swift 5.10 (highest)
+        - '16.2' # Swift 6.0.3 (highest)
     steps:
       - uses: actions/checkout@v2
       - uses: ./.github/actions/setup
@@ -67,7 +64,7 @@ jobs:
         run: bundle exec rake test:package
 
   lint-swift:
-    runs-on: macos-latest
+    runs-on: macos-15
     steps:
       - uses: actions/checkout@v2
       - uses: ./.github/actions/setup

Rakefile

@@ -13,7 +13,7 @@ namespace :build do
 
   desc 'Builds the EpoxyExample app'
   task :example do
-    xcodebuild 'build -scheme EpoxyExample -destination "platform=iOS Simulator,name=iPhone 14"'
+    xcodebuild 'build -scheme EpoxyExample -destination "platform=iOS Simulator,name=iPhone 16"'
   end
 end
 
@@ -23,12 +23,12 @@ namespace :test do
 
   desc 'Runs unit tests'
   task :unit do
-    xcodebuild 'test -scheme EpoxyTests -destination "platform=iOS Simulator,name=iPhone 14"'
+    xcodebuild 'test -scheme EpoxyTests -destination "platform=iOS Simulator,name=iPhone 16"'
   end
 
   desc 'Runs performance tests'
   task :performance do
-    xcodebuild 'test -scheme PerformanceTests -destination "platform=iOS Simulator,name=iPhone 14"'
+    xcodebuild 'test -scheme PerformanceTests -destination "platform=iOS Simulator,name=iPhone 16"'
   end
 end
 

Sources/EpoxyCore/SwiftUI/EpoxySwiftUIHostingController.swift

@@ -50,10 +50,14 @@ open class EpoxySwiftUIHostingController<Content: View>: UIHostingController<Con
 
   /// Creates a dynamic subclass of this hosting controller's view that disables its keyboard
   /// avoidance behavior.
-  /// Setting `safeAreaRegions` to `.container` also works but cannot be used since it's
-  /// supported on 16.4+ and we need to support older versions.
+  /// Setting `safeAreaRegions` to `.container` is preferred on iOS 16.4+, as this approach breaks on iOS 26.
   /// See [here](https://steipete.com/posts/disabling-keyboard-avoidance-in-swiftui-uihostingcontroller/) for more info.
   private func disableKeyboardAvoidance() {
+    if #available(iOS 16.4, tvOS 16.4, *) {
+      self.safeAreaRegions = .container
+      return
+    }
+
     guard let viewClass = object_getClass(view) else {
       EpoxyLogger.shared.assertionFailure("Unable to determine class of \(String(describing: view))")
       return