From 323b5b4220215da024f36674373bb66f86640722 Mon Sep 17 00:00:00 2001
From: earthyoung <studydatawithme@gmail.com>
Date: Sun, 21 Jun 2026 17:37:04 +0900
Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=EC=84=B8=EC=85=98=20=EC=8B=9C?=
 =?UTF-8?q?=EA=B0=84=ED=91=9C=EA=B0=80=20=EB=92=A4=EB=A1=9C=EA=B0=80?=
 =?UTF-8?q?=EA=B8=B0=20=EC=95=A1=EC=85=98=20=EC=8B=9C=20=EC=83=81=ED=83=9C?=
 =?UTF-8?q?=EB=A5=BC=20=EC=9C=A0=EC=A7=80=ED=95=98=EB=8F=84=EB=A1=9D=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/mdx_components/session_timetable.tsx  | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/packages/common/src/components/mdx_components/session_timetable.tsx b/packages/common/src/components/mdx_components/session_timetable.tsx
index 56597e9..26f0b77 100644
--- a/packages/common/src/components/mdx_components/session_timetable.tsx
+++ b/packages/common/src/components/mdx_components/session_timetable.tsx
@@ -168,7 +168,7 @@ export const SessionTimeTable: FC<SessionTimeTablePropType> = ErrorBoundary.with
     const roomCount = Object.keys(rooms).length;
     const sortedRoomList = Object.keys(rooms).sort();
 
-    const selectedDate = confDate || dates[0];
+    const [selectedDate, setSelectedDate] = useState<string>(confDate || dates[0]);
     const selectedTableData = timeTableData[selectedDate];
 
     let breakCount = 0;
