From 03a677ce6713d588fb3626c21b8886f48b81782a Mon Sep 17 00:00:00 2001
From: harukin-expo-dev-env <harukin@haruk.in>
Date: Fri, 31 May 2024 07:31:32 +0000
Subject: [PATCH] =?UTF-8?q?=E4=B8=8D=E8=A6=81=E3=81=AA=E8=A6=81=E7=B4=A0?=
 =?UTF-8?q?=E3=81=AE=E6=95=B4=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Apps.js                    |  8 ++++++--
 Top.js                     | 14 +++++---------
 components/FavoriteList.js |  4 +++-
 3 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/Apps.js b/Apps.js
index 0e358f3..bb77de6 100644
--- a/Apps.js
+++ b/Apps.js
@@ -31,7 +31,7 @@ import { stationNamePair } from "./lib/getStationList2";
 import StatusbarDetect from './StatusbarDetect';
 var Status = StatusbarDetect(); */
 
-export default function Apps({ stationData }) {
+export default function Apps() {
   const { webview, currentTrain } = useCurrentTrain();
   const { height, width } = useWindowDimensions();
   const { navigate } = useNavigation();
@@ -39,7 +39,11 @@ export default function Apps({ stationData }) {
   const { favoriteStation } = useFavoriteStation();
   const { isLandscape, setIsLandscape } = useDeviceOrientationChange();
   const handleLayout = () => {};
-  const { setSelectedLine, setInjectJavaScript } = useTrainMenu();
+  const {
+    setSelectedLine,
+    setInjectJavaScript,
+    mapsStationData: stationData,
+  } = useTrainMenu();
 
   //画面表示関連
   const [iconSetting, setIconSetting] = useState(undefined);
diff --git a/Top.js b/Top.js
index 02fc198..51ac96d 100644
--- a/Top.js
+++ b/Top.js
@@ -22,12 +22,8 @@ export const Top = ({ navigationRef }) => {
   const { navigate, addListener } = navigation;
 
   //地図用
-  const {
-    mapsStationData,
-    setMapsStationData,
-    injectJavaScript,
-    setInjectJavaScript,
-  } = useTrainMenu();
+  const { setMapsStationData, injectJavaScript, setInjectJavaScript } =
+    useTrainMenu();
 
   useEffect(() => {
     getStationList2().then(setMapsStationData);
@@ -77,7 +73,7 @@ export const Top = ({ navigationRef }) => {
           gestureEnabled: true,
           headerTransparent: true,
         }}
-        children={() => <Apps stationData={mapsStationData} />}
+        component={Apps}
       />
       <Stack.Screen
         name="trainbase"
@@ -95,13 +91,13 @@ export const Top = ({ navigationRef }) => {
       <Stack.Screen
         name="trainMenu"
         options={optionData}
-        children={() => <TrainMenu />}
+        component={TrainMenu}
       />
 
       <Stack.Screen
         name="favoriteList"
         options={{ ...optionData, gestureEnabled: false }}
-        children={() => <FavoriteList stationData={mapsStationData} />}
+        component={FavoriteList}
       />
     </Stack.Navigator>
   );
diff --git a/components/FavoriteList.js b/components/FavoriteList.js
index 67f3710..e46b613 100644
--- a/components/FavoriteList.js
+++ b/components/FavoriteList.js
@@ -5,11 +5,13 @@ import Icon from "react-native-vector-icons/Entypo";
 import { useFavoriteStation } from "../stateBox/useFavoriteStation";
 import { useCurrentTrain } from "../stateBox/useCurrentTrain";
 import { useNavigation } from "@react-navigation/native";
+import { useTrainMenu } from "../stateBox/useTrainMenu";
 import { FavoriteListItem } from "./atom/FavoriteListItem";
-export default function FavoriteList({ stationData }) {
+export default function FavoriteList() {
   const { favoriteStation } = useFavoriteStation();
   const { webview } = useCurrentTrain();
   const { navigate, goBack } = useNavigation();
+  const { mapsStationData: stationData } = useTrainMenu();
 
   return (
     <View style={{ height: "100%", backgroundColor: "#0099CC" }}>