Skip to content

Commit 6041973

Browse files
committed
Simplify setup
1 parent d735767 commit 6041973

5 files changed

Lines changed: 11 additions & 38 deletions

File tree

packages/react-native-gesture-handler/android/src/main/java/com/swmansion/gesturehandler/react/RNGestureHandlerButtonWrapperView.kt

Lines changed: 0 additions & 6 deletions
This file was deleted.

packages/react-native-gesture-handler/android/src/main/java/com/swmansion/gesturehandler/react/RNGestureHandlerButtonWrapperViewManager.kt

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,26 +6,23 @@ import com.facebook.react.uimanager.ViewGroupManager
66
import com.facebook.react.uimanager.ViewManagerDelegate
77
import com.facebook.react.viewmanagers.RNGestureHandlerButtonWrapperManagerDelegate
88
import com.facebook.react.viewmanagers.RNGestureHandlerButtonWrapperManagerInterface
9+
import com.facebook.react.views.view.ReactViewGroup
910

1011
@ReactModule(name = RNGestureHandlerButtonWrapperViewManager.REACT_CLASS)
1112
class RNGestureHandlerButtonWrapperViewManager :
12-
ViewGroupManager<RNGestureHandlerButtonWrapperView>(),
13-
RNGestureHandlerButtonWrapperManagerInterface<RNGestureHandlerButtonWrapperView> {
14-
private val mDelegate: ViewManagerDelegate<RNGestureHandlerButtonWrapperView>
13+
ViewGroupManager<ReactViewGroup>(),
14+
RNGestureHandlerButtonWrapperManagerInterface<ReactViewGroup> {
15+
private val mDelegate: ViewManagerDelegate<ReactViewGroup> =
16+
RNGestureHandlerButtonWrapperManagerDelegate<
17+
ReactViewGroup,
18+
RNGestureHandlerButtonWrapperViewManager,
19+
>(this)
1520

16-
init {
17-
mDelegate =
18-
RNGestureHandlerButtonWrapperManagerDelegate<
19-
RNGestureHandlerButtonWrapperView,
20-
RNGestureHandlerButtonWrapperViewManager,
21-
>(this)
22-
}
23-
24-
override fun getDelegate(): ViewManagerDelegate<RNGestureHandlerButtonWrapperView> = mDelegate
21+
override fun getDelegate(): ViewManagerDelegate<ReactViewGroup> = mDelegate
2522

2623
override fun getName() = REACT_CLASS
2724

28-
override fun createViewInstance(reactContext: ThemedReactContext) = RNGestureHandlerButtonWrapperView(reactContext)
25+
override fun createViewInstance(reactContext: ThemedReactContext) = ReactViewGroup(reactContext)
2926

3027
companion object {
3128
const val REACT_CLASS = "RNGestureHandlerButtonWrapper"

packages/react-native-gesture-handler/apple/RNGestureHandlerButtonWrapper.mm

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@
99
#import <react/renderer/components/rngesturehandler_codegen/Props.h>
1010
#import <react/renderer/components/rngesturehandler_codegen/RCTComponentViewHelpers.h>
1111

12-
#include <unordered_map>
13-
1412
@interface RNGestureHandlerButtonWrapper () <RCTRNGestureHandlerButtonWrapperViewProtocol>
1513
@end
1614

packages/react-native-gesture-handler/shared/shadowNodes/react/renderer/components/rngesturehandler_codegen/RNGestureHandlerButtonWrapperShadowNode.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,6 @@ extern const char RNGestureHandlerButtonWrapperComponentName[] =
1919
"RNGestureHandlerButtonWrapper";
2020

2121
void RNGestureHandlerButtonWrapperShadowNode::initialize() {
22-
// Disable forcing view flattening
23-
ShadowNode::traits_.unset(ShadowNodeTraits::ForceFlattenView);
24-
2522
// When the button wrapper is cloned and has a child node, the child node
2623
// should be cloned as well to ensure it is mutable.
2724
if (!getChildren().empty()) {

packages/react-native-gesture-handler/src/components/GestureHandlerButton.tsx

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,6 @@ export default function GestureHandlerButton({
6262
start,
6363
end,
6464
overflow,
65-
transform,
66-
transformOrigin,
67-
zIndex,
6865

6966
// Visual properties
7067
...restStyle
@@ -125,18 +122,8 @@ export default function GestureHandlerButton({
125122
[flattenedStyle]
126123
);
127124

128-
const wrapperStyle = useMemo(
129-
() => ({
130-
zIndex,
131-
transform,
132-
transformOrigin,
133-
}),
134-
[zIndex, transform, transformOrigin]
135-
);
136-
137125
return (
138-
<RNGestureHandlerButtonWrapperNativeComponent
139-
style={[styles.contents, wrapperStyle]}>
126+
<RNGestureHandlerButtonWrapperNativeComponent style={styles.contents}>
140127
<View
141128
collapsable={false}
142129
style={[

0 commit comments

Comments
 (0)