@@ -186,7 +186,15 @@ export const SessionTimeTable: FC<SessionTimeTablePropType> = ErrorBoundary.with
           {dates.map((date, i) => {
             const dateStr = DateTime.fromISO(date).setLocale(language).toLocaleString({ weekday: "long", month: "long", day: "numeric" });
             return (
-              <Button variant="text" key={date} onClick={() => setConfDate(date)} className={selectedDate === date ? "selected" : ""}>
+              <Button
+                variant="text"
+                key={date}
+                onClick={() => {
+                  setConfDate(date);
+                  setSelectedDate(date);
+                }}
+                className={selectedDate === date ? "selected" : ""}
+              >
                 <SessionDateItemContainer direction="column">
                   <SessionDateTitle children={"Day " + (i + 1)} isSelected={selectedDate === date} />
                   <SessionDateSubTitle children={dateStr} isSelected={selectedDate === date} />

From 56fdc618b68de6837fc7200edcd7a9361f9b3570 Mon Sep 17 00:00:00 2001
From: earthyoung <studydatawithme@gmail.com>
Date: Sun, 21 Jun 2026 18:05:11 +0900
Subject: [PATCH 2/2] =?UTF-8?q?fix:=20useState=20->=20location=20state?=
 =?UTF-8?q?=EB=A1=9C=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mdx_components/session_timetable.tsx      | 24 ++++++++++++++-----
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/packages/common/src/components/mdx_components/session_timetable.tsx b/packages/common/src/components/mdx_components/session_timetable.tsx
index 26f0b77..99ebaa2 100644
--- a/packages/common/src/components/mdx_components/session_timetable.tsx
+++ b/packages/common/src/components/mdx_components/session_timetable.tsx
@@ -2,7 +2,7 @@ import { Button, Chip, CircularProgress, Stack, styled, Table, TableBody, TableC
 import { ErrorBoundary, Suspense } from "@suspensive/react";
 import { DateTime } from "luxon";
 import { FC, useState } from "react";
-import { Link } from "react-router-dom";
+import { Link, useLocation } from "react-router-dom";
 import { isArray, isEmpty, isString } from "remeda";
 
 import { CenteredPage } from "@frontend/common/components/centered_page";
@@ -108,8 +108,9 @@ const SessionColumn: FC<{
   rowSpan: number;
   colSpan?: number;
   session: SessionSchema;
+  selectedDate: string;
   getSessionUrl?: (session: SessionSchema) => string;
-}> = ({ rowSpan, colSpan, session, getSessionUrl }) => {
+}> = ({ rowSpan, colSpan, session, selectedDate, getSessionUrl }) => {
   const sessionUrl = getSessionUrl ? getSessionUrl(session) : undefined;
   const clickable = isArray(session.speakers) && !isEmpty(session.speakers) && !!sessionUrl;
   // Firefox는 rowSpan된 td의 height를 계산할 때 rowSpan을 고려하지 않습니다. 따라서 직접 계산하여 height를 설정합니다.
@@ -117,7 +118,7 @@ const SessionColumn: FC<{
   return (
     <SessionTableCell rowSpan={rowSpan} colSpan={colSpan}>
       {clickable ? (
-        <Link to={sessionUrl!} style={{ textDecoration: "none", display: "block" }}>
+        <Link to={sessionUrl!} style={{ textDecoration: "none", display: "block" }} state={{ selectedDate: selectedDate }}>
           <SessionBox className="clickable" sx={{ height: sessionBoxHeight, gap: 0.75, padding: "0.5rem" }}>
             <SessionTitle children={session.title.replace("\\n", "\n")} align="center" />
             <Stack direction="row" alignItems="center" justifyContent="center" sx={{ width: "100%", flexWrap: "wrap", gap: 0.5 }}>
@@ -155,7 +156,9 @@ type SessionTimeTablePropType = {
 export const SessionTimeTable: FC<SessionTimeTablePropType> = ErrorBoundary.with(
   { fallback: ErrorFallback },
   Suspense.with({ fallback: <CenteredPage children={<CircularProgress />} /> }, ({ event, types, getSessionUrl }) => {
-    const [confDate, setConfDate] = useState("");
+    const location = useLocation();
+
+    const [confDate, setConfDate] = useState<string>(location.state?.selectedDate ?? "");
 
     const { language } = Common.useCommonContext();
     const backendAPIClient = BackendAPI.useBackendClient();
@@ -168,7 +171,7 @@ export const SessionTimeTable: FC<SessionTimeTablePropType> = ErrorBoundary.with
     const roomCount = Object.keys(rooms).length;
     const sortedRoomList = Object.keys(rooms).sort();
 
-    const [selectedDate, setSelectedDate] = useState<string>(confDate || dates[0]);
+    const [selectedDate, setSelectedDate] = useState<string>(location.state?.selectedDate ?? (confDate || dates[0]));
     const selectedTableData = timeTableData[selectedDate];
 
     let breakCount = 0;
@@ -281,6 +284,7 @@ export const SessionTimeTable: FC<SessionTimeTablePropType> = ErrorBoundary.with
                         rowSpan={firstSessionInfo.rowSpan}
                         colSpan={roomCount}
                         session={firstSessionInfo.session}
+                        selectedDate={selectedDate}
                         getSessionUrl={getSessionUrl}
                       />
                     </SessionTableRow>
@@ -301,7 +305,15 @@ export const SessionTimeTable: FC<SessionTimeTablePropType> = ErrorBoundary.with
                       }
                       // 세션이 여러 줄에 걸쳐있는 경우, n-1 줄만큼 해당 room에 column을 생성하지 않도록 합니다.
                       if (roomDatum.rowSpan > 1) rooms[room] = roomDatum.rowSpan - 1;
-                      return <SessionColumn key={room} rowSpan={roomDatum.rowSpan} session={roomDatum.session} getSessionUrl={getSessionUrl} />;
+                      return (
+                        <SessionColumn
+                          key={room}
+                          rowSpan={roomDatum.rowSpan}
+                          session={roomDatum.session}
+                          selectedDate={selectedDate}
+                          getSessionUrl={getSessionUrl}
+                        />
+                      );
                     })}
                   </SessionTableRow>
                 );