@open-webapp/calendar 0.2.0 → 0.3.0

package/README.md

@@ -158,6 +158,14 @@ Call at top level of a vitest file; it registers a `describe('StorageAdapter con
 | `onClose?` | `() => void` | |
 | `popupName?` | `string` | `window.open` name for the event popup (default `notesdiary-cal-event`) |
 
+#### RSVP chips
+
+The chips appear in order: Accepted, Maybe, Declined, Unaccepted. Accepted, Maybe, and Declined toggle individual statuses; an empty selection falls back to `DEFAULT_RSVP_STATUSES` (accepted, tentative, needsAction).
+
+Unaccepted is an exclusive shortcut: clicking it selects only `needsAction`, saving the previous selection locally in the pane. Clicking it again restores that selection, or the defaults when no saved selection is available. Toggling another chip while exclusive mode is active applies that toggle to the saved selection (or defaults). An external nonexclusive selection clears the saved selection. Unaccepted is pressed only when the selection is exactly `needsAction`; a mixed selection containing `needsAction` does not press it.
+
+The Unaccepted badge is always visible, including at zero. It counts `needsAction` events from the controller's selected-calendar, rolling ±30-day snapshot before RSVP filtering. Visible counts cap at `99+`; the chip's `aria-label` and `title` expose the full count.
+
 Built-in copy (overridable only through the slots above):
 
 - Not connected: "Not connected to Google Calendar." with "Connect Google Calendar".
@@ -178,6 +186,18 @@ Built-in copy (overridable only through the slots above):
 - `--chip-row-height` (fallback `44px`; host may set it to match its chip row for sticky headers)
 - `--rsvp-bar` (set internally per RSVP status; do not override)
 
+The Unaccepted count badge uses `.calendar-rsvp-chip-badge`, with light and dark styling included in `styles.css`.
+
+## 0.3.0 (minor, additive)
+
+- Adds the Unaccepted exclusive shortcut after Accepted, Maybe, and Declined, with local selection restoration and default fallback as described above.
+- Adds an always-visible Unaccepted count badge, including zero, computed before RSVP filtering from the controller's selected-calendar ±30-day snapshot. Counts above 99 display `99+`, with the full count in the chip's `aria-label` and `title`.
+- Adds the `.calendar-rsvp-chip-badge` host styling hook. Public props and default RSVP statuses remain compatible.
+
+## 0.2.1 (patch)
+
+Fixes only, no behavior contract change: `getState().loading` is now published while a sync pass is in flight; a selection-change (partial) pass no longer clears `deferred` set by an earlier full pass; `CalendarPane` tolerates controllers without `getState`/`hydrate`.
+
 ## Breaking changes in 0.2.0
 
 BREAKING (0.1.0 to 0.2.0):

package/dist/core/controller.js

@@ -178,10 +178,15 @@ export function createCalendarController(opts) {
     }
     async function runPass(only) {
         loadingCount++;
+        publish();
         try {
             const ids = sources.map((s) => s.id).filter((id) => !only || only[id]);
             const results = await Promise.all(ids.map((id) => refreshSource(id, only?.[id])));
-            deferred = results.some(Boolean);
+            const any = results.some(Boolean);
+            if (!only)
+                deferred = any;
+            else if (any)
+                deferred = true;
         }
         catch {
             /* never throws */

package/dist/react/CalendarPane.js

@@ -2,6 +2,16 @@ import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-run
 import { useEffect, useMemo, useRef, useState } from 'react';
 import { filterByRsvp, groupByDay, getOrganizerLabel, formatDayHeader, isEventCurrent, findNextUpcomingEvent, getCalendarEventKey, DEFAULT_RSVP_STATUSES, } from '../core/events.js';
 import { CalendarSelector } from './CalendarSelector.js';
+function toggleRsvpStatus(selection, status) {
+    const next = new Set(selection);
+    if (next.has(status)) {
+        next.delete(status);
+    }
+    else {
+        next.add(status);
+    }
+    return next.size === 0 ? new Set(DEFAULT_RSVP_STATUSES) : next;
+}
 function useWindowWidth() {
     const [width, setWidth] = useState(typeof window !== 'undefined' ? window.innerWidth : 1024);
     useEffect(() => {
@@ -23,16 +33,16 @@ const RSVP_CHIPS = [
         label: 'Maybe',
         icon: (_jsxs("svg", { width: "15", height: "15", viewBox: "0 0 15 15", fill: "none", children: [_jsx("path", { d: "M5.2 5.6C5.2 4.2 6.2 3.2 7.5 3.2C8.8 3.2 9.8 4.2 9.8 5.4C9.8 6.8 7.6 6.9 7.6 8.8", stroke: "currentColor", strokeWidth: "1.3", strokeLinecap: "round", strokeLinejoin: "round" }), _jsx("circle", { cx: "7.6", cy: "11.2", r: "0.9", fill: "currentColor" })] })),
     },
-    {
-        status: 'needsAction',
-        label: 'Unaccepted',
-        icon: (_jsx("svg", { width: "15", height: "15", viewBox: "0 0 15 15", fill: "none", children: _jsx("circle", { cx: "7.5", cy: "7.5", r: "4.3", stroke: "currentColor", strokeWidth: "1.4" }) })),
-    },
     {
         status: 'declined',
         label: 'Declined',
         icon: (_jsx("svg", { width: "15", height: "15", viewBox: "0 0 15 15", fill: "none", children: _jsx("path", { d: "M4 4L11 11M11 4L4 11", stroke: "currentColor", strokeWidth: "1.5", strokeLinecap: "round" }) })),
     },
+    {
+        status: 'needsAction',
+        label: 'Unaccepted',
+        icon: (_jsx("svg", { width: "15", height: "15", viewBox: "0 0 15 15", fill: "none", children: _jsx("circle", { cx: "7.5", cy: "7.5", r: "4.3", stroke: "currentColor", strokeWidth: "1.4" }) })),
+    },
 ];
 const DEFAULT_POPUP_NAME = 'notesdiary-cal-event';
 const POPUP_W = 560;
@@ -106,7 +116,9 @@ export function CalendarPane(props) {
     const events = useMemo(() => controller.getEvents(), [controller, version]);
     const statuses = controller.getSourceStatus();
     const connected = props.connected ?? sources.length > 0;
-    const ctrlState = controller.getState();
+    const ctrlState = typeof controller.getState === 'function'
+        ? controller.getState()
+        : { loading: false, error: false, deferred: false, lastSyncAt: null };
     const multi = sources.length >= 2;
     const needsScopeSources = sources.filter((s) => statuses[s.id] === 'needs-scope');
     const needsReauth = connected && (props.needsReauth ?? (sources.length > 0 && needsScopeSources.length === sources.length));
@@ -120,6 +132,13 @@ export function CalendarPane(props) {
     const chipsRef = useRef(null);
     const popupRef = useRef(null);
     const [now, setNow] = useState(() => new Date());
+    const [savedSelection, setSavedSelection] = useState(null);
+    const isExclusive = selectedRsvpStatuses.size === 1 && selectedRsvpStatuses.has('needsAction');
+    useEffect(() => {
+        if (!isExclusive && savedSelection !== null)
+            setSavedSelection(null);
+    }, [isExclusive, savedSelection]);
+    const unacceptedCount = useMemo(() => events.filter((event) => event.selfResponseStatus === 'needsAction').length, [events]);
     const filteredEvents = useMemo(() => filterByRsvp(events, selectedRsvpStatuses), [events, selectedRsvpStatuses]);
     const calendarsByKey = useMemo(() => {
         const map = new Map();
@@ -141,19 +160,21 @@ export function CalendarPane(props) {
     const nextUpcomingEvent = findNextUpcomingEvent(filteredEvents, now);
     const selectedEventKey = currentEventKeys.values().next().value ??
         (nextUpcomingEvent ? getCalendarEventKey(nextUpcomingEvent) : undefined);
-    function handleToggle(status) {
-        const next = new Set(selectedRsvpStatuses);
-        if (next.has(status)) {
-            next.delete(status);
-            if (next.size === 0) {
-                props.onRsvpStatusesChange(new Set(DEFAULT_RSVP_STATUSES));
-                return;
-            }
+    function handleUnaccepted() {
+        if (isExclusive) {
+            props.onRsvpStatusesChange(savedSelection ?? new Set(DEFAULT_RSVP_STATUSES));
+            setSavedSelection(null);
         }
         else {
-            next.add(status);
+            setSavedSelection(new Set(selectedRsvpStatuses));
+            props.onRsvpStatusesChange(new Set(['needsAction']));
         }
-        props.onRsvpStatusesChange(next);
+    }
+    function handleToggle(status) {
+        const base = isExclusive ? savedSelection ?? DEFAULT_RSVP_STATUSES : selectedRsvpStatuses;
+        if (isExclusive)
+            setSavedSelection(null);
+        props.onRsvpStatusesChange(toggleRsvpStatus(base, status));
     }
     const dayGroups = groupByDay(filteredEvents, todayIso);
     function scrollToToday(behavior = 'auto') {
@@ -277,7 +298,7 @@ export function CalendarPane(props) {
     const loading = ctrlState.loading && filteredEvents.length === 0;
     const emptyStateText = 'No matching events in the next 30 days';
     const showCalendarSelector = calendarSources.length > 0;
-    return (_jsxs("div", { className: "calendar-pane", ref: paneRef, children: [_jsxs("div", { className: "calendar-pane-scroll", children: [_jsxs("div", { className: "calendar-rsvp-chips", ref: chipsRef, children: [_jsx("button", { type: "button", className: "calendar-rsvp-chip calendar-scroll-today-btn", "aria-label": "Scroll to today", title: "Scroll to today", onClick: () => recenter('smooth'), children: _jsxs("svg", { width: "15", height: "15", viewBox: "0 0 15 15", fill: "none", children: [_jsx("rect", { x: "2", y: "3", width: "11", height: "10", rx: "1.5", stroke: "currentColor", strokeWidth: "1.2" }), _jsx("path", { d: "M2 6H13", stroke: "currentColor", strokeWidth: "1.2" }), _jsx("path", { d: "M5 2V4M10 2V4", stroke: "currentColor", strokeWidth: "1.2", strokeLinecap: "round" }), _jsx("circle", { cx: "7.5", cy: "9.5", r: "1.3", fill: "currentColor" })] }) }), RSVP_CHIPS.map((chip) => (_jsx("button", { type: "button", className: `calendar-rsvp-chip${selectedRsvpStatuses.has(chip.status) ? ' selected' : ''}`, "aria-pressed": selectedRsvpStatuses.has(chip.status), "aria-label": chip.label, title: chip.label, onClick: () => handleToggle(chip.status), children: chip.icon }, chip.status)))] }), needsScopeSources.map((s) => (_jsx("div", { children: props.sourceNotice?.(s) }, s.id))), error && (_jsx("div", { className: "empty-state calendar-empty-state", role: "alert", children: _jsx("p", { children: "Couldn't load calendar events. Try again shortly." }) })), !(error && filteredEvents.length === 0) && (_jsxs("div", { className: "calendar-day-groups", children: [dayGroups.map((group) => (_jsxs("div", { className: "calendar-day-group", children: [_jsx("div", { className: "calendar-day-header", ref: (el) => {
+    return (_jsxs("div", { className: "calendar-pane", ref: paneRef, children: [_jsxs("div", { className: "calendar-pane-scroll", children: [_jsxs("div", { className: "calendar-rsvp-chips", ref: chipsRef, children: [_jsx("button", { type: "button", className: "calendar-rsvp-chip calendar-scroll-today-btn", "aria-label": "Scroll to today", title: "Scroll to today", onClick: () => recenter('smooth'), children: _jsxs("svg", { width: "15", height: "15", viewBox: "0 0 15 15", fill: "none", children: [_jsx("rect", { x: "2", y: "3", width: "11", height: "10", rx: "1.5", stroke: "currentColor", strokeWidth: "1.2" }), _jsx("path", { d: "M2 6H13", stroke: "currentColor", strokeWidth: "1.2" }), _jsx("path", { d: "M5 2V4M10 2V4", stroke: "currentColor", strokeWidth: "1.2", strokeLinecap: "round" }), _jsx("circle", { cx: "7.5", cy: "9.5", r: "1.3", fill: "currentColor" })] }) }), RSVP_CHIPS.map((chip) => (_jsxs("button", { type: "button", className: `calendar-rsvp-chip${(chip.status === 'needsAction' ? isExclusive : selectedRsvpStatuses.has(chip.status)) ? ' selected' : ''}`, "aria-pressed": chip.status === 'needsAction' ? isExclusive : selectedRsvpStatuses.has(chip.status), "aria-label": chip.status === 'needsAction' ? `${chip.label} (${unacceptedCount})` : chip.label, title: chip.status === 'needsAction' ? `${chip.label} (${unacceptedCount})` : chip.label, onClick: () => chip.status === 'needsAction' ? handleUnaccepted() : handleToggle(chip.status), children: [chip.icon, chip.status === 'needsAction' && (_jsx("span", { className: "calendar-rsvp-chip-badge", "aria-hidden": "true", children: unacceptedCount > 99 ? '99+' : unacceptedCount }))] }, chip.status)))] }), needsScopeSources.map((s) => (_jsx("div", { children: props.sourceNotice?.(s) }, s.id))), error && (_jsx("div", { className: "empty-state calendar-empty-state", role: "alert", children: _jsx("p", { children: "Couldn't load calendar events. Try again shortly." }) })), !(error && filteredEvents.length === 0) && (_jsxs("div", { className: "calendar-day-groups", children: [dayGroups.map((group) => (_jsxs("div", { className: "calendar-day-group", children: [_jsx("div", { className: "calendar-day-header", ref: (el) => {
                                             if (el) {
                                                 dayHeaderRefs.current.set(group.dateKey, el);
                                             }

package/dist/styles.css

@@ -68,12 +68,16 @@
 }
 
 .calendar-rsvp-chip {
-  width: 32px;
+  width: auto;
+  min-width: 32px;
   height: 32px;
+  box-sizing: border-box;
+  flex-shrink: 0;
   display: flex;
   align-items: center;
   justify-content: center;
-  padding: 0;
+  gap: 4px;
+  padding: 0 8px;
   background: transparent;
   color: #333;
   border: 1px solid #ccc;
@@ -97,6 +101,19 @@
   border-color: #081a59;
 }
 
+.calendar-rsvp-chip-badge {
+  min-width: 16px;
+  padding: 1px 4px;
+  border-radius: 999px;
+  background: #e8eefb;
+  color: #081a59;
+  font-size: 11px;
+  font-weight: 600;
+  line-height: 16px;
+  text-align: center;
+  white-space: nowrap;
+}
+
 .calendar-empty-state {
   padding: 24px 16px;
   color: #999;
@@ -306,6 +323,11 @@
     border-color: #22d0ef;
   }
 
+  .calendar-rsvp-chip-badge {
+    background: #081a59;
+    color: #e8eefb;
+  }
+
   .calendar-day-header {
     background: #222;
     color: #eee;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@open-webapp/calendar",
-  "version": "0.2.0",
+  "version": "0.3.0",
   "type": "module",
   "repository": {
     "type": "git",