Appsの内容分離

components/ActionSheetComponents/EachTrainInfo.js

@@ -2,8 +2,8 @@ import React, { useRef } from "react";
 import { Platform } from "react-native";
 import ActionSheet from "react-native-actions-sheet";
 import { EachTrainInfoCore } from "./EachTrainInfoCore";
-export const EachTrainInfo = (props) => {
-  if (!props.payload) return <></>;
+export const EachTrainInfo = ({payload}) => {
+  if (!payload) return <></>;
 
   const actionSheetRef = useRef(null);
   return (
@@ -17,7 +17,7 @@ export const EachTrainInfo = (props) => {
 
       //useBottomSafeAreaPadding={Platform.OS == "android"}
     >
-      <EachTrainInfoCore {...{ actionSheetRef, ...props.payload }} />
+      <EachTrainInfoCore {...{ actionSheetRef, ...payload }} />
     </ActionSheet>
   );
 };

components/ActionSheetComponents/EachTrainInfoCore.js

@@ -8,7 +8,6 @@ import {
   useWindowDimensions,
   BackHandler,
   Linking,
-  Image,
 } from "react-native";
 import { Ionicons } from "@expo/vector-icons";
 import { SheetManager } from "react-native-actions-sheet";
@@ -34,22 +33,22 @@ import { getType } from "../../lib/eachTrainInfoCoreLib/getType";
 import { searchSpecialTrain } from "../../lib/eachTrainInfoCoreLib/searchSpecialTrain";
 import { openBackTrainInfo } from "../../lib/eachTrainInfoCoreLib/openBackTrainInfo";
 import { ShowSpecialTrain } from "./EachTrainInfo/ShowSpecialTrain";
-import { useNavigation } from "@react-navigation/native";
-import { useInterval } from "../../lib/useInterval";
-import dayjs from "dayjs";
 import { TrainIconStatus } from "./EachTrainInfo/trainIconStatus";
+import { useTrainMenu } from "../../stateBox/useTrainMenu";
 
 export const EachTrainInfoCore = ({
   actionSheetRef,
   data,
-  originalStationList,
   openStationACFromEachTrainInfo,
   from,
-  setTrainInfo,
   navigate,
 }) => {
   // const [actionSheetHorizonalScroll, setActionSheetHorizonalScroll] = useState(false);
   const { currentTrain } = useCurrentTrain();
+  const {
+    setTrainInfo,
+    originalStationList,
+  } = useTrainMenu();
   const [currentTrainData, setCurrentTrainData] = useState();
 
   // const [actionSheetHorizonalScroll, setActionSheetHorizonalScroll] = useState(false);
@@ -96,7 +95,7 @@ export const EachTrainInfoCore = ({
     );
 
   // 使用例
-  const stopStationIDList = trainData.map((i, index) => {
+  const stopStationIDList = trainData.map((i) => {
     const [station, se, time] = i.split(",");
     const Stations = stationList.map((a) =>
       a.filter((d) => d.StationName == station)
@@ -137,7 +136,7 @@ export const EachTrainInfoCore = ({
     }
   }, [data.limited, trainData]);
 
-  const { height, width } = useWindowDimensions();
+  const { height } = useWindowDimensions();
   const { isLandscape } = useDeviceOrientationChange();
 
   const [trueTrainID, setTrueTrainID] = useState();
@@ -222,7 +221,7 @@ export const EachTrainInfoCore = ({
       .then((d) => {
         if (d) setTrainPositionSwitch(d);
       })
-      .catch((d) => AS.setItem("trainPositionSwitch", "false"));
+      .catch(() => AS.setItem("trainPositionSwitch", "false"));
   }, []);
 
   const openTrainInfo = (d) => {