From e7799479fae820b2a8edfb7fb72debfe71f6528b Mon Sep 17 00:00:00 2001
From: Dominik Pschenitschni <mail@celement.de>
Date: Wed, 30 Nov 2022 15:24:31 +0100
Subject: [PATCH] feat: use Intl.DateTimeFormat for gantt weekdays

---
 src/components/tasks/GanttChart.vue | 39 +++++++++++------------------
 src/helpers/time/formatDate.ts      | 16 ++++++++++++
 2 files changed, 31 insertions(+), 24 deletions(-)

diff --git a/src/components/tasks/GanttChart.vue b/src/components/tasks/GanttChart.vue
index c2580d1ca..5cca40c93 100644
--- a/src/components/tasks/GanttChart.vue
+++ b/src/components/tasks/GanttChart.vue
@@ -1,6 +1,6 @@
 <template>
 	<Loading
-		v-if="props.isLoading && tasks.size || dayjsLanguageLoading"
+		v-if="props.isLoading && !ganttBars.length || dayjsLanguageLoading"
 		class="gantt-container"
 	/>
 	<div class="gantt-container" v-else>
@@ -16,14 +16,14 @@
 			@dblclick-bar="openTask"
 			:width="ganttChartWidth + 'px'"
 		>
-			<template #timeunit="{label, value}">
+			<template #timeunit="{value, date}">
 				<div
 					class="timeunit-wrapper"
-					:class="{'today': dayIsToday(label)}"
+					:class="{'today': dateIsToday(date)}"
 				>
 					<span>{{ value }}</span>
 					<span class="weekday">
-						{{ weekdayFromTimeLabel(label) }}
+						{{ weekDayFromDate(date) }}
 					</span>
 				</div>
 			</template>
@@ -40,9 +40,7 @@
 <script setup lang="ts">
 import {computed, ref, watch, toRefs} from 'vue'
 import {useRouter} from 'vue-router'
-import {format, parse} from 'date-fns'
-import dayjs from 'dayjs'
-import isToday from 'dayjs/plugin/isToday'
+import {useNow} from '@vueuse/core'
 
 import {getHexColor} from '@/models/task'
 
@@ -63,6 +61,7 @@ import {
 
 import Loading from '@/components/misc/loading.vue'
 import {MILLISECONDS_A_DAY} from '@/constants/date'
+import {useWeekDayFromDate} from '@/helpers/time/formatDate'
 
 export interface GanttChartProps {
 	isLoading: boolean,
@@ -85,7 +84,6 @@ const {tasks, filters} = toRefs(props)
 // setup dayjs for vue-ganttastic
 const dayjsLanguageLoading = ref(false)
 // const dayjsLanguageLoading = useDayjsLanguageSync(dayjs)
-dayjs.extend(isToday)
 extendDayjs()
 
 const router = useRouter()
@@ -157,23 +155,16 @@ function openTask(e: {
 	})
 }
 
-function parseTimeLabel(label: string) {
-	return parse(label, 'dd.MMM', dateFromDate.value)
-}
+const weekDayFromDate = useWeekDayFromDate()
 
-function weekdayFromTimeLabel(label: string): string {
-	const parsed = parseTimeLabel(label)
-	return format(parsed, 'E')
-}
-
-function dayIsToday(label: string): boolean {
-	const parsed = parseTimeLabel(label)
-
-	const today = new Date()
-	return parsed.getDate() === today.getDate() &&
-		parsed.getMonth() === today.getMonth() &&
-		parsed.getFullYear() === today.getFullYear()
-}
+const today = useNow()
+const dateIsToday = computed(() => (date: Date) => {
+	return (
+		date.getDate() === today.value.getDate() &&
+		date.getMonth() === today.value.getMonth() &&
+		date.getFullYear() === today.value.getFullYear()
+	)
+})
 </script>
 
 <style scoped lang="scss">
diff --git a/src/helpers/time/formatDate.ts b/src/helpers/time/formatDate.ts
index 90ae195a2..6f66794de 100644
--- a/src/helpers/time/formatDate.ts
+++ b/src/helpers/time/formatDate.ts
@@ -5,6 +5,8 @@ import {format, formatDistanceToNow, formatISO as formatISOfns} from 'date-fns'
 import {enGB, de, fr, ru} from 'date-fns/locale'
 
 import {i18n} from '@/i18n'
+import { createSharedComposable, type MaybeRef } from '@vueuse/core'
+import { computed, unref } from 'vue'
 
 const locales = {en: enGB, de, ch: de, fr, ru}
 
@@ -50,3 +52,17 @@ export const formatDateSince = (date) => {
 export function formatISO(date) {
 	return date ? formatISOfns(date) : ''
 }
+
+/**
+ * Because `Intl.DateTimeFormat` is expensive to instatiate we try to reuse it as often as possible,
+ * by creating a shared composable.
+ */
+export const useDateTimeFormatter = createSharedComposable((options?: MaybeRef<Intl.DateTimeFormatOptions>) => {
+	return computed(() => new Intl.DateTimeFormat(i18n.global.locale, unref(options)))
+})
+
+export function useWeekDayFromDate() {
+	const dateTimeFormatter = useDateTimeFormatter({ weekday: 'short' })
+
+	return computed(() => (date: Date) => dateTimeFormatter.value.format(date))
+}
\ No newline at end of file