react-native-screens 3.35.0 → 3.36.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (94) hide show
  1. package/README.md +3 -1
  2. package/android/build.gradle +9 -8
  3. package/android/src/main/AndroidManifest.xml +1 -2
  4. package/android/src/main/java/com/swmansion/rnscreens/RNScreensPackage.kt +4 -2
  5. package/android/src/main/java/com/swmansion/rnscreens/utils/ScreenDummyLayoutHelper.kt +6 -3
  6. package/android/src/paper/java/com/facebook/react/viewmanagers/RNSScreenContainerManagerDelegate.java +3 -2
  7. package/android/src/paper/java/com/facebook/react/viewmanagers/RNSScreenManagerDelegate.java +3 -2
  8. package/android/src/paper/java/com/facebook/react/viewmanagers/RNSScreenStackHeaderConfigManagerDelegate.java +3 -2
  9. package/android/src/paper/java/com/facebook/react/viewmanagers/RNSScreenStackHeaderSubviewManagerDelegate.java +3 -2
  10. package/android/src/paper/java/com/facebook/react/viewmanagers/RNSScreenStackManagerDelegate.java +3 -2
  11. package/android/src/paper/java/com/facebook/react/viewmanagers/RNSSearchBarManagerDelegate.java +3 -2
  12. package/common/cpp/react/renderer/components/rnscreens/RNSScreenShadowNode.cpp +1 -1
  13. package/ios/RNSEnums.h +1 -1
  14. package/ios/RNSFullWindowOverlay.mm +4 -0
  15. package/ios/RNSScreen.mm +6 -1
  16. package/ios/RNSScreenContainer.mm +5 -0
  17. package/ios/RNSScreenStack.mm +7 -0
  18. package/ios/RNSScreenStackHeaderConfig.h +9 -6
  19. package/ios/RNSScreenStackHeaderConfig.mm +8 -0
  20. package/ios/RNSScreenStackHeaderSubview.mm +4 -0
  21. package/ios/utils/RNSDefines.h +7 -0
  22. package/lib/commonjs/components/ScreenStack.js +2 -2
  23. package/lib/commonjs/components/ScreenStack.js.map +1 -1
  24. package/lib/commonjs/components/SearchBar.js +2 -2
  25. package/lib/commonjs/components/SearchBar.js.map +1 -1
  26. package/lib/commonjs/gesture-handler/GestureDetectorProvider.js +2 -2
  27. package/lib/commonjs/gesture-handler/GestureDetectorProvider.js.map +1 -1
  28. package/lib/commonjs/native-stack/views/HeaderConfig.js +10 -8
  29. package/lib/commonjs/native-stack/views/HeaderConfig.js.map +1 -1
  30. package/lib/commonjs/native-stack/views/NativeStackView.js +8 -6
  31. package/lib/commonjs/native-stack/views/NativeStackView.js.map +1 -1
  32. package/lib/commonjs/reanimated/ReanimatedNativeStackScreen.js +2 -2
  33. package/lib/commonjs/reanimated/ReanimatedNativeStackScreen.js.map +1 -1
  34. package/lib/commonjs/reanimated/ReanimatedScreen.js +2 -2
  35. package/lib/commonjs/reanimated/ReanimatedScreen.js.map +1 -1
  36. package/lib/commonjs/reanimated/ReanimatedScreenProvider.js +2 -2
  37. package/lib/commonjs/reanimated/ReanimatedScreenProvider.js.map +1 -1
  38. package/lib/module/components/ScreenStack.js +1 -1
  39. package/lib/module/components/ScreenStack.js.map +1 -1
  40. package/lib/module/components/SearchBar.js +1 -1
  41. package/lib/module/components/SearchBar.js.map +1 -1
  42. package/lib/module/gesture-handler/GestureDetectorProvider.js +1 -1
  43. package/lib/module/gesture-handler/GestureDetectorProvider.js.map +1 -1
  44. package/lib/module/native-stack/views/HeaderConfig.js +3 -1
  45. package/lib/module/native-stack/views/HeaderConfig.js.map +1 -1
  46. package/lib/module/native-stack/views/NativeStackView.js +3 -1
  47. package/lib/module/native-stack/views/NativeStackView.js.map +1 -1
  48. package/lib/module/reanimated/ReanimatedNativeStackScreen.js +1 -2
  49. package/lib/module/reanimated/ReanimatedNativeStackScreen.js.map +1 -1
  50. package/lib/module/reanimated/ReanimatedScreen.js +1 -2
  51. package/lib/module/reanimated/ReanimatedScreen.js.map +1 -1
  52. package/lib/module/reanimated/ReanimatedScreenProvider.js +1 -1
  53. package/lib/module/reanimated/ReanimatedScreenProvider.js.map +1 -1
  54. package/lib/typescript/components/Screen.d.ts +1 -1
  55. package/lib/typescript/components/Screen.d.ts.map +1 -1
  56. package/lib/typescript/components/Screen.web.d.ts +1 -1
  57. package/lib/typescript/components/Screen.web.d.ts.map +1 -1
  58. package/lib/typescript/components/ScreenContainer.d.ts +1 -1
  59. package/lib/typescript/components/ScreenContainer.d.ts.map +1 -1
  60. package/lib/typescript/components/ScreenStack.d.ts +1 -1
  61. package/lib/typescript/components/ScreenStack.d.ts.map +1 -1
  62. package/lib/typescript/components/ScreenStackHeaderConfig.d.ts +1 -1
  63. package/lib/typescript/components/ScreenStackHeaderConfig.d.ts.map +1 -1
  64. package/lib/typescript/components/ScreenStackHeaderConfig.web.d.ts +1 -1
  65. package/lib/typescript/components/ScreenStackHeaderConfig.web.d.ts.map +1 -1
  66. package/lib/typescript/components/SearchBar.d.ts +1 -1
  67. package/lib/typescript/components/SearchBar.d.ts.map +1 -1
  68. package/lib/typescript/native-stack/types.d.ts +1 -1
  69. package/lib/typescript/native-stack/types.d.ts.map +1 -1
  70. package/lib/typescript/native-stack/utils/getDefaultHeaderHeight.d.ts +1 -1
  71. package/lib/typescript/native-stack/utils/getDefaultHeaderHeight.d.ts.map +1 -1
  72. package/lib/typescript/native-stack/views/HeaderConfig.d.ts.map +1 -1
  73. package/lib/typescript/native-stack/views/NativeStackView.d.ts.map +1 -1
  74. package/lib/typescript/reanimated/ReanimatedNativeStackScreen.d.ts +1 -1
  75. package/lib/typescript/reanimated/ReanimatedNativeStackScreen.d.ts.map +1 -1
  76. package/lib/typescript/reanimated/ReanimatedScreen.d.ts +1 -1
  77. package/lib/typescript/reanimated/ReanimatedScreen.d.ts.map +1 -1
  78. package/lib/typescript/reanimated/ReanimatedScreenProvider.d.ts.map +1 -1
  79. package/package.json +14 -1
  80. package/src/components/Screen.tsx +1 -1
  81. package/src/components/Screen.web.tsx +1 -1
  82. package/src/components/ScreenContainer.tsx +1 -1
  83. package/src/components/ScreenStack.tsx +2 -1
  84. package/src/components/ScreenStackHeaderConfig.tsx +1 -1
  85. package/src/components/ScreenStackHeaderConfig.web.tsx +1 -1
  86. package/src/components/SearchBar.tsx +2 -5
  87. package/src/gesture-handler/GestureDetectorProvider.tsx +1 -1
  88. package/src/native-stack/types.tsx +1 -1
  89. package/src/native-stack/utils/getDefaultHeaderHeight.tsx +1 -1
  90. package/src/native-stack/views/HeaderConfig.tsx +7 -5
  91. package/src/native-stack/views/NativeStackView.tsx +4 -7
  92. package/src/reanimated/ReanimatedNativeStackScreen.tsx +2 -2
  93. package/src/reanimated/ReanimatedScreen.tsx +2 -1
  94. package/src/reanimated/ReanimatedScreenProvider.tsx +2 -1
