小規模なコード整理

components/ActionSheetComponents/EachTrainInfo/ShowSpecialTrain.js

@@ -1,13 +1,14 @@
 import { Text, TouchableOpacity } from "react-native";
 import React, { useState } from "react";
+import { useAllTrainDiagram } from "@/stateBox/useAllTrainDiagram";
 export const ShowSpecialTrain = ({
   isTrainDataNothing,
   setTrainData,
-  trainList,
   trueTrainID,
 }) => {
+  const { allTrainDiagram } = useAllTrainDiagram();
   const replaceSpecialTrainDetail = (trainNum) => {
-    let TD = trainList[trainNum];
+    let TD = allTrainDiagram[trainNum];
     if (!TD) return;
     setTrainData(TD.split("#").filter((d) => d != ""));
   };

components/ActionSheetComponents/EachTrainInfoCore.js

@@ -216,9 +216,8 @@ export const EachTrainInfoCore = ({
     if (!data.trainNum) return;
     const NearTrainList = getInfluencedTrainData(data.trainNum);
     if (NearTrainList.length == 0) return;
-    const returnArray = NearTrainList.map((d) => d.id);
     const TDArray = NearTrainList.map((d) => d.TrainData);
-    setNearTrainIDList(returnArray);
+    setNearTrainIDList(NearTrainList.map((d) => d.id));
     if (trainData.length == 0) return;
     if (TDArray.length == 0) return;
     let head = [];
@@ -242,10 +241,8 @@ export const EachTrainInfoCore = ({
         }
       })
     );
-    if (head) setHeadStation(head);
-    else setHeadStation([]);
-    if (tail) setTailStation(tail);
-    else setTailStation([]);
+    setHeadStation(head || []);
+    setTailStation(tail || []);
   }, [trainData, data]);
 
   useEffect(() => {
@@ -391,7 +388,6 @@ export const EachTrainInfoCore = ({
       <DynamicHeaderScrollView
         from={from}
         styles={styles}
-        actionSheetRef={actionSheetRef}
         scrollHandlers={scrollHandlers}
         containerProps={{
           style: {
@@ -459,7 +455,6 @@ export const EachTrainInfoCore = ({
         <ShowSpecialTrain
           isTrainDataNothing={trainData.length == 0}
           setTrainData={setTrainData}
-          trainList={trainList}
           trueTrainID={trueTrainID}
         />
         {!trainData.length && (

components/DynamicHeaderScrollView.js

@@ -6,7 +6,6 @@ import { AS } from "../storageControl";
 export const DynamicHeaderScrollView = (props) => {
   const {
     children,
-    actionSheetRef = {},
     containerProps = {},
     shortHeader = <></>,
     longHeader = <></>,

stateBox/useBusAndTrainData.js

@@ -17,7 +17,7 @@ export const useBusAndTrainData = () => {
 };
 
 export const BusAndTrainDataProvider = ({ children }) => {
-  const { allTrainDiagram: trainList } = useAllTrainDiagram();
+  const { allTrainDiagram } = useAllTrainDiagram();
   const [busAndTrainData, setBusAndTrainData] = useState([]);
   const [trainPairData, setTrainPairData] = useState([]);
   useEffect(() => {
@@ -280,11 +280,11 @@ export const BusAndTrainDataProvider = ({ children }) => {
         break;
     }
     if (new RegExp(/^4[1-9]\d\d[DM]$/).test(trainNum)) {
-      if (trainList["5" + trainNum.substring(1)])
+      if (allTrainDiagram["5" + trainNum.substring(1)])
         returnArray.push("5" + trainNum.substring(1));
     }
     if (new RegExp(/^5[1-7]\d\d[DM]$/).test(trainNum)) {
-      if (trainList["4" + trainNum.substring(1)])
+      if (allTrainDiagram["4" + trainNum.substring(1)])
         returnArray.push("4" + trainNum.substring(1));
     }
     if (
@@ -292,21 +292,21 @@ export const BusAndTrainDataProvider = ({ children }) => {
       new RegExp(/^4[1-9]\d\d[DM]$/).test(trainNum) ||
       new RegExp(/^5[1-7]\d\d[DM]$/).test(trainNum)
     ) {
-      if (trainList[trainNum.substring(1)]) {
+      if (allTrainDiagram[trainNum.substring(1)]) {
         returnArray.push(trainNum.substring(1));
       }
     }
     if (new RegExp(/^[1-9]\d\d[DM]$/).test(trainNum)) {
       // 列番がxxDの場合は4xxDと5xxDの列番を検索
-      if (trainList["4" + trainNum]) returnArray.push("4" + trainNum);
-      if (trainList["5" + trainNum]) returnArray.push("5" + trainNum);
+      if (allTrainDiagram["4" + trainNum]) returnArray.push("4" + trainNum);
+      if (allTrainDiagram["5" + trainNum]) returnArray.push("5" + trainNum);
     }
 
     if (!returnArray.length) return [];
     const TDArray = returnArray
-      .filter((d) => trainList.hasOwnProperty(d))
+      .filter((d) => allTrainDiagram.hasOwnProperty(d))
       .map((d) => {
-        const TD = trainList[d];
+        const TD = allTrainDiagram[d];
         if (!TD) return;
         return { id: d, TrainData: TD.split("#").filter((d) => d != "") };
       });