react-native-screens 4.4.0 → 4.6.0-beta.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/README.md +7 -14
- package/android/build.gradle +9 -8
- package/android/src/fabric/java/com/swmansion/rnscreens/FabricEnabledHeaderConfigViewGroup.kt +31 -10
- package/android/src/fabric/java/com/swmansion/rnscreens/FabricEnabledHeaderSubviewViewGroup.kt +51 -0
- package/android/src/main/AndroidManifest.xml +1 -2
- package/android/src/main/java/com/swmansion/rnscreens/CustomToolbar.kt +12 -2
- package/android/src/main/java/com/swmansion/rnscreens/RNScreensPackage.kt +4 -2
- package/android/src/main/java/com/swmansion/rnscreens/Screen.kt +0 -26
- package/android/src/main/java/com/swmansion/rnscreens/ScreenStackHeaderSubview.kt +12 -7
- package/android/src/main/java/com/swmansion/rnscreens/ScreenStackHeaderSubviewManager.kt +13 -0
- package/android/src/paper/java/com/facebook/react/viewmanagers/RNSScreenContainerManagerDelegate.java +3 -2
- package/android/src/paper/java/com/facebook/react/viewmanagers/RNSScreenContentWrapperManagerDelegate.java +3 -2
- package/android/src/paper/java/com/facebook/react/viewmanagers/RNSScreenFooterManagerDelegate.java +3 -2
- package/android/src/paper/java/com/facebook/react/viewmanagers/RNSScreenManagerDelegate.java +3 -2
- package/android/src/paper/java/com/facebook/react/viewmanagers/RNSScreenStackHeaderConfigManagerDelegate.java +3 -2
- package/android/src/paper/java/com/facebook/react/viewmanagers/RNSScreenStackHeaderSubviewManagerDelegate.java +3 -2
- package/android/src/paper/java/com/facebook/react/viewmanagers/RNSScreenStackManagerDelegate.java +3 -2
- package/android/src/paper/java/com/facebook/react/viewmanagers/RNSSearchBarManagerDelegate.java +3 -2
- package/android/src/paper/java/com/swmansion/rnscreens/FabricEnabledHeaderConfigViewGroup.kt +9 -1
- package/android/src/paper/java/com/swmansion/rnscreens/FabricEnabledHeaderSubviewViewGroup.kt +18 -0
- package/common/cpp/react/renderer/components/rnscreens/RNSScreenStackHeaderConfigComponentDescriptor.h +12 -2
- package/common/cpp/react/renderer/components/rnscreens/RNSScreenStackHeaderConfigShadowNode.cpp +12 -0
- package/common/cpp/react/renderer/components/rnscreens/RNSScreenStackHeaderConfigShadowNode.h +4 -0
- package/common/cpp/react/renderer/components/rnscreens/RNSScreenStackHeaderConfigState.cpp +4 -10
- package/common/cpp/react/renderer/components/rnscreens/RNSScreenStackHeaderConfigState.h +15 -9
- package/common/cpp/react/renderer/components/rnscreens/RNSScreenStackHeaderSubviewComponentDescriptor.h +20 -0
- package/common/cpp/react/renderer/components/rnscreens/RNSScreenStackHeaderSubviewShadowNode.cpp +14 -0
- package/common/cpp/react/renderer/components/rnscreens/RNSScreenStackHeaderSubviewShadowNode.h +2 -0
- package/common/cpp/react/renderer/components/rnscreens/RNSScreenStackHeaderSubviewState.cpp +3 -1
- package/common/cpp/react/renderer/components/rnscreens/RNSScreenStackHeaderSubviewState.h +16 -2
- package/ios/RNSScreenStack.mm +11 -7
- package/ios/RNSScreenStackHeaderConfig.h +21 -7
- package/ios/RNSScreenStackHeaderConfig.mm +74 -15
- package/ios/RNSScreenStackHeaderSubview.h +4 -0
- package/ios/RNSScreenStackHeaderSubview.mm +26 -1
- package/lib/commonjs/components/ScreenStackHeaderConfig.js +0 -1
- package/lib/commonjs/components/ScreenStackHeaderConfig.js.map +1 -1
- package/lib/commonjs/gesture-handler/ScreenGestureDetector.js +12 -0
- package/lib/commonjs/gesture-handler/ScreenGestureDetector.js.map +1 -1
- package/lib/commonjs/gesture-handler/defaults.js +1 -2
- package/lib/commonjs/gesture-handler/defaults.js.map +1 -1
- package/lib/module/components/ScreenStackHeaderConfig.js +0 -1
- package/lib/module/components/ScreenStackHeaderConfig.js.map +1 -1
- package/lib/module/gesture-handler/ScreenGestureDetector.js +12 -0
- package/lib/module/gesture-handler/ScreenGestureDetector.js.map +1 -1
- package/lib/module/gesture-handler/defaults.js +1 -2
- package/lib/module/gesture-handler/defaults.js.map +1 -1
- package/lib/typescript/gesture-handler/ScreenGestureDetector.d.ts.map +1 -1
- package/lib/typescript/gesture-handler/defaults.d.ts.map +1 -1
- package/package.json +10 -11
- package/src/components/ScreenStackHeaderConfig.tsx +0 -1
- package/src/gesture-handler/ScreenGestureDetector.tsx +14 -2
- package/src/gesture-handler/defaults.ts +0 -1
|
@@ -121,6 +121,12 @@ const ScreenGestureDetector = ({
|
|
|
121
121
|
return;
|
|
122
122
|
}
|
|
123
123
|
transitionConfig.screenDimensions = screenSize;
|
|
124
|
+
// Gesture Handler added `pointerType` to event payload back in 2.16.0,
|
|
125
|
+
// see: https://github.com/software-mansion/react-native-gesture-handler/pull/2760
|
|
126
|
+
// and this causes type errors here. Proper solution would be to patch parameter types
|
|
127
|
+
// of this function in reanimated. This should not cause runtime errors as the payload
|
|
128
|
+
// has correct shape, only the types are incorrect.
|
|
129
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
124
130
|
startScreenTransition(transitionConfig);
|
|
125
131
|
canPerformUpdates.value = true;
|
|
126
132
|
}
|
|
@@ -154,6 +160,12 @@ const ScreenGestureDetector = ({
|
|
|
154
160
|
RNScreensTurboModule.finishTransition(stackTag, isTransitionCanceled);
|
|
155
161
|
};
|
|
156
162
|
screenTransitionConfig.value.isTransitionCanceled = isTransitionCanceled;
|
|
163
|
+
// Gesture Handler added `pointerType` to event payload back in 2.16.0,
|
|
164
|
+
// see: https://github.com/software-mansion/react-native-gesture-handler/pull/2760
|
|
165
|
+
// and this causes type errors here. Proper solution would be to patch parameter types
|
|
166
|
+
// of this function in reanimated. This should not cause runtime errors as the payload
|
|
167
|
+
// has correct shape, only the types are incorrect.
|
|
168
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
157
169
|
finishScreenTransition(screenTransitionConfig.value);
|
|
158
170
|
}
|
|
159
171
|
let panGesture = Gesture.Pan().onStart(onStart).onUpdate(onUpdate).onEnd(onEnd);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["React","useEffect","Dimensions","Platform","findNodeHandle","GestureDetector","Gesture","useSharedValue","measure","startScreenTransition","finishScreenTransition","makeMutable","runOnUI","getShadowNodeWrapperAndTagFromRef","isFabric","RNScreensTurboModule","DefaultEvent","DefaultScreenDimensions","checkBoundaries","checkIfTransitionCancelled","getAnimationForTransition","EmptyGestureHandler","Fling","ScreenGestureDetector","children","gestureDetectorBridge","goBackGesture","screenEdgeGesture","transitionAnimation","customTransitionAnimation","screensRefs","currentScreenId","sharedEvent","startingGesturePosition","canPerformUpdates","screenTransitionConfig","stackTag","belowTopScreenId","topScreenId","screenTransition","isTransitionCanceled","screenDimensions","onFinishAnimation","screenTagToNodeWrapperUI","IS_FABRIC","current","stackUseEffectCallback","stackRef","value","OS","disableSwipeBackForTopScreen","undefined","screenTagToNodeWrapper","key","screenRef","screenData","tag","shadowNodeWrapper","console","warn","computeProgress","event","progress","startingPosition","translationX","width","absoluteX","translationY","height","absoluteY","Math","abs","progressX","progressY","max","onStart","transitionConfig","transitionData","startTransition","canStartTransition","topScreenTag","belowTopScreenTag","animatedRefMock","screenSize","Error","finishTransition","onUpdate","updateTransition","onEnd","velocityFactor","distanceX","min","velocityX","distanceY","velocityY","requiredXDistance","requiredYDistance","panGesture","Pan","HIT_SLOP_SIZE","ACTIVATION_DISTANCE","activeOffsetX","hitSlop","left","top","right","activeOffsetY","get","bottom","createElement","gesture"],"sourceRoot":"../../../src","sources":["gesture-handler/ScreenGestureDetector.tsx"],"mappings":"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
|
|
1
|
+
{"version":3,"names":["React","useEffect","Dimensions","Platform","findNodeHandle","GestureDetector","Gesture","useSharedValue","measure","startScreenTransition","finishScreenTransition","makeMutable","runOnUI","getShadowNodeWrapperAndTagFromRef","isFabric","RNScreensTurboModule","DefaultEvent","DefaultScreenDimensions","checkBoundaries","checkIfTransitionCancelled","getAnimationForTransition","EmptyGestureHandler","Fling","ScreenGestureDetector","children","gestureDetectorBridge","goBackGesture","screenEdgeGesture","transitionAnimation","customTransitionAnimation","screensRefs","currentScreenId","sharedEvent","startingGesturePosition","canPerformUpdates","screenTransitionConfig","stackTag","belowTopScreenId","topScreenId","screenTransition","isTransitionCanceled","screenDimensions","onFinishAnimation","screenTagToNodeWrapperUI","IS_FABRIC","current","stackUseEffectCallback","stackRef","value","OS","disableSwipeBackForTopScreen","undefined","screenTagToNodeWrapper","key","screenRef","screenData","tag","shadowNodeWrapper","console","warn","computeProgress","event","progress","startingPosition","translationX","width","absoluteX","translationY","height","absoluteY","Math","abs","progressX","progressY","max","onStart","transitionConfig","transitionData","startTransition","canStartTransition","topScreenTag","belowTopScreenTag","animatedRefMock","screenSize","Error","finishTransition","onUpdate","updateTransition","onEnd","velocityFactor","distanceX","min","velocityX","distanceY","velocityY","requiredXDistance","requiredYDistance","panGesture","Pan","HIT_SLOP_SIZE","ACTIVATION_DISTANCE","activeOffsetX","hitSlop","left","top","right","activeOffsetY","get","bottom","createElement","gesture"],"sourceRoot":"../../../src","sources":["gesture-handler/ScreenGestureDetector.tsx"],"mappings":"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","ignoreList":[]}
|
|
@@ -16,8 +16,7 @@ export const DefaultEvent = {
|
|
|
16
16
|
// and they are required to specify. This should be backward
|
|
17
17
|
// compatible unless they strictly parse the objects, which seems
|
|
18
18
|
// not likely. PointerType is present since 2.16.0, StylusData since 2.20.0
|
|
19
|
-
pointerType: PointerType.TOUCH
|
|
20
|
-
stylusData: undefined
|
|
19
|
+
pointerType: PointerType.TOUCH
|
|
21
20
|
};
|
|
22
21
|
export const DefaultScreenDimensions = {
|
|
23
22
|
width: 0,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["PointerType","ScreenTransition","DefaultEvent","absoluteX","absoluteY","handlerTag","numberOfPointers","state","translationX","translationY","velocityX","velocityY","x","y","pointerType","TOUCH","
|
|
1
|
+
{"version":3,"names":["PointerType","ScreenTransition","DefaultEvent","absoluteX","absoluteY","handlerTag","numberOfPointers","state","translationX","translationY","velocityX","velocityY","x","y","pointerType","TOUCH","DefaultScreenDimensions","width","height","pageX","pageY","AnimationForGesture","swipeRight","SwipeRight","swipeLeft","SwipeLeft","swipeDown","SwipeDown","swipeUp","SwipeUp","horizontalSwipe","Horizontal","verticalSwipe","Vertical","twoDimensionalSwipe","TwoDimensional"],"sourceRoot":"../../../src","sources":["gesture-handler/defaults.ts"],"mappings":"AAAA,SAGEA,WAAW,QACN,8BAA8B;AACrC,SAASC,gBAAgB,QAAQ,yBAAyB;AAE1D,OAAO,MAAMC,YAA+D,GAAG;EAC7EC,SAAS,EAAE,CAAC;EACZC,SAAS,EAAE,CAAC;EACZC,UAAU,EAAE,CAAC;EACbC,gBAAgB,EAAE,CAAC;EACnBC,KAAK,EAAE,CAAC;EACRC,YAAY,EAAE,CAAC;EACfC,YAAY,EAAE,CAAC;EACfC,SAAS,EAAE,CAAC;EACZC,SAAS,EAAE,CAAC;EACZC,CAAC,EAAE,CAAC;EACJC,CAAC,EAAE,CAAC;EAEJ;EACA;EACA;EACA;EACAC,WAAW,EAAEd,WAAW,CAACe;AAC3B,CAAC;AAED,OAAO,MAAMC,uBAAuB,GAAG;EACrCC,KAAK,EAAE,CAAC;EACRC,MAAM,EAAE,CAAC;EACTN,CAAC,EAAE,CAAC;EACJC,CAAC,EAAE,CAAC;EACJM,KAAK,EAAE,CAAC;EACRC,KAAK,EAAE;AACT,CAAC;AAED,OAAO,MAAMC,mBAAmB,GAAG;EACjCC,UAAU,EAAErB,gBAAgB,CAACsB,UAAU;EACvCC,SAAS,EAAEvB,gBAAgB,CAACwB,SAAS;EACrCC,SAAS,EAAEzB,gBAAgB,CAAC0B,SAAS;EACrCC,OAAO,EAAE3B,gBAAgB,CAAC4B,OAAO;EACjCC,eAAe,EAAE7B,gBAAgB,CAAC8B,UAAU;EAC5CC,aAAa,EAAE/B,gBAAgB,CAACgC,QAAQ;EACxCC,mBAAmB,EAAEjC,gBAAgB,CAACkC;AACxC,CAAC","ignoreList":[]}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ScreenGestureDetector.d.ts","sourceRoot":"","sources":["../../../src/gesture-handler/ScreenGestureDetector.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAoB,MAAM,OAAO,CAAC;AAwBzC,OAAO,EAAE,oBAAoB,EAAE,MAAM,UAAU,CAAC;AAIhD,QAAA,MAAM,qBAAqB,yJAQxB,oBAAoB,
|
|
1
|
+
{"version":3,"file":"ScreenGestureDetector.d.ts","sourceRoot":"","sources":["../../../src/gesture-handler/ScreenGestureDetector.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAoB,MAAM,OAAO,CAAC;AAwBzC,OAAO,EAAE,oBAAoB,EAAE,MAAM,UAAU,CAAC;AAIhD,QAAA,MAAM,qBAAqB,yJAQxB,oBAAoB,sBAsNtB,CAAC;AAEF,eAAe,qBAAqB,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"defaults.d.ts","sourceRoot":"","sources":["../../../src/gesture-handler/defaults.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,kBAAkB,EAClB,6BAA6B,EAE9B,MAAM,8BAA8B,CAAC;AAGtC,eAAO,MAAM,YAAY,EAAE,kBAAkB,CAAC,6BAA6B,
|
|
1
|
+
{"version":3,"file":"defaults.d.ts","sourceRoot":"","sources":["../../../src/gesture-handler/defaults.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,kBAAkB,EAClB,6BAA6B,EAE9B,MAAM,8BAA8B,CAAC;AAGtC,eAAO,MAAM,YAAY,EAAE,kBAAkB,CAAC,6BAA6B,CAkB1E,CAAC;AAEF,eAAO,MAAM,uBAAuB;;;;;;;CAOnC,CAAC;AAEF,eAAO,MAAM,mBAAmB;;;;;;;;CAQ/B,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "react-native-screens",
|
|
3
|
-
"version": "4.
|
|
3
|
+
"version": "4.6.0-beta.0",
|
|
4
4
|
"description": "Native navigation primitives for your React Native app.",
|
|
5
5
|
"scripts": {
|
|
6
6
|
"submodules": "git submodule update --init --recursive && (cd react-navigation && yarn && yarn build && cd ../)",
|
|
@@ -80,18 +80,17 @@
|
|
|
80
80
|
"@react-native-community/cli": "15.0.1",
|
|
81
81
|
"@react-native-community/cli-platform-android": "15.0.1",
|
|
82
82
|
"@react-native-community/cli-platform-ios": "15.0.1",
|
|
83
|
-
"@react-native/babel-preset": "0.
|
|
84
|
-
"@react-native/eslint-config": "0.
|
|
85
|
-
"@react-native/metro-config": "0.
|
|
86
|
-
"@react-native/typescript-config": "0.
|
|
83
|
+
"@react-native/babel-preset": "0.77.0-rc.6",
|
|
84
|
+
"@react-native/eslint-config": "0.77.0-rc.6",
|
|
85
|
+
"@react-native/metro-config": "0.77.0-rc.6",
|
|
86
|
+
"@react-native/typescript-config": "0.77.0-rc.6",
|
|
87
87
|
"@react-navigation/native": "^5.8.0",
|
|
88
88
|
"@react-navigation/stack": "^5.10.0",
|
|
89
|
-
"@types/jest": "^29.
|
|
89
|
+
"@types/jest": "^29.5.13",
|
|
90
90
|
"@types/react": "^18.2.72",
|
|
91
91
|
"@types/react-test-renderer": "^18.0.0",
|
|
92
92
|
"@typescript-eslint/eslint-plugin": "^6.5.0",
|
|
93
93
|
"@typescript-eslint/parser": "^6.5.0",
|
|
94
|
-
"babel-jest": "^29.6.4",
|
|
95
94
|
"clang-format": "^1.8.0",
|
|
96
95
|
"eslint": "^8.56.0",
|
|
97
96
|
"eslint-config-prettier": "^8.10.0",
|
|
@@ -106,11 +105,11 @@
|
|
|
106
105
|
"prettier": "^2.8.8",
|
|
107
106
|
"react": "18.2.0",
|
|
108
107
|
"react-dom": "^18.2.0",
|
|
109
|
-
"react-native": "0.
|
|
108
|
+
"react-native": "0.77.0-rc.6",
|
|
110
109
|
"react-native-builder-bob": "^0.23.2",
|
|
111
|
-
"react-native-gesture-handler": "^2.
|
|
112
|
-
"react-native-reanimated": "3.
|
|
113
|
-
"react-native-safe-area-context": "
|
|
110
|
+
"react-native-gesture-handler": "^2.22.0",
|
|
111
|
+
"react-native-reanimated": "3.16.7",
|
|
112
|
+
"react-native-safe-area-context": "5.1.0",
|
|
114
113
|
"react-native-windows": "^0.64.8",
|
|
115
114
|
"react-test-renderer": "^18.2.0",
|
|
116
115
|
"release-it": "^15.6.0",
|
|
@@ -159,7 +159,13 @@ const ScreenGestureDetector = ({
|
|
|
159
159
|
return;
|
|
160
160
|
}
|
|
161
161
|
transitionConfig.screenDimensions = screenSize;
|
|
162
|
-
|
|
162
|
+
// Gesture Handler added `pointerType` to event payload back in 2.16.0,
|
|
163
|
+
// see: https://github.com/software-mansion/react-native-gesture-handler/pull/2760
|
|
164
|
+
// and this causes type errors here. Proper solution would be to patch parameter types
|
|
165
|
+
// of this function in reanimated. This should not cause runtime errors as the payload
|
|
166
|
+
// has correct shape, only the types are incorrect.
|
|
167
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
168
|
+
startScreenTransition(transitionConfig as any);
|
|
163
169
|
canPerformUpdates.value = true;
|
|
164
170
|
}
|
|
165
171
|
|
|
@@ -201,7 +207,13 @@ const ScreenGestureDetector = ({
|
|
|
201
207
|
RNScreensTurboModule.finishTransition(stackTag, isTransitionCanceled);
|
|
202
208
|
};
|
|
203
209
|
screenTransitionConfig.value.isTransitionCanceled = isTransitionCanceled;
|
|
204
|
-
|
|
210
|
+
// Gesture Handler added `pointerType` to event payload back in 2.16.0,
|
|
211
|
+
// see: https://github.com/software-mansion/react-native-gesture-handler/pull/2760
|
|
212
|
+
// and this causes type errors here. Proper solution would be to patch parameter types
|
|
213
|
+
// of this function in reanimated. This should not cause runtime errors as the payload
|
|
214
|
+
// has correct shape, only the types are incorrect.
|
|
215
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
216
|
+
finishScreenTransition(screenTransitionConfig.value as any);
|
|
205
217
|
}
|
|
206
218
|
|
|
207
219
|
let panGesture = Gesture.Pan()
|
|
@@ -23,7 +23,6 @@ export const DefaultEvent: GestureUpdateEvent<PanGestureHandlerEventPayload> = {
|
|
|
23
23
|
// compatible unless they strictly parse the objects, which seems
|
|
24
24
|
// not likely. PointerType is present since 2.16.0, StylusData since 2.20.0
|
|
25
25
|
pointerType: PointerType.TOUCH,
|
|
26
|
-
stylusData: undefined,
|
|
27
26
|
};
|
|
28
27
|
|
|
29
28
|
export const DefaultScreenDimensions = {
|