Merge pull request #101 from linked-planet/dev

Dev

Author: marcus-wishes

library/src/components/timetable/TimeTableHeader.tsx

@@ -2,9 +2,11 @@ import dayjs, { type Dayjs } from "dayjs"
 import weekOfYear from "dayjs/plugin/weekOfYear"
 import weekYear from "dayjs/plugin/weekYear"
 import localeData from "dayjs/plugin/localeData"
+import utc from "dayjs/plugin/utc"
 dayjs.extend(weekOfYear)
 dayjs.extend(weekYear)
 dayjs.extend(localeData)
+dayjs.extend(utc)
 import type React from "react"
 import { Fragment, type RefObject, useCallback, useRef, useState } from "react"
 

library/src/components/timetable/timeTableUtils.ts

@@ -458,7 +458,26 @@ export function getLeftAndWidth(
 	}
 
 	const timeSpanMin = itemModEnd.diff(itemModStart, "minute")
-	const width = timeSpanMin / timeSlotMinutes
+	const timeSpanDayDiff = itemModEnd.diff(itemModStart, "day")
+	const overnightDiff =
+		24 * 60 * timeSpanDayDiff - timeSpanDayDiff * timeFrameDay.oneDayMinutes
+	const timeSpanMinWithoutOvernight = timeSpanMin - overnightDiff
+
+	// remove night if it is not in the time frame
+
+	const width = timeSpanMinWithoutOvernight / timeSlotMinutes
+
+	console.log(
+		"WIDTH TEST",
+		width,
+		timeSpanMin / timeSlotMinutes,
+		overnightDiff,
+		dayStartDiff,
+		itemModStart.format(),
+		itemModEnd.format(),
+		item.startDate.format(),
+		item.endDate.format(),
+	)
 
 	if (width <= 0) {
 		// this should not happen, but if it does, we need to log it to find the error

package-lock.json

@@ -156,7 +156,7 @@
 		"stylelint-config-tailwindcss": "^0.0.7",
 		"stylelint-order": "^6.0.4",
 		"tailwind-merge": "^2.5.5",
-		"tailwindcss": "^3.4.16",
+		"tailwindcss": "^3.4.17",
 		"typescript": "^5.7.2",
 		"typescript-plugin-css-modules": "^5.1.0",
 		"vite": "^6.0.3",