* [#337] added timezone loading from backend * [#337] changed data structure to allow patching timezone while keeping other datetime params value * [#337] fixed gap, event create modale sync with settings and added checkbox * [#337] isBrowserDefaultTimezone is set to true when API return null timezone Co-authored-by: Camille Moussu <cmoussu@linagora.com>
This commit is contained in:
@@ -41,6 +41,7 @@ import {
|
||||
restoreFormDataFromTemp,
|
||||
EventFormState,
|
||||
} from "../../utils/eventFormTempStorage";
|
||||
import { browserDefaultTimeZone } from "../../utils/timezone";
|
||||
|
||||
function EventPopover({
|
||||
open,
|
||||
@@ -84,17 +85,14 @@ function EventPopover({
|
||||
|
||||
const timezoneList = useMemo(() => {
|
||||
const zones = Object.keys(TIMEZONES.zones).sort();
|
||||
const browserTz = resolveTimezone(
|
||||
Intl.DateTimeFormat().resolvedOptions().timeZone
|
||||
);
|
||||
const browserTz = resolveTimezone(browserDefaultTimeZone);
|
||||
|
||||
return { zones, browserTz, getTimezoneOffset };
|
||||
}, []);
|
||||
|
||||
const calendarTimezone = useAppSelector((state) => state.calendars.timeZone);
|
||||
const calendarTimezone = useAppSelector((state) => state.settings.timeZone);
|
||||
const resolvedCalendarTimezone = useMemo(() => {
|
||||
const tz =
|
||||
calendarTimezone || Intl.DateTimeFormat().resolvedOptions().timeZone;
|
||||
const tz = calendarTimezone || browserDefaultTimeZone;
|
||||
return resolveTimezone(tz);
|
||||
}, [calendarTimezone]);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user