react-native-navigation 7.37.2 → 7.38.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.
- package/.nvmrc +1 -1
- package/ReactNativeNavigation.podspec +8 -2
- package/lib/android/app/build.gradle +12 -12
- package/lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/stack/topbar/button/ButtonPresenter.kt +2 -2
- package/lib/android/app/src/main/java/com/reactnativenavigation/views/stack/topbar/titlebar/TitleAndButtonsContainer.kt +1 -1
- package/lib/ios/RNNAppDelegate.mm +1 -2
- package/lib/ios/RNNReactView.h +2 -2
- package/lib/ios/{RNNReactView.m → RNNReactView.mm} +6 -4
- package/metro.config.js +4 -0
- package/package.json +12 -8
package/.nvmrc
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
|
|
1
|
+
20
|
|
@@ -16,7 +16,7 @@ Pod::Spec.new do |s|
|
|
|
16
16
|
|
|
17
17
|
s.module_name = 'ReactNativeNavigation'
|
|
18
18
|
s.default_subspec = 'Core'
|
|
19
|
-
|
|
19
|
+
|
|
20
20
|
s.subspec 'Core' do |ss|
|
|
21
21
|
s.source = { :git => "https://github.com/wix/react-native-navigation.git", :tag => "#{s.version}" }
|
|
22
22
|
s.source_files = 'lib/ios/**/*.{h,m,mm,cpp}'
|
|
@@ -24,12 +24,17 @@ Pod::Spec.new do |s|
|
|
|
24
24
|
end
|
|
25
25
|
|
|
26
26
|
if fabric_enabled
|
|
27
|
+
install_modules_dependencies(s)
|
|
28
|
+
|
|
27
29
|
folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32'
|
|
28
30
|
fabric_flags = fabric_enabled ? '-DRCT_NEW_ARCH_ENABLED' : ''
|
|
31
|
+
|
|
29
32
|
s.pod_target_xcconfig = {
|
|
30
|
-
|
|
33
|
+
'HEADER_SEARCH_PATHS' => '"$(PODS_ROOT)/boost" "$(PODS_ROOT)/boost-for-react-native" "$(PODS_ROOT)/RCT-Folly" "$(PODS_ROOT)/Headers/Private/React-Core" "$(PODS_ROOT)/Headers/Private/Yoga"',
|
|
31
34
|
"CLANG_CXX_LANGUAGE_STANDARD" => "c++17",
|
|
35
|
+
"OTHER_CPLUSPLUSFLAGS" => "-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1",
|
|
32
36
|
}
|
|
37
|
+
|
|
33
38
|
s.compiler_flags = folly_compiler_flags + ' ' + '-DRCT_NEW_ARCH_ENABLED'
|
|
34
39
|
s.requires_arc = true
|
|
35
40
|
|
|
@@ -45,6 +50,7 @@ Pod::Spec.new do |s|
|
|
|
45
50
|
s.dependency "React-runtimeexecutor"
|
|
46
51
|
s.dependency "React-rncore"
|
|
47
52
|
end
|
|
53
|
+
|
|
48
54
|
s.dependency 'React-Core'
|
|
49
55
|
s.dependency 'React-CoreModules'
|
|
50
56
|
s.dependency 'React-RCTImage'
|
|
@@ -12,9 +12,9 @@ def safeExtGetFallbackLowerBound(prop, fallback) {
|
|
|
12
12
|
Math.max(safeExtGet(prop,fallback),fallback)
|
|
13
13
|
}
|
|
14
14
|
|
|
15
|
-
def DEFAULT_COMPILE_SDK_VERSION =
|
|
15
|
+
def DEFAULT_COMPILE_SDK_VERSION = 34
|
|
16
16
|
def DEFAULT_MIN_SDK_VERSION = 21
|
|
17
|
-
def DEFAULT_TARGET_SDK_VERSION =
|
|
17
|
+
def DEFAULT_TARGET_SDK_VERSION = 34
|
|
18
18
|
def DEFAULT_KOTLIN_VERSION = "1.5.31"
|
|
19
19
|
def DEFAULT_KOTLIN_STDLIB = 'kotlin-stdlib-jdk8'
|
|
20
20
|
def kotlinVersion = safeExtGet("RNNKotlinVersion", DEFAULT_KOTLIN_VERSION)
|
|
@@ -22,7 +22,7 @@ def kotlinStdlib = safeExtGet('RNNKotlinStdlib',DEFAULT_KOTLIN_STDLIB )
|
|
|
22
22
|
def kotlinCoroutinesCore = safeExtGet('RNNKotlinCoroutinesCore', '1.5.2')
|
|
23
23
|
android {
|
|
24
24
|
compileSdkVersion safeExtGetFallbackLowerBound('compileSdkVersion', DEFAULT_COMPILE_SDK_VERSION)
|
|
25
|
-
buildToolsVersion = "
|
|
25
|
+
buildToolsVersion = "34.0.0"
|
|
26
26
|
defaultConfig {
|
|
27
27
|
minSdkVersion safeExtGetFallbackLowerBound('minSdkVersion', DEFAULT_MIN_SDK_VERSION)
|
|
28
28
|
targetSdkVersion safeExtGetFallbackLowerBound('targetSdkVersion', DEFAULT_TARGET_SDK_VERSION)
|
|
@@ -56,17 +56,17 @@ android {
|
|
|
56
56
|
def repeatLength = output.length()
|
|
57
57
|
println '\n\n' + ('-' * repeatLength) + '\n' + output + '\n' + ('-' * repeatLength) + '\n'
|
|
58
58
|
|
|
59
|
-
println "see report at file://${t.reports.html.
|
|
59
|
+
println "see report at file://${t.reports.html.outputLocation}/index.html"
|
|
60
60
|
}
|
|
61
61
|
}
|
|
62
62
|
}
|
|
63
63
|
}
|
|
64
64
|
compileOptions {
|
|
65
|
-
sourceCompatibility JavaVersion.
|
|
66
|
-
targetCompatibility JavaVersion.
|
|
65
|
+
sourceCompatibility JavaVersion.VERSION_17
|
|
66
|
+
targetCompatibility JavaVersion.VERSION_17
|
|
67
67
|
}
|
|
68
68
|
kotlinOptions {
|
|
69
|
-
jvmTarget = JavaVersion.
|
|
69
|
+
jvmTarget = JavaVersion.VERSION_17
|
|
70
70
|
}
|
|
71
71
|
|
|
72
72
|
flavorDimensions "RNN.reactNativeVersion"
|
|
@@ -172,14 +172,14 @@ List reactNativeVersionComponents(rnPackageJsonFile) {
|
|
|
172
172
|
|
|
173
173
|
dependencies {
|
|
174
174
|
|
|
175
|
-
implementation "androidx.core:core-ktx:1.6.
|
|
175
|
+
implementation "androidx.core:core-ktx:1.6.1"
|
|
176
176
|
implementation "org.jetbrains.kotlin:$kotlinStdlib:$kotlinVersion"
|
|
177
177
|
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$kotlinCoroutinesCore"
|
|
178
|
-
implementation "androidx.constraintlayout:constraintlayout:2.
|
|
178
|
+
implementation "androidx.constraintlayout:constraintlayout:2.1.4"
|
|
179
179
|
|
|
180
|
-
implementation 'androidx.appcompat:appcompat:1.
|
|
181
|
-
implementation 'androidx.annotation:annotation:1.
|
|
182
|
-
implementation 'com.google.android.material:material:1.
|
|
180
|
+
implementation 'androidx.appcompat:appcompat:1.6.1'
|
|
181
|
+
implementation 'androidx.annotation:annotation:1.7.1'
|
|
182
|
+
implementation 'com.google.android.material:material:1.11.0'
|
|
183
183
|
|
|
184
184
|
implementation 'com.github.wix-playground:ahbottomnavigation:3.3.0'
|
|
185
185
|
// implementation project(':AHBottomNavigation')
|
|
@@ -194,8 +194,8 @@ open class ButtonPresenter(private val context: Context, private val button: But
|
|
|
194
194
|
|
|
195
195
|
class WixAccessibilityDelegateCompat: AccessibilityDelegateCompat(){
|
|
196
196
|
override fun onInitializeAccessibilityNodeInfo(
|
|
197
|
-
host: View
|
|
198
|
-
info: AccessibilityNodeInfoCompat
|
|
197
|
+
host: View,
|
|
198
|
+
info: AccessibilityNodeInfoCompat
|
|
199
199
|
) {
|
|
200
200
|
super.onInitializeAccessibilityNodeInfo(host, info)
|
|
201
201
|
|
|
@@ -71,7 +71,7 @@ class TitleAndButtonsContainer(context: Context) : ViewGroup(context) {
|
|
|
71
71
|
component?.layoutDirection = layoutDirection
|
|
72
72
|
titleSubTitleBar.layoutDirection = layoutDirection
|
|
73
73
|
rightButtonBar.layoutDirection = layoutDirection
|
|
74
|
-
leftButtonBar.layoutDirection = if(isRTL()) View.
|
|
74
|
+
leftButtonBar.layoutDirection = if (isRTL()) View.LAYOUT_DIRECTION_RTL else layoutDirection
|
|
75
75
|
}
|
|
76
76
|
|
|
77
77
|
fun setSubTitleTextAlignment(alignment: Alignment) = titleSubTitleBar.setSubTitleAlignment(alignment)
|
|
@@ -6,10 +6,9 @@
|
|
|
6
6
|
#import "RCTLegacyInteropComponents.h"
|
|
7
7
|
#import <React/CoreModulesPlugins.h>
|
|
8
8
|
#import <React/RCTCxxBridgeDelegate.h>
|
|
9
|
-
#import <React/RCTFabricSurfaceHostingProxyRootView.h>
|
|
10
9
|
#import <React/RCTLegacyViewManagerInteropComponentView.h>
|
|
11
|
-
#import <React/RCTRuntimeExecutorFromBridge.h>
|
|
12
10
|
#import <React/RCTSurfacePresenter.h>
|
|
11
|
+
#import <React/RCTSurfacePresenterStub.h>
|
|
13
12
|
#import <React/RCTSurfacePresenterBridgeAdapter.h>
|
|
14
13
|
#import <ReactCommon/RCTTurboModuleManager.h>
|
|
15
14
|
#import <react/config/ReactNativeConfig.h>
|
package/lib/ios/RNNReactView.h
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
#ifdef RCT_NEW_ARCH_ENABLED
|
|
2
|
-
#import <React/
|
|
2
|
+
#import <React/RCTSurfaceHostingProxyRootView.h>
|
|
3
3
|
#else
|
|
4
4
|
#import <React/RCTRootView.h>
|
|
5
5
|
#endif
|
|
@@ -32,7 +32,7 @@ typedef void (^RNNReactViewReadyCompletionBlock)(void);
|
|
|
32
32
|
|
|
33
33
|
#ifdef RCT_NEW_ARCH_ENABLED
|
|
34
34
|
@interface RNNReactView
|
|
35
|
-
:
|
|
35
|
+
: RCTSurfaceHostingProxyRootView <RCTRootViewDelegate, RNNComponentProtocol>
|
|
36
36
|
#else
|
|
37
37
|
@interface RNNReactView : RCTRootView <RCTRootViewDelegate, RNNComponentProtocol>
|
|
38
38
|
#endif
|
|
@@ -1,6 +1,10 @@
|
|
|
1
1
|
#import "RNNReactView.h"
|
|
2
2
|
#import <React/RCTRootContentView.h>
|
|
3
3
|
|
|
4
|
+
#ifdef RCT_NEW_ARCH_ENABLED
|
|
5
|
+
#import <React/RCTFabricSurface.h>
|
|
6
|
+
#endif
|
|
7
|
+
|
|
4
8
|
@implementation RNNReactView {
|
|
5
9
|
BOOL _isAppeared;
|
|
6
10
|
}
|
|
@@ -11,10 +15,8 @@
|
|
|
11
15
|
eventEmitter:(RNNEventEmitter *)eventEmitter
|
|
12
16
|
sizeMeasureMode:(RCTSurfaceSizeMeasureMode)sizeMeasureMode
|
|
13
17
|
reactViewReadyBlock:(RNNReactViewReadyCompletionBlock)reactViewReadyBlock {
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
initialProperties:initialProperties
|
|
17
|
-
sizeMeasureMode:sizeMeasureMode];
|
|
18
|
+
RCTFabricSurface *surface = [[RCTFabricSurface alloc] initWithBridge:bridge moduleName:moduleName initialProperties:initialProperties];
|
|
19
|
+
self = [super initWithSurface:surface sizeMeasureMode:sizeMeasureMode];
|
|
18
20
|
#else
|
|
19
21
|
- (instancetype)initWithBridge:(RCTBridge *)bridge
|
|
20
22
|
moduleName:(NSString *)moduleName
|
package/metro.config.js
CHANGED
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "react-native-navigation",
|
|
3
|
-
"version": "7.
|
|
3
|
+
"version": "7.38.0",
|
|
4
4
|
"description": "React Native Navigation - truly native navigation for iOS and Android",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"nativePackage": true,
|
|
@@ -22,6 +22,7 @@
|
|
|
22
22
|
"main": "lib/dist/src/index.js",
|
|
23
23
|
"typings": "lib/dist/src/index.d.ts",
|
|
24
24
|
"scripts": {
|
|
25
|
+
"postinstall": "node scripts/postinstall.js",
|
|
25
26
|
"build": "node ./scripts/build",
|
|
26
27
|
"watch": "node ./scripts/watch",
|
|
27
28
|
"xcode": "open playground/ios/playground.xcworkspace",
|
|
@@ -76,14 +77,16 @@
|
|
|
76
77
|
"@babel/plugin-proposal-export-namespace-from": "7.10.1",
|
|
77
78
|
"@babel/runtime": "7.22.6",
|
|
78
79
|
"@babel/types": "7.22.5",
|
|
79
|
-
"@
|
|
80
|
+
"@babel/preset-env": "^7.22.9",
|
|
81
|
+
"@react-native/metro-config": "^0.73.2",
|
|
82
|
+
"@react-native/babel-preset": "^0.73.18",
|
|
83
|
+
"@react-native/typescript-config": "^0.73.1",
|
|
80
84
|
"@react-native-community/blur": "^3.6.0",
|
|
81
85
|
"@react-native-community/datetimepicker": "^3.4.7",
|
|
82
86
|
"@react-native-community/eslint-config": "2.0.0",
|
|
83
87
|
"@react-native-community/netinfo": "^5.9.4",
|
|
84
88
|
"@testing-library/jest-native": "^5.4.2",
|
|
85
89
|
"@testing-library/react-native": "^12.0.1",
|
|
86
|
-
"@types/detox": "17.14.3",
|
|
87
90
|
"@types/hoist-non-react-statics": "^3.0.1",
|
|
88
91
|
"@types/jasmine": "3.5.10",
|
|
89
92
|
"@types/jest": "27.0.2",
|
|
@@ -95,7 +98,7 @@
|
|
|
95
98
|
"@typescript-eslint/parser": "4.33.0",
|
|
96
99
|
"babel-jest": "^27.0.0",
|
|
97
100
|
"clang-format": "^1.4.0",
|
|
98
|
-
"detox": "20.
|
|
101
|
+
"detox": "20.18.1",
|
|
99
102
|
"detox-testing-library-rnn-adapter": "^2.0.3",
|
|
100
103
|
"eslint": "7.32.0",
|
|
101
104
|
"eslint-config-prettier": "6.11.0",
|
|
@@ -110,10 +113,10 @@
|
|
|
110
113
|
"pngjs": "^6.0.0",
|
|
111
114
|
"prettier": "2.1.2",
|
|
112
115
|
"react": "18.2.0",
|
|
113
|
-
"react-native": "0.
|
|
116
|
+
"react-native": "0.73.3",
|
|
114
117
|
"react-native-fast-image": "^8.6.3",
|
|
115
118
|
"react-native-gesture-handler": "^2.10.1",
|
|
116
|
-
"react-native-reanimated": "3.
|
|
119
|
+
"react-native-reanimated": "3.6.2",
|
|
117
120
|
"react-native-ui-lib": "7.3.6",
|
|
118
121
|
"react-redux": "5.x.x",
|
|
119
122
|
"react-test-renderer": "18.2.0",
|
|
@@ -156,7 +159,8 @@
|
|
|
156
159
|
"simulator": {
|
|
157
160
|
"type": "ios.simulator",
|
|
158
161
|
"device": {
|
|
159
|
-
"type": "iPhone 13 Pro Max"
|
|
162
|
+
"type": "iPhone 13 Pro Max",
|
|
163
|
+
"os": "15.5"
|
|
160
164
|
}
|
|
161
165
|
},
|
|
162
166
|
"genymotion.emulator.name": {
|
|
@@ -200,7 +204,7 @@
|
|
|
200
204
|
"ios.none": {
|
|
201
205
|
"binaryPath": "playground/ios/DerivedData/playground/Build/Products/Debug-iphonesimulator/playground.app",
|
|
202
206
|
"type": "ios.none",
|
|
203
|
-
"name": "iPhone
|
|
207
|
+
"name": "iPhone 13",
|
|
204
208
|
"session": {
|
|
205
209
|
"server": "ws://localhost:8099",
|
|
206
210
|
"sessionId": "playground"
|