Skip to content

Commit f985073

Browse files
Change pan to tap gesture to make scrolls work again
1 parent 480713b commit f985073

File tree

4 files changed

+32
-34
lines changed

4 files changed

+32
-34
lines changed

src/components/features/header/HeaderBase.tsx

+4-1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import {EdgeInsets, useSafeAreaInsets} from 'react-native-safe-area-context'
44
import {HideFromAccessibility} from '@/components/features/accessibility/HideFromAccessibility'
55
import {HeaderProps} from '@/components/features/header/types'
66
import {Box} from '@/components/ui/containers/Box'
7+
import {ExtendAccessCodeValidityOnTap} from '@/modules/access-code/components/ExtendAccessCodeValidityOnTap'
78
import {useScreen} from '@/store/slices/screen'
89

910
type BackgroundColorProp = {
@@ -27,7 +28,9 @@ export const HeaderBase = ({backgroundColor, children}: Props) => {
2728
<HideFromAccessibility
2829
hide={isContentHiddenFromAccessibility || isHiddenFromAccessibility}
2930
style={styles.header}>
30-
<Box>{children}</Box>
31+
<ExtendAccessCodeValidityOnTap>
32+
<Box>{children}</Box>
33+
</ExtendAccessCodeValidityOnTap>
3134
</HideFromAccessibility>
3235
)
3336
}

src/components/features/header/HeaderContent.tsx

+23-28
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import {Row} from '@/components/ui/layout/Row'
77
import {ScreenHeaderTitle} from '@/components/ui/text/ScreenHeaderTitle'
88
import {IconSize} from '@/components/ui/types'
99
import {useAccessibilityAutoFocus} from '@/hooks/accessibility/useAccessibilityAutoFocus'
10-
import {ExtendAccessCodeValidityOnPanGesture} from '@/modules/access-code/components/ExtendAccessCodeValidityOnPanGesture'
1110

1211
const chevronSize = 'ml'
1312

@@ -36,34 +35,30 @@ export const HeaderContent = ({
3635
})
3736

3837
return (
39-
<ExtendAccessCodeValidityOnPanGesture>
40-
<View collapsable={false}>
41-
<Row
42-
gutter="lg"
43-
valign="center">
44-
<View
45-
accessible
46-
ref={accessibilityAutoFocusRef}
47-
style={styles.sideColumn}>
48-
{!!back && (
49-
<HeaderBackButton
50-
iconSize={chevronSize}
51-
onPress={onBackPress}
52-
/>
53-
)}
54-
</View>
55-
<View style={styles.middleColumn}>
56-
<ScreenHeaderTitle
57-
accessibilityLanguage={accessibilityLanguage}
58-
text={title}
59-
/>
60-
</View>
61-
<View style={styles.sideColumn}>
62-
{!!SideComponent && <SideComponent />}
63-
</View>
64-
</Row>
38+
<Row
39+
gutter="lg"
40+
valign="center">
41+
<View
42+
accessible
43+
ref={accessibilityAutoFocusRef}
44+
style={styles.sideColumn}>
45+
{!!back && (
46+
<HeaderBackButton
47+
iconSize={chevronSize}
48+
onPress={onBackPress}
49+
/>
50+
)}
6551
</View>
66-
</ExtendAccessCodeValidityOnPanGesture>
52+
<View style={styles.middleColumn}>
53+
<ScreenHeaderTitle
54+
accessibilityLanguage={accessibilityLanguage}
55+
text={title}
56+
/>
57+
</View>
58+
<View style={styles.sideColumn}>
59+
{!!SideComponent && <SideComponent />}
60+
</View>
61+
</Row>
6762
)
6863
}
6964

src/components/features/screen/ScreenBase.tsx

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import {ScreenInnerWrapper} from '@/components/features/screen/ScreenInnerWrappe
88
import {ScreenWrapper} from '@/components/features/screen/ScreenWrapper'
99
import {AlertTopOfScreen} from '@/components/ui/feedback/alert/AlertTopOfScreen'
1010
import {Gutter} from '@/components/ui/layout/Gutter'
11-
import {ExtendAccessCodeValidityOnPanGesture} from '@/modules/access-code/components/ExtendAccessCodeValidityOnPanGesture'
11+
import {ExtendAccessCodeValidityOnTap} from '@/modules/access-code/components/ExtendAccessCodeValidityOnTap'
1212
import {DisableScrollProvider} from '@/providers/disableScroll.provider'
1313
import {useScreen} from '@/store/slices/screen'
1414

@@ -60,7 +60,7 @@ export const ScreenBase = ({
6060

6161
return (
6262
<DisableScrollProvider>
63-
<ExtendAccessCodeValidityOnPanGesture>
63+
<ExtendAccessCodeValidityOnTap>
6464
<HideFromAccessibility
6565
hide={isHiddenFromAccessibility}
6666
style={styles.screen}
@@ -90,7 +90,7 @@ export const ScreenBase = ({
9090
)}
9191
{!!spaceBottom && <View style={{height: spaceBottom}} />}
9292
</HideFromAccessibility>
93-
</ExtendAccessCodeValidityOnPanGesture>
93+
</ExtendAccessCodeValidityOnTap>
9494
</DisableScrollProvider>
9595
)
9696
}

src/modules/access-code/components/ExtendAccessCodeValidityOnPanGesture.tsx src/modules/access-code/components/ExtendAccessCodeValidityOnTap.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@ type Props = {
77
children: ReactNode
88
}
99

10-
export const ExtendAccessCodeValidityOnPanGesture = ({children}: Props) => {
10+
export const ExtendAccessCodeValidityOnTap = ({children}: Props) => {
1111
const {onExtendAccessCodeValidity} = useEnterAccessCode()
1212

1313
const gesture = useMemo(
1414
() =>
15-
Gesture.Pan().onBegin(() => {
15+
Gesture.Tap().onBegin(() => {
1616
runOnJS(onExtendAccessCodeValidity)()
1717
}),
1818
[onExtendAccessCodeValidity],

0 commit comments

Comments
 (0)