@super-calendar/native 2.15.0 → 2.17.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +63 -0
- package/dist/{DefaultMonthEvent-BDD7GgL8.d.mts → DefaultMonthEvent-C3C30hfV.d.mts} +7 -21
- package/dist/{DefaultMonthEvent-ggwYo7Fy.d.ts → DefaultMonthEvent-Dx3lD7ig.d.ts} +7 -21
- package/dist/{MonthList-D4_LBnbU.js → MonthList-B2TSGYp7.js} +409 -109
- package/dist/{MonthList-DWCH3GT5.mjs → MonthList-N1GVDIE4.mjs} +400 -112
- package/dist/index.d.mts +50 -16
- package/dist/index.d.ts +50 -16
- package/dist/index.js +375 -46
- package/dist/index.mjs +370 -47
- package/dist/picker.d.mts +1 -1
- package/dist/picker.d.ts +1 -1
- package/dist/picker.js +1 -1
- package/dist/picker.mjs +1 -1
- package/package.json +2 -2
- package/src/components/Calendar.tsx +83 -9
- package/src/components/MonthPager.tsx +175 -20
- package/src/components/MonthView.tsx +332 -116
- package/src/components/MultiWeekView.tsx +34 -0
- package/src/components/ResourceTimeline.tsx +153 -4
- package/src/components/TimeGrid.tsx +241 -7
- package/src/index.tsx +8 -0
- package/src/types.ts +1 -0
- package/src/utils/holdWebDateDrag.ts +63 -0
package/dist/picker.d.mts
CHANGED
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { C as EventKeyExtractor, D as RenderEvent, F as PartialCalendarTheme, I as darkTheme, L as defaultTheme, N as CalendarTheme, O as RenderEventArgs, P as CalendarThemeProvider, R as mergeTheme, _ as CalendarMode, a as MonthPager, c as MonthViewProps, h as CalendarEvent, j as WeekStartsOn, n as MonthList, o as MonthPagerProps, r as MonthListProps, s as MonthView, t as DefaultMonthEvent, w as ICalendarEvent, z as useCalendarTheme } from "./DefaultMonthEvent-C3C30hfV.mjs";
|
|
2
2
|
import { DateRange, DateSelectionConstraints, DaySelectionState, MonthGrid, MonthGridDay, MonthGridWeek, MonthGridWeekday, UseDateRangeOptions, UseMonthGridOptions, buildMonthGrid, buildMonthWeeks, daySelectionState, getIsToday, getWeekDays, isDateSelectable, isRangeEndpoint, isSameCalendarDay, isWeekend, isWithinDateRange, minutesIntoDay, nextDateRange, useDateRange, useMonthGrid } from "@super-calendar/core";
|
|
3
3
|
export { type CalendarEvent, type CalendarMode, type CalendarTheme, CalendarThemeProvider, type DateRange, type DateSelectionConstraints, type DaySelectionState, DefaultMonthEvent, type EventKeyExtractor, type ICalendarEvent, type MonthGrid, type MonthGridDay, type MonthGridWeek, type MonthGridWeekday, MonthList, type MonthListProps, MonthPager, type MonthPagerProps, MonthView, type MonthViewProps, type PartialCalendarTheme, type RenderEvent, type RenderEventArgs, type UseDateRangeOptions, type UseMonthGridOptions, type WeekStartsOn, buildMonthGrid, buildMonthWeeks, darkTheme, daySelectionState, defaultTheme, getIsToday, getWeekDays, isDateSelectable, isRangeEndpoint, isSameCalendarDay, isWeekend, isWithinDateRange, mergeTheme, minutesIntoDay, nextDateRange, useCalendarTheme, useDateRange, useMonthGrid };
|
package/dist/picker.d.ts
CHANGED
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { C as EventKeyExtractor, D as RenderEvent, F as PartialCalendarTheme, I as darkTheme, L as defaultTheme, N as CalendarTheme, O as RenderEventArgs, P as CalendarThemeProvider, R as mergeTheme, _ as CalendarMode, a as MonthPager, c as MonthViewProps, h as CalendarEvent, j as WeekStartsOn, n as MonthList, o as MonthPagerProps, r as MonthListProps, s as MonthView, t as DefaultMonthEvent, w as ICalendarEvent, z as useCalendarTheme } from "./DefaultMonthEvent-Dx3lD7ig.js";
|
|
2
2
|
import { DateRange, DateSelectionConstraints, DaySelectionState, MonthGrid, MonthGridDay, MonthGridWeek, MonthGridWeekday, UseDateRangeOptions, UseMonthGridOptions, buildMonthGrid, buildMonthWeeks, daySelectionState, getIsToday, getWeekDays, isDateSelectable, isRangeEndpoint, isSameCalendarDay, isWeekend, isWithinDateRange, minutesIntoDay, nextDateRange, useDateRange, useMonthGrid } from "@super-calendar/core";
|
|
3
3
|
export { type CalendarEvent, type CalendarMode, type CalendarTheme, CalendarThemeProvider, type DateRange, type DateSelectionConstraints, type DaySelectionState, DefaultMonthEvent, type EventKeyExtractor, type ICalendarEvent, type MonthGrid, type MonthGridDay, type MonthGridWeek, type MonthGridWeekday, MonthList, type MonthListProps, MonthPager, type MonthPagerProps, MonthView, type MonthViewProps, type PartialCalendarTheme, type RenderEvent, type RenderEventArgs, type UseDateRangeOptions, type UseMonthGridOptions, type WeekStartsOn, buildMonthGrid, buildMonthWeeks, darkTheme, daySelectionState, defaultTheme, getIsToday, getWeekDays, isDateSelectable, isRangeEndpoint, isSameCalendarDay, isWeekend, isWithinDateRange, mergeTheme, minutesIntoDay, nextDateRange, useCalendarTheme, useDateRange, useMonthGrid };
|
package/dist/picker.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
|
|
2
|
-
const require_MonthList = require("./MonthList-
|
|
2
|
+
const require_MonthList = require("./MonthList-B2TSGYp7.js");
|
|
3
3
|
let _super_calendar_core = require("@super-calendar/core");
|
|
4
4
|
exports.CalendarThemeProvider = require_MonthList.CalendarThemeProvider;
|
|
5
5
|
exports.DefaultMonthEvent = require_MonthList.DefaultMonthEvent;
|
package/dist/picker.mjs
CHANGED
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { _ as mergeTheme, g as defaultTheme, h as darkTheme, i as MonthPager, m as CalendarThemeProvider, n as DefaultMonthEvent, o as MonthView, t as MonthList, v as useCalendarTheme } from "./MonthList-N1GVDIE4.mjs";
|
|
2
2
|
import { buildMonthGrid, buildMonthWeeks, daySelectionState, getIsToday, getWeekDays, isDateSelectable, isRangeEndpoint, isSameCalendarDay, isWeekend, isWithinDateRange, minutesIntoDay, nextDateRange, useDateRange, useMonthGrid } from "@super-calendar/core";
|
|
3
3
|
export { CalendarThemeProvider, DefaultMonthEvent, MonthList, MonthPager, MonthView, buildMonthGrid, buildMonthWeeks, darkTheme, daySelectionState, defaultTheme, getIsToday, getWeekDays, isDateSelectable, isRangeEndpoint, isSameCalendarDay, isWeekend, isWithinDateRange, mergeTheme, minutesIntoDay, nextDateRange, useCalendarTheme, useDateRange, useMonthGrid };
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@super-calendar/native",
|
|
3
|
-
"version": "2.
|
|
3
|
+
"version": "2.17.0",
|
|
4
4
|
"description": "Gesture-driven, virtualized month / week / day calendar and date picker for React Native (and web via react-native-web).",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"agenda",
|
|
@@ -64,7 +64,7 @@
|
|
|
64
64
|
"access": "public"
|
|
65
65
|
},
|
|
66
66
|
"dependencies": {
|
|
67
|
-
"@super-calendar/core": "2.
|
|
67
|
+
"@super-calendar/core": "2.17.0"
|
|
68
68
|
},
|
|
69
69
|
"peerDependencies": {
|
|
70
70
|
"@legendapp/list": ">=3",
|
|
@@ -13,6 +13,7 @@ import {
|
|
|
13
13
|
startOfYear,
|
|
14
14
|
} from "date-fns";
|
|
15
15
|
import {
|
|
16
|
+
type ComponentType,
|
|
16
17
|
type ForwardedRef,
|
|
17
18
|
forwardRef,
|
|
18
19
|
type ReactElement,
|
|
@@ -30,12 +31,14 @@ import type {
|
|
|
30
31
|
BusinessHoursBand,
|
|
31
32
|
CalendarEvent,
|
|
32
33
|
CalendarMode,
|
|
34
|
+
CreateGhostArgs,
|
|
33
35
|
EventKeyExtractor,
|
|
34
36
|
RenderEvent,
|
|
35
37
|
RenderEventArgs,
|
|
36
38
|
WeekStartsOn,
|
|
37
39
|
} from "../types";
|
|
38
40
|
import {
|
|
41
|
+
buildMultiWeekGrid,
|
|
39
42
|
type DateRange,
|
|
40
43
|
type EventAccessibilityLabeler,
|
|
41
44
|
eventsInTimeZone,
|
|
@@ -53,7 +56,7 @@ import { type SlotStyleProps } from "../utils/slots";
|
|
|
53
56
|
import { YearView, type YearViewSlot } from "./YearView";
|
|
54
57
|
import { Agenda, type AgendaSlot } from "./Agenda";
|
|
55
58
|
import { DefaultEvent } from "./DefaultEvent";
|
|
56
|
-
import {
|
|
59
|
+
import { DateRowsPager } from "./MonthPager";
|
|
57
60
|
import type { MonthViewSlot } from "./MonthView";
|
|
58
61
|
import {
|
|
59
62
|
DEFAULT_HOUR_HEIGHT,
|
|
@@ -139,6 +142,11 @@ export type CalendarProps<T> = SlotStyleProps<CalendarSlot> & {
|
|
|
139
142
|
* on empty space when set.
|
|
140
143
|
*/
|
|
141
144
|
onCreateEvent?: (start: Date, end: Date) => void;
|
|
145
|
+
/**
|
|
146
|
+
* A component that draws content inside the time-grid drag-to-create preview;
|
|
147
|
+
* see `TimeGrid`'s prop of the same name. Applies to the week/day grid only.
|
|
148
|
+
*/
|
|
149
|
+
renderCreateGhost?: ComponentType<CreateGhostArgs>;
|
|
142
150
|
/**
|
|
143
151
|
* Month and year modes: reports a create sweep's day span as it happens, as the
|
|
144
152
|
* ordered inclusive `[start, end]` days, so a selection highlight can follow the
|
|
@@ -197,6 +205,8 @@ export type CalendarProps<T> = SlotStyleProps<CalendarSlot> & {
|
|
|
197
205
|
weekdayFormat?: WeekdayFormat;
|
|
198
206
|
/** Number of day columns when `mode="custom"`. Ignored by other modes. Default 1. */
|
|
199
207
|
numberOfDays?: number;
|
|
208
|
+
/** Consecutive full week rows for `mode="multiweek"` (default 2). */
|
|
209
|
+
numberOfWeeks?: number;
|
|
200
210
|
/**
|
|
201
211
|
* Last weekday of a `custom` partial-week view (0–6). When set, `custom` shows
|
|
202
212
|
* `weekStartsOn`…`weekEndsOn` of the visible week and pages by week, taking
|
|
@@ -382,7 +392,13 @@ function visibleRange(
|
|
|
382
392
|
weekStartsOn: WeekStartsOn,
|
|
383
393
|
numberOfDays: number,
|
|
384
394
|
weekEndsOn?: WeekStartsOn,
|
|
395
|
+
numberOfWeeks = 2,
|
|
396
|
+
hiddenDays?: number[],
|
|
385
397
|
): [Date, Date] {
|
|
398
|
+
if (mode === "multiweek") {
|
|
399
|
+
const { visibleRange } = buildMultiWeekGrid(date, { numberOfWeeks, weekStartsOn, hiddenDays });
|
|
400
|
+
return [visibleRange.start, endOfDay(addDays(visibleRange.endExclusive, -1))];
|
|
401
|
+
}
|
|
386
402
|
if (mode === "month") {
|
|
387
403
|
return [
|
|
388
404
|
startOfWeek(startOfMonth(date), { weekStartsOn }),
|
|
@@ -408,7 +424,17 @@ function expansionRange(
|
|
|
408
424
|
weekStartsOn: WeekStartsOn,
|
|
409
425
|
numberOfDays: number,
|
|
410
426
|
weekEndsOn?: WeekStartsOn,
|
|
427
|
+
numberOfWeeks = 2,
|
|
411
428
|
): [Date, Date] {
|
|
429
|
+
if (mode === "multiweek") {
|
|
430
|
+
const { period } = buildMultiWeekGrid(date, { numberOfWeeks, weekStartsOn });
|
|
431
|
+
const previous = addWeeks(period.start, -numberOfWeeks);
|
|
432
|
+
const following = addWeeks(period.endExclusive, numberOfWeeks);
|
|
433
|
+
return [
|
|
434
|
+
Number.isFinite(previous.getTime()) ? previous : period.start,
|
|
435
|
+
endOfDay(addDays(Number.isFinite(following.getTime()) ? following : period.endExclusive, -1)),
|
|
436
|
+
];
|
|
437
|
+
}
|
|
412
438
|
if (mode === "month") {
|
|
413
439
|
return [
|
|
414
440
|
startOfWeek(startOfMonth(addMonths(date, -1)), { weekStartsOn }),
|
|
@@ -484,6 +510,7 @@ function CalendarInner<T>(
|
|
|
484
510
|
resetPageOnPressCell,
|
|
485
511
|
onLongPressCell,
|
|
486
512
|
onCreateEvent,
|
|
513
|
+
renderCreateGhost,
|
|
487
514
|
onSelectDrag,
|
|
488
515
|
selectedDates,
|
|
489
516
|
selectedRange,
|
|
@@ -505,6 +532,7 @@ function CalendarInner<T>(
|
|
|
505
532
|
now,
|
|
506
533
|
weekdayFormat,
|
|
507
534
|
numberOfDays,
|
|
535
|
+
numberOfWeeks = 2,
|
|
508
536
|
weekEndsOn,
|
|
509
537
|
renderEvent = DefaultEvent,
|
|
510
538
|
eventAccessibilityLabel,
|
|
@@ -581,7 +609,14 @@ function CalendarInner<T>(
|
|
|
581
609
|
const displayEvents = useMemo(() => {
|
|
582
610
|
let out = events;
|
|
583
611
|
if (out.some((e) => e.recurrence)) {
|
|
584
|
-
let [start, end] = expansionRange(
|
|
612
|
+
let [start, end] = expansionRange(
|
|
613
|
+
mode,
|
|
614
|
+
date,
|
|
615
|
+
weekStartsOn,
|
|
616
|
+
numberOfDays ?? 1,
|
|
617
|
+
weekEndsOn,
|
|
618
|
+
numberOfWeeks,
|
|
619
|
+
);
|
|
585
620
|
// A display zone shifts each occurrence's wall-clock by up to ~a day, which
|
|
586
621
|
// can move an edge occurrence into a visible column; widen so it's generated.
|
|
587
622
|
if (timeZone) {
|
|
@@ -593,7 +628,16 @@ function CalendarInner<T>(
|
|
|
593
628
|
if (timeZone) out = eventsInTimeZone(out, timeZone);
|
|
594
629
|
return out;
|
|
595
630
|
// `date.getTime()`: recompute on the instant, not a re-created Date identity.
|
|
596
|
-
}, [
|
|
631
|
+
}, [
|
|
632
|
+
events,
|
|
633
|
+
mode,
|
|
634
|
+
date.getTime(),
|
|
635
|
+
weekStartsOn,
|
|
636
|
+
numberOfDays,
|
|
637
|
+
weekEndsOn,
|
|
638
|
+
timeZone,
|
|
639
|
+
numberOfWeeks,
|
|
640
|
+
]);
|
|
597
641
|
|
|
598
642
|
// Swallow presses on disabled events once, so every view inherits the guard.
|
|
599
643
|
const handlePressEvent = useCallback(
|
|
@@ -616,9 +660,28 @@ function CalendarInner<T>(
|
|
|
616
660
|
const handleChangeDate = useCallback(
|
|
617
661
|
(next: Date) => {
|
|
618
662
|
onChangeDate(next);
|
|
619
|
-
onChangeDateRange?.(
|
|
663
|
+
onChangeDateRange?.(
|
|
664
|
+
visibleRange(
|
|
665
|
+
mode,
|
|
666
|
+
next,
|
|
667
|
+
weekStartsOn,
|
|
668
|
+
numberOfDays ?? 1,
|
|
669
|
+
weekEndsOn,
|
|
670
|
+
numberOfWeeks,
|
|
671
|
+
hiddenDays,
|
|
672
|
+
),
|
|
673
|
+
);
|
|
620
674
|
},
|
|
621
|
-
[
|
|
675
|
+
[
|
|
676
|
+
onChangeDate,
|
|
677
|
+
onChangeDateRange,
|
|
678
|
+
mode,
|
|
679
|
+
weekStartsOn,
|
|
680
|
+
numberOfDays,
|
|
681
|
+
weekEndsOn,
|
|
682
|
+
numberOfWeeks,
|
|
683
|
+
hiddenDays,
|
|
684
|
+
],
|
|
622
685
|
);
|
|
623
686
|
|
|
624
687
|
// Inject `eventCellStyle`, `ampm`, `showTime`, `ellipsizeTitle` and
|
|
@@ -669,13 +732,25 @@ function CalendarInner<T>(
|
|
|
669
732
|
eventAccessibilityLabel,
|
|
670
733
|
]);
|
|
671
734
|
|
|
735
|
+
const rowSpec = useMemo(
|
|
736
|
+
() =>
|
|
737
|
+
mode === "multiweek"
|
|
738
|
+
? { kind: "multiweek" as const, numberOfWeeks }
|
|
739
|
+
: {
|
|
740
|
+
kind: "month" as const,
|
|
741
|
+
showAdjacentMonths: showAdjacentMonths ?? true,
|
|
742
|
+
showSixWeeks: showSixWeeks ?? false,
|
|
743
|
+
},
|
|
744
|
+
[mode, numberOfWeeks, showAdjacentMonths, showSixWeeks],
|
|
745
|
+
);
|
|
672
746
|
const resolvedLabels = useMemo(() => resolveCalendarLabels(labels), [labels]);
|
|
673
747
|
|
|
674
748
|
return (
|
|
675
749
|
<CalendarThemeProvider value={mergedTheme}>
|
|
676
750
|
<CalendarLabelsContext.Provider value={resolvedLabels}>
|
|
677
|
-
{mode === "month" ? (
|
|
678
|
-
<
|
|
751
|
+
{mode === "month" || mode === "multiweek" ? (
|
|
752
|
+
<DateRowsPager
|
|
753
|
+
spec={rowSpec}
|
|
679
754
|
date={date}
|
|
680
755
|
events={displayEvents}
|
|
681
756
|
maxVisibleEventCount={maxVisibleEventCount}
|
|
@@ -688,11 +763,9 @@ function CalendarInner<T>(
|
|
|
688
763
|
labels={labels}
|
|
689
764
|
sortedMonthView={sortedMonthView}
|
|
690
765
|
moreLabel={moreLabel}
|
|
691
|
-
showAdjacentMonths={showAdjacentMonths}
|
|
692
766
|
highlightWeekends={highlightWeekends}
|
|
693
767
|
disableMonthEventCellPress={disableMonthEventCellPress}
|
|
694
768
|
isRTL={isRTL}
|
|
695
|
-
showSixWeeks={showSixWeeks}
|
|
696
769
|
showTitle={showTitle}
|
|
697
770
|
activeDate={activeDate}
|
|
698
771
|
renderHeaderForMonthView={renderHeaderForMonthView}
|
|
@@ -823,6 +896,7 @@ function CalendarInner<T>(
|
|
|
823
896
|
resetPageOnPressCell={resetPageOnPressCell}
|
|
824
897
|
onLongPressCell={onLongPressCell}
|
|
825
898
|
onCreateEvent={onCreateEvent}
|
|
899
|
+
renderCreateGhost={renderCreateGhost}
|
|
826
900
|
onPressDateHeader={onPressDateHeader}
|
|
827
901
|
onChangeDate={handleChangeDate}
|
|
828
902
|
renderHeader={renderTimeGridHeader}
|
|
@@ -4,7 +4,17 @@ import {
|
|
|
4
4
|
type LegendListRenderItemProps,
|
|
5
5
|
type OnViewableItemsChangedInfo,
|
|
6
6
|
} from "@legendapp/list/react-native";
|
|
7
|
-
import {
|
|
7
|
+
import {
|
|
8
|
+
addDays,
|
|
9
|
+
addMonths,
|
|
10
|
+
addWeeks,
|
|
11
|
+
differenceInCalendarMonths,
|
|
12
|
+
differenceInCalendarWeeks,
|
|
13
|
+
format,
|
|
14
|
+
type Locale,
|
|
15
|
+
startOfMonth,
|
|
16
|
+
startOfWeek,
|
|
17
|
+
} from "date-fns";
|
|
8
18
|
import {
|
|
9
19
|
type ComponentRef,
|
|
10
20
|
memo,
|
|
@@ -37,6 +47,7 @@ import type {
|
|
|
37
47
|
import {
|
|
38
48
|
type CalendarSelection,
|
|
39
49
|
CalendarSelectionProvider,
|
|
50
|
+
buildMultiWeekGrid,
|
|
40
51
|
type DateRange,
|
|
41
52
|
type WeekdayFormat,
|
|
42
53
|
filterHiddenDays,
|
|
@@ -46,7 +57,7 @@ import {
|
|
|
46
57
|
import type { CalendarLabels } from "@super-calendar/core";
|
|
47
58
|
import { createSlots, type SlotStyleProps } from "../utils/slots";
|
|
48
59
|
import { useWebPagerKeys } from "../utils/useWebPagerKeys";
|
|
49
|
-
import {
|
|
60
|
+
import { DateRows, type DateRowsSource, type MonthViewSlot } from "./MonthView";
|
|
50
61
|
|
|
51
62
|
// Horizontal swipe paging doesn't translate to web; there we disable it and page
|
|
52
63
|
// with the arrow keys instead.
|
|
@@ -130,7 +141,41 @@ export type MonthPagerProps<T> = {
|
|
|
130
141
|
renderCustomDateForMonth?: (date: Date) => React.ReactNode;
|
|
131
142
|
} & SlotStyleProps<MonthViewSlot>;
|
|
132
143
|
|
|
144
|
+
/**
|
|
145
|
+
* Which pages a {@link DateRowsPager} swipes through. Internal to the package:
|
|
146
|
+
* the public pagers and `Calendar` adapt their own props to it.
|
|
147
|
+
*/
|
|
148
|
+
export type DateRowsPagerSpec =
|
|
149
|
+
| {
|
|
150
|
+
kind: "month";
|
|
151
|
+
showAdjacentMonths: boolean;
|
|
152
|
+
showSixWeeks: boolean;
|
|
153
|
+
}
|
|
154
|
+
| { kind: "multiweek"; numberOfWeeks: number };
|
|
155
|
+
|
|
156
|
+
/** Props for the private {@link DateRowsPager}. */
|
|
157
|
+
export type DateRowsPagerProps<T> = Omit<
|
|
158
|
+
MonthPagerProps<T>,
|
|
159
|
+
"showAdjacentMonths" | "showSixWeeks"
|
|
160
|
+
> & {
|
|
161
|
+
spec: DateRowsPagerSpec;
|
|
162
|
+
};
|
|
163
|
+
|
|
133
164
|
function MonthPagerInner<T>({
|
|
165
|
+
showAdjacentMonths = true,
|
|
166
|
+
showSixWeeks = false,
|
|
167
|
+
...rest
|
|
168
|
+
}: MonthPagerProps<T>): ReactElement {
|
|
169
|
+
const spec = useMemo<DateRowsPagerSpec>(
|
|
170
|
+
() => ({ kind: "month", showAdjacentMonths, showSixWeeks }),
|
|
171
|
+
[showAdjacentMonths, showSixWeeks],
|
|
172
|
+
);
|
|
173
|
+
return <DateRowsPager<T> {...rest} spec={spec} />;
|
|
174
|
+
}
|
|
175
|
+
|
|
176
|
+
function DateRowsPagerInner<T>({
|
|
177
|
+
spec,
|
|
178
|
+
initialAnchor,
|
|
134
179
|
date,
|
|
135
180
|
events,
|
|
136
181
|
maxVisibleEventCount,
|
|
@@ -143,7 +188,6 @@ function MonthPagerInner<T>({
|
|
|
143
188
|
sortedMonthView,
|
|
144
189
|
moreLabel,
|
|
145
190
|
labels,
|
|
146
|
-
showAdjacentMonths,
|
|
147
191
|
highlightWeekends,
|
|
148
192
|
disableMonthEventCellPress,
|
|
149
193
|
isRTL,
|
|
@@ -171,14 +215,13 @@ function MonthPagerInner<T>({
|
|
|
171
215
|
onChangeDate,
|
|
172
216
|
freeSwipe = false,
|
|
173
217
|
swipeEnabled = true,
|
|
174
|
-
showSixWeeks = false,
|
|
175
218
|
showTitle = true,
|
|
176
219
|
activeDate,
|
|
177
220
|
renderHeaderForMonthView,
|
|
178
221
|
renderCustomDateForMonth,
|
|
179
222
|
classNames,
|
|
180
223
|
styles: styleOverrides,
|
|
181
|
-
}:
|
|
224
|
+
}: DateRowsPagerProps<T> & { initialAnchor?: Date }): ReactElement {
|
|
182
225
|
const theme = useCalendarTheme();
|
|
183
226
|
// Stable across renders (it feeds the memoized renderItem below).
|
|
184
227
|
const slot = useMemo(
|
|
@@ -221,15 +264,37 @@ function MonthPagerInner<T>({
|
|
|
221
264
|
// A fixed window of months, anchored once and aligned to the month start. The
|
|
222
265
|
// array never shifts as the date changes, so paging never re-renders a page's
|
|
223
266
|
// content — LegendList virtualises and keys by month.
|
|
224
|
-
const [anchorDate] = useState(date);
|
|
225
|
-
const
|
|
226
|
-
const
|
|
227
|
-
() =>
|
|
228
|
-
|
|
267
|
+
const [anchorDate] = useState(initialAnchor ?? date);
|
|
268
|
+
const numberOfWeeks = spec.kind === "multiweek" ? spec.numberOfWeeks : undefined;
|
|
269
|
+
const anchor = useMemo(
|
|
270
|
+
() =>
|
|
271
|
+
numberOfWeeks === undefined
|
|
272
|
+
? startOfMonth(anchorDate)
|
|
273
|
+
: startOfWeek(anchorDate, { weekStartsOn }),
|
|
274
|
+
[anchorDate, numberOfWeeks, weekStartsOn],
|
|
229
275
|
);
|
|
276
|
+
const monthDates = useMemo(() => {
|
|
277
|
+
const dates = Array.from({ length: PAGE_WINDOW * 2 + 1 }, (_, i) =>
|
|
278
|
+
numberOfWeeks === undefined
|
|
279
|
+
? addMonths(anchor, i - PAGE_WINDOW)
|
|
280
|
+
: addWeeks(anchor, (i - PAGE_WINDOW) * numberOfWeeks),
|
|
281
|
+
);
|
|
282
|
+
// The requested window is valid, but preloaded neighbours can run past
|
|
283
|
+
// Date's endpoints. Keep only complete representable multi-week pages.
|
|
284
|
+
return numberOfWeeks === undefined
|
|
285
|
+
? dates
|
|
286
|
+
: dates.filter(
|
|
287
|
+
(page) =>
|
|
288
|
+
Number.isFinite(page.getTime()) &&
|
|
289
|
+
Number.isFinite(addWeeks(page, numberOfWeeks).getTime()),
|
|
290
|
+
);
|
|
291
|
+
}, [anchor, numberOfWeeks]);
|
|
230
292
|
const indexOfMonth = useCallback(
|
|
231
|
-
(target: Date) =>
|
|
232
|
-
|
|
293
|
+
(target: Date) =>
|
|
294
|
+
numberOfWeeks === undefined
|
|
295
|
+
? differenceInCalendarMonths(startOfMonth(target), anchor) + PAGE_WINDOW
|
|
296
|
+
: differenceInCalendarWeeks(target, monthDates[0], { weekStartsOn }) / numberOfWeeks,
|
|
297
|
+
[anchor, monthDates, numberOfWeeks, weekStartsOn],
|
|
233
298
|
);
|
|
234
299
|
|
|
235
300
|
// The committed month's page is the centred/active one. Derived (not stored)
|
|
@@ -305,7 +370,7 @@ function MonthPagerInner<T>({
|
|
|
305
370
|
// `fillCellOnSelection` and `onSelectDrag` ride along because they reach the
|
|
306
371
|
// grids as renderItem props, not through the selection context below: toggling
|
|
307
372
|
// a "pick dates" mode on must reach the pages already rendered.
|
|
308
|
-
const
|
|
373
|
+
const monthExtraData = useMemo(
|
|
309
374
|
() => ({
|
|
310
375
|
events,
|
|
311
376
|
activeDate,
|
|
@@ -325,14 +390,28 @@ function MonthPagerInner<T>({
|
|
|
325
390
|
[selectedDates, selectedRange, minDate, maxDate, isDateDisabled],
|
|
326
391
|
);
|
|
327
392
|
|
|
393
|
+
// One source object per page date, so a memoized page skips re-rendering when
|
|
394
|
+
// the list calls `renderItem` again with unchanged inputs.
|
|
395
|
+
const sourceFor = useMemo(() => {
|
|
396
|
+
const cache = new WeakMap<Date, DateRowsSource>();
|
|
397
|
+
return (item: Date): DateRowsSource => {
|
|
398
|
+
let source = cache.get(item);
|
|
399
|
+
if (!source) {
|
|
400
|
+
source = { ...spec, date: item };
|
|
401
|
+
cache.set(item, source);
|
|
402
|
+
}
|
|
403
|
+
return source;
|
|
404
|
+
};
|
|
405
|
+
}, [spec]);
|
|
406
|
+
|
|
328
407
|
const snapToIndices = useMemo(() => monthDates.map((_, index) => index), [monthDates]);
|
|
329
408
|
const keyExtractorList = useCallback((item: Date) => item.toISOString(), []);
|
|
330
409
|
const getFixedItemSize = useCallback(() => containerWidth, [containerWidth]);
|
|
331
410
|
const renderItem = useCallback(
|
|
332
411
|
({ item }: LegendListRenderItemProps<Date>) => (
|
|
333
412
|
<View style={{ width: containerWidth, height: pageHeight }}>
|
|
334
|
-
<
|
|
335
|
-
|
|
413
|
+
<DateRows
|
|
414
|
+
source={sourceFor(item)}
|
|
336
415
|
events={events}
|
|
337
416
|
// The pager shows one shared weekday header and the month title above it
|
|
338
417
|
// (see below), so each page's grid omits its own title and weekday row.
|
|
@@ -347,11 +426,9 @@ function MonthPagerInner<T>({
|
|
|
347
426
|
sortedMonthView={sortedMonthView}
|
|
348
427
|
moreLabel={moreLabel}
|
|
349
428
|
labels={labels}
|
|
350
|
-
showAdjacentMonths={showAdjacentMonths}
|
|
351
429
|
highlightWeekends={highlightWeekends}
|
|
352
430
|
disableMonthEventCellPress={disableMonthEventCellPress}
|
|
353
431
|
isRTL={isRTL}
|
|
354
|
-
showSixWeeks={showSixWeeks}
|
|
355
432
|
activeDate={activeDate}
|
|
356
433
|
calendarCellStyle={calendarCellStyle}
|
|
357
434
|
renderEvent={renderEvent}
|
|
@@ -388,11 +465,10 @@ function MonthPagerInner<T>({
|
|
|
388
465
|
sortedMonthView,
|
|
389
466
|
moreLabel,
|
|
390
467
|
labels,
|
|
391
|
-
|
|
468
|
+
sourceFor,
|
|
392
469
|
highlightWeekends,
|
|
393
470
|
disableMonthEventCellPress,
|
|
394
471
|
isRTL,
|
|
395
|
-
showSixWeeks,
|
|
396
472
|
activeDate,
|
|
397
473
|
calendarCellStyle,
|
|
398
474
|
renderEvent,
|
|
@@ -416,6 +492,24 @@ function MonthPagerInner<T>({
|
|
|
416
492
|
],
|
|
417
493
|
);
|
|
418
494
|
|
|
495
|
+
// The multi-week view invalidates cached pages for every input that reaches
|
|
496
|
+
// renderItem, including callbacks and layout. LegendList does not track a new
|
|
497
|
+
// renderItem identity on its own.
|
|
498
|
+
const listExtraData = useMemo(
|
|
499
|
+
() => (numberOfWeeks === undefined ? monthExtraData : { renderItem }),
|
|
500
|
+
[numberOfWeeks, monthExtraData, renderItem],
|
|
501
|
+
);
|
|
502
|
+
const visible = useMemo(
|
|
503
|
+
() =>
|
|
504
|
+
numberOfWeeks === undefined
|
|
505
|
+
? null
|
|
506
|
+
: buildMultiWeekGrid(date, { numberOfWeeks, weekStartsOn, hiddenDays }).visibleRange,
|
|
507
|
+
[date, numberOfWeeks, weekStartsOn, hiddenDays],
|
|
508
|
+
);
|
|
509
|
+
const title = visible
|
|
510
|
+
? `${format(visible.start, "PP", { locale })} – ${format(addDays(visible.endExclusive, -1), "PP", { locale })}`
|
|
511
|
+
: format(date, "MMMM yyyy", { locale });
|
|
512
|
+
|
|
419
513
|
return (
|
|
420
514
|
<CalendarSelectionProvider value={selection}>
|
|
421
515
|
<View ref={containerRef} style={[styles.container, theme.containers.monthContainer]}>
|
|
@@ -429,7 +523,7 @@ function MonthPagerInner<T>({
|
|
|
429
523
|
})}
|
|
430
524
|
allowFontScaling={false}
|
|
431
525
|
>
|
|
432
|
-
{
|
|
526
|
+
{title}
|
|
433
527
|
</Text>
|
|
434
528
|
) : null}
|
|
435
529
|
{renderHeaderForMonthView ? (
|
|
@@ -506,6 +600,67 @@ function MonthPagerInner<T>({
|
|
|
506
600
|
*/
|
|
507
601
|
export const MonthPager = memo(MonthPagerInner) as typeof MonthPagerInner;
|
|
508
602
|
|
|
603
|
+
/** The swipeable pager behind `MonthPager` and `Calendar`'s row modes. */
|
|
604
|
+
function DateRowsPagerRoot<T>(props: DateRowsPagerProps<T>): ReactElement {
|
|
605
|
+
const count = props.spec.kind === "multiweek" ? props.spec.numberOfWeeks : undefined;
|
|
606
|
+
const target = useMemo(
|
|
607
|
+
() =>
|
|
608
|
+
count === undefined
|
|
609
|
+
? props.date
|
|
610
|
+
: buildMultiWeekGrid(props.date, { numberOfWeeks: count, weekStartsOn: props.weekStartsOn })
|
|
611
|
+
.period.start,
|
|
612
|
+
[props.date, count, props.weekStartsOn],
|
|
613
|
+
);
|
|
614
|
+
const [series, setSeries] = useState(() => ({
|
|
615
|
+
anchor: target,
|
|
616
|
+
count,
|
|
617
|
+
weekStartsOn: props.weekStartsOn,
|
|
618
|
+
}));
|
|
619
|
+
let current = series;
|
|
620
|
+
if (count !== undefined) {
|
|
621
|
+
const offset =
|
|
622
|
+
differenceInCalendarWeeks(target, series.anchor, { weekStartsOn: props.weekStartsOn }) /
|
|
623
|
+
count;
|
|
624
|
+
if (
|
|
625
|
+
series.count !== count ||
|
|
626
|
+
series.weekStartsOn !== props.weekStartsOn ||
|
|
627
|
+
!Number.isInteger(offset) ||
|
|
628
|
+
Math.abs(offset) > PAGE_WINDOW
|
|
629
|
+
) {
|
|
630
|
+
current = { anchor: target, count, weekStartsOn: props.weekStartsOn };
|
|
631
|
+
setSeries(current);
|
|
632
|
+
}
|
|
633
|
+
}
|
|
634
|
+
const key =
|
|
635
|
+
count === undefined ? "month" : `${current.anchor.getTime()}:${count}:${props.weekStartsOn}`;
|
|
636
|
+
const generation = useRef(key);
|
|
637
|
+
generation.current = key;
|
|
638
|
+
useEffect(() => {
|
|
639
|
+
generation.current = key;
|
|
640
|
+
return () => {
|
|
641
|
+
generation.current = "unmounted";
|
|
642
|
+
};
|
|
643
|
+
}, [key]);
|
|
644
|
+
const onChangeDate = useCallback(
|
|
645
|
+
(date: Date) => {
|
|
646
|
+
// A remounted series can still receive a queued viewability callback from
|
|
647
|
+
// the old list. Never let it change the controlled date.
|
|
648
|
+
if (generation.current === key) props.onChangeDate(date);
|
|
649
|
+
},
|
|
650
|
+
[key, props.onChangeDate],
|
|
651
|
+
);
|
|
652
|
+
return (
|
|
653
|
+
<DateRowsPagerInner
|
|
654
|
+
{...props}
|
|
655
|
+
key={key}
|
|
656
|
+
initialAnchor={count === undefined ? undefined : current.anchor}
|
|
657
|
+
onChangeDate={onChangeDate}
|
|
658
|
+
/>
|
|
659
|
+
);
|
|
660
|
+
}
|
|
661
|
+
|
|
662
|
+
export const DateRowsPager = memo(DateRowsPagerRoot) as typeof DateRowsPagerRoot;
|
|
663
|
+
|
|
509
664
|
type MonthWeekdayHeaderProps = {
|
|
510
665
|
weekDays: Date[];
|
|
511
666
|
weekdayFormat?: WeekdayFormat;
|