harukin/jrshikoku
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

小規模なコード整理

Browse Source
This commit is contained in:
harukin-expo-dev-env 2025-04-10 18:29:56 +00:00
parent 99831e8d39
commit 423625c08a
4 changed files with 14 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
components/ActionSheetComponents/EachTrainInfo/ShowSpecialTrain.js
View File

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

11
components/ActionSheetComponents/EachTrainInfoCore.js
View File

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

1
components/DynamicHeaderScrollView.js
View File

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

16
stateBox/useBusAndTrainData.js
View File

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