From c30d593838271dceff6887366962866c55478c9f Mon Sep 17 00:00:00 2001 From: harukin-expo-dev-env Date: Mon, 25 Mar 2024 00:22:23 +0000 Subject: [PATCH] =?UTF-8?q?=E3=82=AF=E3=83=A9=E3=83=83=E3=82=B7=E3=83=A5?= =?UTF-8?q?=E3=83=90=E3=82=B0=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Apps.js | 1 + .../ActionSheetComponents/EachTrainInfo/LongHeader.js | 2 ++ .../ActionSheetComponents/EachTrainInfo/ShortHeader.js | 2 ++ .../ActionSheetComponents/EachTrainInfo/TrainDataView.js | 2 +- components/ActionSheetComponents/EachTrainInfoCore.js | 6 ++++-- 5 files changed, 10 insertions(+), 3 deletions(-) diff --git a/Apps.js b/Apps.js index f06b756..ffc568d 100644 --- a/Apps.js +++ b/Apps.js @@ -315,6 +315,7 @@ export default function Apps({ stationData }) { openStationACFromEachTrainInfo, from: "Train", setTrainInfo, + navigate, }} /> diff --git a/components/ActionSheetComponents/EachTrainInfo/LongHeader.js b/components/ActionSheetComponents/EachTrainInfo/LongHeader.js index 95f23f9..0410b53 100644 --- a/components/ActionSheetComponents/EachTrainInfo/LongHeader.js +++ b/components/ActionSheetComponents/EachTrainInfo/LongHeader.js @@ -7,6 +7,7 @@ export const LongHeader = ({ currentPosition, nearTrainIDList, openTrainInfo, + navigate, }) => { return ( ); diff --git a/components/ActionSheetComponents/EachTrainInfo/ShortHeader.js b/components/ActionSheetComponents/EachTrainInfo/ShortHeader.js index a289e24..1f68b85 100644 --- a/components/ActionSheetComponents/EachTrainInfo/ShortHeader.js +++ b/components/ActionSheetComponents/EachTrainInfo/ShortHeader.js @@ -7,6 +7,7 @@ export const ShortHeader = ({ currentPosition, nearTrainIDList, openTrainInfo, + navigate, }) => { return ( ); diff --git a/components/ActionSheetComponents/EachTrainInfo/TrainDataView.js b/components/ActionSheetComponents/EachTrainInfo/TrainDataView.js index aba8784..05b2662 100644 --- a/components/ActionSheetComponents/EachTrainInfo/TrainDataView.js +++ b/components/ActionSheetComponents/EachTrainInfo/TrainDataView.js @@ -13,8 +13,8 @@ export const TrainDataView = ({ nearTrainIDList, openTrainInfo, mode = 0, + navigate, }) => { - const { navigate } = useNavigation(); const { width, height } = useWindowDimensions(); const { isLandscape } = useDeviceOrientationChange(); const { webview, getCurrentTrain } = useCurrentTrain(); diff --git a/components/ActionSheetComponents/EachTrainInfoCore.js b/components/ActionSheetComponents/EachTrainInfoCore.js index a35b7dc..4275a4a 100644 --- a/components/ActionSheetComponents/EachTrainInfoCore.js +++ b/components/ActionSheetComponents/EachTrainInfoCore.js @@ -41,9 +41,9 @@ export const EachTrainInfoCore = ({ openStationACFromEachTrainInfo, from, setTrainInfo, + navigate, }) => { // const [actionSheetHorizonalScroll, setActionSheetHorizonalScroll] = useState(false); - const { navigate } = useNavigation(); const { currentTrain } = useCurrentTrain(); const [currentTrainData, setCurrentTrainData] = useState(); @@ -111,7 +111,7 @@ export const EachTrainInfoCore = ({ const trainName = useMemo(() => { if (!data.limited) return ""; const limitedArray = data.limited.split(":"); - const type = getTrainType(limitedArray[0]); + const type = getType(limitedArray[0]); switch (true) { case limitedArray[1]: @@ -309,6 +309,7 @@ export const EachTrainInfoCore = ({ currentPosition={currentPosition} nearTrainIDList={nearTrainIDList} openTrainInfo={openTrainInfo} + navigate={navigate} /> } longHeader={ @@ -317,6 +318,7 @@ export const EachTrainInfoCore = ({ currentPosition={currentPosition} nearTrainIDList={nearTrainIDList} openTrainInfo={openTrainInfo} + navigate={navigate} /> } topStickyContent={