Top.jsの部分整理
This commit is contained in:
parent
85519cf857
commit
4085ee3675
28
Top.js
28
Top.js
@ -18,8 +18,7 @@ import { useTrainMenu } from "./stateBox/useTrainMenu";
|
||||
const Stack = createStackNavigator();
|
||||
export const Top = ({ navigationRef }) => {
|
||||
const { webview } = useCurrentTrain();
|
||||
const navigation = useNavigation();
|
||||
const { navigate, addListener } = navigation;
|
||||
const { navigate, addListener } = useNavigation();
|
||||
|
||||
//地図用
|
||||
const { setMapsStationData, injectJavaScript, setInjectJavaScript } =
|
||||
@ -38,17 +37,19 @@ export const Top = ({ navigationRef }) => {
|
||||
ASCore({ k: "mapSwitch", s: setMapSwitch, d: "false" });
|
||||
}, []);
|
||||
|
||||
|
||||
const goToFavoriteList = () => navigate("favoriteList");
|
||||
|
||||
useEffect(() => {
|
||||
const unsubscribe = addListener("tabLongPress", () =>
|
||||
navigate("favoriteList")
|
||||
);
|
||||
const unsubscribe = addListener("tabLongPress", goToFavoriteList);
|
||||
return unsubscribe;
|
||||
}, [navigation]);
|
||||
useEffect(() => {
|
||||
const unsubscribe = navigation.addListener("tabPress", () => {
|
||||
}, [{ navigate, addListener }]);
|
||||
|
||||
|
||||
const goToTrainMenu = () => {
|
||||
if (navigationRef.current?.getCurrentRoute().name == "Apps") {
|
||||
if (mapSwitch == "true") {
|
||||
navigation.navigate("trainMenu");
|
||||
navigate("trainMenu");
|
||||
setInjectJavaScript("");
|
||||
} else {
|
||||
webview.current?.injectJavaScript(`AccordionClassEvent()`);
|
||||
@ -60,11 +61,14 @@ export const Top = ({ navigationRef }) => {
|
||||
setInjectJavaScript("");
|
||||
}
|
||||
}
|
||||
navigation.navigate("Apps");
|
||||
navigate("Apps");
|
||||
}
|
||||
});
|
||||
};
|
||||
|
||||
useEffect(() => {
|
||||
const unsubscribe = addListener("tabPress", goToTrainMenu);
|
||||
return unsubscribe;
|
||||
}, [navigation, mapSwitch, injectJavaScript]);
|
||||
}, [{ navigate, addListener }, mapSwitch, injectJavaScript]);
|
||||
|
||||
return (
|
||||
<Stack.Navigator>
|
||||
|
Loading…
Reference in New Issue
Block a user