expo-modules-core 56.0.21 → 56.0.22

package/CHANGELOG.md

@@ -10,6 +10,17 @@
 
 ### 💡 Others
 
+## 56.0.22 — 2026-07-23
+
+### 🎉 New features
+
+- [iOS] `ExpoSwiftUI.IgnoreSafeArea` that ignores the device and container safe area regions. ([#47619](https://github.com/expo/expo/pull/47619) by [@nishan](https://github.com/intergalacticspacehighway))
+
+### 🐛 Bug fixes
+
+- [iOS] Fix SwiftUI-hosted React views corrupting Fabric rendering after unmount: `UIViewHost` now hands SwiftUI a disposable isolation container instead of the React-managed view, so leaked `autoresizingMask`/frame/visibility mutations (including deferred ones from `Menu`/`ContextMenu` teardown) can no longer zero-size or hide unrelated components. ([#47707](https://github.com/expo/expo/pull/47707) by [@cvburgess](https://github.com/cvburgess))
+- [Android] Fix Compose-hosted React Native content (e.g. the `@expo/ui` community `BottomSheet`) keeping a stale size after a rapid resize such as dismissing the software keyboard, leaving bottom-anchored content stranded mid-view. The final shadow node size update could be dropped when its one-shot pre-draw listener fired without a following draw pass; the pending update is now also posted to the view so the latest size always flushes. ([#47778](https://github.com/expo/expo/issues/47778) by [@zayyartun-cgm](https://github.com/zayyartun-cgm)) ([#47810](https://github.com/expo/expo/pull/47810) by [@intergalacticspacehighway](https://github.com/intergalacticspacehighway))
+
 ## 56.0.21 — 2026-07-15
 
 ### 🐛 Bug fixes

package/android/build.gradle

@@ -27,7 +27,7 @@ if (shouldIncludeCompose) {
 }
 
 group = 'host.exp.exponent'
-version = '56.0.21'
+version = '56.0.22'
 
 def isExpoModulesCoreTests = {
   Gradle gradle = getGradle()
@@ -94,7 +94,7 @@ android {
   defaultConfig {
     consumerProguardFiles 'proguard-rules.pro'
     versionCode 1
-    versionName "56.0.21"
+    versionName "56.0.22"
     buildConfigField "String", "EXPO_MODULES_CORE_VERSION", "\"${versionName}\""
     buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", "true"
 

package/android/src/main/java/expo/modules/kotlin/views/ShadowNodeProxy.kt

@@ -10,6 +10,7 @@ class ShadowNodeProxy(expoView: ExpoView) {
 
   private var pendingFlush: ((stateWrapper: Any) -> Unit)? = null
   private var preDrawListener: ViewTreeObserver.OnPreDrawListener? = null
+  private val flushRunnable = Runnable { drainPendingFlush() }
 
   // Schedule in predraw listener to avoid early return in re-entrancy
   // We have a proper fix [here](https://github.com/facebook/react-native/pull/56311)
@@ -29,25 +30,37 @@ class ShadowNodeProxy(expoView: ExpoView) {
 
   private fun scheduleFlush(flush: (stateWrapper: Any) -> Unit) {
     pendingFlush = flush
-    val observer = weakExpoView.get()?.viewTreeObserver?.takeIf { it.isAlive } ?: return
-
-    // Remove the previous attached listener
-    preDrawListener?.let(observer::removeOnPreDrawListener)
-
-    val listener = object : ViewTreeObserver.OnPreDrawListener {
-      override fun onPreDraw(): Boolean {
-        preDrawListener = null
-        // The view is attached while drawing, so this re-fetch returns the same
-        // observer that is dispatching us. removeOnPreDrawListener throws on a dead
-        // observer, hence the isAlive guard.
-        weakExpoView.get()?.viewTreeObserver?.takeIf { it.isAlive }?.removeOnPreDrawListener(this)
-        val flushNow = pendingFlush
-        pendingFlush = null
-        weakExpoView.get()?.stateWrapper?.let { flushNow?.invoke(it) }
-        return true
+    val view = weakExpoView.get() ?: return
+    val observer = view.viewTreeObserver?.takeIf { it.isAlive }
+
+    if (observer != null) {
+      // Remove the previous attached listener
+      preDrawListener?.let(observer::removeOnPreDrawListener)
+
+      val listener = object : ViewTreeObserver.OnPreDrawListener {
+        override fun onPreDraw(): Boolean {
+          preDrawListener = null
+          // The view is attached while drawing, so this re-fetch returns the same
+          // observer that is dispatching us. removeOnPreDrawListener throws on a dead
+          // observer, hence the isAlive guard.
+          weakExpoView.get()?.viewTreeObserver?.takeIf { it.isAlive }?.removeOnPreDrawListener(this)
+          drainPendingFlush()
+          return true
+        }
       }
+      preDrawListener = listener
+      observer.addOnPreDrawListener(listener)
     }
-    preDrawListener = listener
-    observer.addOnPreDrawListener(listener)
+
+    // Predraw listener do not get called for each keyboard transition event so we add a fallback flush to be called here
+    // https://github.com/expo/expo/issues/47778
+    view.removeCallbacks(flushRunnable)
+    view.post(flushRunnable)
+  }
+
+  private fun drainPendingFlush() {
+    val flushNow = pendingFlush ?: return
+    pendingFlush = null
+    weakExpoView.get()?.stateWrapper?.let { flushNow.invoke(it) }
   }
 }

package/ios/Core/Views/SwiftUI/SwiftUIHostingView.swift

@@ -60,11 +60,6 @@ extension ExpoSwiftUI {
      */
     private let hostingController: UIHostingController<AnyView>
 
-    /**
-     Tracks whether safe area has been configured (can only be set once on mount)
-     */
-    private var hasSafeAreaBeenConfigured = false
-
     /**
      Initializes a SwiftUI hosting view with the given SwiftUI view type.
      */
@@ -121,11 +116,8 @@ extension ExpoSwiftUI {
         log.error("Updating props for \(ContentView.self) has failed: \(error.localizedDescription)")
       }
 
-      if !hasSafeAreaBeenConfigured,
-         let safeAreaProps = props as? SafeAreaControllable,
-         let ignoreSafeArea = safeAreaProps.ignoreSafeArea {
-        hostingController.disableSafeArea(ignoreSafeArea)
-        hasSafeAreaBeenConfigured = true
+      if let safeAreaProps = props as? SafeAreaControllable {
+        hostingController.setSafeAreaRegions(ignoring: safeAreaProps.ignoreSafeArea)
       }
     }
 
@@ -260,45 +252,26 @@ extension ExpoSwiftUI {
 }
 
 extension UIHostingController {
-  func disableSafeArea(_ mode: ExpoSwiftUI.IgnoreSafeArea) {
-    if #available(iOS 16.4, tvOS 16.4, macOS 13.3, *) {
+  /// Applies the `ignoreSafeArea` mode reactively, restoring the default safe area when `nil` so
+  /// clearing the prop re-enables the safe area without an app reload.
+  func setSafeAreaRegions(ignoring mode: ExpoSwiftUI.IgnoreSafeArea?) {
+    // `safeAreaRegions` needs iOS 16.4+; the precompiled xcframework targets 16.0, so no-op below it.
+    guard #available(iOS 16.4, tvOS 16.4, macOS 13.3, *) else {
+      return
+    }
+    var regions: SafeAreaRegions = .all
+    if let mode {
       switch mode {
       case .all:
-        self.safeAreaRegions.remove(.all)
+        regions = []
+      case .container:
+        regions.remove(.container)
       case .keyboard:
-        self.safeAreaRegions.remove(.keyboard)
-      }
-    } else {
-      // For older versions
-      // https://gist.github.com/steipete/da72299613dcc91e8d729e48b4bb582c
-      // https://developer.apple.com/forums/thread/658432
-      guard let viewClass = object_getClass(view) else { return }
-
-      let suffix = mode == .all ? "_IgnoresSafeArea" : "_IgnoresKeyboard"
-      let viewSubclassName = String(cString: class_getName(viewClass)).appending(suffix)
-      if let viewSubclass = NSClassFromString(viewSubclassName) {
-          object_setClass(view, viewSubclass)
-      } else {
-          guard let viewClassNameUtf8 = (viewSubclassName as NSString).utf8String else { return }
-          guard let viewSubclass = objc_allocateClassPair(viewClass, viewClassNameUtf8, 0) else { return }
-
-          if mode == .all,
-             let method = class_getInstanceMethod(UIView.self, #selector(getter: UIView.safeAreaInsets)) {
-              let safeAreaInsets: @convention(block) (AnyObject) -> UIEdgeInsets = { _ in
-                  return .zero
-              }
-              class_addMethod(viewSubclass, #selector(getter: UIView.safeAreaInsets),
-                              imp_implementationWithBlock(safeAreaInsets), method_getTypeEncoding(method))
-          }
-
-          if let method = class_getInstanceMethod(viewClass, NSSelectorFromString("keyboardWillShowWithNotification:")) {
-              let keyboardWillShow: @convention(block) (AnyObject, AnyObject) -> Void = { _, _ in }
-              class_addMethod(viewSubclass, NSSelectorFromString("keyboardWillShowWithNotification:"),
-                              imp_implementationWithBlock(keyboardWillShow), method_getTypeEncoding(method))
-          }
-          objc_registerClassPair(viewSubclass)
-          object_setClass(view, viewSubclass)
-        }
+        regions.remove(.keyboard)
       }
     }
+    if safeAreaRegions != regions {
+      safeAreaRegions = regions
+    }
+  }
 }

package/ios/Core/Views/SwiftUI/SwiftUIViewHost.swift

@@ -13,7 +13,6 @@ extension ExpoSwiftUI {
 
     #if os(macOS)
     func makeNSView(context: Context) -> NSView {
-      context.coordinator.originalAutoresizingMask = view.autoresizingMask
       return view
     }
 
@@ -23,8 +22,17 @@ extension ExpoSwiftUI {
     #endif
 
     func makeUIView(context: Context) -> UIView {
-      context.coordinator.originalAutoresizingMask = view.autoresizingMask
+      #if os(macOS)
       return view
+      #else
+      // SwiftUI mutates the view it hosts (autoresizingMask, frame, visibility), sometimes
+      // asynchronously after teardown, corrupting unmounted or recycled React views.
+      // Hand it a disposable container instead. Fixes expo/expo#47706; supersedes the #40604 mitigation.
+      let container = ReactViewIsolationContainer()
+      container.hostedView = view
+      container.addSubview(view)
+      return container
+      #endif
     }
 
     func updateUIView(_ uiView: UIView, context: Context) {
@@ -32,11 +40,7 @@ extension ExpoSwiftUI {
     }
 
     static func dismantleUIView(_ uiView: UIView, coordinator: Coordinator) {
-      // https://github.com/expo/expo/issues/40604
-      // UIViewRepresentable attaches autoresizingMask w+h to the hosted UIView
-      // This causes issues for RN views when they are recycled.
-      // So we restore the original autoresizingMask to avoid issues.
-      uiView.autoresizingMask = coordinator.originalAutoresizingMask
+      // Nothing to restore — SwiftUI only ever touched the container.
     }
 
     func makeCoordinator() -> Coordinator {
@@ -44,7 +48,6 @@ extension ExpoSwiftUI {
     }
 
     class Coordinator {
-      var originalAutoresizingMask: UIView.AutoresizingMask = []
       init() {}
     }
 
@@ -63,5 +66,24 @@ extension ExpoSwiftUI {
     }
   }
 
+  #if !os(macOS)
+  /**
+   Disposable UIView handed to SwiftUI in place of the React-managed view —
+   see `UIViewHost.makeUIView`.
+   */
+  private final class ReactViewIsolationContainer: UIView {
+    weak var hostedView: UIView?
+
+    override func layoutSubviews() {
+      super.layoutSubviews()
+      // Ignore transient zero bounds (initial layout, teardown) — never propagate them.
+      guard let hostedView, hostedView.superview === self, !bounds.isEmpty else {
+        return
+      }
+      if hostedView.frame != bounds {
+        hostedView.frame = bounds
+      }
+    }
+  }
+  #endif
 }
-

package/ios/Core/Views/SwiftUI/SwiftUIViewProps.swift

@@ -7,6 +7,7 @@ internal let GLOBAL_EVENT_NAME = "onGlobalEvent"
 extension ExpoSwiftUI {
   public enum IgnoreSafeArea: String, Enumerable {
     case all
+    case container
     case keyboard
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-modules-core",
-  "version": "56.0.21",
+  "version": "56.0.22",
   "description": "The core of Expo Modules architecture",
   "main": "src/index.ts",
   "types": "build/index.d.ts",
@@ -66,7 +66,7 @@
     "@types/invariant": "^2.2.33",
     "expo-module-scripts": "56.0.3"
   },
-  "gitHead": "8a480d22f04f94fd36570a319baeaa3529330794",
+  "gitHead": "60c9da71e15060aa859a7a6e85f4b14062b761f4",
   "scripts": {
     "build": "expo-module build",
     "clean": "expo-module clean",