依存関係修正完了

components/ActionSheetComponents/EachTrainInfo.js

@@ -32,28 +32,6 @@ import { LandscapeTrainInfo } from "./EachTrainInfo/LandscapeTrainInfo";
 
 export const EachTrainInfo = (props) => {
   if (!props.payload) return <></>;
-  const {
-    data,
-    navigate,
-    originalStationList,
-    openStationACFromEachTrainInfo = () => {},
-    from,
-  } = props.payload;
-
-  const { currentTrain } = useCurrentTrain();
-  const [currentTrainData, setCurrentTrainData] = useState([]);
-
-  // const [actionSheetHorizonalScroll, setActionSheetHorizonalScroll] = useState(false);
-
-  useEffect(() => {
-    setCurrentTrainData(
-      checkDuplicateTrainData(
-        currentTrain.filter((d) => d.num == data.trainNum)
-      )
-    );
-  }, [currentTrain]);
-
-  //bconst insets = useSafeAreaInsets();
 
   const actionSheetRef = useRef(null);
   return (
@@ -67,17 +45,7 @@ export const EachTrainInfo = (props) => {
 
       //useBottomSafeAreaPadding={Platform.OS == "android"}
     >
-      <Hoge
+      <EachTrainInfoCore {...{ actionSheetRef, ...props.payload }} />
-        {...{
-          actionSheetRef,
-          data,
-          navigate,
-          originalStationList,
-          openStationACFromEachTrainInfo,
-          from,
-          currentTrainData,
-        }}
-      />
     </ActionSheet>
   );
 };
@@ -99,15 +67,33 @@ const styles = StyleSheet.create({
     textAlign: "center",
   },
 });
-const Hoge = ({
+const EachTrainInfoCore = ({
   actionSheetRef,
   data,
   navigate,
   originalStationList,
   openStationACFromEachTrainInfo,
   from,
-  currentTrainData,
 }) => {
+  // const [actionSheetHorizonalScroll, setActionSheetHorizonalScroll] = useState(false);
+
+  const { currentTrain } = useCurrentTrain();
+  const [currentTrainData, setCurrentTrainData] = useState();
+
+  // const [actionSheetHorizonalScroll, setActionSheetHorizonalScroll] = useState(false);
+
+  useEffect(() => {
+    console.log(currentTrain.length);
+    if (!currentTrain.length) return;
+    setCurrentTrainData(
+      checkDuplicateTrainData(
+        currentTrain.filter((d) => d.num == data.trainNum)
+      )
+    );
+  }, [currentTrain]);
+
+  //bconst insets = useSafeAreaInsets();
+
   const [headStation, setHeadStation] = useState();
   const [tailStation, setTailStation] = useState();
   const [isConcatNear, setIsConcatNear] = useState(false);
@@ -308,6 +294,7 @@ const Hoge = ({
   const [isLandscape, setIsLandscape] = useState(false);
   useEffect(() => {
     //currentTrainData.Pos = "鴨川～端岡"; //test
+    if (!currentTrainData) return;
     if (!currentTrainData?.Pos) return;
     if (currentTrainData?.Pos.match("～")) {
       const pos = currentTrainData?.Pos.replace("（下り）", "")