diff --git a/components/ActionSheetComponents/EachTrainInfoCore.js b/components/ActionSheetComponents/EachTrainInfoCore.js index 828e66e..d5638d3 100644 --- a/components/ActionSheetComponents/EachTrainInfoCore.js +++ b/components/ActionSheetComponents/EachTrainInfoCore.js @@ -33,17 +33,18 @@ import { getType } from "../../lib/eachTrainInfoCoreLib/getType"; import { searchSpecialTrain } from "../../lib/eachTrainInfoCoreLib/searchSpecialTrain"; import { openBackTrainInfo } from "../../lib/eachTrainInfoCoreLib/openBackTrainInfo"; import { ShowSpecialTrain } from "./EachTrainInfo/ShowSpecialTrain"; +import { useStationList } from "../../stateBox/useStationList"; import { useNavigation } from "@react-navigation/native"; export const EachTrainInfoCore = ({ actionSheetRef, data, - originalStationList, openStationACFromEachTrainInfo, from, setTrainInfo, navigate, }) => { + const { originalStationList } = useStationList(); // const [actionSheetHorizonalScroll, setActionSheetHorizonalScroll] = useState(false); const { currentTrain } = useCurrentTrain(); const [currentTrainData, setCurrentTrainData] = useState(); @@ -236,7 +237,6 @@ export const EachTrainInfoCore = ({ }${TrainNumber}`, }, navigate, - originalStationList, from: from == "LED" ? "LED2" : "NearTrainDiagramView", }; if (setTrainInfo) { diff --git a/components/AllTrainDiagramView.js b/components/AllTrainDiagramView.js index 8c2583d..9c2bdf6 100644 --- a/components/AllTrainDiagramView.js +++ b/components/AllTrainDiagramView.js @@ -19,9 +19,7 @@ import { useNavigation } from "@react-navigation/native"; export default function AllTrainDiagramView() { const { navigate } = useNavigation(); const { allTrainDiagram } = useAllTrainDiagram(); - const [originalStationList, setOriginalStationList] = useState(); // 第一要素 const [keyList, setKeyList] = useState(); // 第二要素 - useEffect(() => getStationList().then(setOriginalStationList), []); useEffect( () => allTrainDiagram && setKeyList(Object.keys(allTrainDiagram)), [] @@ -59,7 +57,6 @@ export default function AllTrainDiagramView() { }${TrainNumber}`, }, navigate, - originalStationList, from: "AllTrainDiagramView", }; SheetManager.show("EachTrainInfo", { diff --git a/components/Apps.js b/components/Apps.js index 06c96ea..bb05c7d 100644 --- a/components/Apps.js +++ b/components/Apps.js @@ -134,7 +134,6 @@ export default function Apps() { ) : null} {/* {Status} */} { + const { originalStationList } = useStationList(); const { webview, currentTrain } = useCurrentTrain(); const { navigate } = useNavigation(); const { favoriteStation } = useFavoriteStation(); @@ -102,7 +103,6 @@ export const AppsWebView = ({ const payload = { data: { trainNum, limited }, navigate, - originalStationList, openStationACFromEachTrainInfo, }; SheetManager.show("EachTrainInfo", { payload }); diff --git a/components/発車時刻表/LED_vidion.js b/components/発車時刻表/LED_vidion.js index e18caab..b771f79 100644 --- a/components/発車時刻表/LED_vidion.js +++ b/components/発車時刻表/LED_vidion.js @@ -50,7 +50,6 @@ export default function LED_vision(props) { trainDiagram, getCurrentTrain, navigate, - originalStationList, openStationACFromEachTrainInfo, } = props; const { currentTrain } = useCurrentTrain(); @@ -207,7 +206,6 @@ export default function LED_vision(props) { trainDescriptionSwitch, customTrainDataDetector, navigate, - originalStationList, openStationACFromEachTrainInfo, }} station={station[0]} @@ -245,7 +243,6 @@ const EachData = (props) => { station, customTrainDataDetector, navigate, - originalStationList, openStationACFromEachTrainInfo, } = props; const { currentTrain } = useCurrentTrain(); @@ -265,7 +262,6 @@ const EachData = (props) => { }${TrainNumber}`, }, navigate, - originalStationList, openStationACFromEachTrainInfo, from: "LED", }; diff --git a/menu.js b/menu.js index 24d3033..9eb57d6 100644 --- a/menu.js +++ b/menu.js @@ -30,11 +30,12 @@ import { useFavoriteStation } from "./stateBox/useFavoriteStation"; import { SheetManager } from "react-native-actions-sheet"; import { useTrainDelayData } from "./stateBox/useTrainDelayData"; import { useNavigation } from "@react-navigation/native"; +import { useStationList } from "./stateBox/useStationList"; export default function Menu({ getCurrentTrain }) { const { navigate } = useNavigation(); const { favoriteStation } = useFavoriteStation(); - + const { originalStationList } = useStationList(); //位置情報 const [locationStatus, setLocationStatus] = useState(null); useEffect(() => { @@ -90,8 +91,6 @@ export default function Menu({ getCurrentTrain }) { const [currentStation, setCurrentStation] = useState(undefined); //第三要素 - const [originalStationList, setOriginalStationList] = useState([]); // 第一要素 - useEffect(() => getStationList().then(setOriginalStationList), []); const carouselRef = useRef(); const [selectedCurrentStation, setSelectedCurrentStation] = useState(0); @@ -210,7 +209,6 @@ export default function Menu({ getCurrentTrain }) { trainDiagram={trainDiagram} getCurrentTrain={getCurrentTrain} navigate={navigate} - originalStationList={originalStationList} openStationACFromEachTrainInfo={() => {}} /> )} diff --git a/stateBox/useStationList.tsx b/stateBox/useStationList.tsx index fc46c05..717ca60 100644 --- a/stateBox/useStationList.tsx +++ b/stateBox/useStationList.tsx @@ -27,7 +27,7 @@ export const useStationList = () => { }; export const StationListProvider: FC = ({ children }) => { - const [originalStationList, setOriginalStationList] = useState(); + const [originalStationList, setOriginalStationList] = useState([]); useEffect(() => { getStationList().then(setOriginalStationList); }, []);