Merge pull request #3785 from TrainLCD/fix/route-modal-local

普通/各停で経路選択を確定できないバグを修正
TrainLCD · Oct 10, 2024 · a6df6db · a6df6db
2 parents 747f7d6 + 5fd6484
commit a6df6db
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 16 deletions.
diff --git a/src/components/RouteList.tsx b/src/components/RouteList.tsx
@@ -85,7 +85,7 @@ export const RouteList = ({
   loading,
 }: {
   routes: Route[]
-  onSelect: (item: Route) => void
+  onSelect: (item: Route | undefined) => void
   loading: boolean
 }) => {
   const [trainTypeInfoModalVisible, setTrainTypeInfoModalVisible] =
@@ -174,7 +174,7 @@ export const RouteList = ({
         disabled={loading}
         stations={selectedRoute?.stops ?? []}
         onClose={() => setTrainTypeInfoModalVisible(false)}
-        onConfirmed={() => selectedRoute && onSelect(selectedRoute)}
+        onConfirmed={() => onSelect(selectedRoute)}
       />
     </>
   )

diff --git a/src/components/RouteListModal.tsx b/src/components/RouteListModal.tsx
@@ -25,7 +25,7 @@ type Props = {
   isTrainTypesLoading: boolean
   error: ConnectError | null
   onClose: () => void
-  onSelect: (route: Route) => void
+  onSelect: (route: Route | undefined) => void
 }
 
 const styles = StyleSheet.create({

diff --git a/src/components/TrainTypeInfoModal.tsx b/src/components/TrainTypeInfoModal.tsx
@@ -25,7 +25,7 @@ type Props = {
   disabled?: boolean
   error: ConnectError | null
   onClose: () => void
-  onConfirmed: (trainType: TrainType) => void
+  onConfirmed: (trainType: TrainType | undefined) => void
 }
 
 const styles = StyleSheet.create({
@@ -223,8 +223,8 @@ export const TrainTypeInfoModal: React.FC<Props> = ({
           <View style={styles.buttons}>
             <Button
               color={isLEDTheme ? undefined : '#008ffe'}
-              onPress={() => trainType && onConfirmed(trainType)}
-              disabled={loading || !trainType || disabled}
+              onPress={() => onConfirmed(trainType ?? undefined)}
+              disabled={loading || disabled}
             >
               {translate('submit')}
             </Button>

diff --git a/src/screens/RouteSearchScreen.tsx b/src/screens/RouteSearchScreen.tsx
@@ -146,15 +146,9 @@ const RouteSearchScreen = () => {
         selectedLine: stationFromSearch.line ?? null,
       }))
       setSelectedStation(stationFromSearch)
-
-      if (stationFromSearch.hasTrainTypes) {
-        setIsRouteListModalVisible(true)
-        return
-      }
-
-      navigation.navigate('SelectBound')
+      setIsRouteListModalVisible(true)
     },
-    [navigation, setLineState]
+    [setLineState]
   )
 
   const onKeyPress = useCallback(
@@ -174,8 +168,8 @@ const RouteSearchScreen = () => {
   )
 
   const handleSelect = useCallback(
-    async (route: Route) => {
-      const trainType = route.stops.find(
+    async (route: Route | undefined) => {
+      const trainType = route?.stops.find(
         (s) => s.groupId === currentStation?.groupId
       )?.trainType