react-native-screens 3.31.0-rc.1 → 3.31.0

package/RNScreens.podspec

@@ -67,6 +67,8 @@ Pod::Spec.new do |s|
 
   if defined?(install_modules_dependencies()) != nil
     install_modules_dependencies(s)
+    # Add missing dependencies, that were not included in install_modules_dependencies
+    s.dependency "React-RCTImage"
     RNScreensDependencyHelper.add_common_subspec(s, new_arch_enabled)
   else
     RNScreensDependencyHelper.install_dependencies(s, new_arch_enabled)

package/android/src/main/java/com/swmansion/rnscreens/Screen.kt

@@ -253,8 +253,10 @@ class Screen(context: ReactContext?) : FabricEnabledViewGroup(context) {
     }
 
     private fun notifyHeaderHeightChange(headerHeight: Double) {
-        UIManagerHelper.getEventDispatcherForReactTag(context as ReactContext, id)
-            ?.dispatchEvent(HeaderHeightChangeEvent(id, headerHeight))
+        val screenContext = context as ReactContext
+        val surfaceId = UIManagerHelper.getSurfaceId(screenContext)
+        UIManagerHelper.getEventDispatcherForReactTag(screenContext, id)
+            ?.dispatchEvent(HeaderHeightChangeEvent(surfaceId, id, headerHeight))
     }
 
     enum class StackPresentation {

package/android/src/main/java/com/swmansion/rnscreens/events/HeaderAttachedEvent.kt

@@ -4,7 +4,7 @@ import com.facebook.react.bridge.Arguments
 import com.facebook.react.bridge.WritableMap
 import com.facebook.react.uimanager.events.Event
 
-class HeaderAttachedEvent(surfaceId: Int, viewId: Int) : Event<ScreenAppearEvent>(surfaceId, viewId) {
+class HeaderAttachedEvent(surfaceId: Int, viewId: Int) : Event<HeaderAttachedEvent>(surfaceId, viewId) {
     override fun getEventName(): String = EVENT_NAME
 
     // All events for a given view can be coalesced.

package/android/src/main/java/com/swmansion/rnscreens/events/HeaderBackButtonClickedEvent.kt

@@ -4,7 +4,7 @@ import com.facebook.react.bridge.Arguments
 import com.facebook.react.bridge.WritableMap
 import com.facebook.react.uimanager.events.Event
 
-class HeaderBackButtonClickedEvent(surfaceId: Int, viewId: Int) : Event<ScreenAppearEvent>(surfaceId, viewId) {
+class HeaderBackButtonClickedEvent(surfaceId: Int, viewId: Int) : Event<HeaderBackButtonClickedEvent>(surfaceId, viewId) {
     override fun getEventName(): String = EVENT_NAME
 
     // All events for a given view can be coalesced.

package/android/src/main/java/com/swmansion/rnscreens/events/HeaderDetachedEvent.kt

@@ -4,7 +4,7 @@ import com.facebook.react.bridge.Arguments
 import com.facebook.react.bridge.WritableMap
 import com.facebook.react.uimanager.events.Event
 
-class HeaderDetachedEvent(surfaceId: Int, viewId: Int) : Event<ScreenAppearEvent>(surfaceId, viewId) {
+class HeaderDetachedEvent(surfaceId: Int, viewId: Int) : Event<HeaderDetachedEvent>(surfaceId, viewId) {
     override fun getEventName(): String = EVENT_NAME
 
     // All events for a given view can be coalesced.

package/android/src/main/java/com/swmansion/rnscreens/events/HeaderHeightChangeEvent.kt

@@ -1,23 +1,23 @@
 package com.swmansion.rnscreens.events
 
 import com.facebook.react.bridge.Arguments
+import com.facebook.react.bridge.WritableMap
 import com.facebook.react.uimanager.events.Event
 import com.facebook.react.uimanager.events.RCTEventEmitter
 
 class HeaderHeightChangeEvent(
+    surfaceId: Int,
     viewId: Int,
     private val headerHeight: Double
-) : Event<HeaderHeightChangeEvent>(viewId) {
+) : Event<HeaderHeightChangeEvent>(surfaceId, viewId) {
 
     override fun getEventName() = EVENT_NAME
 
     // As the same header height could appear twice, use header height as a coalescing key.
     override fun getCoalescingKey(): Short = headerHeight.toInt().toShort()
 
-    override fun dispatch(rctEventEmitter: RCTEventEmitter) {
-        val map = Arguments.createMap()
-        map.putDouble("headerHeight", headerHeight)
-        rctEventEmitter.receiveEvent(viewTag, eventName, map)
+    override fun getEventData(): WritableMap? = Arguments.createMap().apply {
+        putDouble("headerHeight", headerHeight)
     }
 
     companion object {

package/android/src/main/java/com/swmansion/rnscreens/events/ScreenTransitionProgressEvent.kt

@@ -11,7 +11,7 @@ class ScreenTransitionProgressEvent(
     private val isClosing: Boolean,
     private val isGoingForward: Boolean,
     private val coalescingKey: Short
-) : Event<ScreenAppearEvent?>(surfaceId, viewId) {
+) : Event<ScreenTransitionProgressEvent>(surfaceId, viewId) {
     override fun getEventName(): String = EVENT_NAME
 
     override fun getCoalescingKey(): Short = coalescingKey

package/android/src/main/java/com/swmansion/rnscreens/events/SearchBarBlurEvent.kt

@@ -4,7 +4,7 @@ import com.facebook.react.bridge.Arguments
 import com.facebook.react.bridge.WritableMap
 import com.facebook.react.uimanager.events.Event
 
-class SearchBarBlurEvent(surfaceId: Int, viewId: Int) : Event<ScreenAppearEvent>(surfaceId, viewId) {
+class SearchBarBlurEvent(surfaceId: Int, viewId: Int) : Event<SearchBarBlurEvent>(surfaceId, viewId) {
     override fun getEventName(): String = EVENT_NAME
 
     // All events for a given view can be coalesced.

package/android/src/main/java/com/swmansion/rnscreens/events/SearchBarChangeTextEvent.kt

@@ -8,7 +8,7 @@ class SearchBarChangeTextEvent(
     surfaceId: Int,
     viewId: Int,
     private val text: String?,
-) : Event<ScreenAppearEvent>(surfaceId, viewId) {
+) : Event<SearchBarChangeTextEvent>(surfaceId, viewId) {
     override fun getEventName(): String = EVENT_NAME
 
     // All events for a given view can be coalesced.

package/android/src/main/java/com/swmansion/rnscreens/events/SearchBarCloseEvent.kt

@@ -4,7 +4,7 @@ import com.facebook.react.bridge.Arguments
 import com.facebook.react.bridge.WritableMap
 import com.facebook.react.uimanager.events.Event
 
-class SearchBarCloseEvent(surfaceId: Int, viewId: Int) : Event<ScreenAppearEvent>(surfaceId, viewId) {
+class SearchBarCloseEvent(surfaceId: Int, viewId: Int) : Event<SearchBarCloseEvent>(surfaceId, viewId) {
     override fun getEventName(): String = EVENT_NAME
 
     // All events for a given view can be coalesced.

package/android/src/main/java/com/swmansion/rnscreens/events/SearchBarFocusEvent.kt

@@ -4,7 +4,7 @@ import com.facebook.react.bridge.Arguments
 import com.facebook.react.bridge.WritableMap
 import com.facebook.react.uimanager.events.Event
 
-class SearchBarFocusEvent(surfaceId: Int, viewId: Int) : Event<ScreenAppearEvent>(surfaceId, viewId) {
+class SearchBarFocusEvent(surfaceId: Int, viewId: Int) : Event<SearchBarFocusEvent>(surfaceId, viewId) {
     override fun getEventName(): String = EVENT_NAME
 
     // All events for a given view can be coalesced.

package/android/src/main/java/com/swmansion/rnscreens/events/SearchBarOpenEvent.kt

@@ -4,7 +4,7 @@ import com.facebook.react.bridge.Arguments
 import com.facebook.react.bridge.WritableMap
 import com.facebook.react.uimanager.events.Event
 
-class SearchBarOpenEvent(surfaceId: Int, viewId: Int) : Event<ScreenAppearEvent>(surfaceId, viewId) {
+class SearchBarOpenEvent(surfaceId: Int, viewId: Int) : Event<SearchBarOpenEvent>(surfaceId, viewId) {
     override fun getEventName(): String = EVENT_NAME
 
     // All events for a given view can be coalesced.

package/android/src/main/java/com/swmansion/rnscreens/events/SearchBarSearchButtonPressEvent.kt

@@ -4,7 +4,7 @@ import com.facebook.react.bridge.Arguments
 import com.facebook.react.bridge.WritableMap
 import com.facebook.react.uimanager.events.Event
 
-class SearchBarSearchButtonPressEvent(surfaceId: Int, viewId: Int, private val text: String?) : Event<ScreenAppearEvent>(surfaceId, viewId) {
+class SearchBarSearchButtonPressEvent(surfaceId: Int, viewId: Int, private val text: String?) : Event<SearchBarSearchButtonPressEvent>(surfaceId, viewId) {
     override fun getEventName(): String = EVENT_NAME
 
     // All events for a given view can be coalesced.

package/ios/RNSFullWindowOverlay.mm

@@ -123,7 +123,7 @@
 
 - (void)show
 {
-  UIWindow *window = RCTSharedApplication().delegate.window;
+  UIWindow *window = RCTKeyWindow();
   [window addSubview:_container];
 }
 
@@ -156,7 +156,7 @@
 // so when the component gets recycled we need to add it back.
 - (void)maybeShow
 {
-  UIWindow *window = RCTSharedApplication().delegate.window;
+  UIWindow *window = RCTKeyWindow();
   if (![[window subviews] containsObject:self]) {
     [window addSubview:_container];
   }

package/lib/commonjs/components/Screen.js

@@ -50,7 +50,7 @@ class InnerScreen extends _react.default.Component {
     } = rest;
     if (enabled && _core.isNativePlatformSupported) {
       // Due to how Yoga resolves layout, we need to have different components for modal nad non-modal screens
-      const AnimatedScreen = _reactNative.Platform.OS === 'android' || stackPresentation === 'push' || stackPresentation === 'containedModal' || stackPresentation === 'containedTransparentModal' ? AnimatedNativeScreen : AnimatedNativeModalScreen;
+      const AnimatedScreen = _reactNative.Platform.OS === 'android' || stackPresentation === undefined || stackPresentation === 'push' || stackPresentation === 'containedModal' || stackPresentation === 'containedTransparentModal' ? AnimatedNativeScreen : AnimatedNativeModalScreen;
       let {
         // Filter out active prop in this case because it is unused and
         // can cause problems depending on react-native version:

package/lib/commonjs/components/Screen.js.map

@@ -1 +1 @@
-{"version":3,"names":["_react","_interopRequireDefault","require","_reactNative","_TransitionProgressContext","_DelayedFreeze","_core","_ScreenNativeComponent","_ModalScreenNativeComponent","obj","__esModule","default","_extends","Object","assign","bind","target","i","arguments","length","source","key","prototype","hasOwnProperty","call","apply","NativeScreen","exports","ScreenNativeComponent","AnimatedNativeScreen","Animated","createAnimatedComponent","AnimatedNativeModalScreen","ModalScreenNativeComponent","InnerScreen","React","Component","ref","closing","Value","progress","goingForward","setNativeProps","props","setRef","onComponentRef","render","enabled","screensEnabled","freezeOnBlur","freezeEnabled","rest","sheetAllowedDetents","sheetLargestUndimmedDetent","sheetGrabberVisible","sheetCornerRadius","sheetExpandsWhenScrolledToEdge","stackPresentation","isNativePlatformSupported","AnimatedScreen","Platform","OS","active","activityState","children","isNativeStack","gestureResponseDistance","onGestureCancel","undefined","console","warn","handleRef","viewConfig","validAttributes","style","display","_viewConfig","createElement","freeze","start","end","top","bottom","onTransitionProgress","event","nativeEvent","useNativeDriver","Provider","value","View","ScreenContext","createContext","Screen","contextType","ScreenWrapper","context","_default"],"sourceRoot":"../../../src","sources":["components/Screen.tsx"],"mappings":"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"}
+{"version":3,"names":["_react","_interopRequireDefault","require","_reactNative","_TransitionProgressContext","_DelayedFreeze","_core","_ScreenNativeComponent","_ModalScreenNativeComponent","obj","__esModule","default","_extends","Object","assign","bind","target","i","arguments","length","source","key","prototype","hasOwnProperty","call","apply","NativeScreen","exports","ScreenNativeComponent","AnimatedNativeScreen","Animated","createAnimatedComponent","AnimatedNativeModalScreen","ModalScreenNativeComponent","InnerScreen","React","Component","ref","closing","Value","progress","goingForward","setNativeProps","props","setRef","onComponentRef","render","enabled","screensEnabled","freezeOnBlur","freezeEnabled","rest","sheetAllowedDetents","sheetLargestUndimmedDetent","sheetGrabberVisible","sheetCornerRadius","sheetExpandsWhenScrolledToEdge","stackPresentation","isNativePlatformSupported","AnimatedScreen","Platform","OS","undefined","active","activityState","children","isNativeStack","gestureResponseDistance","onGestureCancel","console","warn","handleRef","viewConfig","validAttributes","style","display","_viewConfig","createElement","freeze","start","end","top","bottom","onTransitionProgress","event","nativeEvent","useNativeDriver","Provider","value","View","ScreenContext","createContext","Screen","contextType","ScreenWrapper","context","_default"],"sourceRoot":"../../../src","sources":["components/Screen.tsx"],"mappings":"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"}

package/lib/module/components/Screen.js

@@ -46,7 +46,7 @@ export class InnerScreen extends React.Component {
     } = rest;
     if (enabled && isNativePlatformSupported) {
       // Due to how Yoga resolves layout, we need to have different components for modal nad non-modal screens
-      const AnimatedScreen = Platform.OS === 'android' || stackPresentation === 'push' || stackPresentation === 'containedModal' || stackPresentation === 'containedTransparentModal' ? AnimatedNativeScreen : AnimatedNativeModalScreen;
+      const AnimatedScreen = Platform.OS === 'android' || stackPresentation === undefined || stackPresentation === 'push' || stackPresentation === 'containedModal' || stackPresentation === 'containedTransparentModal' ? AnimatedNativeScreen : AnimatedNativeModalScreen;
       let {
         // Filter out active prop in this case because it is unused and
         // can cause problems depending on react-native version:

package/lib/module/components/Screen.js.map

@@ -1 +1 @@
-{"version":3,"names":["React","Animated","Platform","TransitionProgressContext","DelayedFreeze","freezeEnabled","isNativePlatformSupported","screensEnabled","ScreenNativeComponent","ModalScreenNativeComponent","NativeScreen","AnimatedNativeScreen","createAnimatedComponent","AnimatedNativeModalScreen","InnerScreen","Component","ref","closing","Value","progress","goingForward","setNativeProps","props","setRef","onComponentRef","render","enabled","freezeOnBlur","rest","sheetAllowedDetents","sheetLargestUndimmedDetent","sheetGrabberVisible","sheetCornerRadius","sheetExpandsWhenScrolledToEdge","stackPresentation","AnimatedScreen","OS","active","activityState","children","isNativeStack","gestureResponseDistance","onGestureCancel","undefined","console","warn","handleRef","viewConfig","validAttributes","style","display","_viewConfig","createElement","freeze","_extends","start","end","top","bottom","onTransitionProgress","event","nativeEvent","useNativeDriver","Provider","value","View","ScreenContext","createContext","Screen","contextType","ScreenWrapper","context"],"sourceRoot":"../../../src","sources":["components/Screen.tsx"],"mappings":"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"}
+{"version":3,"names":["React","Animated","Platform","TransitionProgressContext","DelayedFreeze","freezeEnabled","isNativePlatformSupported","screensEnabled","ScreenNativeComponent","ModalScreenNativeComponent","NativeScreen","AnimatedNativeScreen","createAnimatedComponent","AnimatedNativeModalScreen","InnerScreen","Component","ref","closing","Value","progress","goingForward","setNativeProps","props","setRef","onComponentRef","render","enabled","freezeOnBlur","rest","sheetAllowedDetents","sheetLargestUndimmedDetent","sheetGrabberVisible","sheetCornerRadius","sheetExpandsWhenScrolledToEdge","stackPresentation","AnimatedScreen","OS","undefined","active","activityState","children","isNativeStack","gestureResponseDistance","onGestureCancel","console","warn","handleRef","viewConfig","validAttributes","style","display","_viewConfig","createElement","freeze","_extends","start","end","top","bottom","onTransitionProgress","event","nativeEvent","useNativeDriver","Provider","value","View","ScreenContext","createContext","Screen","contextType","ScreenWrapper","context"],"sourceRoot":"../../../src","sources":["components/Screen.tsx"],"mappings":"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"}

package/lib/typescript/components/Screen.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Screen.d.ts","sourceRoot":"","sources":["../../../src/components/Screen.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAY,IAAI,EAAY,MAAM,cAAc,CAAC;AAIxD,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAYnD,eAAO,MAAM,YAAY,EAAE,KAAK,CAAC,aAAa,CAAC,WAAW,CAC5B,CAAC;AAyB/B,qBAAa,WAAY,SAAQ,KAAK,CAAC,SAAS,CAAC,WAAW,CAAC;IAC3D,OAAO,CAAC,GAAG,CAA8C;IACzD,OAAO,CAAC,OAAO,CAAyB;IACxC,OAAO,CAAC,QAAQ,CAAyB;IACzC,OAAO,CAAC,YAAY,CAAyB;IAE7C,cAAc,CAAC,KAAK,EAAE,WAAW,GAAG,IAAI;IAIxC,MAAM,QAAS,MAAM,UAAU,CAAC,WAAW,CAAC,GAAG,IAAI,KAAG,IAAI,CAGxD;IAEF,MAAM;CA+IP;AAID,eAAO,MAAM,aAAa,mCAAmC,CAAC;AAE9D,cAAM,MAAO,SAAQ,KAAK,CAAC,SAAS,CAAC,WAAW,CAAC;IAC/C,MAAM,CAAC,WAAW,oCAAiB;IAEnC,MAAM;CAIP;AAED,eAAe,MAAM,CAAC"}
+{"version":3,"file":"Screen.d.ts","sourceRoot":"","sources":["../../../src/components/Screen.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAY,IAAI,EAAY,MAAM,cAAc,CAAC;AAIxD,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAYnD,eAAO,MAAM,YAAY,EAAE,KAAK,CAAC,aAAa,CAAC,WAAW,CAC5B,CAAC;AAyB/B,qBAAa,WAAY,SAAQ,KAAK,CAAC,SAAS,CAAC,WAAW,CAAC;IAC3D,OAAO,CAAC,GAAG,CAA8C;IACzD,OAAO,CAAC,OAAO,CAAyB;IACxC,OAAO,CAAC,QAAQ,CAAyB;IACzC,OAAO,CAAC,YAAY,CAAyB;IAE7C,cAAc,CAAC,KAAK,EAAE,WAAW,GAAG,IAAI;IAIxC,MAAM,QAAS,MAAM,UAAU,CAAC,WAAW,CAAC,GAAG,IAAI,KAAG,IAAI,CAGxD;IAEF,MAAM;CAgJP;AAID,eAAO,MAAM,aAAa,mCAAmC,CAAC;AAE9D,cAAM,MAAO,SAAQ,KAAK,CAAC,SAAS,CAAC,WAAW,CAAC;IAC/C,MAAM,CAAC,WAAW,oCAAiB;IAEnC,MAAM;CAIP;AAED,eAAe,MAAM,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-screens",
-  "version": "3.31.0-rc.1",
+  "version": "3.31.0",
   "description": "Native navigation primitives for your React Native app.",
   "scripts": {
     "submodules": "git submodule update --init --recursive && (cd react-navigation && yarn)",
@@ -9,13 +9,13 @@
     "test:unit": "jest --passWithNoTests",
     "format-js": "prettier --write --list-different './{src,Example}/**/*.{js,ts,tsx}'",
     "format-android": "node ./scripts/format-android.js",
-    "format-ios": "find ios/ -iname *.h -o -iname *.m -o -iname *.cpp -o -iname *.mm | xargs clang-format -i",
+    "format-ios": "find ios/ -iname \"*.h\" -o -iname \"*.m\" -o -iname \"*.cpp\" -o -iname \"*.mm\" | xargs clang-format -i",
     "format": "yarn format-js && yarn format-android && yarn format-ios",
     "lint-js": "eslint --ext '.js,.ts,.tsx' --fix src",
     "lint-android": "./android/gradlew -p android spotlessCheck -q",
     "lint": "yarn lint-js && yarn lint-android",
     "release": "npm login && release-it",
-    "prepare": "bob build && husky install"
+    "postinstall": "bob build && husky install"
   },
   "main": "lib/commonjs/index",
   "module": "lib/module/index",
@@ -149,5 +149,5 @@
       "javaPackageName": "com.swmansion.rnscreens"
     }
   },
-  "packageManager": "yarn@1.22.22"
+  "packageManager": "yarn@4.1.1"
 }

package/src/components/Screen.tsx

@@ -79,6 +79,7 @@ export class InnerScreen extends React.Component<ScreenProps> {
       // Due to how Yoga resolves layout, we need to have different components for modal nad non-modal screens
       const AnimatedScreen =
         Platform.OS === 'android' ||
+        stackPresentation === undefined ||
         stackPresentation === 'push' ||
         stackPresentation === 'containedModal' ||
         stackPresentation === 'containedTransparentModal'