package/README.md CHANGED
@@ -108,7 +108,8 @@ Screens are already integrated with the React Native's most popular navigation l
108
108
 
109
109
  | library version | react-native version |
110
110
  | --------------- | -------------------- |
111
- | 3.33.0+ | 0.72.0+
111
+ | 3.36.0+ | 0.73.0+ |
112
+ | 3.33.0+ | 0.72.0+ |
112
113
  | 3.32.0+ | 0.71.0+ |
113
114
  | 3.30.0+ | 0.68.0+ |
114
115
  | 3.14.0+ | 0.64.0+ |
@@ -123,6 +124,7 @@ Here's a table with summary of supported `react-native` versions when Fabric is
123
124
 
124
125
  | library version | react-native version |
125
126
  | --------------- | -------------------- |
127
+ | 3.36.0+ | 0.77.0+ |
126
128
  | 3.33.0+ | 0.75.0+ |
127
129
  | 3.32.0+ | 0.74.0+ |
128
130
  | 3.28.0+ | 0.73.0+ |
@@ -59,13 +59,7 @@ def IS_NEW_ARCHITECTURE_ENABLED = isNewArchitectureEnabled()
59
59
 
60
60
  android {
61
61
  compileSdkVersion safeExtGet('compileSdkVersion', rnsDefaultCompileSdkVersion)
62
- def agpVersion = Version.ANDROID_GRADLE_PLUGIN_VERSION
63
- if (agpVersion.tokenize('.')[0].toInteger() >= 7) {
64
- namespace "com.swmansion.rnscreens"
65
- buildFeatures {
66
- buildConfig true
67
- }
68
- }
62
+ namespace "com.swmansion.rnscreens"
69
63
 
70
64
  // Used to override the NDK path/version on internal CI or by allowing
71
65
  // users to customize the NDK path/version from their root project (e.g. for M1 support)
@@ -94,6 +88,7 @@ android {
94
88
  }
95
89
  buildFeatures {
96
90
  prefab true
91
+ buildConfig true
97
92
  }
98
93
  externalNativeBuild {
99
94
  cmake {
@@ -119,7 +114,13 @@ android {
119
114
  "**/libc++_shared.so",
120
115
  "**/libreact_render*.so",
121
116
  "**/libreactnativejni.so",
122
- "**/libreact_performance_timeline.so"
117
+ "**/libreact_performance_timeline.so",
118
+ // In 0.76 multiple react-native's libraries were merged and these are the main new artifacts we're using.
119
+ // Some of above lib* names could be removed after we remove support for 0.76.
120
+ // https://github.com/facebook/react-native/pull/43909
121
+ // https://github.com/facebook/react-native/pull/46059
122
+ "**/libfbjni.so",
123
+ "**/libreactnative.so"
123
124
  ]
124
125
  }
125
126
  sourceSets.main {
@@ -1,5 +1,4 @@
1
1
 
2
- <manifest xmlns:android="http://schemas.android.com/apk/res/android"
3
- package="com.swmansion.rnscreens">
2
+ <manifest xmlns:android="http://schemas.android.com/apk/res/android">
4
3
 
5
4
  </manifest>
@@ -1,6 +1,6 @@
1
1
  package com.swmansion.rnscreens
2
2
 
3
- import com.facebook.react.TurboReactPackage
3
+ import com.facebook.react.BaseReactPackage
4
4
  import com.facebook.react.bridge.NativeModule
5
5
  import com.facebook.react.bridge.ReactApplicationContext
6
6
  import com.facebook.react.module.annotations.ReactModuleList
@@ -9,12 +9,14 @@ import com.facebook.react.module.model.ReactModuleInfoProvider
9
9
  import com.facebook.react.uimanager.ViewManager
10
10
  import com.swmansion.rnscreens.utils.ScreenDummyLayoutHelper
11
11
 
12
+ // Fool autolinking for older versions that do not support BaseReactPackage.
13
+ // public class RNScreensPackage implements TurboReactPackage {
12
14
  @ReactModuleList(
13
15
  nativeModules = [
14
16
  ScreensModule::class,
15
17
  ],
16
18
  )
17
- class RNScreensPackage : TurboReactPackage() {
19
+ class RNScreensPackage : BaseReactPackage() {
18
20
  // We just retain it here. This object helps us tackle jumping content when using native header.
19
21
  // See: https://github.com/software-mansion/react-native-screens/pull/2169
20
22
  private var screenDummyLayoutHelper: ScreenDummyLayoutHelper? = null
@@ -82,7 +82,9 @@ internal class ScreenDummyLayoutHelper(
82
82
  // We need to use activity here, as react context does not have theme attributes required by
83
83
  // AppBarLayout attached leading to crash.
84
84
  val contextWithTheme =
85
- requireNotNull(reactContext.currentActivity) { "[RNScreens] Attempt to use context detached from activity. This could happen only due to race-condition." }
85
+ requireNotNull(reactContext.currentActivity) {
86
+ "[RNScreens] Attempt to use context detached from activity. This could happen only due to race-condition."
87
+ }
86
88
 
87
89
  synchronized(this) {
88
90
  // The layout could have been initialised when this thread waited for access to critical section.
@@ -166,7 +168,7 @@ internal class ScreenDummyLayoutHelper(
166
168
  // is still null at this execution point. We don't wanna crash in such case, thus returning zeroed height.
167
169
  Log.e(
168
170
  TAG,
169
- "[RNScreens] Failed to late-init layout while computing header height. This is most likely a race-condition-bug in react-native-screens, please file an issue at https://github.com/software-mansion/react-native-screens/issues"
171
+ "[RNScreens] Failed to late-init layout while computing header height. This is most likely a race-condition-bug in react-native-screens, please file an issue at https://github.com/software-mansion/react-native-screens/issues",
170
172
  )
171
173
  return 0.0f
172
174
  }
@@ -214,7 +216,8 @@ internal class ScreenDummyLayoutHelper(
214
216
  private fun requireReactContext(lazyMessage: (() -> Any)? = null): ReactApplicationContext =
215
217
  requireNotNull(
216
218
  reactContextRef.get(),
217
- lazyMessage ?: { "[RNScreens] Attempt to require missing react context" })
219
+ lazyMessage ?: { "[RNScreens] Attempt to require missing react context" },
220
+ )
218
221
 
219
222
  private fun requireActivity(): Activity =
220
223
  requireNotNull(requireReactContext().currentActivity) {
@@ -11,10 +11,11 @@ package com.facebook.react.viewmanagers;
11
11
 
12
12
  import android.view.View;
13
13
  import androidx.annotation.Nullable;
14
+ import com.facebook.react.uimanager.BaseViewManager;
14
15
  import com.facebook.react.uimanager.BaseViewManagerDelegate;
15
- import com.facebook.react.uimanager.BaseViewManagerInterface;
16
+ import com.facebook.react.uimanager.LayoutShadowNode;
16
17
 
17
- public class RNSScreenContainerManagerDelegate<T extends View, U extends BaseViewManagerInterface<T> & RNSScreenContainerManagerInterface<T>> extends BaseViewManagerDelegate<T, U> {
18
+ public class RNSScreenContainerManagerDelegate<T extends View, U extends BaseViewManager<T, ? extends LayoutShadowNode> & RNSScreenContainerManagerInterface<T>> extends BaseViewManagerDelegate<T, U> {
18
19
  public RNSScreenContainerManagerDelegate(U viewManager) {
19
20
  super(viewManager);
20
21
  }
@@ -13,10 +13,11 @@ import android.view.View;
13
13
  import androidx.annotation.Nullable;
14
14
  import com.facebook.react.bridge.ColorPropConverter;
15
15
  import com.facebook.react.bridge.ReadableMap;
16
+ import com.facebook.react.uimanager.BaseViewManager;
16
17
  import com.facebook.react.uimanager.BaseViewManagerDelegate;
17
- import com.facebook.react.uimanager.BaseViewManagerInterface;
18
+ import com.facebook.react.uimanager.LayoutShadowNode;
18
19
 
19
- public class RNSScreenManagerDelegate<T extends View, U extends BaseViewManagerInterface<T> & RNSScreenManagerInterface<T>> extends BaseViewManagerDelegate<T, U> {
20
+ public class RNSScreenManagerDelegate<T extends View, U extends BaseViewManager<T, ? extends LayoutShadowNode> & RNSScreenManagerInterface<T>> extends BaseViewManagerDelegate<T, U> {
20
21
  public RNSScreenManagerDelegate(U viewManager) {
21
22
  super(viewManager);
22
23
  }
@@ -12,10 +12,11 @@ package com.facebook.react.viewmanagers;
12
12
  import android.view.View;
13
13
  import androidx.annotation.Nullable;
14
14
  import com.facebook.react.bridge.ColorPropConverter;
15
+ import com.facebook.react.uimanager.BaseViewManager;
15
16
  import com.facebook.react.uimanager.BaseViewManagerDelegate;
16
- import com.facebook.react.uimanager.BaseViewManagerInterface;
17
+ import com.facebook.react.uimanager.LayoutShadowNode;
17
18
 
18
- public class RNSScreenStackHeaderConfigManagerDelegate<T extends View, U extends BaseViewManagerInterface<T> & RNSScreenStackHeaderConfigManagerInterface<T>> extends BaseViewManagerDelegate<T, U> {
19
+ public class RNSScreenStackHeaderConfigManagerDelegate<T extends View, U extends BaseViewManager<T, ? extends LayoutShadowNode> & RNSScreenStackHeaderConfigManagerInterface<T>> extends BaseViewManagerDelegate<T, U> {
19
20
  public RNSScreenStackHeaderConfigManagerDelegate(U viewManager) {
20
21
  super(viewManager);
21
22
  }
@@ -11,10 +11,11 @@ package com.facebook.react.viewmanagers;
11
11
 
12
12
  import android.view.View;
13
13
  import androidx.annotation.Nullable;
14
+ import com.facebook.react.uimanager.BaseViewManager;
14
15
  import com.facebook.react.uimanager.BaseViewManagerDelegate;
15
- import com.facebook.react.uimanager.BaseViewManagerInterface;
16
+ import com.facebook.react.uimanager.LayoutShadowNode;
16
17
 
17
- public class RNSScreenStackHeaderSubviewManagerDelegate<T extends View, U extends BaseViewManagerInterface<T> & RNSScreenStackHeaderSubviewManagerInterface<T>> extends BaseViewManagerDelegate<T, U> {
18
+ public class RNSScreenStackHeaderSubviewManagerDelegate<T extends View, U extends BaseViewManager<T, ? extends LayoutShadowNode> & RNSScreenStackHeaderSubviewManagerInterface<T>> extends BaseViewManagerDelegate<T, U> {
18
19
  public RNSScreenStackHeaderSubviewManagerDelegate(U viewManager) {
19
20
  super(viewManager);
20
21
  }
@@ -11,10 +11,11 @@ package com.facebook.react.viewmanagers;
11
11
 
12
12
  import android.view.View;
13
13
  import androidx.annotation.Nullable;
14
+ import com.facebook.react.uimanager.BaseViewManager;
14
15
  import com.facebook.react.uimanager.BaseViewManagerDelegate;
15
- import com.facebook.react.uimanager.BaseViewManagerInterface;
16
+ import com.facebook.react.uimanager.LayoutShadowNode;
16
17
 
17
- public class RNSScreenStackManagerDelegate<T extends View, U extends BaseViewManagerInterface<T> & RNSScreenStackManagerInterface<T>> extends BaseViewManagerDelegate<T, U> {
18
+ public class RNSScreenStackManagerDelegate<T extends View, U extends BaseViewManager<T, ? extends LayoutShadowNode> & RNSScreenStackManagerInterface<T>> extends BaseViewManagerDelegate<T, U> {
18
19
  public RNSScreenStackManagerDelegate(U viewManager) {
19
20
  super(viewManager);
20
21
  }
@@ -13,10 +13,11 @@ import android.view.View;
13
13
  import androidx.annotation.Nullable;
14
14
  import com.facebook.react.bridge.ColorPropConverter;
15
15
  import com.facebook.react.bridge.ReadableArray;
16
+ import com.facebook.react.uimanager.BaseViewManager;
16
17
  import com.facebook.react.uimanager.BaseViewManagerDelegate;
17
- import com.facebook.react.uimanager.BaseViewManagerInterface;
18
+ import com.facebook.react.uimanager.LayoutShadowNode;
18
19
 
19
- public class RNSSearchBarManagerDelegate<T extends View, U extends BaseViewManagerInterface<T> & RNSSearchBarManagerInterface<T>> extends BaseViewManagerDelegate<T, U> {
20
+ public class RNSSearchBarManagerDelegate<T extends View, U extends BaseViewManager<T, ? extends LayoutShadowNode> & RNSSearchBarManagerInterface<T>> extends BaseViewManagerDelegate<T, U> {
20
21
  public RNSSearchBarManagerDelegate(U viewManager) {
21
22
  super(viewManager);
22
23
  }
@@ -26,10 +26,10 @@ findHeaderConfigChild(const YogaLayoutableShadowNode &screenShadowNode) {
26
26
  return {};
27
27
  }
28
28
 
29
+ #ifdef ANDROID
29
30
  static constexpr const char *kScreenDummyLayoutHelperClass =
30
31
  "com/swmansion/rnscreens/utils/ScreenDummyLayoutHelper";
31
32
 
32
- #ifdef ANDROID
33
33
  std::optional<float> findHeaderHeight(
34
34
  const int fontSize,
35
35
  const bool isTitleEmpty) {
package/ios/RNSEnums.h CHANGED
@@ -60,8 +60,8 @@ typedef NS_ENUM(NSInteger, RNSScreenStackHeaderSubviewType) {
60
60
  };
61
61
 
62
62
  typedef NS_ENUM(NSInteger, RNSScreenDetentType) {
63
- RNSScreenDetentTypeMedium,
64
63
  RNSScreenDetentTypeLarge,
64
+ RNSScreenDetentTypeMedium,
65
65
  RNSScreenDetentTypeAll,
66
66
  };
67
67
 
@@ -1,5 +1,6 @@
1
1
  #import <UIKit/UIKit.h>
2
2
 
3
+ #import "RNSDefines.h"
3
4
  #import "RNSFullWindowOverlay.h"
4
5
 
5
6
  #ifdef RCT_NEW_ARCH_ENABLED
@@ -198,6 +199,8 @@
198
199
  [childComponentView removeFromSuperview];
199
200
  }
200
201
 
202
+ RNS_IGNORE_SUPER_CALL_BEGIN
203
+ // We do not set frame for ouselves, but rather for the container.
201
204
  - (void)updateLayoutMetrics:(react::LayoutMetrics const &)layoutMetrics
202
205
  oldLayoutMetrics:(react::LayoutMetrics const &)oldLayoutMetrics
203
206
  {
@@ -205,6 +208,7 @@
205
208
  _reactFrame = frame;
206
209
  [_container setFrame:frame];
207
210
  }
211
+ RNS_IGNORE_SUPER_CALL_END
208
212
 
209
213
  #else
210
214
  #pragma mark - Paper specific
package/ios/RNSScreen.mm CHANGED
@@ -25,6 +25,7 @@
25
25
  #import "RNSScreenStack.h"
26
26
  #import "RNSScreenStackHeaderConfig.h"
27
27
 
28
+ #import "RNSDefines.h"
28
29
  #import "UIView+RNSUtility.h"
29
30
 
30
31
  #ifdef RCT_NEW_ARCH_ENABLED
@@ -109,10 +110,12 @@ namespace react = facebook::react;
109
110
  }
110
111
 
111
112
  #ifdef RCT_NEW_ARCH_ENABLED
113
+ RNS_IGNORE_SUPER_CALL_BEGIN
112
114
  - (NSArray<UIView *> *)reactSubviews
113
115
  {
114
116
  return _reactSubviews;
115
117
  }
118
+ RNS_IGNORE_SUPER_CALL_END
116
119
  #endif
117
120
 
118
121
  - (void)updateBounds
@@ -291,10 +294,12 @@ namespace react = facebook::react;
291
294
  }
292
295
  #endif
293
296
 
297
+ RNS_IGNORE_SUPER_CALL_BEGIN
294
298
  - (UIView *)reactSuperview
295
299
  {
296
300
  return _reactSuperview;
297
301
  }
302
+ RNS_IGNORE_SUPER_CALL_END
298
303
 
299
304
  - (void)addSubview:(UIView *)view
300
305
  {
@@ -1619,7 +1624,7 @@ RCT_ENUM_CONVERTER(
1619
1624
  @"medium" : @(RNSScreenDetentTypeMedium),
1620
1625
  @"all" : @(RNSScreenDetentTypeAll),
1621
1626
  }),
1622
- RNSScreenDetentTypeAll,
1627
+ RNSScreenDetentTypeLarge,
1623
1628
  integerValue)
1624
1629
 
1625
1630
  + (UIInterfaceOrientationMask)UIInterfaceOrientationMask:(id)json
@@ -1,4 +1,5 @@
1
1
  #import "RNSScreenContainer.h"
2
+ #import "RNSDefines.h"
2
3
  #import "RNSScreen.h"
3
4
 
4
5
  #ifdef RCT_NEW_ARCH_ENABLED
@@ -89,6 +90,9 @@ namespace react = facebook::react;
89
90
  [self updateContainer];
90
91
  }
91
92
 
93
+ RNS_IGNORE_SUPER_CALL_BEGIN
94
+ // We do not call super as we do not want to update UIKit model. It will
95
+ // be updated after we receive all mutations.
92
96
  - (void)insertReactSubview:(RNSScreenView *)subview atIndex:(NSInteger)atIndex
93
97
  {
94
98
  subview.reactSuperview = self;
@@ -106,6 +110,7 @@ namespace react = facebook::react;
106
110
  {
107
111
  return _reactSubviews;
108
112
  }
113
+ RNS_IGNORE_SUPER_CALL_END
109
114
 
110
115
  - (UIViewController *)reactViewController
111
116
  {
@@ -20,6 +20,7 @@
20
20
  #import "RCTTouchHandler+RNSUtility.h"
21
21
  #endif // RCT_NEW_ARCH_ENABLED
22
22
 
23
+ #import "RNSDefines.h"
23
24
  #import "RNSScreen.h"
24
25
  #import "RNSScreenStack.h"
25
26
  #import "RNSScreenStackAnimator.h"
@@ -257,10 +258,12 @@ namespace react = facebook::react;
257
258
  }
258
259
  }
259
260
 
261
+ RNS_IGNORE_SUPER_CALL_BEGIN
260
262
  - (NSArray<UIView *> *)reactSubviews
261
263
  {
262
264
  return _reactSubviews;
263
265
  }
266
+ RNS_IGNORE_SUPER_CALL_END
264
267
 
265
268
  - (void)didMoveToWindow
266
269
  {
@@ -1048,6 +1051,9 @@ namespace react = facebook::react;
1048
1051
 
1049
1052
  #endif // !TARGET_OS_TV
1050
1053
 
1054
+ RNS_IGNORE_SUPER_CALL_BEGIN
1055
+ // We hijack the udpates as we don't want to update UIKit model yet.
1056
+ // This is done after all mutations are processed.
1051
1057
  - (void)insertReactSubview:(RNSScreenView *)subview atIndex:(NSInteger)atIndex
1052
1058
  {
1053
1059
  if (![subview isKindOfClass:[RNSScreenView class]]) {
@@ -1063,6 +1069,7 @@ namespace react = facebook::react;
1063
1069
  subview.reactSuperview = nil;
1064
1070
  [_reactSubviews removeObject:subview];
1065
1071
  }
1072
+ RNS_IGNORE_SUPER_CALL_END
1066
1073
 
1067
1074
  - (void)didUpdateReactSubviews
1068
1075
  {
@@ -11,7 +11,7 @@
11
11
 
12
12
  @interface NSString (RNSStringUtil)
13
13
 
14
- + (BOOL)RNSisBlank:(NSString *)string;
14
+ + (BOOL)RNSisBlank:(nullable NSString *)string;
15
15
 
16
16
  @end
17
17
 
@@ -30,6 +30,8 @@
30
30
  @property (nonatomic) BOOL hide;
31
31
  #endif
32
32
 
33
+ NS_ASSUME_NONNULL_BEGIN
34
+
33
35
  @property (nonatomic, retain) NSString *title;
34
36
  @property (nonatomic, retain) NSString *titleFontFamily;
35
37
  @property (nonatomic, retain) NSNumber *titleFontSize;
@@ -57,9 +59,11 @@
57
59
  @property (nonatomic) UINavigationItemBackButtonDisplayMode backButtonDisplayMode;
58
60
  @property (nonatomic) RNSBlurEffectStyle blurEffect;
59
61
 
60
- + (void)willShowViewController:(UIViewController *)vc
62
+ NS_ASSUME_NONNULL_END
63
+
64
+ + (void)willShowViewController:(nonnull UIViewController *)vc
61
65
  animated:(BOOL)animated
62
- withConfig:(RNSScreenStackHeaderConfig *)config;
66
+ withConfig:(nonnull RNSScreenStackHeaderConfig *)config;
63
67
 
64
68
  @end
65
69
 
@@ -69,8 +73,7 @@
69
73
 
70
74
  @interface RCTConvert (RNSScreenStackHeader)
71
75
 
72
- + (UIBlurEffectStyle)UIBlurEffectStyle:(id)json;
73
- + (UISemanticContentAttribute)UISemanticContentAttribute:(id)json;
74
- + (UINavigationItemBackButtonDisplayMode)UINavigationItemBackButtonDisplayMode:(id)json;
76
+ + (UISemanticContentAttribute)UISemanticContentAttribute:(nonnull id)json;
77
+ + (UINavigationItemBackButtonDisplayMode)UINavigationItemBackButtonDisplayMode:(nonnull id)json;
75
78
 
76
79
  @end
@@ -20,6 +20,7 @@
20
20
  #import <React/RCTImageLoader.h>
21
21
  #import <React/RCTImageSource.h>
22
22
  #import "RNSConvert.h"
23
+ #import "RNSDefines.h"
23
24
  #import "RNSScreen.h"
24
25
  #import "RNSScreenStackHeaderConfig.h"
25
26
  #import "RNSSearchBar.h"
@@ -99,6 +100,7 @@ namespace react = facebook::react;
99
100
  _blurEffect = RNSBlurEffectStyleNone;
100
101
  }
101
102
 
103
+ RNS_IGNORE_SUPER_CALL_BEGIN
102
104
  - (UIView *)reactSuperview
103
105
  {
104
106
  return _screenView;
@@ -108,6 +110,7 @@ namespace react = facebook::react;
108
110
  {
109
111
  return _reactSubviews;
110
112
  }
113
+ RNS_IGNORE_SUPER_CALL_END
111
114
 
112
115
  - (void)removeFromSuperview
113
116
  {
@@ -730,6 +733,7 @@ namespace react = facebook::react;
730
733
  }
731
734
  }
732
735
 
736
+ RNS_IGNORE_SUPER_CALL_BEGIN
733
737
  - (void)insertReactSubview:(RNSScreenStackHeaderSubview *)subview atIndex:(NSInteger)atIndex
734
738
  {
735
739
  [_reactSubviews insertObject:subview atIndex:atIndex];
@@ -740,6 +744,7 @@ namespace react = facebook::react;
740
744
  {
741
745
  [_reactSubviews removeObject:subview];
742
746
  }
747
+ RNS_IGNORE_SUPER_CALL_BEGIN
743
748
 
744
749
  - (void)didUpdateReactSubviews
745
750
  {
@@ -824,6 +829,9 @@ static RCTResizeMode resizeModeFromCppEquiv(react::ImageResizeMode resizeMode)
824
829
  return RCTResizeModeCenter;
825
830
  case react::ImageResizeMode::Repeat:
826
831
  return RCTResizeModeRepeat;
832
+ default:
833
+ // Both RCTConvert and ImageProps use this as a default as of RN 0.76
834
+ return RCTResizeModeStretch;
827
835
  }
828
836
  }
829
837
 
@@ -1,5 +1,6 @@
1
1
  #import "RNSScreenStackHeaderSubview.h"
2
2
  #import "RNSConvert.h"
3
+ #import "RNSDefines.h"
3
4
  #import "RNSScreenStackHeaderConfig.h"
4
5
 
5
6
  #ifdef RCT_NEW_ARCH_ENABLED
@@ -84,6 +85,8 @@ namespace react = facebook::react;
84
85
  return react::concreteComponentDescriptorProvider<react::RNSScreenStackHeaderSubviewComponentDescriptor>();
85
86
  }
86
87
 
88
+ RNS_IGNORE_SUPER_CALL_BEGIN
89
+ // System layouts the subviews.
87
90
  - (void)updateLayoutMetrics:(const react::LayoutMetrics &)layoutMetrics
88
91
  oldLayoutMetrics:(const react::LayoutMetrics &)oldLayoutMetrics
89
92
  {
@@ -103,6 +106,7 @@ namespace react = facebook::react;
103
106
  [self layoutNavigationBarIfNeeded];
104
107
  }
105
108
  }
109
+ RNS_IGNORE_SUPER_CALL_BEGIN
106
110
 
107
111
  + (BOOL)shouldBeRecycled
108
112
  {
@@ -0,0 +1,7 @@
1
+ #pragma once
2
+
3
+ #define RNS_IGNORE_SUPER_CALL_BEGIN \
4
+ _Pragma("clang diagnostic push") \
5
+ _Pragma("clang diagnostic ignored \"-Wobjc-missing-super-calls\"")
6
+
7
+ #define RNS_IGNORE_SUPER_CALL_END _Pragma("clang diagnostic pop")
@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
6
6
  });
7
7
  exports.default = void 0;
8
8
  var _react = _interopRequireDefault(require("react"));
9
- var _reactNativeScreens = require("react-native-screens");
9
+ var _core = require("../core");
10
10
  var _DelayedFreeze = _interopRequireDefault(require("./helpers/DelayedFreeze"));
11
11
  var _ScreenStackNativeComponent = _interopRequireDefault(require("../fabric/ScreenStackNativeComponent"));
12
12
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -31,7 +31,7 @@ function ScreenStack(props) {
31
31
  key
32
32
  } = child;
33
33
  const descriptor = props?.descriptor ?? props?.descriptors?.[key];
34
- const isFreezeEnabled = descriptor?.options?.freezeOnBlur ?? (0, _reactNativeScreens.freezeEnabled)();
34
+ const isFreezeEnabled = descriptor?.options?.freezeOnBlur ?? (0, _core.freezeEnabled)();
35
35
 
36
36
  // On Fabric, when screen is frozen, animated and reanimated values are not updated
37
37
  // due to component being unmounted. To avoid this, we don't freeze the previous screen there
@@ -1 +1 @@
1
- {"version":3,"names":["Object","defineProperty","exports","value","default","_react","_interopRequireDefault","require","_reactNativeScreens","_DelayedFreeze","_ScreenStackNativeComponent","obj","__esModule","_extends","assign","bind","target","i","arguments","length","source","key","prototype","hasOwnProperty","call","apply","NativeScreenStack","ScreenStackNativeComponent","isFabric","global","ScreenStack","props","children","gestureDetectorBridge","rest","ref","React","useRef","size","Children","count","childrenWithFreeze","map","child","index","descriptor","descriptors","isFreezeEnabled","options","freezeOnBlur","freezeEnabled","freezePreviousScreen","createElement","freeze","useEffect","current","stackUseEffectCallback","_default"],"sourceRoot":"../../../src","sources":["components/ScreenStack.tsx"],"mappings":";AAAA,YAAY;;AAACA,MAAA,CAAAC,cAAA,CAAAC,OAAA;EAAAC,KAAA;AAAA;AAAAD,OAAA,CAAAE,OAAA;AAEb,IAAAC,MAAA,GAAAC,sBAAA,CAAAC,OAAA;AACA,IAAAC,mBAAA,GAAAD,OAAA;AACA,IAAAE,cAAA,GAAAH,sBAAA,CAAAC,OAAA;AAGA,IAAAG,2BAAA,GAAAJ,sBAAA,CAAAC,OAAA;AAA8E,SAAAD,uBAAAK,GAAA,WAAAA,GAAA,IAAAA,GAAA,CAAAC,UAAA,GAAAD,GAAA,KAAAP,OAAA,EAAAO,GAAA;AAAA,SAAAE,SAAA,IAAAA,QAAA,GAAAb,MAAA,CAAAc,MAAA,GAAAd,MAAA,CAAAc,MAAA,CAAAC,IAAA,eAAAC,MAAA,aAAAC,CAAA,MAAAA,CAAA,GAAAC,SAAA,CAAAC,MAAA,EAAAF,CAAA,UAAAG,MAAA,GAAAF,SAAA,CAAAD,CAAA,YAAAI,GAAA,IAAAD,MAAA,QAAApB,MAAA,CAAAsB,SAAA,CAAAC,cAAA,CAAAC,IAAA,CAAAJ,MAAA,EAAAC,GAAA,KAAAL,MAAA,CAAAK,GAAA,IAAAD,MAAA,CAAAC,GAAA,gBAAAL,MAAA,YAAAH,QAAA,CAAAY,KAAA,OAAAP,SAAA,KAD9E;AAEA,MAAMQ,iBAAwD,GAC5DC,mCAAiC;AAEnC,SAASC,QAAQA,CAAA,EAAG;EAClB,OAAO,uBAAuB,IAAIC,MAAM;AAC1C;AAEA,SAASC,WAAWA,CAACC,KAAuB,EAAE;EAC5C,MAAM;IAAEC,QAAQ;IAAEC,qBAAqB;IAAE,GAAGC;EAAK,CAAC,GAAGH,KAAK;EAC1D,MAAMI,GAAG,GAAGC,cAAK,CAACC,MAAM,CAAC,IAAI,CAAC;EAC9B,MAAMC,IAAI,GAAGF,cAAK,CAACG,QAAQ,CAACC,KAAK,CAACR,QAAQ,CAAC;EAC3C;EACA,MAAMS,kBAAkB,GAAGL,cAAK,CAACG,QAAQ,CAACG,GAAG,CAACV,QAAQ,EAAE,CAACW,KAAK,EAAEC,KAAK,KAAK;IACxE;IACA,MAAM;MAAEb,KAAK;MAAEV;IAAI,CAAC,GAAGsB,KAAK;IAC5B,MAAME,UAAU,GAAGd,KAAK,EAAEc,UAAU,IAAId,KAAK,EAAEe,WAAW,GAAGzB,GAAG,CAAC;IACjE,MAAM0B,eAAe,GACnBF,UAAU,EAAEG,OAAO,EAAEC,YAAY,IAAI,IAAAC,iCAAa,EAAC,CAAC;;IAEtD;IACA;IACA,MAAMC,oBAAoB,GAAGvB,QAAQ,CAAC,CAAC,GACnCU,IAAI,GAAGM,KAAK,GAAG,CAAC,GAChBN,IAAI,GAAGM,KAAK,GAAG,CAAC;IAEpB,oBACEvC,MAAA,CAAAD,OAAA,CAAAgD,aAAA,CAAC3C,cAAA,CAAAL,OAAa;MAACiD,MAAM,EAAEN,eAAe,IAAII;IAAqB,GAC5DR,KACY,CAAC;EAEpB,CAAC,CAAC;EAEFP,cAAK,CAACkB,SAAS,CAAC,MAAM;IACpB,IAAIrB,qBAAqB,EAAE;MACzBA,qBAAqB,CAACsB,OAAO,CAACC,sBAAsB,CAACrB,GAAG,CAAC;IAC3D;EACF,CAAC,CAAC;EACF,oBACE9B,MAAA,CAAAD,OAAA,CAAAgD,aAAA,CAAC1B,iBAAiB,EAAAb,QAAA,KAAKqB,IAAI;IAAEC,GAAG,EAAEA;EAAI,IACnCM,kBACgB,CAAC;AAExB;AAAC,IAAAgB,QAAA,GAAAvD,OAAA,CAAAE,OAAA,GAEc0B,WAAW"}
1
+ {"version":3,"names":["Object","defineProperty","exports","value","default","_react","_interopRequireDefault","require","_core","_DelayedFreeze","_ScreenStackNativeComponent","obj","__esModule","_extends","assign","bind","target","i","arguments","length","source","key","prototype","hasOwnProperty","call","apply","NativeScreenStack","ScreenStackNativeComponent","isFabric","global","ScreenStack","props","children","gestureDetectorBridge","rest","ref","React","useRef","size","Children","count","childrenWithFreeze","map","child","index","descriptor","descriptors","isFreezeEnabled","options","freezeOnBlur","freezeEnabled","freezePreviousScreen","createElement","freeze","useEffect","current","stackUseEffectCallback","_default"],"sourceRoot":"../../../src","sources":["components/ScreenStack.tsx"],"mappings":";AAAA,YAAY;;AAACA,MAAA,CAAAC,cAAA,CAAAC,OAAA;EAAAC,KAAA;AAAA;AAAAD,OAAA,CAAAE,OAAA;AAEb,IAAAC,MAAA,GAAAC,sBAAA,CAAAC,OAAA;AAEA,IAAAC,KAAA,GAAAD,OAAA;AACA,IAAAE,cAAA,GAAAH,sBAAA,CAAAC,OAAA;AAGA,IAAAG,2BAAA,GAAAJ,sBAAA,CAAAC,OAAA;AAA8E,SAAAD,uBAAAK,GAAA,WAAAA,GAAA,IAAAA,GAAA,CAAAC,UAAA,GAAAD,GAAA,KAAAP,OAAA,EAAAO,GAAA;AAAA,SAAAE,SAAA,IAAAA,QAAA,GAAAb,MAAA,CAAAc,MAAA,GAAAd,MAAA,CAAAc,MAAA,CAAAC,IAAA,eAAAC,MAAA,aAAAC,CAAA,MAAAA,CAAA,GAAAC,SAAA,CAAAC,MAAA,EAAAF,CAAA,UAAAG,MAAA,GAAAF,SAAA,CAAAD,CAAA,YAAAI,GAAA,IAAAD,MAAA,QAAApB,MAAA,CAAAsB,SAAA,CAAAC,cAAA,CAAAC,IAAA,CAAAJ,MAAA,EAAAC,GAAA,KAAAL,MAAA,CAAAK,GAAA,IAAAD,MAAA,CAAAC,GAAA,gBAAAL,MAAA,YAAAH,QAAA,CAAAY,KAAA,OAAAP,SAAA,KAD9E;AAEA,MAAMQ,iBAAwD,GAC5DC,mCAAiC;AAEnC,SAASC,QAAQA,CAAA,EAAG;EAClB,OAAO,uBAAuB,IAAIC,MAAM;AAC1C;AAEA,SAASC,WAAWA,CAACC,KAAuB,EAAE;EAC5C,MAAM;IAAEC,QAAQ;IAAEC,qBAAqB;IAAE,GAAGC;EAAK,CAAC,GAAGH,KAAK;EAC1D,MAAMI,GAAG,GAAGC,cAAK,CAACC,MAAM,CAAC,IAAI,CAAC;EAC9B,MAAMC,IAAI,GAAGF,cAAK,CAACG,QAAQ,CAACC,KAAK,CAACR,QAAQ,CAAC;EAC3C;EACA,MAAMS,kBAAkB,GAAGL,cAAK,CAACG,QAAQ,CAACG,GAAG,CAACV,QAAQ,EAAE,CAACW,KAAK,EAAEC,KAAK,KAAK;IACxE;IACA,MAAM;MAAEb,KAAK;MAAEV;IAAI,CAAC,GAAGsB,KAAK;IAC5B,MAAME,UAAU,GAAGd,KAAK,EAAEc,UAAU,IAAId,KAAK,EAAEe,WAAW,GAAGzB,GAAG,CAAC;IACjE,MAAM0B,eAAe,GACnBF,UAAU,EAAEG,OAAO,EAAEC,YAAY,IAAI,IAAAC,mBAAa,EAAC,CAAC;;IAEtD;IACA;IACA,MAAMC,oBAAoB,GAAGvB,QAAQ,CAAC,CAAC,GACnCU,IAAI,GAAGM,KAAK,GAAG,CAAC,GAChBN,IAAI,GAAGM,KAAK,GAAG,CAAC;IAEpB,oBACEvC,MAAA,CAAAD,OAAA,CAAAgD,aAAA,CAAC3C,cAAA,CAAAL,OAAa;MAACiD,MAAM,EAAEN,eAAe,IAAII;IAAqB,GAC5DR,KACY,CAAC;EAEpB,CAAC,CAAC;EAEFP,cAAK,CAACkB,SAAS,CAAC,MAAM;IACpB,IAAIrB,qBAAqB,EAAE;MACzBA,qBAAqB,CAACsB,OAAO,CAACC,sBAAsB,CAACrB,GAAG,CAAC;IAC3D;EACF,CAAC,CAAC;EACF,oBACE9B,MAAA,CAAAD,OAAA,CAAAgD,aAAA,CAAC1B,iBAAiB,EAAAb,QAAA,KAAKqB,IAAI;IAAEC,GAAG,EAAEA;EAAI,IACnCM,kBACgB,CAAC;AAExB;AAAC,IAAAgB,QAAA,GAAAvD,OAAA,CAAAE,OAAA,GAEc0B,WAAW"}
@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
6
6
  });
7
7
  exports.default = exports.NativeSearchBarCommands = exports.NativeSearchBar = void 0;
8
8
  var _react = _interopRequireDefault(require("react"));
9
- var _reactNativeScreens = require("react-native-screens");
9
+ var _utils = require("../utils");
10
10
  var _reactNative = require("react-native");
11
11
  var _SearchBarNativeComponent = _interopRequireWildcard(require("../fabric/SearchBarNativeComponent"));
12
12
  function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
@@ -45,7 +45,7 @@ function SearchBar(props, ref) {
45
45
  console.warn('Reference to native search bar component has not been updated yet');
46
46
  }
47
47
  }, [searchBarRef]);
48
- if (!_reactNativeScreens.isSearchBarAvailableForCurrentPlatform) {
48
+ if (!_utils.isSearchBarAvailableForCurrentPlatform) {
49
49
  console.warn('Importing SearchBar is only valid on iOS and Android devices.');
50
50
  return _reactNative.View;
51
51
  }
@@ -1 +1 @@
1
- {"version":3,"names":["Object","defineProperty","exports","value","default","NativeSearchBarCommands","NativeSearchBar","_react","_interopRequireDefault","require","_reactNativeScreens","_reactNative","_SearchBarNativeComponent","_interopRequireWildcard","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","has","get","n","__proto__","a","getOwnPropertyDescriptor","u","prototype","hasOwnProperty","call","i","set","obj","_extends","assign","bind","target","arguments","length","source","key","apply","SearchBarNativeComponent","SearchBarNativeCommands","SearchBar","props","ref","searchBarRef","React","useRef","useImperativeHandle","blur","_callMethodWithRef","focus","toggleCancelButton","flag","clearText","setText","text","cancelSearch","useCallback","method","current","console","warn","isSearchBarAvailableForCurrentPlatform","View","createElement","onSearchFocus","onFocus","onSearchBlur","onBlur","onSearchButtonPress","onCancelButtonPress","onChangeText","_default","forwardRef"],"sourceRoot":"../../../src","sources":["components/SearchBar.tsx"],"mappings":"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"}
1
+ {"version":3,"names":["Object","defineProperty","exports","value","default","NativeSearchBarCommands","NativeSearchBar","_react","_interopRequireDefault","require","_utils","_reactNative","_SearchBarNativeComponent","_interopRequireWildcard","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","has","get","n","__proto__","a","getOwnPropertyDescriptor","u","prototype","hasOwnProperty","call","i","set","obj","_extends","assign","bind","target","arguments","length","source","key","apply","SearchBarNativeComponent","SearchBarNativeCommands","SearchBar","props","ref","searchBarRef","React","useRef","useImperativeHandle","blur","_callMethodWithRef","focus","toggleCancelButton","flag","clearText","setText","text","cancelSearch","useCallback","method","current","console","warn","isSearchBarAvailableForCurrentPlatform","View","createElement","onSearchFocus","onFocus","onSearchBlur","onBlur","onSearchButtonPress","onCancelButtonPress","onChangeText","_default","forwardRef"],"sourceRoot":"../../../src","sources":["components/SearchBar.tsx"],"mappings":"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"}
@@ -5,14 +5,14 @@ Object.defineProperty(exports, "__esModule", {
5
5
  });
6
6
  exports.default = GestureDetectorProvider;
7
7
  var _react = _interopRequireDefault(require("react"));
8
- var _reactNativeScreens = require("react-native-screens");
8
+ var _GHContext = require("../native-stack/contexts/GHContext");
9
9
  var _ScreenGestureDetector = _interopRequireDefault(require("./ScreenGestureDetector"));
10
10
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
11
11
  function GHWrapper(props) {
12
12
  return /*#__PURE__*/_react.default.createElement(_ScreenGestureDetector.default, props);
13
13
  }
14
14
  function GestureDetectorProvider(props) {
15
- return /*#__PURE__*/_react.default.createElement(_reactNativeScreens.GHContext.Provider, {
15
+ return /*#__PURE__*/_react.default.createElement(_GHContext.GHContext.Provider, {
16
16
  value: GHWrapper
17
17
  }, props.children);
18
18
  }
@@ -1 +1 @@
1
- {"version":3,"names":["_react","_interopRequireDefault","require","_reactNativeScreens","_ScreenGestureDetector","obj","__esModule","default","GHWrapper","props","createElement","GestureDetectorProvider","GHContext","Provider","value","children"],"sourceRoot":"../../../src","sources":["gesture-handler/GestureDetectorProvider.tsx"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,sBAAA,CAAAC,OAAA;AACA,IAAAC,mBAAA,GAAAD,OAAA;AACA,IAAAE,sBAAA,GAAAH,sBAAA,CAAAC,OAAA;AAA4D,SAAAD,uBAAAI,GAAA,WAAAA,GAAA,IAAAA,GAAA,CAAAC,UAAA,GAAAD,GAAA,KAAAE,OAAA,EAAAF,GAAA;AAG5D,SAASG,SAASA,CAACC,KAA2B,EAAE;EAC9C,oBAAOT,MAAA,CAAAO,OAAA,CAAAG,aAAA,CAACN,sBAAA,CAAAG,OAAqB,EAAKE,KAAQ,CAAC;AAC7C;AAEe,SAASE,uBAAuBA,CAACF,KAE/C,EAAE;EACD,oBACET,MAAA,CAAAO,OAAA,CAAAG,aAAA,CAACP,mBAAA,CAAAS,SAAS,CAACC,QAAQ;IAACC,KAAK,EAAEN;EAAU,GAAEC,KAAK,CAACM,QAA6B,CAAC;AAE/E"}
1
+ {"version":3,"names":["_react","_interopRequireDefault","require","_GHContext","_ScreenGestureDetector","obj","__esModule","default","GHWrapper","props","createElement","GestureDetectorProvider","GHContext","Provider","value","children"],"sourceRoot":"../../../src","sources":["gesture-handler/GestureDetectorProvider.tsx"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,sBAAA,CAAAC,OAAA;AACA,IAAAC,UAAA,GAAAD,OAAA;AACA,IAAAE,sBAAA,GAAAH,sBAAA,CAAAC,OAAA;AAA4D,SAAAD,uBAAAI,GAAA,WAAAA,GAAA,IAAAA,GAAA,CAAAC,UAAA,GAAAD,GAAA,KAAAE,OAAA,EAAAF,GAAA;AAG5D,SAASG,SAASA,CAACC,KAA2B,EAAE;EAC9C,oBAAOT,MAAA,CAAAO,OAAA,CAAAG,aAAA,CAACN,sBAAA,CAAAG,OAAqB,EAAKE,KAAQ,CAAC;AAC7C;AAEe,SAASE,uBAAuBA,CAACF,KAE/C,EAAE;EACD,oBACET,MAAA,CAAAO,OAAA,CAAAG,aAAA,CAACP,UAAA,CAAAS,SAAS,CAACC,QAAQ;IAACC,KAAK,EAAEN;EAAU,GAAEC,KAAK,CAACM,QAA6B,CAAC;AAE/E"}