Skip to content

Commit 7514d4a

Browse files
committed
fix: remove touchable layer in JS to avoid duplicated pointer events
1 parent 274f0b6 commit 7514d4a

File tree

1 file changed

+23
-34
lines changed

1 file changed

+23
-34
lines changed

src/Rive.tsx

Lines changed: 23 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@ import {
1717
NativeSyntheticEvent,
1818
StyleSheet,
1919
View,
20-
TouchableWithoutFeedback,
21-
GestureResponderEvent,
2220
StyleProp,
2321
NativeModules,
2422
NativeEventEmitter,
@@ -1026,38 +1024,29 @@ const RiveContainer = React.forwardRef<RiveRef, Props>(
10261024
return (
10271025
<View style={[styles.container, style]} ref={ref as any} testID={testID}>
10281026
<View style={styles.children}>{children}</View>
1029-
<TouchableWithoutFeedback
1030-
onPressIn={(event: GestureResponderEvent) =>
1031-
touchBegan(event.nativeEvent.locationX, event.nativeEvent.locationY)
1032-
}
1033-
onPressOut={(event: GestureResponderEvent) =>
1034-
touchEnded(event.nativeEvent.locationX, event.nativeEvent.locationY)
1035-
}
1036-
>
1037-
<RiveViewManager
1038-
ref={riveRef}
1039-
resourceName={resourceName}
1040-
isUserHandlingErrors={isUserHandlingErrors}
1041-
autoplay={autoplay}
1042-
fit={fit}
1043-
layoutScaleFactor={layoutScaleFactor}
1044-
url={url}
1045-
style={styles.animation}
1046-
onPlay={onPlayHandler}
1047-
onPause={onPauseHandler}
1048-
onStop={onStopHandler}
1049-
onLoopEnd={onLoopEndHandler}
1050-
onStateChanged={onStateChangedHandler}
1051-
onRiveEventReceived={onRiveEventReceivedHandler}
1052-
onError={onErrorHandler}
1053-
alignment={alignment}
1054-
artboardName={artboardName}
1055-
referencedAssets={convertedAssetHandledSources}
1056-
dataBinding={dataBinding}
1057-
animationName={animationName}
1058-
stateMachineName={stateMachineName}
1059-
/>
1060-
</TouchableWithoutFeedback>
1027+
<RiveViewManager
1028+
ref={riveRef}
1029+
resourceName={resourceName}
1030+
isUserHandlingErrors={isUserHandlingErrors}
1031+
autoplay={autoplay}
1032+
fit={fit}
1033+
layoutScaleFactor={layoutScaleFactor}
1034+
url={url}
1035+
style={styles.animation}
1036+
onPlay={onPlayHandler}
1037+
onPause={onPauseHandler}
1038+
onStop={onStopHandler}
1039+
onLoopEnd={onLoopEndHandler}
1040+
onStateChanged={onStateChangedHandler}
1041+
onRiveEventReceived={onRiveEventReceivedHandler}
1042+
onError={onErrorHandler}
1043+
alignment={alignment}
1044+
artboardName={artboardName}
1045+
referencedAssets={convertedAssetHandledSources}
1046+
dataBinding={dataBinding}
1047+
animationName={animationName}
1048+
stateMachineName={stateMachineName}
1049+
/>
10611050
</View>
10621051
);
10631052
}

0 commit comments

Comments
 (0)