diff --git a/mobile/patches/react-native-actions-sheet@0.9.7.patch b/mobile/patches/react-native-actions-sheet@0.9.7.patch index 725d4c8d..5a6a18bb 100644 --- a/mobile/patches/react-native-actions-sheet@0.9.7.patch +++ b/mobile/patches/react-native-actions-sheet@0.9.7.patch @@ -1,5 +1,5 @@ diff --git a/dist/src/index.js b/dist/src/index.js -index 0e124da4da841bfb16fd7379ba77e8e8fc9abbe7..3062317a6e8a98827ca971cace2967cdfc08c632 100644 +index 0e124da4da841bfb16fd7379ba77e8e8fc9abbe7..66f5e0e2f4e5aad54eb2fe8294008d8a98839960 100644 --- a/dist/src/index.js +++ b/dist/src/index.js @@ -288,10 +288,19 @@ export default forwardRef(function ActionSheet(_a, ref) { @@ -32,3 +32,21 @@ index 0e124da4da841bfb16fd7379ba77e8e8fc9abbe7..3062317a6e8a98827ca971cace2967cd var height = rootViewHeight - safeMarginFromTop; var width = rootViewWidth; dimensionsRef.current = { +@@ -575,9 +585,14 @@ export default forwardRef(function ActionSheet(_a, ref) { + ? { enabled: false } + : { + onBegan: function () { +- if (Platform.OS === 'android') { +- scrollable(false); +- } ++ // FIXME: This was causing scrolling on lists to be a bit ++ // janky. From my tests so far, there doesn't seem to be ++ // any issues with removing this. ++ // - There's no notes in the v0.9.0 PR that added this in ++ // on why this is here. ++ // if (Platform.OS === 'android') { ++ // scrollable(false); ++ // } + }, + onGestureEvent: function (event) { + var _a, _b; diff --git a/mobile/pnpm-lock.yaml b/mobile/pnpm-lock.yaml index 413bcfdb..e915289e 100644 --- a/mobile/pnpm-lock.yaml +++ b/mobile/pnpm-lock.yaml @@ -12,7 +12,7 @@ patchedDependencies: hash: zgk2jjhdnijgnajdwndrw6mz2q path: patches/@backpackapp-io__react-native-toast@0.13.0.patch react-native-actions-sheet@0.9.7: - hash: h5772mzkxikifnpakqyhehjppm + hash: dmf2cvt7t24xk2qlczkgl6j5zu path: patches/react-native-actions-sheet@0.9.7.patch dependencies: @@ -117,7 +117,7 @@ dependencies: version: 0.75.4(@babel/core@7.26.0)(@babel/preset-env@7.26.0)(@types/react@18.3.12)(react@18.3.1)(typescript@5.6.3) react-native-actions-sheet: specifier: ^0.9.7 - version: 0.9.7(patch_hash=h5772mzkxikifnpakqyhehjppm)(react-native-gesture-handler@2.21.2)(react-native-safe-area-context@4.14.0)(react-native@0.75.4) + version: 0.9.7(patch_hash=dmf2cvt7t24xk2qlczkgl6j5zu)(react-native-gesture-handler@2.21.2)(react-native-safe-area-context@4.14.0)(react-native@0.75.4) react-native-bootsplash: specifier: ^6.3.2 version: 6.3.2(react-native@0.75.4)(react@18.3.1) @@ -9941,7 +9941,7 @@ packages: resolution: {integrity: sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==} dev: false - /react-native-actions-sheet@0.9.7(patch_hash=h5772mzkxikifnpakqyhehjppm)(react-native-gesture-handler@2.21.2)(react-native-safe-area-context@4.14.0)(react-native@0.75.4): + /react-native-actions-sheet@0.9.7(patch_hash=dmf2cvt7t24xk2qlczkgl6j5zu)(react-native-gesture-handler@2.21.2)(react-native-safe-area-context@4.14.0)(react-native@0.75.4): resolution: {integrity: sha512-rjUwxUr5dxbdSLDtLDUFAdSlFxpNSpJsbXLhHkBzEBMxEMPUhRT3zqbvKqsPj0JUkjwuRligxrhbIJZkg/6ZDw==} peerDependencies: react-native: '*' diff --git a/mobile/src/screens/Sheets/Language.tsx b/mobile/src/screens/Sheets/Language.tsx index 37fd7182..e81a67c4 100644 --- a/mobile/src/screens/Sheets/Language.tsx +++ b/mobile/src/screens/Sheets/Language.tsx @@ -32,6 +32,7 @@ export default function LanguageSheet(props: SheetProps<"language-sheet">) { {item.name} )} + overScrollMode="never" showsVerticalScrollIndicator={false} contentContainerClassName="gap-1 pb-4" /> diff --git a/mobile/src/screens/Sheets/ScanFilterList/index.tsx b/mobile/src/screens/Sheets/ScanFilterList/index.tsx index 2fda3505..ecdab021 100644 --- a/mobile/src/screens/Sheets/ScanFilterList/index.tsx +++ b/mobile/src/screens/Sheets/ScanFilterList/index.tsx @@ -82,6 +82,7 @@ export default function ScanFilterListSheet( ListEmptyComponent={ {t("response.noFilters")} } + overScrollMode="never" showsVerticalScrollIndicator={false} contentContainerClassName="pb-4" /> diff --git a/mobile/src/screens/Sheets/TrackToPlaylist.tsx b/mobile/src/screens/Sheets/TrackToPlaylist.tsx index 9920127b..d0b5e49c 100644 --- a/mobile/src/screens/Sheets/TrackToPlaylist.tsx +++ b/mobile/src/screens/Sheets/TrackToPlaylist.tsx @@ -68,6 +68,7 @@ export default function TrackToPlaylistSheet( {t("response.noPlaylists")} ) } + overScrollMode="never" showsVerticalScrollIndicator={false} contentContainerClassName="pb-4" /> diff --git a/mobile/src/screens/Sheets/TrackUpcoming.tsx b/mobile/src/screens/Sheets/TrackUpcoming.tsx index 510b9f8c..1ccfb510 100644 --- a/mobile/src/screens/Sheets/TrackUpcoming.tsx +++ b/mobile/src/screens/Sheets/TrackUpcoming.tsx @@ -91,6 +91,7 @@ export default function TrackUpcomingSheet( ); }} + overScrollMode="never" showsVerticalScrollIndicator={false} contentContainerClassName="pb-4" />