Skip to content

Commit

Permalink
Merge pull request #300 from ds8k/bugfix/touchevent-action-item
Browse files Browse the repository at this point in the history
Bugfix/touchevent action item
  • Loading branch information
codypearce authored Sep 30, 2019
2 parents 568b19c + 2f7e492 commit 0c500b2
Show file tree
Hide file tree
Showing 6 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion src/Components/Chip/__snapshots__/Chip.test.js.snap
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ exports[`Chip Renders 1`] = `
onResponderTerminationRequest={[Function]}
onRippleAnimation={[Function]}
onStartShouldSetResponder={[Function]}
pointerEvents="box-only"
rippleCentered={false}
rippleColor="rgba(0, 0, 0, .87)"
rippleDuration={400}
Expand Down Expand Up @@ -81,6 +80,7 @@ exports[`Chip Renders 1`] = `
/>
</View>
<View
pointerEvents="none"
style={
Array [
Object {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ exports[`DrawerItem Renders 1`] = `
onResponderTerminationRequest={[Function]}
onRippleAnimation={[Function]}
onStartShouldSetResponder={[Function]}
pointerEvents="box-only"
rippleCentered={false}
rippleColor="rgba(0, 0, 0, .87)"
rippleDuration={400}
Expand Down Expand Up @@ -50,6 +49,7 @@ exports[`DrawerItem Renders 1`] = `
}
/>
<View
pointerEvents="none"
style={
Array [
Object {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ exports[`MenuItem Renders 1`] = `
onResponderTerminationRequest={[Function]}
onRippleAnimation={[Function]}
onStartShouldSetResponder={[Function]}
pointerEvents="box-only"
rippleCentered={false}
rippleColor="rgba(0, 0, 0, .87)"
rippleDuration={400}
Expand Down Expand Up @@ -65,6 +64,7 @@ exports[`MenuItem Renders 1`] = `
}
/>
<View
pointerEvents="none"
style={
Array [
Object {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ exports[`RadioButton Renders 1`] = `
onResponderTerminationRequest={[Function]}
onRippleAnimation={[Function]}
onStartShouldSetResponder={[Function]}
pointerEvents="box-only"
rippleCentered={true}
rippleColor="rgba(0,0,0,.8)"
rippleDuration={400}
Expand Down Expand Up @@ -57,6 +56,7 @@ exports[`RadioButton Renders 1`] = `
}
/>
<View
pointerEvents="none"
style={
Array [
Object {
Expand Down
4 changes: 2 additions & 2 deletions src/Components/Ripple/Ripple.js
Original file line number Diff line number Diff line change
Expand Up @@ -297,9 +297,9 @@ export default class Ripple extends PureComponent {
{...touchableProps}
{...panResponder}
testID={testID}>
<Animated.View {...props} pointerEvents="box-only">
<Animated.View {...props}>
{children}
<View style={[styles.container, containerStyle]}>
<View style={[styles.container, containerStyle]} pointerEvents="none">
{ripples.map(this.renderRipple)}
</View>
</Animated.View>
Expand Down
2 changes: 1 addition & 1 deletion src/Components/Ripple/__snapshots__/Ripple.test.js.snap
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ exports[`Ripple Renders 1`] = `
onResponderTerminationRequest={[Function]}
onRippleAnimation={[Function]}
onStartShouldSetResponder={[Function]}
pointerEvents="box-only"
rippleCentered={false}
rippleColor="rgba(0, 0, 0, .87)"
rippleDuration={400}
Expand All @@ -23,6 +22,7 @@ exports[`Ripple Renders 1`] = `
testID="mb-ripple"
>
<View
pointerEvents="none"
style={
Array [
Object {
Expand Down

0 comments on commit 0c500b2

Please sign in to comment.