Handle weekInfo across different browsers (fix Safari). Closes #214

techniq · techniq · commit 7ae07d2e6772 · 2024-02-06T10:15:34.000-05:00
diff --git a/packages/svelte-ux/src/lib/utils/dateInternal.ts b/packages/svelte-ux/src/lib/utils/dateInternal.ts
@@ -5,7 +5,8 @@ export function getWeekStartsOnFromIntl(locales?: string): DayOfWeek {
     return DayOfWeek.Sunday;
   }
 
-  const info = new Intl.Locale(locales);
+  const locale = new Intl.Locale(locales);
   // @ts-ignore
-  return (info.weekInfo.firstDay ?? 0) % 7; // (in Intl, sunday is 7 not 0, so we need to mod 7)
+  const weekInfo = locale.weekInfo ?? locale.getWeekInfo?.();
+  return (weekInfo?.firstDay ?? 0) % 7; // (in Intl, sunday is 7 not 0, so we need to mod 7)
 }

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,8 @@ export function getWeekStartsOnFromIntl(locales?: string): DayOfWeek {`
`5`	`5`	`return DayOfWeek.Sunday;`
`6`	`6`	`}`
`7`	`7`
`8`		`- const info = new Intl.Locale(locales);`
	`8`	`+ const locale = new Intl.Locale(locales);`
`9`	`9`	`// @ts-ignore`
`10`		`- return (info.weekInfo.firstDay ?? 0) % 7; // (in Intl, sunday is 7 not 0, so we need to mod 7)`
	`10`	`+ const weekInfo = locale.weekInfo ?? locale.getWeekInfo?.();`
	`11`	`+ return (weekInfo?.firstDay ?? 0) % 7; // (in Intl, sunday is 7 not 0, so we need to mod 7)`
`11`	`12`	`}`