adalal/solidtime
1
0
Fork 0
mirror of https://github.com/solidtime-io/solidtime.git synced 2026-06-13 12:52:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

revert reka-ui update; fix DST cellMath;

Browse Source
This commit is contained in:
Gregor Vostrak
2026-05-29 17:03:52 +02:00
parent 0aa0f0bd77
commit 8eab0485c9
3 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
package-lock.json generated
View File

@@ -34,7 +34,7 @@
"parse-duration": "^2.0.1",
"pinia": "^3.0.0",
"radix-vue": "^1.9.6",
"reka-ui": "^2.8.2",
"reka-ui": "2.8.2",
"tailwind-merge": "^2.6.0",
"tailwindcss-animate": "^1.0.7",
"vue-echarts": "^8.0.0",
@@ -6750,9 +6750,9 @@
}
},
"node_modules/reka-ui": {
"version": "2.9.6",
"resolved": "https://registry.npmjs.org/reka-ui/-/reka-ui-2.9.6.tgz",
"integrity": "sha512-K6bL457owpvWONc7hsjFxo3HDC9s6IzhRqShW0w9JSKelPGfRbkHD558UQTn/NH1cvrXVHygKyC7fExFmRketg==",
"version": "2.8.2",
"resolved": "https://registry.npmjs.org/reka-ui/-/reka-ui-2.8.2.tgz",
"integrity": "sha512-8lTKcJhmG+D3UyJxhBnNnW/720sLzm0pbA9AC1MWazmJ5YchJAyTSl+O00xP/kxBmEN0fw5JqWVHguiFmsGjzA==",
"license": "MIT",
"dependencies": {
"@floating-ui/dom": "^1.6.13",
@@ -6763,7 +6763,7 @@
"@vueuse/core": "^14.1.0",
"@vueuse/shared": "^14.1.0",
"aria-hidden": "^1.2.4",
"defu": "^6.1.5",
"defu": "^6.1.4",
"ohash": "^2.0.11"
},
"funding": {
@@ -6771,7 +6771,7 @@
"url": "https://github.com/sponsors/zernonia"
},
"peerDependencies": {
"vue": ">= 3.4.0"
"vue": ">= 3.2.0"
}
},
"node_modules/remove-accents": {

2
package.json
View File

@@ -78,7 +78,7 @@
"parse-duration": "^2.0.1",
"pinia": "^3.0.0",
"radix-vue": "^1.9.6",
"reka-ui": "^2.8.2",
"reka-ui": "2.8.2",
"tailwind-merge": "^2.6.0",
"tailwindcss-animate": "^1.0.7",
"vue-echarts": "^8.0.0",

10
resources/js/utils/timesheet/cellMath.ts
View File

@@ -28,10 +28,14 @@ interface Interval {
function localDayBounds(date: string, tz: string): { dayStart: Dayjs; dayEnd: Dayjs } {
const dayjs = getDayJsInstance();
const localDayStart = dayjs.tz(`${date} 00:00:00`, tz);
// `.add(1, 'day')` on a Dayjs instance advances by a fixed 24h, which is
// wrong on DST-transition days (the local day is 23h or 25h long). Derive
// the next calendar date in UTC (no DST) and take its local midnight, so
// `dayEnd` is always the real next local midnight.
const nextDate = dayjs.utc(date).add(1, 'day').format('YYYY-MM-DD');
return {
dayStart: localDayStart.utc(),
dayEnd: localDayStart.add(1, 'day').utc(),
dayStart: dayjs.tz(`${date} 00:00:00`, tz).utc(),
dayEnd: dayjs.tz(`${nextDate} 00:00:00`, tz).utc(),
};
}