Merge pull request #36 from linked-planet/dev

Dev
linked-planet · Sep 5, 2024 · 1159864 · 1159864
2 parents 838f88c + ce8960e
commit 1159864
Show file tree

Hide file tree

Showing 8 changed files with 1,182 additions and 231 deletions.
diff --git a/library/src/components/ToastFlag.tsx b/library/src/components/ToastFlag.tsx
@@ -141,7 +141,7 @@ export function showFlagExtended({
 			appearance={appearance}
 			type={flagType}
 			style={flagStyle}
-			className="bottom-0 bg-transparent p-0"
+			className="bottom-0 bg-transparent p-0 shadow-none"
 			{...props}
 		/>,
 		{

diff --git a/library/src/components/timetable/TimeTable.tsx b/library/src/components/timetable/TimeTable.tsx
@@ -158,6 +158,12 @@ export interface LPTimeTableProps<
 	 */
 	hideOutOfRangeMarkers?: boolean
 
+	/**
+	 * The locale to use for the dayjs library
+	 * @default "en"
+	 **/
+	locale?: "en" | "de"
+
 	/**
 	 * If defined this is called by each cell to check if it is disabled
 	 */
@@ -222,6 +228,7 @@ const LPTimeTableImpl = <G extends TimeTableGroup, I extends TimeSlotBooking>({
 	showTimeSlotHeader,
 	hideOutOfRangeMarkers = false,
 	nowOverwrite,
+	locale = "en",
 	dateHeaderTextFormat,
 	weekStartsOnSunday = false,
 	disableMessages = false,
@@ -478,6 +485,7 @@ const LPTimeTableImpl = <G extends TimeTableGroup, I extends TimeSlotBooking>({
 								}
 								dateHeaderTextFormat={dateHeaderTextFormat}
 								weekStartsOnSunday={weekStartsOnSunday}
+								locale={locale}
 								ref={tableHeaderRef}
 							/>
 							<tbody ref={tableBodyRef} className="table-fixed">

diff --git a/library/src/components/timetable/TimeTableHeader.tsx b/library/src/components/timetable/TimeTableHeader.tsx
@@ -1,15 +1,30 @@
 import dayjs, { type Dayjs } from "dayjs"
 import weekOfYear from "dayjs/plugin/weekOfYear"
 import weekYear from "dayjs/plugin/weekYear"
+import localeData from "dayjs/plugin/localeData"
 dayjs.extend(weekOfYear)
 dayjs.extend(weekYear)
+dayjs.extend(localeData)
 import type React from "react"
 import { Fragment, forwardRef } from "react"
 
+// if more locales then english and germans are needed, we need to enable them first here
+import "dayjs/locale/de"
+//import "dayjs/locale/es"
+//import "dayjs/locale/fr"
+//import "dayjs/locale/it"
+//import "dayjs/locale/nl"
+
 import type { TimeTableViewType } from "./TimeTable"
 import type { TimeFrameDay } from "./TimeTableConfigStore"
 
-const headerTimeSlotFormat = "HH:mm"
+const headerTimeSlotFormat: { [viewType in TimeTableViewType]: string } = {
+	hours: "HH:mm",
+	days: "dd HH:mm",
+	weeks: "HH:mm",
+	months: "HH:mm",
+	years: "HH:mm",
+}
 
 export function headerText(
 	tsStart: Dayjs,
@@ -49,6 +64,7 @@ type TimeTableHeaderProps = {
 	/** a dayjs format string */
 	dateHeaderTextFormat?: string
 	weekStartsOnSunday: boolean
+	locale?: "en" | "de"
 }
 
 export const LPTimeTableHeader = forwardRef(function TimeTableHeader(
@@ -63,9 +79,15 @@ export const LPTimeTableHeader = forwardRef(function TimeTableHeader(
 		timeFrameDay,
 		dateHeaderTextFormat,
 		weekStartsOnSunday,
+		locale,
 	}: TimeTableHeaderProps,
 	tableHeaderRef: React.Ref<HTMLTableSectionElement>,
 ) {
+	const currentLocale = dayjs.locale()
+	if (locale && locale !== currentLocale) {
+		dayjs.locale(locale)
+	}
+
 	const viewTypeUnit = viewType === "hours" ? "days" : viewType
 	const daysOrWeeksOrMonths = [
 		...new Set(
@@ -217,7 +239,9 @@ export const LPTimeTableHeader = forwardRef(function TimeTableHeader(
 								} ${showTimeSlotHeader ? "pt-1" : ""}`}
 							>
 								{showTimeSlotHeader
-									? slot.format(headerTimeSlotFormat)
+									? slot.format(
+											headerTimeSlotFormat[viewType],
+										)
 									: undefined}
 							</th>
 						)