UI update

hkbus · Aug 21, 2024 · 4099933 · 4099933
1 parent aea04ce
commit 4099933
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 11 deletions.
diff --git a/src/components/route-eta/TimeTableButton.tsx b/src/components/route-eta/TimeTableButton.tsx
@@ -19,7 +19,7 @@ const TimeTableButton = ({ routeId }: { routeId: string }) => {
         startIcon={<ScheduleIcon />}
         onClick={() => setIsOpen(true)}
       >
-        {t("時間表")}
+        {t("車程")}
       </Button>
       <TimetableDrawer
         routeId={routeId}

diff --git a/src/components/route-eta/TimetableDrawer.tsx b/src/components/route-eta/TimetableDrawer.tsx
@@ -12,7 +12,7 @@ interface TimetableDrawerProps {
 
 const TimetableDrawer = ({ routeId, open, onClose }: TimetableDrawerProps) => {
   const { t } = useTranslation();
-  const [tab, setTab] = useState<"schedule" | "jt">("schedule");
+  const [tab, setTab] = useState<"schedule" | "jt">("jt");
 
   const modalProps = useMemo(() => {
     return {
@@ -33,11 +33,11 @@ const TimetableDrawer = ({ routeId, open, onClose }: TimetableDrawerProps) => {
       anchor="right"
     >
       <Tabs value={tab} onChange={(_, v) => setTab(v)} sx={tabbarSx}>
-        <Tab value="schedule" label={t("時間表")} />
         <Tab label={t("車程")} value="jt" />
+        <Tab value="schedule" label={t("時間表")} />
       </Tabs>
-      {tab === "schedule" && <TimeTable routeId={routeId} />}
       {tab === "jt" && <JourneyTimePanel routeId={routeId} />}
+      {tab === "schedule" && <TimeTable routeId={routeId} />}
     </Drawer>
   );
 };

diff --git a/src/components/route-eta/timetableDrawer/JourneyTimePanel.tsx b/src/components/route-eta/timetableDrawer/JourneyTimePanel.tsx
@@ -76,13 +76,21 @@ const JourneyTimePanel = ({ routeId }: JourneyTimePanelProps) => {
       stopList,
       batchSize: Math.max(Math.ceil((state.endSeq - state.startSeq) / 3), 6),
       signal: abortController.current.signal,
-    }).then((jt) => {
-      setState((prev) => ({
-        ...prev,
-        jt: Math.round(jt),
-        isLoading: false,
-      }));
-    });
+    })
+      .then((jt) => {
+        setState((prev) => ({
+          ...prev,
+          jt: Math.round(jt),
+          isLoading: false,
+        }));
+      })
+      .catch((e) => {
+        console.error(e);
+        setState((prev) => ({
+          ...prev,
+          isLoading: false,
+        }));
+      });
   }, [route, state.endSeq, state.startSeq, stopList]);
 
   const stops = useMemo(() => {