Skip to content

Commit 29bc24e

Browse files
committed
Merge remote-tracking branch 'origin/develop'
2 parents 468f6d0 + 6ec087e commit 29bc24e

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

src/pages/Session/timetable.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,10 @@ const getTimeTableData: (data: APIPretalxSessions) => TimeTableData = (data) =>
9393
const SessionColumn: React.FC<{ rowSpan: number, colSpan?: number, session: APIPretalxSessions[0] }> = ({ rowSpan, colSpan, session }) => {
9494
const navigate = useNavigate()
9595
const clickable = ENABLE_DETAILS && R.isArray(session.speakers) && !R.isEmpty(session.speakers)
96+
// Firefox는 rowSpan된 td의 height를 계산할 때 rowSpan을 고려하지 않습니다. 따라서 직접 계산하여 height를 설정합니다.
97+
const sessionBoxHeight = `${TD_HEIGHT * rowSpan}rem`
9698
return <td rowSpan={rowSpan} colSpan={colSpan}>
97-
<SessionBox onClick={() => clickable && navigate(`/session/${session.code}`)} className={clickable ? 'clickable' : ''}>
99+
<SessionBox onClick={() => clickable && navigate(`/session/${session.code}`)} className={clickable ? 'clickable' : ''} style={{ height: sessionBoxHeight }}>
98100
<h6>{session.title}</h6>
99101
<SessionSpeakerContainer>
100102
{session.speakers.map((speaker) => <kbd key={speaker.code}>{speaker.name}</kbd>)}

0 commit comments

Comments
 (0)