originalStationListに依存していたファイルを移動

This commit is contained in:
harukin-expo-dev-env 2024-09-01 06:11:50 +00:00
parent 9aa000af8c
commit 02281068fe
7 changed files with 7 additions and 18 deletions

View File

@ -33,17 +33,18 @@ import { getType } from "../../lib/eachTrainInfoCoreLib/getType";
import { searchSpecialTrain } from "../../lib/eachTrainInfoCoreLib/searchSpecialTrain"; import { searchSpecialTrain } from "../../lib/eachTrainInfoCoreLib/searchSpecialTrain";
import { openBackTrainInfo } from "../../lib/eachTrainInfoCoreLib/openBackTrainInfo"; import { openBackTrainInfo } from "../../lib/eachTrainInfoCoreLib/openBackTrainInfo";
import { ShowSpecialTrain } from "./EachTrainInfo/ShowSpecialTrain"; import { ShowSpecialTrain } from "./EachTrainInfo/ShowSpecialTrain";
import { useStationList } from "../../stateBox/useStationList";
import { useNavigation } from "@react-navigation/native"; import { useNavigation } from "@react-navigation/native";
export const EachTrainInfoCore = ({ export const EachTrainInfoCore = ({
actionSheetRef, actionSheetRef,
data, data,
originalStationList,
openStationACFromEachTrainInfo, openStationACFromEachTrainInfo,
from, from,
setTrainInfo, setTrainInfo,
navigate, navigate,
}) => { }) => {
const { originalStationList } = useStationList();
// const [actionSheetHorizonalScroll, setActionSheetHorizonalScroll] = useState(false); // const [actionSheetHorizonalScroll, setActionSheetHorizonalScroll] = useState(false);
const { currentTrain } = useCurrentTrain(); const { currentTrain } = useCurrentTrain();
const [currentTrainData, setCurrentTrainData] = useState(); const [currentTrainData, setCurrentTrainData] = useState();
@ -236,7 +237,6 @@ export const EachTrainInfoCore = ({
}${TrainNumber}`, }${TrainNumber}`,
}, },
navigate, navigate,
originalStationList,
from: from == "LED" ? "LED2" : "NearTrainDiagramView", from: from == "LED" ? "LED2" : "NearTrainDiagramView",
}; };
if (setTrainInfo) { if (setTrainInfo) {

View File

@ -19,9 +19,7 @@ import { useNavigation } from "@react-navigation/native";
export default function AllTrainDiagramView() { export default function AllTrainDiagramView() {
const { navigate } = useNavigation(); const { navigate } = useNavigation();
const { allTrainDiagram } = useAllTrainDiagram(); const { allTrainDiagram } = useAllTrainDiagram();
const [originalStationList, setOriginalStationList] = useState(); // 第一要素
const [keyList, setKeyList] = useState(); // 第二要素 const [keyList, setKeyList] = useState(); // 第二要素
useEffect(() => getStationList().then(setOriginalStationList), []);
useEffect( useEffect(
() => allTrainDiagram && setKeyList(Object.keys(allTrainDiagram)), () => allTrainDiagram && setKeyList(Object.keys(allTrainDiagram)),
[] []
@ -59,7 +57,6 @@ export default function AllTrainDiagramView() {
}${TrainNumber}`, }${TrainNumber}`,
}, },
navigate, navigate,
originalStationList,
from: "AllTrainDiagramView", from: "AllTrainDiagramView",
}; };
SheetManager.show("EachTrainInfo", { SheetManager.show("EachTrainInfo", {

View File

@ -134,7 +134,6 @@ export default function Apps() {
) : null} ) : null}
{/* {Status} */} {/* {Status} */}
<AppsWebView <AppsWebView
originalStationList={originalStationList}
{...{ {...{
setLoadError, setLoadError,
setTrainInfo, setTrainInfo,
@ -153,7 +152,6 @@ export default function Apps() {
<EachTrainInfoCore <EachTrainInfoCore
{...{ {...{
data: trainInfo.trainNum ? trainInfo : undefined, data: trainInfo.trainNum ? trainInfo : undefined,
originalStationList,
openStationACFromEachTrainInfo, openStationACFromEachTrainInfo,
from: "Train", from: "Train",
setTrainInfo, setTrainInfo,

View File

@ -12,13 +12,14 @@ import { SheetManager } from "react-native-actions-sheet";
import { useNavigation } from "@react-navigation/native"; import { useNavigation } from "@react-navigation/native";
import { useTrainMenu } from "../../stateBox/useTrainMenu"; import { useTrainMenu } from "../../stateBox/useTrainMenu";
import { stationNamePair } from "../../lib/getStationList2"; import { stationNamePair } from "../../lib/getStationList2";
import { useStationList } from "../../stateBox/useStationList";
export const AppsWebView = ({ export const AppsWebView = ({
originalStationList,
setLoadError, setLoadError,
setTrainInfo, setTrainInfo,
openStationACFromEachTrainInfo, openStationACFromEachTrainInfo,
injectJavascript, injectJavascript,
}) => { }) => {
const { originalStationList } = useStationList();
const { webview, currentTrain } = useCurrentTrain(); const { webview, currentTrain } = useCurrentTrain();
const { navigate } = useNavigation(); const { navigate } = useNavigation();
const { favoriteStation } = useFavoriteStation(); const { favoriteStation } = useFavoriteStation();
@ -102,7 +103,6 @@ export const AppsWebView = ({
const payload = { const payload = {
data: { trainNum, limited }, data: { trainNum, limited },
navigate, navigate,
originalStationList,
openStationACFromEachTrainInfo, openStationACFromEachTrainInfo,
}; };
SheetManager.show("EachTrainInfo", { payload }); SheetManager.show("EachTrainInfo", { payload });

View File

@ -50,7 +50,6 @@ export default function LED_vision(props) {
trainDiagram, trainDiagram,
getCurrentTrain, getCurrentTrain,
navigate, navigate,
originalStationList,
openStationACFromEachTrainInfo, openStationACFromEachTrainInfo,
} = props; } = props;
const { currentTrain } = useCurrentTrain(); const { currentTrain } = useCurrentTrain();
@ -207,7 +206,6 @@ export default function LED_vision(props) {
trainDescriptionSwitch, trainDescriptionSwitch,
customTrainDataDetector, customTrainDataDetector,
navigate, navigate,
originalStationList,
openStationACFromEachTrainInfo, openStationACFromEachTrainInfo,
}} }}
station={station[0]} station={station[0]}
@ -245,7 +243,6 @@ const EachData = (props) => {
station, station,
customTrainDataDetector, customTrainDataDetector,
navigate, navigate,
originalStationList,
openStationACFromEachTrainInfo, openStationACFromEachTrainInfo,
} = props; } = props;
const { currentTrain } = useCurrentTrain(); const { currentTrain } = useCurrentTrain();
@ -265,7 +262,6 @@ const EachData = (props) => {
}${TrainNumber}`, }${TrainNumber}`,
}, },
navigate, navigate,
originalStationList,
openStationACFromEachTrainInfo, openStationACFromEachTrainInfo,
from: "LED", from: "LED",
}; };

View File

@ -30,11 +30,12 @@ import { useFavoriteStation } from "./stateBox/useFavoriteStation";
import { SheetManager } from "react-native-actions-sheet"; import { SheetManager } from "react-native-actions-sheet";
import { useTrainDelayData } from "./stateBox/useTrainDelayData"; import { useTrainDelayData } from "./stateBox/useTrainDelayData";
import { useNavigation } from "@react-navigation/native"; import { useNavigation } from "@react-navigation/native";
import { useStationList } from "./stateBox/useStationList";
export default function Menu({ getCurrentTrain }) { export default function Menu({ getCurrentTrain }) {
const { navigate } = useNavigation(); const { navigate } = useNavigation();
const { favoriteStation } = useFavoriteStation(); const { favoriteStation } = useFavoriteStation();
const { originalStationList } = useStationList();
//位置情報 //位置情報
const [locationStatus, setLocationStatus] = useState(null); const [locationStatus, setLocationStatus] = useState(null);
useEffect(() => { useEffect(() => {
@ -90,8 +91,6 @@ export default function Menu({ getCurrentTrain }) {
const [currentStation, setCurrentStation] = useState(undefined); //第三要素 const [currentStation, setCurrentStation] = useState(undefined); //第三要素
const [originalStationList, setOriginalStationList] = useState([]); // 第一要素
useEffect(() => getStationList().then(setOriginalStationList), []);
const carouselRef = useRef(); const carouselRef = useRef();
const [selectedCurrentStation, setSelectedCurrentStation] = useState(0); const [selectedCurrentStation, setSelectedCurrentStation] = useState(0);
@ -210,7 +209,6 @@ export default function Menu({ getCurrentTrain }) {
trainDiagram={trainDiagram} trainDiagram={trainDiagram}
getCurrentTrain={getCurrentTrain} getCurrentTrain={getCurrentTrain}
navigate={navigate} navigate={navigate}
originalStationList={originalStationList}
openStationACFromEachTrainInfo={() => {}} openStationACFromEachTrainInfo={() => {}}
/> />
)} )}

View File

@ -27,7 +27,7 @@ export const useStationList = () => {
}; };
export const StationListProvider: FC<Props> = ({ children }) => { export const StationListProvider: FC<Props> = ({ children }) => {
const [originalStationList, setOriginalStationList] = useState<any[]>(); const [originalStationList, setOriginalStationList] = useState<any[]>([]);
useEffect(() => { useEffect(() => {
getStationList().then(setOriginalStationList); getStationList().then(setOriginalStationList);
}, []); }, []);