diff --git a/src/lib/holidayUtils.ts b/src/lib/holidayUtils.ts index 133f389..59d8fe3 100644 --- a/src/lib/holidayUtils.ts +++ b/src/lib/holidayUtils.ts @@ -33,14 +33,18 @@ export function getHolidaysForYear(countryCode: string, year: number, stateCode? // The date-holidays lib has translations for many holidays, but defaults to using the language of the country. // We can pass in the browser's preferred languages (though the lib doesn't fall back, e.g. from `de-AT` to `de`) const languages = navigator.languages.map(lang => lang.split('-')[0]); - const opts = { languages } + // Start/end dates are returned in that country/state's time zone, so we need to provide our time zone to localise + const opts = { languages, timezone: Intl.DateTimeFormat().resolvedOptions().timeZone }; const hd = stateCode ? new Holidays(countryCode, stateCode, opts) : new Holidays(countryCode, opts); return hd.getHolidays(year) .filter(holiday => holiday.type === 'public') - .map(holiday => ({ - date: new Date(holiday.date), - name: holiday.name - })); + .flatMap(holiday => + // To handle single- and multi-day holidays, we generate a holiday entry for each day in the period + Array.from({ length: daysBetween(holiday.start, holiday.end) }, (_, i) => ({ + date: new Date(holiday.start.getFullYear(), holiday.start.getMonth(), holiday.start.getDate() + i), + name: holiday.name, + })) + ); } // Optimize days off to create the longest possible chains