Merge pull request #3841 from TrainLCD/fix/deep-link

ディープリンク処理タイミング修正
TrainLCD · Oct 21, 2024 · 20a18b8 · 20a18b8
2 parents 28df4be + b6ab37e
commit 20a18b8
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 24 deletions.
diff --git a/src/hooks/useDeepLink.ts b/src/hooks/useDeepLink.ts
@@ -1,13 +1,13 @@
 import * as Linking from 'expo-linking'
-import { useEffect } from 'react'
+import { useCallback, useEffect } from 'react'
 import { useOpenRouteFromLink } from './useOpenRouteFromLink'
 
 export const useDeepLink = () => {
-  const url = Linking.useURL()
   const { openLink: openRoute } = useOpenRouteFromLink()
 
-  useEffect(() => {
-    const getUrlAsync = async () => {
+  const handleURL = useCallback(
+    async (event: Linking.EventType) => {
+      const url = event.url
       if (url && (await Linking.canOpenURL(url))) {
         const parsedUrl = Linking.parse(url)
         if (parsedUrl.queryParams) {
@@ -36,7 +36,15 @@ export const useDeepLink = () => {
           })
         }
       }
+    },
+    [openRoute]
+  )
+
+  useEffect(() => {
+    const listener = Linking.addEventListener('url', handleURL)
+
+    return () => {
+      listener.remove()
     }
-    getUrlAsync()
-  }, [openRoute, url])
+  }, [handleURL])
 }
diff --git a/src/hooks/useOpenRouteFromLink.ts b/src/hooks/useOpenRouteFromLink.ts
@@ -1,7 +1,7 @@
 import { useMutation } from '@connectrpc/connect-query'
 import { useNavigation } from '@react-navigation/native'
 import { useCallback } from 'react'
-import { useRecoilState, useSetRecoilState } from 'recoil'
+import { useSetRecoilState } from 'recoil'
 import {
   getStationsByLineGroupId,
   getStationsByLineId,
@@ -15,13 +15,11 @@ import { LineDirection } from '../models/Bound'
 import lineState from '../store/atoms/line'
 import navigationState from '../store/atoms/navigation'
 import stationState from '../store/atoms/station'
-import { useResetMainState } from './useResetMainState'
 
 export const useOpenRouteFromLink = () => {
   const navigation = useNavigation()
-  const resetState = useResetMainState()
 
-  const [{ selectedBound }, setStationState] = useRecoilState(stationState)
+  const setStationState = useSetRecoilState(stationState)
   const setNavigationState = useSetRecoilState(navigationState)
   const setLineState = useSetRecoilState(lineState)
 
@@ -42,17 +40,11 @@ export const useOpenRouteFromLink = () => {
       stations: Station[],
       direction: LineDirection | null
     ) => {
-      if (selectedBound) {
-        return
-      }
-
       const line = station?.line
       if (!line) {
         return
       }
 
-      resetState()
-
       setStationState((prev) => ({
         ...prev,
         stations,
@@ -74,14 +66,7 @@ export const useOpenRouteFromLink = () => {
       }))
       navigation.navigate('Main')
     },
-    [
-      navigation,
-      resetState,
-      selectedBound,
-      setLineState,
-      setNavigationState,
-      setStationState,
-    ]
+    [navigation, setLineState, setNavigationState, setStationState]
   )
 
   const openLink = useCallback(

diff --git a/src/hooks/useResetMainState.ts b/src/hooks/useResetMainState.ts
@@ -15,6 +15,7 @@ export const useResetMainState = () => {
       bottomState: 'LINE',
       leftStations: [],
       stationForHeader: null,
+      fromBuilder: false,
     }))
     setStationState((prev) => ({
       ...prev,