Merge commit '7500582165eea1a436e09b2015f820934ab93525' into patch/6.x

Top.js

@@ -19,7 +19,7 @@ export const Top = () => {
   const { navigate, addListener, isFocused } = useNavigation();
 
   //地図用
-  const { injectJavaScript, mapSwitch } = useTrainMenu();
+  const { mapSwitch } = useTrainMenu();
 
   const goToFavoriteList = () =>
     navigate("positions", { screen: "favoriteList" });
@@ -44,7 +44,7 @@ export const Top = () => {
   useEffect(() => {
     const unsubscribe = addListener("tabPress", goToTrainMenu);
     return unsubscribe;
-  }, [addListener, mapSwitch, injectJavaScript]);
+  }, [addListener, mapSwitch]);
 
   return (
     <Stack.Navigator detachInactiveScreens={false}>

components/Apps.js

@@ -36,8 +36,7 @@ export default function Apps() {
   const { isLandscape } = useDeviceOrientationChange();
   const handleLayout = () => {};
   const { originalStationList } = useStationList();
-  const { setInjectJavaScript, mapSwitch, trainInfo, setTrainInfo } =
+  const { mapSwitch, trainInfo, setTrainInfo } = useTrainMenu();
-    useTrainMenu();
 
   const openStationACFromEachTrainInfo = async (stationName) => {
     await SheetManager.hide("EachTrainInfo");
@@ -60,7 +59,7 @@ export default function Apps() {
         useShow: () => SheetManager.show("StationDetailView", { payload }),
         onExit: () => SheetManager.hide("StationDetailView"),
       };
-      setTimeout(()=>SheetManager.show("StationDetailView", { payload }),50);
+      setTimeout(() => SheetManager.show("StationDetailView", { payload }), 50);
     } else {
       SheetManager.hide("StationDetailView");
     }
@@ -110,7 +109,6 @@ export default function Apps() {
       {isLandscape || (
         <MapsButton
           onPress={() => {
-            setInjectJavaScript("");
             navigate("trainMenu", { webview });
           }}
         />

components/trainMenu.js

@@ -18,8 +18,6 @@ export default function TrainMenu({ style }) {
   const {
     selectedLine,
     setSelectedLine,
-    injectJavaScript,
-    setInjectJavaScript,
     mapsStationData: stationData,
   } = useTrainMenu();
   useEffect(() => {
@@ -214,7 +212,6 @@ export default function TrainMenu({ style }) {
       <MapsButton
         onPress={() => {
           goBack();
-          webview.current?.injectJavaScript(injectJavaScript);
         }}
         top={0}
         mapSwitch={"flex"}

components/trainMenu.web.js

@@ -19,8 +19,6 @@ export default function TrainMenu({ style }) {
   const {
     selectedLine,
     setSelectedLine,
-    injectJavaScript,
-    setInjectJavaScript,
     mapsStationData: stationData,
   } = useTrainMenu();
   useEffect(() => {
@@ -215,7 +213,6 @@ export default function TrainMenu({ style }) {
       <MapsButton
         onPress={() => {
           goBack();
-          webview.current?.injectJavaScript(injectJavaScript);
         }}
         top={0}
         mapSwitch={"flex"}

stateBox/useTrainMenu.js

@@ -10,8 +10,6 @@ const initialState = {
   setSelectedLine: () => {},
   mapsStationData: undefined,
   setMapsStationData: () => {},
-  injectJavaScript: "",
-  setInjectJavaScript: () => {},
   iconSetting: undefined,
   setIconSetting: () => {},
   mapSwitch: undefined,
@@ -40,8 +38,6 @@ export const useTrainMenu = () => {
 export const TrainMenuProvider = ({ children }) => {
   const [selectedLine, setSelectedLine] = useState(undefined);
   const [mapsStationData, setMapsStationData] = useState(undefined);
-  const [injectJavaScript, setInjectJavaScript] = useState();
-
   useEffect(() => {
     getStationList2().then(setMapsStationData);
   }, []);
@@ -88,8 +84,6 @@ export const TrainMenuProvider = ({ children }) => {
         setSelectedLine,
         mapsStationData,
         setMapsStationData,
-        injectJavaScript,
-        setInjectJavaScript,
         iconSetting,
         setIconSetting,
         mapSwitch,