@typescript-calendar-lib/svelte 0.5.4 → 0.6.2
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 +124 -112
- package/dist/Calendar.svelte +55 -8
- package/dist/Calendar.svelte.d.ts +11 -2
- package/dist/InteractiveCalendar.svelte +59 -14
- package/dist/InteractiveCalendar.svelte.d.ts +11 -0
- package/dist/useCalendarState.svelte.d.ts +7 -0
- package/dist/useCalendarState.svelte.js +28 -8
- package/package.json +19 -8
package/README.md
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
# @typescript-calendar-lib/svelte
|
|
2
2
|
|
|
3
|
-
A `<Calendar />` Svelte 5 component with CSS-based themes and color schemes, plus a `useCalendarState` hook for full interactivity. The component is fully controlled — you pass `year`
|
|
3
|
+
A `<Calendar />` Svelte 5 component with CSS-based themes and color schemes, plus a `useCalendarState` hook for full interactivity. The component is fully controlled — you pass `year` + `month` (or a single `date`) and it renders the grid.
|
|
4
4
|
|
|
5
5
|
> **Warning: Peer dependency** — Requires Svelte 5 (runes). The package doesn't bundle Svelte; install it in your app:
|
|
6
6
|
>
|
|
@@ -66,34 +66,36 @@ Run the component through a Svelte compiler such as Vite or SvelteKit; the packa
|
|
|
66
66
|
<Calendar year={2026} month={9} />
|
|
67
67
|
```
|
|
68
68
|
|
|
69
|
-
| Prop
|
|
70
|
-
|
|
|
71
|
-
| `
|
|
72
|
-
| `
|
|
73
|
-
| `
|
|
74
|
-
| `
|
|
75
|
-
| `
|
|
76
|
-
| `
|
|
77
|
-
| `
|
|
78
|
-
| `
|
|
79
|
-
| `
|
|
80
|
-
| `
|
|
81
|
-
| `
|
|
82
|
-
| `
|
|
83
|
-
| `
|
|
84
|
-
| `
|
|
85
|
-
| `
|
|
86
|
-
| `
|
|
87
|
-
| `
|
|
88
|
-
| `
|
|
89
|
-
| `
|
|
90
|
-
| `
|
|
91
|
-
| `
|
|
92
|
-
| `
|
|
93
|
-
| `
|
|
94
|
-
| `
|
|
95
|
-
| `
|
|
96
|
-
| `
|
|
69
|
+
| Prop | Type | Default | Description |
|
|
70
|
+
| :---------------- | :----------------------------------------------------- | :---------- | :---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
|
|
71
|
+
| `date` | `Date` | — | Shorthand for `year` + `month`; takes precedence when both are given |
|
|
72
|
+
| `year` | `number` | — | Calendar year (required unless `date` is given) |
|
|
73
|
+
| `month` | `number` | — | Month, 1-indexed (`1`–`12`) (required unless `date` is given) |
|
|
74
|
+
| `locale` | `"en" \| "ja" \| "es" \| "de" \| "fr" \| "ko" \| "zh"` | `"en"` | Language |
|
|
75
|
+
| `holidayLocale` | `"en" \| "ja" \| "es" \| "de" \| "fr" \| "ko" \| "zh"` | `"ja"` | Holiday rules (fixed-date holidays for every locale; moving holidays such as Easter are not included) |
|
|
76
|
+
| `weekStart` | `"sunday" \| "monday"` | `"sunday"` | First day of the week |
|
|
77
|
+
| `highlight` | `Date` | — | Date to highlight |
|
|
78
|
+
| `range` | `{ from: Date; to: Date }` | — | Dates to emphasize |
|
|
79
|
+
| `rangePreview` | `{ from: Date; to: Date }` | — | Candidate range preview (hover preview), rendered with the `is-in-range-preview` class |
|
|
80
|
+
| `isDateDisabled` | `(date: Date) => boolean` | — | Mark dates as non-selectable in interactive mode (`is-disabled` class) |
|
|
81
|
+
| `today` | `Date` | — | Reference date for "today" styling |
|
|
82
|
+
| `selected` | `Date \| null` | — | Selected date (`.is-selected` class, `aria-pressed="true"` in interactive mode; other buttons are `"false"`) |
|
|
83
|
+
| `cursorDate` | `Date \| null` | — | Cursor position (`.is-cursor` class) |
|
|
84
|
+
| `hoveredDate` | `Date \| null` | — | Hovered date (`.is-hovered` class) |
|
|
85
|
+
| `theme` | `ThemeName \| SvelteTheme` | `"default"` | CSS class-based theme |
|
|
86
|
+
| `colorScheme` | `ColorSchemeName \| SvelteColorScheme` | `"default"` | CSS variable-based colors |
|
|
87
|
+
| `size` | `CalendarSize` | `"md"` | Cell size |
|
|
88
|
+
| `responsive` | `boolean` | `false` | Shrink cells & padding below `480px` so the grid fits phone screens |
|
|
89
|
+
| `showWeekNumbers` | `boolean` | `false` | Render a leading week-number column (`th[scope="row"]` with class `calendar-week`); the number follows `weekStart` (`"monday"` → ISO week, `"sunday"` → week-containing-Jan-1 week) |
|
|
90
|
+
| `class` | `string` | — | Extra class on the root element |
|
|
91
|
+
| `style` | `CSSProperties` | — | Extra styles for the root element |
|
|
92
|
+
| `interactive` | `boolean` | `false` | Enable cell click/hover/keyboard selection |
|
|
93
|
+
| `onDateClick` | `(date: Date, data?: unknown) => void` | — | Called when a day cell is clicked (or Enter/Space pressed); `data` is that cell's `cellData` value (`undefined` when none) |
|
|
94
|
+
| `onDateHover` | `(date: Date) => void` | — | Called when a day cell is hovered |
|
|
95
|
+
| `onDateLeave` | `() => void` | — | Called when the mouse leaves the calendar |
|
|
96
|
+
| `onkeydown` | `(event: KeyboardEvent) => void` | — | Keyboard handler fired on the root element (arrow keys etc.) |
|
|
97
|
+
| `cellData` | `(date: Date) => unknown` | — | Resolve per-cell data; passed to `renderCell` and `onDateClick` |
|
|
98
|
+
| `renderCell` | `(day, date, state, data?) => string` | — | Custom cell content; the returned string is inserted as plain text (XSS-safe) |
|
|
97
99
|
|
|
98
100
|
The component exports as both named `Calendar` and default.
|
|
99
101
|
|
|
@@ -103,7 +105,7 @@ A turnkey component that wires `useCalendarState` and `Calendar` together with b
|
|
|
103
105
|
|
|
104
106
|
```svelte
|
|
105
107
|
<script lang="ts">
|
|
106
|
-
import InteractiveCalendar from "@typescript-calendar-lib/svelte";
|
|
108
|
+
import { InteractiveCalendar } from "@typescript-calendar-lib/svelte";
|
|
107
109
|
import "@typescript-calendar-lib/svelte/calendar.css";
|
|
108
110
|
</script>
|
|
109
111
|
|
|
@@ -142,31 +144,32 @@ Pass `isDateDisabled` to mark dates as non-selectable. Disabled cells get the `i
|
|
|
142
144
|
|
|
143
145
|
Combines `useCalendarState` options, `Calendar` visual props, and event callbacks:
|
|
144
146
|
|
|
145
|
-
| Prop
|
|
146
|
-
|
|
|
147
|
-
| `initialYear`
|
|
148
|
-
| `initialMonth`
|
|
149
|
-
| `locale`
|
|
150
|
-
| `holidayLocale`
|
|
151
|
-
| `weekStart`
|
|
152
|
-
| `showWeekNumbers` | `boolean`
|
|
153
|
-
| `selectionMode`
|
|
154
|
-
| `highlight`
|
|
155
|
-
| `range`
|
|
156
|
-
| `today`
|
|
157
|
-
| `isDateDisabled`
|
|
158
|
-
| `onkeydown`
|
|
159
|
-
| `onMonthChange`
|
|
160
|
-
| `theme`
|
|
161
|
-
| `colorScheme`
|
|
162
|
-
| `size`
|
|
163
|
-
| `responsive`
|
|
164
|
-
| `
|
|
165
|
-
| `
|
|
166
|
-
| `
|
|
167
|
-
| `
|
|
168
|
-
| `
|
|
169
|
-
| `
|
|
147
|
+
| Prop | Type | Description |
|
|
148
|
+
| :---------------- | :----------------------------------------------- | :------------------------------------------------------------------------------------------ |
|
|
149
|
+
| `initialYear` | `number` | Starting year (defaults to today's year) |
|
|
150
|
+
| `initialMonth` | `number` | Starting month `1`–`12` (normalized if out of range) |
|
|
151
|
+
| `locale` | `Locale` | Language |
|
|
152
|
+
| `holidayLocale` | `Locale` | Locale used for holiday detection (defaults to `ja`) |
|
|
153
|
+
| `weekStart` | `WeekStart` | First day of the week |
|
|
154
|
+
| `showWeekNumbers` | `boolean` | Render the leading week-number column |
|
|
155
|
+
| `selectionMode` | `SelectionMode` | Selection mode: `"single"` \| `"range"` (default `"single"`; range commits on the 2nd pick) |
|
|
156
|
+
| `highlight` | `Date` | Date to highlight |
|
|
157
|
+
| `range` | `{ from: Date; to: Date }` | Dates to emphasize |
|
|
158
|
+
| `today` | `Date` | Reference date for "today" styling |
|
|
159
|
+
| `isDateDisabled` | `(date: Date) => boolean` | Mark dates as non-selectable |
|
|
160
|
+
| `onkeydown` | `(event: KeyboardEvent) => void` | Keyboard handler fired on the root element (arrow keys etc.) |
|
|
161
|
+
| `onMonthChange` | `(year: number, month: number) => void` | Called when the displayed month changes |
|
|
162
|
+
| `theme` | `ThemeName \| SvelteTheme` | CSS class-based theme |
|
|
163
|
+
| `colorScheme` | `ColorSchemeName \| SvelteColorScheme` | CSS variable-based colors |
|
|
164
|
+
| `size` | `CalendarSize` | Cell size |
|
|
165
|
+
| `responsive` | `boolean` | Shrink cells & padding below `480px` so the grid fits phone screens |
|
|
166
|
+
| `class` | `string` | Extra class on the root element |
|
|
167
|
+
| `style` | `CSSProperties` | Extra styles for the root element |
|
|
168
|
+
| `cellData` | `(date: Date) => unknown` | Resolve per-cell data; passed to `renderCell` and `onDateClick` |
|
|
169
|
+
| `renderCell` | `(day, date, state, data?) => string \| Snippet` | Custom cell content (plain text is XSS-safe; a `Snippet` renders markup) |
|
|
170
|
+
| `onDateClick` | `(date: Date, data?: unknown) => void` | Called when a date is selected; `data` is the cell's `cellData` value |
|
|
171
|
+
| `onDateHover` | `(date: Date) => void` | Called on cell hover |
|
|
172
|
+
| `onDateLeave` | `() => void` | Called when the mouse leaves the calendar |
|
|
170
173
|
|
|
171
174
|
## Accessibility notes
|
|
172
175
|
|
|
@@ -247,26 +250,26 @@ For full interactivity (cursor movement, month navigation, selection), use the `
|
|
|
247
250
|
|
|
248
251
|
### Return value
|
|
249
252
|
|
|
250
|
-
| Field
|
|
251
|
-
|
|
|
252
|
-
| `state`
|
|
253
|
-
| `goNext`
|
|
254
|
-
| `goPrev`
|
|
255
|
-
| `goToday`
|
|
256
|
-
| `navigateYear`
|
|
257
|
-
| `goToMonth`
|
|
258
|
-
| `goToDate`
|
|
259
|
-
| `moveCursor`
|
|
260
|
-
| `selectDate`
|
|
261
|
-
| `selectDateAt`
|
|
262
|
-
| `selectRange`
|
|
263
|
-
| `setCursorToDate` | `(date: Date) => void`
|
|
264
|
-
| `clearSelection`
|
|
265
|
-
| `cursorDate`
|
|
266
|
-
| `selectedDate`
|
|
267
|
-
| `selectedRange`
|
|
268
|
-
| `hoveredDate`
|
|
269
|
-
| `setHoveredDate`
|
|
253
|
+
| Field | Type | Description |
|
|
254
|
+
| :---------------- | :-------------------------------------- | :------------------------------------------------------------------ |
|
|
255
|
+
| `state` | `CalendarState` | Current calendar state (from tui) |
|
|
256
|
+
| `goNext` | `() => void` | Move to next month |
|
|
257
|
+
| `goPrev` | `() => void` | Move to previous month |
|
|
258
|
+
| `goToday` | `() => void` | Jump to today's month |
|
|
259
|
+
| `navigateYear` | `(direction: MonthDirection) => void` | Move to the previous/next year (`"prev"` / `"next"`) |
|
|
260
|
+
| `goToMonth` | `(year: number, month: number) => void` | Jump to a specific year and month |
|
|
261
|
+
| `goToDate` | `(date: Date) => void` | Jump to a date's month and put the cursor on that date |
|
|
262
|
+
| `moveCursor` | `(direction: Direction) => void` | Move cursor: `"up"` / `"down"` / `"left"` / `"right"` |
|
|
263
|
+
| `selectDate` | `() => void` | Select the date under the cursor |
|
|
264
|
+
| `selectDateAt` | `(date: Date) => void` | Move cursor to a date and select it (useful for mouse click) |
|
|
265
|
+
| `selectRange` | `(from: Date, to: Date) => void` | Set a committed range directly (range mode) |
|
|
266
|
+
| `setCursorToDate` | `(date: Date) => void` | Move the cursor to a specific date (no-op if outside current month) |
|
|
267
|
+
| `clearSelection` | `() => void` | Clear the selection |
|
|
268
|
+
| `cursorDate` | `Date \| null` | Date under the cursor |
|
|
269
|
+
| `selectedDate` | `Date \| null` | Currently selected date |
|
|
270
|
+
| `selectedRange` | `DateRange \| null` | Committed selection range (range mode) |
|
|
271
|
+
| `hoveredDate` | `Date \| null` | Currently hovered date |
|
|
272
|
+
| `setHoveredDate` | `(date: Date \| null) => void` | Set or clear the hovered date |
|
|
270
273
|
|
|
271
274
|
## Range selection
|
|
272
275
|
|
|
@@ -339,8 +342,13 @@ Predefined theme map and resolver.
|
|
|
339
342
|
|
|
340
343
|
```ts
|
|
341
344
|
type ColorSchemeName =
|
|
342
|
-
| "default"
|
|
343
|
-
| "
|
|
345
|
+
| "default"
|
|
346
|
+
| "ocean"
|
|
347
|
+
| "forest"
|
|
348
|
+
| "sunset"
|
|
349
|
+
| "mono"
|
|
350
|
+
| "midnight"
|
|
351
|
+
| "blossom";
|
|
344
352
|
```
|
|
345
353
|
|
|
346
354
|
### `SvelteColorScheme`
|
|
@@ -353,24 +361,24 @@ type SvelteColorScheme = Record<`--cal-${string}`, string>;
|
|
|
353
361
|
|
|
354
362
|
Available variables:
|
|
355
363
|
|
|
356
|
-
| Variable
|
|
357
|
-
|
|
|
358
|
-
| `--cal-bg`
|
|
359
|
-
| `--cal-fg`
|
|
360
|
-
| `--cal-accent`
|
|
361
|
-
| `--cal-weekend-fg`
|
|
362
|
-
| `--cal-holiday-fg`
|
|
363
|
-
| `--cal-border`
|
|
364
|
-
| `--cal-header-bg`
|
|
365
|
-
| `--cal-highlight-bg`
|
|
366
|
-
| `--cal-highlight-fg`
|
|
367
|
-
| `--cal-range-bg`
|
|
364
|
+
| Variable | Purpose |
|
|
365
|
+
| :----------------------- | :-------------------------------------------------------- |
|
|
366
|
+
| `--cal-bg` | Background |
|
|
367
|
+
| `--cal-fg` | Foreground |
|
|
368
|
+
| `--cal-accent` | Accent (highlight) |
|
|
369
|
+
| `--cal-weekend-fg` | Weekend foreground |
|
|
370
|
+
| `--cal-holiday-fg` | Holiday foreground |
|
|
371
|
+
| `--cal-border` | Borders |
|
|
372
|
+
| `--cal-header-bg` | Header background |
|
|
373
|
+
| `--cal-highlight-bg` | Highlight background |
|
|
374
|
+
| `--cal-highlight-fg` | Highlight foreground |
|
|
375
|
+
| `--cal-range-bg` | Range background |
|
|
368
376
|
| `--cal-range-preview-bg` | Range preview background (falls back to `--cal-range-bg`) |
|
|
369
|
-
| `--cal-today-bg`
|
|
370
|
-
| `--cal-today-fg`
|
|
371
|
-
| `--cal-selected-bg`
|
|
372
|
-
| `--cal-selected-fg`
|
|
373
|
-
| `--cal-disabled-fg`
|
|
377
|
+
| `--cal-today-bg` | Today background |
|
|
378
|
+
| `--cal-today-fg` | Today foreground |
|
|
379
|
+
| `--cal-selected-bg` | Selected cell background (interactive mode) |
|
|
380
|
+
| `--cal-selected-fg` | Selected cell foreground (interactive mode) |
|
|
381
|
+
| `--cal-disabled-fg` | Disabled cell foreground (interactive mode) |
|
|
374
382
|
|
|
375
383
|
`calendar.css` also uses a CSS-only `--cal-hover-bg` (falls back to `--cal-range-bg`) for the interactive hover state; set it with `style` or your own CSS.
|
|
376
384
|
|
|
@@ -393,13 +401,17 @@ Predefined schemes and resolver.
|
|
|
393
401
|
### `CalendarSize`
|
|
394
402
|
|
|
395
403
|
```ts
|
|
396
|
-
type CalendarSize =
|
|
404
|
+
type CalendarSize =
|
|
405
|
+
| "sm"
|
|
406
|
+
| "md"
|
|
407
|
+
| "lg"
|
|
408
|
+
| { width?: number | string; height?: number | string };
|
|
397
409
|
```
|
|
398
410
|
|
|
399
|
-
| Size
|
|
400
|
-
|
|
|
401
|
-
| `"sm"` | `1.75rem` × `1.5rem`
|
|
402
|
-
| `"md"` | `2.25rem` × `2rem`
|
|
411
|
+
| Size | Cell dimensions |
|
|
412
|
+
| :----- | :--------------------- |
|
|
413
|
+
| `"sm"` | `1.75rem` × `1.5rem` |
|
|
414
|
+
| `"md"` | `2.25rem` × `2rem` |
|
|
403
415
|
| `"lg"` | `3.125rem` × `2.75rem` |
|
|
404
416
|
|
|
405
417
|
Custom objects set the `--cal-cell-w` / `--cal-cell-h` CSS variables (numbers become px, strings pass through):
|
|
@@ -436,18 +448,18 @@ It's **off by default** to keep existing layouts unchanged. The calendar root ge
|
|
|
436
448
|
|
|
437
449
|
Each day cell gets semantic classes you can target with CSS. The table is labelled by the visible `<h2>` heading via `aria-labelledby`, weekday headers use `scope="col"`, week-number cells use `th[scope="row"]`, today's cell uses `aria-current="date"`, and interactive day buttons expose `aria-pressed="true"` or `"false"`:
|
|
438
450
|
|
|
439
|
-
| Class
|
|
440
|
-
|
|
|
441
|
-
| `is-weekend`
|
|
442
|
-
| `is-holiday`
|
|
443
|
-
| `is-today`
|
|
444
|
-
| `is-highlight`
|
|
445
|
-
| `is-in-range`
|
|
446
|
-
| `is-in-range-preview` | Inside `rangePreview`
|
|
447
|
-
| `is-hovered`
|
|
448
|
-
| `is-disabled`
|
|
449
|
-
| `is-selected`
|
|
450
|
-
| `is-cursor`
|
|
451
|
+
| Class | When |
|
|
452
|
+
| :-------------------- | :------------------------------------------------------------ |
|
|
453
|
+
| `is-weekend` | Saturday or Sunday |
|
|
454
|
+
| `is-holiday` | Holiday per `holidayLocale` (default `"ja"`) |
|
|
455
|
+
| `is-today` | Matches `today` |
|
|
456
|
+
| `is-highlight` | Matches `highlight` |
|
|
457
|
+
| `is-in-range` | Inside `range` |
|
|
458
|
+
| `is-in-range-preview` | Inside `rangePreview` |
|
|
459
|
+
| `is-hovered` | Matches `hoveredDate` (interactive mode) |
|
|
460
|
+
| `is-disabled` | Date returned `true` from `isDateDisabled` (interactive mode) |
|
|
461
|
+
| `is-selected` | Matches `selected` |
|
|
462
|
+
| `is-cursor` | Matches `cursorDate` |
|
|
451
463
|
|
|
452
464
|
## Exports
|
|
453
465
|
|
|
@@ -489,4 +501,4 @@ import type {
|
|
|
489
501
|
|
|
490
502
|
## License
|
|
491
503
|
|
|
492
|
-
MIT
|
|
504
|
+
MIT
|
package/dist/Calendar.svelte
CHANGED
|
@@ -9,6 +9,7 @@
|
|
|
9
9
|
getMonthName,
|
|
10
10
|
getWeekOfYear,
|
|
11
11
|
getWeekdayHeaders,
|
|
12
|
+
getYearMonth,
|
|
12
13
|
isSameDay,
|
|
13
14
|
} from "@typescript-calendar-lib/core";
|
|
14
15
|
import {
|
|
@@ -33,8 +34,15 @@
|
|
|
33
34
|
import { mergeColorScheme, resolveTheme } from "./themes.js";
|
|
34
35
|
|
|
35
36
|
interface CalendarProps {
|
|
36
|
-
|
|
37
|
-
|
|
37
|
+
/**
|
|
38
|
+
* 表示する年月を `Date` で指定する。`year` / `month` の代わりに使える
|
|
39
|
+
* (両方を併用した場合は `date` を優先する)。
|
|
40
|
+
*/
|
|
41
|
+
date?: Date;
|
|
42
|
+
/** 表示する年。`date` 省略時は `month` と併せて必須 */
|
|
43
|
+
year?: number;
|
|
44
|
+
/** 表示する月 (1–12)。`date` 省略時は `year` と併せて必須 */
|
|
45
|
+
month?: number;
|
|
38
46
|
locale?: CalendarOptions["locale"];
|
|
39
47
|
holidayLocale?: CalendarOptions["holidayLocale"];
|
|
40
48
|
weekStart?: CalendarOptions["weekStart"];
|
|
@@ -61,6 +69,8 @@
|
|
|
61
69
|
responsive?: boolean;
|
|
62
70
|
/** 行の先頭に週番号を表示する。既定は false(非表示) */
|
|
63
71
|
showWeekNumbers?: boolean;
|
|
72
|
+
/** root 要素に追加するクラス。レイアウトや追加スタイルのフックに使う */
|
|
73
|
+
class?: string;
|
|
64
74
|
/** root 要素に追加するスタイル。CSS変数(--cal-*)で自由に上書きできる */
|
|
65
75
|
style?: CSSProperties;
|
|
66
76
|
|
|
@@ -96,6 +106,7 @@
|
|
|
96
106
|
}
|
|
97
107
|
|
|
98
108
|
let {
|
|
109
|
+
date: dateProp,
|
|
99
110
|
year,
|
|
100
111
|
month,
|
|
101
112
|
locale = "en",
|
|
@@ -113,6 +124,7 @@
|
|
|
113
124
|
size = "md",
|
|
114
125
|
responsive = false,
|
|
115
126
|
showWeekNumbers = false,
|
|
127
|
+
class: className,
|
|
116
128
|
style,
|
|
117
129
|
interactive = false,
|
|
118
130
|
onDateClick,
|
|
@@ -124,6 +136,16 @@
|
|
|
124
136
|
isDateDisabled,
|
|
125
137
|
}: CalendarProps = $props();
|
|
126
138
|
|
|
139
|
+
// date が指定されればそれを優先し、なければ year/month を使う。
|
|
140
|
+
// どちらも揃っていない場合は、黙って現在月を出さずに即座に失敗させる。
|
|
141
|
+
const yearMonth = $derived.by(() => {
|
|
142
|
+
if (dateProp !== undefined) return getYearMonth(dateProp);
|
|
143
|
+
if (year !== undefined && month !== undefined) return { year, month };
|
|
144
|
+
throw new TypeError(
|
|
145
|
+
"Calendar requires either `date` or both `year` and `month`.",
|
|
146
|
+
);
|
|
147
|
+
});
|
|
148
|
+
|
|
127
149
|
// interactive 時のみ APG の grid セマンティクスを付与する。静的表示では
|
|
128
150
|
// ネイティブの table/cell セマンティクスをそのまま使う。
|
|
129
151
|
const gridCellRole = $derived(interactive ? "gridcell" : undefined);
|
|
@@ -132,7 +154,8 @@
|
|
|
132
154
|
// id が衝突し aria-labelledby が別のカレンダーを見指すため。
|
|
133
155
|
const headingId = $props.id();
|
|
134
156
|
|
|
135
|
-
const cellDate = (day: number): Date =>
|
|
157
|
+
const cellDate = (day: number): Date =>
|
|
158
|
+
createDate(yearMonth.year, yearMonth.month - 1, day);
|
|
136
159
|
|
|
137
160
|
/**
|
|
138
161
|
* 1セルぶんの表示データ(Date・状態・クラス・aria 用の状態)を1回の計算でまとめる。
|
|
@@ -185,7 +208,11 @@
|
|
|
185
208
|
const weekOf = (row: (number | null)[]): number | null => {
|
|
186
209
|
const firstIdx = row.findIndex((d) => d !== null);
|
|
187
210
|
if (firstIdx === -1) return null;
|
|
188
|
-
const firstDate = createDate(
|
|
211
|
+
const firstDate = createDate(
|
|
212
|
+
yearMonth.year,
|
|
213
|
+
yearMonth.month - 1,
|
|
214
|
+
row[firstIdx]!,
|
|
215
|
+
);
|
|
189
216
|
const weekStartDate = addDays(firstDate, -firstIdx);
|
|
190
217
|
return weekStart === "monday"
|
|
191
218
|
? getISOWeek(weekStartDate)
|
|
@@ -204,7 +231,9 @@
|
|
|
204
231
|
};
|
|
205
232
|
|
|
206
233
|
// グリッド・曜日ヘッダーは月単位で不変。$derived なので年月が変わったときだけ再計算される
|
|
207
|
-
const grid = $derived(
|
|
234
|
+
const grid = $derived(
|
|
235
|
+
buildMonthGrid(yearMonth.year, yearMonth.month, weekStart),
|
|
236
|
+
);
|
|
208
237
|
const weekdays = $derived(getWeekdayHeaders(locale, weekStart));
|
|
209
238
|
// 週番号は表示時のみ計算する。グリッドと同じ月単位の依存
|
|
210
239
|
const weekNumbers = $derived(showWeekNumbers ? grid.map(weekOf) : null);
|
|
@@ -224,6 +253,19 @@
|
|
|
224
253
|
...style,
|
|
225
254
|
}),
|
|
226
255
|
);
|
|
256
|
+
|
|
257
|
+
const rootClass = $derived(
|
|
258
|
+
[
|
|
259
|
+
"calendar",
|
|
260
|
+
resolveTheme(theme).className,
|
|
261
|
+
isSizeName(size) ? `calendar-size-${size}` : "",
|
|
262
|
+
interactive ? "calendar-interactive" : "",
|
|
263
|
+
responsive ? "calendar-responsive" : "",
|
|
264
|
+
className ?? "",
|
|
265
|
+
]
|
|
266
|
+
.filter(Boolean)
|
|
267
|
+
.join(" "),
|
|
268
|
+
);
|
|
227
269
|
</script>
|
|
228
270
|
|
|
229
271
|
<!-- svelte-ignore a11y_no_static_element_interactions -->
|
|
@@ -231,7 +273,7 @@
|
|
|
231
273
|
InteractiveCalendar が table 上で扱う。root 自体は widget ではないため
|
|
232
274
|
ARIA role は持たない。 -->
|
|
233
275
|
<div
|
|
234
|
-
class=
|
|
276
|
+
class={rootClass}
|
|
235
277
|
style={rootStyle}
|
|
236
278
|
onmouseleave={interactive ? handleMouseLeave : undefined}
|
|
237
279
|
onkeydown={onkeydown}
|
|
@@ -247,7 +289,7 @@
|
|
|
247
289
|
aria-live={interactive ? "polite" : undefined}
|
|
248
290
|
aria-atomic={interactive ? "true" : undefined}
|
|
249
291
|
>
|
|
250
|
-
{getMonthName(locale, month)} {year}
|
|
292
|
+
{getMonthName(locale, yearMonth.month)} {yearMonth.year}
|
|
251
293
|
</h2>
|
|
252
294
|
</div>
|
|
253
295
|
<!-- interactive 時のみ APG の grid セマンティクスを付与する。静的表示では
|
|
@@ -294,7 +336,12 @@
|
|
|
294
336
|
onmouseenter={cell.isDisabled ? undefined : () => handleCellHover(cell)}
|
|
295
337
|
tabindex={cell.isCursor ? 0 : -1}
|
|
296
338
|
data-cursor={cell.isCursor ? "true" : undefined}
|
|
297
|
-
aria-label={formatCellLabel(
|
|
339
|
+
aria-label={formatCellLabel(
|
|
340
|
+
locale,
|
|
341
|
+
yearMonth.year,
|
|
342
|
+
yearMonth.month,
|
|
343
|
+
day,
|
|
344
|
+
)}
|
|
298
345
|
aria-pressed={cell.isSelected}
|
|
299
346
|
disabled={cell.isDisabled}
|
|
300
347
|
>
|
|
@@ -4,8 +4,15 @@ import type { CSSProperties } from "./style.js";
|
|
|
4
4
|
import type { ColorSchemeName, SvelteColorScheme, SvelteTheme, ThemeName } from "./themes.js";
|
|
5
5
|
import type { Snippet } from "svelte";
|
|
6
6
|
interface CalendarProps {
|
|
7
|
-
|
|
8
|
-
|
|
7
|
+
/**
|
|
8
|
+
* 表示する年月を `Date` で指定する。`year` / `month` の代わりに使える
|
|
9
|
+
* (両方を併用した場合は `date` を優先する)。
|
|
10
|
+
*/
|
|
11
|
+
date?: Date;
|
|
12
|
+
/** 表示する年。`date` 省略時は `month` と併せて必須 */
|
|
13
|
+
year?: number;
|
|
14
|
+
/** 表示する月 (1–12)。`date` 省略時は `year` と併せて必須 */
|
|
15
|
+
month?: number;
|
|
9
16
|
locale?: CalendarOptions["locale"];
|
|
10
17
|
holidayLocale?: CalendarOptions["holidayLocale"];
|
|
11
18
|
weekStart?: CalendarOptions["weekStart"];
|
|
@@ -38,6 +45,8 @@ interface CalendarProps {
|
|
|
38
45
|
responsive?: boolean;
|
|
39
46
|
/** 行の先頭に週番号を表示する。既定は false(非表示) */
|
|
40
47
|
showWeekNumbers?: boolean;
|
|
48
|
+
/** root 要素に追加するクラス。レイアウトや追加スタイルのフックに使う */
|
|
49
|
+
class?: string;
|
|
41
50
|
/** root 要素に追加するスタイル。CSS変数(--cal-*)で自由に上書きできる */
|
|
42
51
|
style?: CSSProperties;
|
|
43
52
|
/** インタラクティブモードを有効にする。セルクリック・ホバー・キーボード選択が可能になる */
|
|
@@ -1,5 +1,10 @@
|
|
|
1
1
|
<script lang="ts">
|
|
2
2
|
import type { CalendarCellState, CalendarOptions } from "@typescript-calendar-lib/core";
|
|
3
|
+
import {
|
|
4
|
+
createDate,
|
|
5
|
+
getYearMonth,
|
|
6
|
+
lastDayOfMonth,
|
|
7
|
+
} from "@typescript-calendar-lib/core";
|
|
3
8
|
import type { SelectionMode } from "@typescript-calendar-lib/tui";
|
|
4
9
|
import { keyToAction } from "@typescript-calendar-lib/tui";
|
|
5
10
|
import type { Snippet } from "svelte";
|
|
@@ -22,6 +27,15 @@
|
|
|
22
27
|
initialYear?: number;
|
|
23
28
|
/** 表示開始月 (1-12)。範囲外は正規化される */
|
|
24
29
|
initialMonth?: number;
|
|
30
|
+
/**
|
|
31
|
+
* 表示開始位置を `Date` で指定する。`initialYear` / `initialMonth` を
|
|
32
|
+
* 個別に指定した場合はそちらが優先される。
|
|
33
|
+
*/
|
|
34
|
+
initialDate?: Date;
|
|
35
|
+
/** 制御モードの表示年。指定すると initialYear より優先され、月移動は onMonthChange に委譲される */
|
|
36
|
+
year?: number;
|
|
37
|
+
/** 制御モードの表示月 (1-12) */
|
|
38
|
+
month?: number;
|
|
25
39
|
locale?: CalendarOptions["locale"];
|
|
26
40
|
holidayLocale?: CalendarOptions["holidayLocale"];
|
|
27
41
|
weekStart?: CalendarOptions["weekStart"];
|
|
@@ -47,6 +61,8 @@
|
|
|
47
61
|
size?: CalendarSize;
|
|
48
62
|
/** 狭い画面(スマホ等)でセルサイズと余白を自動調整する */
|
|
49
63
|
responsive?: boolean;
|
|
64
|
+
/** root 要素に追加するクラス。レイアウトや追加スタイルのフックに使う */
|
|
65
|
+
class?: string;
|
|
50
66
|
style?: CSSProperties;
|
|
51
67
|
/** セル内容のカスタムレンダリング。文字列または Snippet。第4引数に該当日のデータが渡る */
|
|
52
68
|
renderCell?: (
|
|
@@ -71,6 +87,7 @@
|
|
|
71
87
|
let {
|
|
72
88
|
initialYear,
|
|
73
89
|
initialMonth,
|
|
90
|
+
initialDate,
|
|
74
91
|
locale,
|
|
75
92
|
holidayLocale,
|
|
76
93
|
weekStart,
|
|
@@ -80,11 +97,14 @@
|
|
|
80
97
|
selectionMode,
|
|
81
98
|
today,
|
|
82
99
|
isDateDisabled,
|
|
100
|
+
year,
|
|
101
|
+
month,
|
|
83
102
|
onMonthChange,
|
|
84
103
|
theme,
|
|
85
104
|
colorScheme,
|
|
86
105
|
size,
|
|
87
106
|
responsive,
|
|
107
|
+
class: className,
|
|
88
108
|
style,
|
|
89
109
|
renderCell,
|
|
90
110
|
cellData,
|
|
@@ -93,19 +113,28 @@
|
|
|
93
113
|
onDateLeave,
|
|
94
114
|
}: InteractiveCalendarProps = $props();
|
|
95
115
|
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
116
|
+
// initialDate は initialYear / initialMonth のショートハンド。
|
|
117
|
+
// 個別指定があればそちらを優先する。getter 内で解決するのは、
|
|
118
|
+
// 値の変化を追跡しつつ props の初期値キャプチャ警告を避けるため。
|
|
119
|
+
const cal = useCalendarState(() => {
|
|
120
|
+
const initialFromDate =
|
|
121
|
+
initialDate !== undefined ? getYearMonth(initialDate) : undefined;
|
|
122
|
+
return {
|
|
123
|
+
initialYear: initialYear ?? initialFromDate?.year,
|
|
124
|
+
initialMonth: initialMonth ?? initialFromDate?.month,
|
|
125
|
+
year,
|
|
126
|
+
month,
|
|
127
|
+
locale,
|
|
128
|
+
holidayLocale,
|
|
129
|
+
weekStart,
|
|
130
|
+
today,
|
|
131
|
+
highlight,
|
|
132
|
+
range,
|
|
133
|
+
isDateDisabled,
|
|
134
|
+
selectionMode,
|
|
135
|
+
onMonthChange,
|
|
136
|
+
};
|
|
137
|
+
});
|
|
109
138
|
|
|
110
139
|
// クリック(マウス・Enter/Space 共通)で日付を選択する。
|
|
111
140
|
// 従来の onDateClick コールバックも引き続き発火し、第2引数に該当日のデータが渡る。
|
|
@@ -142,7 +171,7 @@
|
|
|
142
171
|
});
|
|
143
172
|
|
|
144
173
|
const handleKeyDown = (event: KeyboardEvent) => {
|
|
145
|
-
const action = keyToAction(event.key);
|
|
174
|
+
const action = keyToAction(event.key, event);
|
|
146
175
|
if (action === undefined) return;
|
|
147
176
|
event.preventDefault();
|
|
148
177
|
switch (action) {
|
|
@@ -152,6 +181,21 @@
|
|
|
152
181
|
case "next":
|
|
153
182
|
cal.goNext();
|
|
154
183
|
break;
|
|
184
|
+
case "prevYear":
|
|
185
|
+
cal.navigateYear("prev");
|
|
186
|
+
break;
|
|
187
|
+
case "nextYear":
|
|
188
|
+
cal.navigateYear("next");
|
|
189
|
+
break;
|
|
190
|
+
case "firstDay":
|
|
191
|
+
cal.setCursorToDate(createDate(cal.state.year, cal.state.month - 1, 1));
|
|
192
|
+
break;
|
|
193
|
+
case "lastDay":
|
|
194
|
+
cal.setCursorToDate(lastDayOfMonth(cal.state.year, cal.state.month));
|
|
195
|
+
break;
|
|
196
|
+
case "clear":
|
|
197
|
+
cal.clearSelection();
|
|
198
|
+
break;
|
|
155
199
|
default:
|
|
156
200
|
cal.moveCursor(action);
|
|
157
201
|
}
|
|
@@ -174,6 +218,7 @@
|
|
|
174
218
|
colorScheme={colorScheme}
|
|
175
219
|
size={size}
|
|
176
220
|
responsive={responsive}
|
|
221
|
+
class={className}
|
|
177
222
|
style={style}
|
|
178
223
|
interactive
|
|
179
224
|
renderCell={renderCell}
|
|
@@ -9,6 +9,15 @@ interface InteractiveCalendarProps {
|
|
|
9
9
|
initialYear?: number;
|
|
10
10
|
/** 表示開始月 (1-12)。範囲外は正規化される */
|
|
11
11
|
initialMonth?: number;
|
|
12
|
+
/**
|
|
13
|
+
* 表示開始位置を `Date` で指定する。`initialYear` / `initialMonth` を
|
|
14
|
+
* 個別に指定した場合はそちらが優先される。
|
|
15
|
+
*/
|
|
16
|
+
initialDate?: Date;
|
|
17
|
+
/** 制御モードの表示年。指定すると initialYear より優先され、月移動は onMonthChange に委譲される */
|
|
18
|
+
year?: number;
|
|
19
|
+
/** 制御モードの表示月 (1-12) */
|
|
20
|
+
month?: number;
|
|
12
21
|
locale?: CalendarOptions["locale"];
|
|
13
22
|
holidayLocale?: CalendarOptions["holidayLocale"];
|
|
14
23
|
weekStart?: CalendarOptions["weekStart"];
|
|
@@ -34,6 +43,8 @@ interface InteractiveCalendarProps {
|
|
|
34
43
|
size?: CalendarSize;
|
|
35
44
|
/** 狭い画面(スマホ等)でセルサイズと余白を自動調整する */
|
|
36
45
|
responsive?: boolean;
|
|
46
|
+
/** root 要素に追加するクラス。レイアウトや追加スタイルのフックに使う */
|
|
47
|
+
class?: string;
|
|
37
48
|
style?: CSSProperties;
|
|
38
49
|
/** セル内容のカスタムレンダリング。文字列または Snippet。第4引数に該当日のデータが渡る */
|
|
39
50
|
renderCell?: (day: number, date: Date, state: CalendarCellState, data?: unknown) => string | Snippet;
|
|
@@ -3,6 +3,13 @@ import type { CalendarState, CalendarStateOptions, Direction, MonthDirection } f
|
|
|
3
3
|
export interface UseCalendarStateOptions extends Pick<CalendarStateOptions, "locale" | "holidayLocale" | "weekStart" | "today" | "highlight" | "range" | "isDateDisabled" | "selectionMode"> {
|
|
4
4
|
initialYear?: number;
|
|
5
5
|
initialMonth?: number;
|
|
6
|
+
/**
|
|
7
|
+
* 制御モードの表示年。指定すると `initialYear` より優先され、値が変わるたびに
|
|
8
|
+
* その年月へ再構築される。月移動は内部状態を変えず `onMonthChange` に通知する。
|
|
9
|
+
*/
|
|
10
|
+
year?: number;
|
|
11
|
+
/** 制御モードの表示月 (1–12)。`year` と併用する */
|
|
12
|
+
month?: number;
|
|
6
13
|
/** 表示中の年月が変わったときに呼ばれる */
|
|
7
14
|
onMonthChange?: (year: number, month: number) => void;
|
|
8
15
|
}
|
|
@@ -50,16 +50,36 @@ export function useCalendarState(options = {}) {
|
|
|
50
50
|
prev = next;
|
|
51
51
|
state = updateStateOptions(state, next, previous);
|
|
52
52
|
});
|
|
53
|
-
// 表示月が変わったら onMonthChange
|
|
53
|
+
// 表示月が変わったら onMonthChange を通知し、古い月を指すホバーをクリアする。
|
|
54
|
+
// 制御モードでは props 側が月を決めているので再通知しない(二重通知の抑止)。
|
|
54
55
|
let prevMonthKey = null;
|
|
55
56
|
$effect(() => {
|
|
56
57
|
const key = `${state.year}-${state.month}`;
|
|
57
58
|
if (prevMonthKey !== null && key !== prevMonthKey) {
|
|
58
59
|
hoveredDate = null;
|
|
59
|
-
getter()
|
|
60
|
+
const current = getter();
|
|
61
|
+
if (current.year === undefined && current.month === undefined) {
|
|
62
|
+
current.onMonthChange?.(state.year, state.month);
|
|
63
|
+
}
|
|
60
64
|
}
|
|
61
65
|
prevMonthKey = key;
|
|
62
66
|
});
|
|
67
|
+
/** 制御モードか(year/month のどちらかが指定されている) */
|
|
68
|
+
const isControlled = () => {
|
|
69
|
+
const current = getter();
|
|
70
|
+
return current.year !== undefined || current.month !== undefined;
|
|
71
|
+
};
|
|
72
|
+
/** 制御モードなら onMonthChange に委譲し、そうでなければ状態を更新する */
|
|
73
|
+
const applyNavigation = (next) => {
|
|
74
|
+
if (isControlled()) {
|
|
75
|
+
const current = getter();
|
|
76
|
+
if (next.year !== state.year || next.month !== state.month) {
|
|
77
|
+
current.onMonthChange?.(next.year, next.month);
|
|
78
|
+
}
|
|
79
|
+
return;
|
|
80
|
+
}
|
|
81
|
+
state = next;
|
|
82
|
+
};
|
|
63
83
|
return {
|
|
64
84
|
get state() {
|
|
65
85
|
return state;
|
|
@@ -80,22 +100,22 @@ export function useCalendarState(options = {}) {
|
|
|
80
100
|
state = moveCursor(state, direction);
|
|
81
101
|
},
|
|
82
102
|
goNext: () => {
|
|
83
|
-
|
|
103
|
+
applyNavigation(navigateMonth(state, "next"));
|
|
84
104
|
},
|
|
85
105
|
goPrev: () => {
|
|
86
|
-
|
|
106
|
+
applyNavigation(navigateMonth(state, "prev"));
|
|
87
107
|
},
|
|
88
108
|
navigateYear: (direction) => {
|
|
89
|
-
|
|
109
|
+
applyNavigation(navigateYear(state, direction));
|
|
90
110
|
},
|
|
91
111
|
goToMonth: (year, month) => {
|
|
92
|
-
|
|
112
|
+
applyNavigation(goToMonth(state, year, month));
|
|
93
113
|
},
|
|
94
114
|
goToDate: (date) => {
|
|
95
|
-
|
|
115
|
+
applyNavigation(goToDate(state, date));
|
|
96
116
|
},
|
|
97
117
|
goToday: () => {
|
|
98
|
-
|
|
118
|
+
applyNavigation(goToToday(state));
|
|
99
119
|
},
|
|
100
120
|
selectDate: () => {
|
|
101
121
|
state = selectDate(state);
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@typescript-calendar-lib/svelte",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.6.2",
|
|
4
4
|
"description": "Svelte 5 components and reactive state for typescript-calendar-lib",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"repository": {
|
|
@@ -34,20 +34,31 @@
|
|
|
34
34
|
"svelte": "^5"
|
|
35
35
|
},
|
|
36
36
|
"dependencies": {
|
|
37
|
-
"@typescript-calendar-lib/core": "^0.
|
|
38
|
-
"@typescript-calendar-lib/tui": "^0.
|
|
39
|
-
"@typescript-calendar-lib/web": "^0.
|
|
37
|
+
"@typescript-calendar-lib/core": "^0.6.2",
|
|
38
|
+
"@typescript-calendar-lib/tui": "^0.6.2",
|
|
39
|
+
"@typescript-calendar-lib/web": "^0.6.2"
|
|
40
40
|
},
|
|
41
41
|
"devDependencies": {
|
|
42
|
-
"@sveltejs/package": "^
|
|
43
|
-
"@sveltejs/vite-plugin-svelte": "^7.3.
|
|
42
|
+
"@sveltejs/package": "^3.0.2",
|
|
43
|
+
"@sveltejs/vite-plugin-svelte": "^7.3.1",
|
|
44
44
|
"@testing-library/jest-dom": "^7.0.1",
|
|
45
45
|
"@testing-library/svelte": "^5",
|
|
46
|
-
"jsdom": "^
|
|
46
|
+
"jsdom": "^31",
|
|
47
47
|
"svelte-check": "^4",
|
|
48
48
|
"typescript": "^5.9.0",
|
|
49
|
-
"vitest": "^5"
|
|
49
|
+
"vitest": "^5.1.0"
|
|
50
50
|
},
|
|
51
|
+
"author": "nazozokc",
|
|
52
|
+
"homepage": "https://github.com/nazozokc/typescript-calendar-lib#readme",
|
|
53
|
+
"bugs": {
|
|
54
|
+
"url": "https://github.com/nazozokc/typescript-calendar-lib/issues"
|
|
55
|
+
},
|
|
56
|
+
"engines": {
|
|
57
|
+
"node": ">=22"
|
|
58
|
+
},
|
|
59
|
+
"sideEffects": [
|
|
60
|
+
"**/*.css"
|
|
61
|
+
],
|
|
51
62
|
"scripts": {
|
|
52
63
|
"build": "svelte-package -i src && cp ../web/dist/calendar.css dist/calendar.css",
|
|
53
64
|
"typecheck": "svelte-check --tsconfig ./tsconfig.json --fail-on-warnings"
|