Merge pull request #78 from linked-planet/dev

Dev
linked-planet · Nov 26, 2024 · 50aae7b · 50aae7b
2 parents 85ec1d4 + ca28322
commit 50aae7b
Show file tree

Hide file tree

Showing 16 changed files with 1,179 additions and 711 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -4,6 +4,11 @@
 	// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
 	"version": "0.2.0",
 	"configurations": [
+		{
+			"type": "firefox",
+			"request": "attach",
+			"name": "Attach"
+		},
 		{
 			"type": "chrome",
 			"request": "launch",

diff --git a/library/src/components/Button.tsx b/library/src/components/Button.tsx
@@ -201,8 +201,9 @@ export const LoadingButton = ({
 	iconAfter,
 	iconBefore,
 	children,
+	loadingSpinnerClassName,
 	...props
-}: ButtonProps & { loading: boolean }) => {
+}: ButtonProps & { loading: boolean; loadingSpinnerClassName?: string }) => {
 	return (
 		<Button
 			iconAfter={!loading && iconAfter}
@@ -213,11 +214,12 @@ export const LoadingButton = ({
 			{loading && (
 				<div className="absolute inset-0 flex items-center justify-center">
 					<LoadingSpinner
-						className={
+						className={twMerge(
 							loadingSpinnerClassNames[
 								props.appearance ?? "default"
-							]
-						}
+							],
+							loadingSpinnerClassName,
+						)}
 					/>
 				</div>
 			)}

diff --git a/library/src/components/ToastFlag.tsx b/library/src/components/ToastFlag.tsx
@@ -77,7 +77,7 @@ function CloseButton({
 			type="button"
 			data-id="flag-close-button"
 			ref={ref}
-			className={`cursor-pointer mb-auto ${
+			className={`cursor-pointer mb-auto bg-transparent border-none ${
 				inverted ? "text-text" : "text-text-inverse"
 			}`}
 			onClick={closeToast}

diff --git a/library/src/components/timetable/TimeTable.tsx b/library/src/components/timetable/TimeTable.tsx
@@ -25,9 +25,6 @@ import {
 import {
 	initAndUpdateTimeTableConfigStore,
 	type TimeFrameDay,
-	useTTCSlotsArray,
-	useTTCTimeFrameOfDay,
-	useTTCTimeSlotMinutes,
 } from "./TimeTableConfigStore"
 import { TimeTableIdentProvider } from "./TimeTableIdentContext"
 import { initAndUpdateTimeTableComponentStore } from "./TimeTableComponentStore"
@@ -194,6 +191,12 @@ export interface LPTimeTableProps<
 		timeSlot: (props: CustomHeaderRowTimeSlotProps<G, I>) => JSX.Element
 		header: (props: CustomHeaderRowHeaderProps<G, I>) => JSX.Element
 	}
+
+	/**
+	 * renderBatch tells how many groups are calculated in one step and rendered. This is useful for large time tables, where the rendering takes a long time.
+	 * @default 10
+	 */
+	renderBatch?: number
 }
 
 const nowbarUpdateIntervall = 1000 * 60 // 1 minute
@@ -214,6 +217,8 @@ export default function LPTimeTable<
 	)
 }
 
+export let timeTableGroupRenderBatchSize = 10
+
 /**
  * The LPTimeTable depends on the localization messages. It needs to be wrapped in an
  * @returns
@@ -252,12 +257,15 @@ const LPTimeTableImpl = <G extends TimeTableGroup, I extends TimeSlotBooking>({
 	className,
 	style,
 	customHeaderRow,
+	renderBatch = timeTableGroupRenderBatchSize,
 }: LPTimeTableProps<G, I>) => {
 	// if we have viewType of days, we need to round the start and end date to the start and end of the day
 	const { setMessage, translatedMessage } = useTimeTableMessage(
 		!disableMessages,
 	)
 
+	timeTableGroupRenderBatchSize = renderBatch
+
 	// change on viewType
 	// biome-ignore lint/correctness/useExhaustiveDependencies: just remove the message is props change
 	useEffect(() => {
@@ -293,33 +301,32 @@ const LPTimeTableImpl = <G extends TimeTableGroup, I extends TimeSlotBooking>({
 		isCellDisabled,
 	)
 
-	const timeFrameDay = useTTCTimeFrameOfDay(storeIdent)
-	const timeSlotMinutes = useTTCTimeSlotMinutes(storeIdent)
-
 	initAndUpdateTimeTableSelectionStore(
 		storeIdent,
 		defaultSelectedTimeRange,
 		selectedTimeRange,
 		onTimeRangeSelected,
 	)
 
-	const slotsArray = useTTCSlotsArray(storeIdent)
-	if (!slotsArray || slotsArray.length === 0) {
-		console.warn(
-			"LPTimeTable - no slots array, or slots array is empty",
-			slotsArray,
-		)
-		return <div>No slots array</div>
-	}
-
 	const {
 		groupRows,
 		rowCount,
 		maxRowCountOfSingleGroup,
 		itemsOutsideOfDayRange,
 		itemsWithSameStartAndEnd,
+		slotsArray,
+		timeFrameDay,
+		timeSlotMinutes,
 	} = useGroupRows(entries)
 
+	if (!slotsArray || slotsArray.length === 0) {
+		console.warn(
+			"LPTimeTable - no slots array, or slots array is empty",
+			slotsArray,
+		)
+		return <div>No slots array</div>
+	}
+
 	useEffect(() => {
 		if (!setMessage) return
 		if (Object.keys(itemsOutsideOfDayRange).length > 0) {
@@ -531,6 +538,10 @@ const LPTimeTableImpl = <G extends TimeTableGroup, I extends TimeSlotBooking>({
 									intersectionContainerRef
 								}
 								headerRef={tableHeaderRef}
+								slotsArray={slotsArray}
+								timeSlotMinutes={timeSlotMinutes}
+								timeFrameDay={timeFrameDay}
+								viewType={viewType}
 							/>
 						</tbody>
 					</table>
@@ -627,11 +638,27 @@ function moveNowBar(
 	const startSlot = startAndEndSlot.startSlot
 
 	// the first row in the body is used for the time slot bars
-	const tbodyFirstRow = tableBody.children[0] as
+	let childIdx = 0
+	let tbodyFirstRow = tableBody.children[childIdx] as
 		| HTMLTableRowElement
 		| undefined
 	// now get the current time slot index element (not -1 because the first empty element for the groups)
 
+	// find the first rendered row
+	while (tbodyFirstRow && tbodyFirstRow.children.length === 0) {
+		childIdx++
+		tbodyFirstRow = tableBody.children[childIdx] as
+			| HTMLTableRowElement
+			| undefined
+	}
+
+	if (!tbodyFirstRow) {
+		console.warn(
+			"LPTimeTable - unable to find time slot row for the now bar",
+		)
+		return
+	}
+
 	const slotBar = tbodyFirstRow?.children[startSlot + 1] as
 		| HTMLDivElement
 		| undefined
@@ -652,7 +679,7 @@ function moveNowBar(
 		nowBar = document.createElement("div")
 		//nowBar.className = styles.nowBar
 		nowBar.className =
-			"absolute opacity-60 bg-orange-bold top-0 bottom-0 z-[1] w-[2px]"
+			"absolute opacity-60 bg-orange-bold top-0 bottom-0 z-[2] w-[2px]"
 		slotBar.appendChild(nowBar)
 		nowBarRef.current = nowBar
 	}
@@ -673,7 +700,7 @@ function moveNowBar(
 
 	const diffPerc = diffNow / timeSlotMinutes
 	nowBar.style.left = `${diffPerc * 100}%`
-	nowBar.style.height = `${tableBody.clientHeight}px`
+	nowBar.style.height = `${tableBody.getBoundingClientRect().bottom - slotBar.getBoundingClientRect().top}px`
 
 	// add orange border
 	const nowTimeSlotCell = headerTimeSlotCells[startSlot + 1]

diff --git a/library/src/components/timetable/TimeTableConfigStore.ts b/library/src/components/timetable/TimeTableConfigStore.ts
@@ -239,26 +239,6 @@ export function useTTCTimeFrameOfDay(ident: string) {
 	return timeFrameOfDay
 }
 
-/**
- * returns the current time slots array
- */
-export function useTTCSlotsArray(ident: string) {
-	const slotsArray = useSnapshot(
-		timeTableConfigStore[ident].basicProperties,
-	).slotsArray
-	return slotsArray
-}
-
-/**
- * returns the time slot minutes and a setter for it
- */
-export function useTTCTimeSlotMinutes(ident: string) {
-	const timeSlotMinutes = useSnapshot(
-		timeTableConfigStore[ident].basicProperties,
-	).timeSlotMinutes
-	return timeSlotMinutes
-}
-
 export function useTTCTimeSlotSelectionDisabled(ident: string) {
 	const timeSlotSelectionDisabled = useSnapshot(
 		timeTableConfigStore[ident],