Skip to content

Commit 757622a

Browse files
committed
fix(calendar): skip datalist reset when no date is saved
1 parent 379c480 commit 757622a

File tree

2 files changed

+12
-8
lines changed

2 files changed

+12
-8
lines changed

src/stores/data/calendar.store.ts

+6-4
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@ export const useCalendarStore = defineStore(CalendarStoreConstants.Store, () =>
5151
const weeks = ref(1);
5252
const days = computed(() => weeks.value * 7 * 2);
5353

54-
const _center = ref<Date>();
55-
const center = computed(() => _center.value ?? new Date());
54+
const savedCenter = ref<Date>();
55+
const center = computed(() => savedCenter.value ?? new Date());
5656

5757
const startCalendar = ref<Date>(DateUtils.weeks.previous(weeks.value, center.value));
5858
const endCalendar = ref<Date>(DateUtils.weeks.next(weeks.value, center.value));
@@ -64,15 +64,16 @@ export const useCalendarStore = defineStore(CalendarStoreConstants.Store, () =>
6464

6565
const saveState = async () => {
6666
return storage.local.set<CalendarState>(CalendarStoreConstants.Store, {
67-
center: _center.value?.getTime(),
67+
center: savedCenter.value?.getTime(),
6868
weeks: weeks.value,
6969
extended: extended.value,
7070
});
7171
};
7272

7373
const clearState = (date?: Date, save = true) => {
74+
if (!date && !savedCenter.value) return;
7475
calendar.value = [];
75-
_center.value = date;
76+
savedCenter.value = date;
7677
startCalendar.value = DateUtils.weeks.previous(weeks.value, center.value);
7778
endCalendar.value = DateUtils.weeks.next(weeks.value, center.value);
7879
clearProxy(calendarErrors);
@@ -167,6 +168,7 @@ export const useCalendarStore = defineStore(CalendarStoreConstants.Store, () =>
167168
loading,
168169
calendar,
169170
center,
171+
savedCenter: computed(() => savedCenter.value),
170172
startCalendar,
171173
endCalendar,
172174
filter,

src/stores/data/releases.store.ts

+6-4
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,8 @@ export const useReleasesStore = defineStore(ReleasesStoreConstants.Store, () =>
7272
const weeks = ref(1);
7373
const days = computed(() => weeks.value * 7 * 2);
7474

75-
const _center = ref<Date>();
76-
const center = computed(() => _center.value ?? new Date());
75+
const savedCenter = ref<Date>();
76+
const center = computed(() => savedCenter.value ?? new Date());
7777

7878
const startCalendar = ref<Date>(DateUtils.weeks.previous(weeks.value, center.value));
7979
const endCalendar = ref<Date>(DateUtils.weeks.next(weeks.value, center.value));
@@ -89,15 +89,16 @@ export const useReleasesStore = defineStore(ReleasesStoreConstants.Store, () =>
8989

9090
const saveState = async () =>
9191
storage.local.set<ReleaseState>(ReleasesStoreConstants.Store, {
92-
center: _center.value?.getTime(),
92+
center: savedCenter.value?.getTime(),
9393
weeks: weeks.value,
9494
region: region.value,
9595
releaseType: releaseType.value,
9696
});
9797

9898
const clearState = (date?: Date) => {
99+
if (!date && !savedCenter.value) return;
99100
releases.value = [];
100-
_center.value = date;
101+
savedCenter.value = date;
101102
startCalendar.value = DateUtils.weeks.previous(weeks.value, center.value);
102103
endCalendar.value = DateUtils.weeks.next(weeks.value, center.value);
103104
clearProxy(releasesErrors);
@@ -238,6 +239,7 @@ export const useReleasesStore = defineStore(ReleasesStoreConstants.Store, () =>
238239
fetchReleases,
239240
fetchRegions,
240241
center,
242+
savedCenter,
241243
regionLoading,
242244
regions,
243245
region: computed<string | undefined>({

0 commit comments

Comments
 (0)