駅名標読み込みにタイミングがずれていたバグ、ボタンが一部表示されない問題を修正

Apps.js

@@ -248,23 +248,21 @@ export default function Apps({ navigation, webview, stationData }) {
         return pre;
       }, []);
     if (returnDataBase.length) {
-      sleep(25, function () {
+      const payload = {
-        const payload = {
+        currentStation: returnDataBase,
-          currentStation: returnDataBase,
+        originalStationList: originalStationList,
-          originalStationList: originalStationList,
+        navigate: navigate,
-          navigate: navigate,
+        goTo: "Apps",
-          goTo: "Apps",
+        useShow: () =>
-          useShow: () =>
+          SheetManager.show("StationDetailView", {
-            SheetManager.show("StationDetailView", {
+            payload,
-              payload,
+          }),
-            }),
+        onExit: () => {
-          onExit: () => {
+          SheetManager.hide("StationDetailView");
-            SheetManager.hide("StationDetailView");
+        },
-          },
+      };
-        };
+      SheetManager.show("StationDetailView", {
-        SheetManager.show("StationDetailView", {
+        payload,
-          payload,
-        });
       });
     } else {
       SheetManager.hide("StationDetailView");

trainbaseview.js

@@ -36,7 +36,7 @@ export default function TrainBase({ route, navigation }) {
         setSupportMultipleWindows={false}
         onMessage={(event) => {}}
       />
-      {from == "LED" && (
+      {(from == "LED" || from == "AllTrainDiagramView") && (
         <TouchableOpacity
           style={{
             padding: 10,
@@ -47,7 +47,9 @@ export default function TrainBase({ route, navigation }) {
             borderRadius: 5,
             alignItems: "center",
           }}
-          onPress={() => navigate("menu")}
+          onPress={() =>
+            navigate(from == "AllTrainDiagramView" ? "AllTrainIDList" : "menu")
+          }
         >
           <View style={{ flex: 1 }} />
           <MaterialCommunityIcons name="close" color="black" size={30} />