Skip to content

Fix/incubator touch2 long press #1435

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 3, 2021
Merged

Fix/incubator touch2 long press #1435

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
117e88e
Fix missing behaviour on long-press, active opacity was dismissed
mendyEdri Jul 27, 2021
7ee8049
added RN-touchable-opacity to demo for reference
mendyEdri Jul 27, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions demo/src/screens/incubatorScreens/TouchableOpacityScreen.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, {Component} from 'react';
import {TouchableOpacity} from 'react-native';
import {View, Text, Colors, Incubator} from 'react-native-ui-lib';

class TouchableOpacityScreen extends Component {
Expand Down Expand Up @@ -35,6 +36,24 @@ class TouchableOpacityScreen extends Component {
);
}

renderRNTouchableExample = () => {
return (
<View row centerV marginT-20>
<Text marginR-14>RN TouchableOpacity</Text>
<TouchableOpacity
onPress={() => {
console.warn('onPress');
}}
onLongPress={() => {
console.warn('onLongPress');
}}
>
<View style={{backgroundColor: Colors.green40, width: 100, height: 34, borderRadius: 22}}/>
</TouchableOpacity>
</View>
);
};

render() {
const {counter, longPressCounter} = this.state;
return (
Expand Down Expand Up @@ -64,6 +83,7 @@ class TouchableOpacityScreen extends Component {
>
<Text white>TouchableOpacity2</Text>
</Incubator.TouchableOpacity2>
{this.renderRNTouchableExample()}
</View>
);
}
Expand Down
15 changes: 9 additions & 6 deletions src/incubator/TouchableOpacity2.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import Reanimated, {
} from 'react-native-reanimated';
import {TapGestureHandler, LongPressGestureHandler, State} from 'react-native-gesture-handler';
import {asBaseComponent, forwardRef, BaseComponentInjectedProps, ForwardRefInjectedProps} from '../commons/new';
import {ViewProps} from '../components/view';
import View, {ViewProps} from '../components/view';

export type TouchableOpacityProps = {
/**
Expand Down Expand Up @@ -107,23 +107,24 @@ function TouchableOpacity(props: Props) {
},
onEnd: () => {
toggleActive(0);

runOnJS(onPress)();
},
onFail: () => {
toggleActive(0);
if (!isLongPressed.value) {
toggleActive(0);
}
}
});

const longPressGestureHandler = useAnimatedGestureHandler({
onActive: () => {
if (!isLongPressed.value) {
isLongPressed.value = true;
toggleActive(0);
runOnJS(onLongPress)();
}
},
onFinish: () => {
toggleActive(0);
isLongPressed.value = false;
}
});
Expand All @@ -140,6 +141,8 @@ function TouchableOpacity(props: Props) {
};
}, [backgroundColor, feedbackColor]);

const Container = props.onLongPress ? LongPressGestureHandler : View;

return (
<TapGestureHandler
// @ts-expect-error
Expand All @@ -149,7 +152,7 @@ function TouchableOpacity(props: Props) {
>
<Reanimated.View>
{/* @ts-expect-error */}
<LongPressGestureHandler onGestureEvent={longPressGestureHandler} shouldCancelWhenOutside>
<Container onGestureEvent={longPressGestureHandler} shouldCancelWhenOutside>
<Reanimated.View
{...others}
ref={forwardedRef}
Expand All @@ -166,7 +169,7 @@ function TouchableOpacity(props: Props) {
>
{children}
</Reanimated.View>
</LongPressGestureHandler>
</Container>
</Reanimated.View>
</TapGestureHandler>
);
Expand Down