From 482c03c2802410e0109f9b9ef124d0a44d0a5ab0 Mon Sep 17 00:00:00 2001
From: Krishna Gupta <belivethatkg@gmail.com>
Date: Sun, 16 Jun 2024 13:29:20 +0530
Subject: [PATCH 1/2] fix: Distance - Page is not scrollable after adding
 multiple stops.

Signed-off-by: Krishna Gupta <belivethatkg@gmail.com>
---
 src/components/DraggableList/index.android.tsx | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/components/DraggableList/index.android.tsx b/src/components/DraggableList/index.android.tsx
index 30bf7c927bd9..8cfea9e0bc85 100644
--- a/src/components/DraggableList/index.android.tsx
+++ b/src/components/DraggableList/index.android.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import {View} from 'react-native';
-import DraggableFlatList from 'react-native-draggable-flatlist';
+import {NestableDraggableFlatList, NestableScrollContainer} from 'react-native-draggable-flatlist';
 import type {FlatList} from 'react-native-gesture-handler';
 import useThemeStyles from '@hooks/useThemeStyles';
 import type {DraggableListProps} from './types';
@@ -8,16 +8,15 @@ import type {DraggableListProps} from './types';
 function DraggableList<T>({renderClone, shouldUsePortal, ListFooterComponent, ...viewProps}: DraggableListProps<T>, ref: React.ForwardedRef<FlatList<T>>) {
     const styles = useThemeStyles();
     return (
-        <View style={styles.flex1}>
-            <DraggableFlatList
+        <NestableScrollContainer contentContainerStyle={styles.flexGrow1}>
+            <NestableDraggableFlatList
                 ref={ref}
-                containerStyle={ListFooterComponent ? undefined : styles.flex1}
-                contentContainerStyle={ListFooterComponent ? undefined : styles.flexGrow1}
+                contentContainerStyle={styles.flex1}
                 // eslint-disable-next-line react/jsx-props-no-spreading
                 {...viewProps}
             />
             {React.isValidElement(ListFooterComponent) && <View style={styles.flexGrow1}>{ListFooterComponent}</View>}
-        </View>
+        </NestableScrollContainer>
     );
 }
 

From ffa8cddb6239357b7828383fbc33b9f2ce961e78 Mon Sep 17 00:00:00 2001
From: Krishna Gupta <belivethatkg@gmail.com>
Date: Sun, 16 Jun 2024 14:53:11 +0530
Subject: [PATCH 2/2] fix scroll issue after selceting a route.

Signed-off-by: Krishna Gupta <belivethatkg@gmail.com>
---
 src/components/DraggableList/index.android.tsx | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/components/DraggableList/index.android.tsx b/src/components/DraggableList/index.android.tsx
index 8cfea9e0bc85..cc1a7b1910d4 100644
--- a/src/components/DraggableList/index.android.tsx
+++ b/src/components/DraggableList/index.android.tsx
@@ -1,16 +1,18 @@
 import React from 'react';
 import {View} from 'react-native';
 import {NestableDraggableFlatList, NestableScrollContainer} from 'react-native-draggable-flatlist';
-import type {FlatList} from 'react-native-gesture-handler';
+import type {ScrollView} from 'react-native-gesture-handler';
 import useThemeStyles from '@hooks/useThemeStyles';
 import type {DraggableListProps} from './types';
 
-function DraggableList<T>({renderClone, shouldUsePortal, ListFooterComponent, ...viewProps}: DraggableListProps<T>, ref: React.ForwardedRef<FlatList<T>>) {
+function DraggableList<T>({renderClone, shouldUsePortal, ListFooterComponent, ...viewProps}: DraggableListProps<T>, ref: React.ForwardedRef<ScrollView>) {
     const styles = useThemeStyles();
     return (
-        <NestableScrollContainer contentContainerStyle={styles.flexGrow1}>
+        <NestableScrollContainer
+            ref={ref}
+            contentContainerStyle={styles.flexGrow1}
+        >
             <NestableDraggableFlatList
-                ref={ref}
                 contentContainerStyle={styles.flex1}
                 // eslint-disable-next-line react/jsx-props-no-spreading
                 {...viewProps}