@koine/react 2.0.0-beta.1 → 2.0.0-beta.11

package/Calendar/CalendarLegend.mjs

@@ -1,5 +1,5 @@
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
-export var KoineCalendarLegend = function (_a) {
+export const KoineCalendarLegend = ({ calendarsMap = {}, toggleCalendarVisibility, LegendItem = "div", LegendItemStatus = "span", LegendItemLabel = "span", LegendItemEvents = "span" })=>{
     // const sorted = Object.entries(calendarsMap).sort((a, b) => {
     //   const { name: nameA } = a[1];
     //   const { name: nameB } = b[1];
@@ -7,9 +7,23 @@ export var KoineCalendarLegend = function (_a) {
     //   else if (nameA > nameB) return 1;
     //   else return 0;
     // });
-    var _b = _a.calendarsMap, calendarsMap = _b === void 0 ? {} : _b, toggleCalendarVisibility = _a.toggleCalendarVisibility, _c = _a.LegendItem, LegendItem = _c === void 0 ? "div" : _c, _d = _a.LegendItemStatus, LegendItemStatus = _d === void 0 ? "span" : _d, _e = _a.LegendItemLabel, LegendItemLabel = _e === void 0 ? "span" : _e, _f = _a.LegendItemEvents, LegendItemEvents = _f === void 0 ? "span" : _f;
-    return (_jsx(_Fragment, { children: Object.entries(calendarsMap).map(function (_a) {
-            var id = _a[0], calendar = _a[1];
-            return (_jsxs(LegendItem, { onClick: function () { return toggleCalendarVisibility(id); }, "$color": calendar.color, "$empty": calendar.events === 0, disabled: calendar.events === 0, children: [_jsx(LegendItemStatus, { children: calendar.on ? "\u2b24" : "\u2b58" }), _jsx(LegendItemLabel, { children: calendar.name }), _jsx(LegendItemEvents, { children: calendar.events })] }, "CalendarLegend." + id));
-        }) }));
+    return /*#__PURE__*/ _jsx(_Fragment, {
+        children: Object.entries(calendarsMap).map(([id, calendar])=>/*#__PURE__*/ _jsxs(LegendItem, {
+                onClick: ()=>toggleCalendarVisibility(id),
+                $color: calendar.color,
+                $empty: calendar.events === 0,
+                disabled: calendar.events === 0,
+                children: [
+                    /*#__PURE__*/ _jsx(LegendItemStatus, {
+                        children: calendar.on ? "\u2b24" : "\u2b58"
+                    }),
+                    /*#__PURE__*/ _jsx(LegendItemLabel, {
+                        children: calendar.name
+                    }),
+                    /*#__PURE__*/ _jsx(LegendItemEvents, {
+                        children: calendar.events
+                    })
+                ]
+            }, "CalendarLegend." + id))
+    });
 };

package/Calendar/calendar-api-google.d.ts

@@ -1,4 +1,4 @@
-import type { Calendars, CalendarEventsMap } from "./types";
+import type { CalendarEventsMap, Calendars } from "./types";
 type GetCalendarsEventsFromGoogleOptions = {
     /** Fall back to `process.env.GOOGLE_CALENDAR_API_KEY */
     apiKey?: string;

package/Calendar/calendar-api-google.mjs

@@ -1,108 +1,78 @@
-import { __assign, __awaiter, __generator, __rest } from "tslib";
+import differenceInDays from "date-fns/differenceInDays";
+import subDays from "date-fns/subDays";
 import arrayToLookup from "@koine/utils/arrayToLookup";
 import isString from "@koine/utils/isString";
 import isUndefined from "@koine/utils/isUndefined";
-import differenceInDays from "date-fns/differenceInDays";
-import subDays from "date-fns/subDays";
-import { getEventTimestamp, addCalendarEvents } from "./utils";
-var baseURL = "https://www.googleapis.com/calendar/v3/calendars/";
-export function getCalendarsEventsFromGoogle(_a) {
-    var calendars = _a.calendars, options = __rest(_a, ["calendars"]);
-    return __awaiter(this, void 0, void 0, function () {
-        var allEvents;
-        var _this = this;
-        return __generator(this, function (_b) {
-            switch (_b.label) {
-                case 0:
-                    allEvents = {};
-                    return [4 /*yield*/, Promise.all(calendars.map(function (calendar) { return __awaiter(_this, void 0, void 0, function () {
-                            var events;
-                            return __generator(this, function (_a) {
-                                switch (_a.label) {
-                                    case 0: return [4 /*yield*/, getCalendarEventsFromGoogle(__assign({ calendar: calendar }, options))];
-                                    case 1:
-                                        events = _a.sent();
-                                        addCalendarEvents(events, allEvents);
-                                        return [2 /*return*/];
-                                }
-                            });
-                        }); }))];
-                case 1:
-                    _b.sent();
-                    return [2 /*return*/, allEvents];
-            }
+import { addCalendarEvents, getEventTimestamp } from "./utils";
+const baseURL = "https://www.googleapis.com/calendar/v3/calendars/";
+export async function getCalendarsEventsFromGoogle({ calendars, ...options }) {
+    const allEvents = {};
+    await Promise.all(calendars.map(async (calendar)=>{
+        const events = await getCalendarEventsFromGoogle({
+            calendar,
+            ...options
         });
-    });
+        addCalendarEvents(events, allEvents);
+    }));
+    return allEvents;
 }
-function getCalendarEventsFromGoogle(_a) {
-    var apiKey = _a.apiKey, calendar = _a.calendar, _b = _a.timeZone, timeZone = _b === void 0 ? "" : _b, start = _a.start, end = _a.end;
-    return __awaiter(this, void 0, void 0, function () {
-        var events, params, url, response, data, e_1;
-        return __generator(this, function (_c) {
-            switch (_c.label) {
-                case 0:
-                    events = {};
-                    params = new URLSearchParams({
-                        calendarId: calendar.id,
-                        timeZone: timeZone,
-                        singleEvents: "true",
-                        maxAttendees: "1",
-                        maxResults: "9999",
-                        sanitizeHtml: "true",
-                        timeMin: start.toISOString(),
-                        timeMax: end.toISOString(),
-                        key: apiKey || process.env["GOOGLE_CALENDAR_API_KEY"] || "",
-                    }).toString();
-                    url = baseURL + calendar.id + "/events?" + params;
-                    _c.label = 1;
-                case 1:
-                    _c.trys.push([1, 4, , 5]);
-                    return [4 /*yield*/, fetch(url, { method: "GET" })];
-                case 2:
-                    response = _c.sent();
-                    return [4 /*yield*/, response.json()];
-                case 3:
-                    data = (_c.sent());
-                    calendar.name = calendar.name || data.summary;
-                    data.items.forEach(function (googleEvent) {
-                        var event = transformCalendarEventFromGoogle(googleEvent, calendar);
-                        events[event.uid] = event;
-                    });
-                    return [3 /*break*/, 5];
-                case 4:
-                    e_1 = _c.sent();
-                    return [3 /*break*/, 5];
-                case 5: return [2 /*return*/, events];
-            }
+async function getCalendarEventsFromGoogle({ apiKey, calendar, timeZone = "", start, end }) {
+    const events = {};
+    const params = new URLSearchParams({
+        calendarId: calendar.id,
+        timeZone,
+        singleEvents: "true",
+        maxAttendees: "1",
+        maxResults: "9999",
+        sanitizeHtml: "true",
+        timeMin: start.toISOString(),
+        timeMax: end.toISOString(),
+        key: apiKey || process.env["GOOGLE_CALENDAR_API_KEY"] || ""
+    }).toString();
+    const url = baseURL + calendar.id + "/events?" + params;
+    try {
+        const response = await fetch(url, {
+            method: "GET"
+        });
+        const data = await response.json();
+        calendar.name = calendar.name || data.summary;
+        data.items.forEach((googleEvent)=>{
+            const event = transformCalendarEventFromGoogle(googleEvent, calendar);
+            events[event.uid] = event;
         });
-    });
+    } catch (e) {
+    // if (onError) onError(e);
+    }
+    return events;
 }
 function transformCalendarEventFromGoogle(event, calendar) {
-    var created = new Date(event.created);
-    var link = event.htmlLink;
-    var title = event.summary;
-    var status = event.status;
-    var start = new Date(event.start.date || event.start.dateTime);
-    var end = new Date(event.end.date || event.end.dateTime);
-    var color = calendar.color;
-    var allDay = isUndefined(event.end.dateTime) && isString(event.end.date);
-    var location = event.location || "";
-    var description = event.description || ""; // FIXME: he.decode(event.description || '');
-    var uid = created.getTime() + "" + start.getTime();
+    const created = new Date(event.created);
+    const link = event.htmlLink;
+    const title = event.summary;
+    const status = event.status;
+    const start = new Date(event.start.date || event.start.dateTime);
+    let end = new Date(event.end.date || event.end.dateTime);
+    const color = calendar.color;
+    const allDay = isUndefined(event.end.dateTime) && isString(event.end.date);
+    const location = event.location || "";
+    const description = event.description || ""; // FIXME: he.decode(event.description || '');
+    const uid = created.getTime() + "" + start.getTime();
     // multi-days all day events has as end date the date after to what we actually
     // mean, hence we subtract one day. @see https://support.google.com/calendar/thread/10074544/google-calendar-all-day-events-are-showing-up-as-a-24-hr-event-across-time-zones?hl=en
     if (allDay && end > start) {
         end = subDays(end, 1);
         end.setHours(23, 59, 59);
     }
-    var days = getDays();
-    var daysMap = arrayToLookup(days);
-    var multi = days.length > 1;
+    const days = getDays();
+    const daysMap = arrayToLookup(days);
+    const multi = days.length > 1;
     function getDays() {
-        var from = new Date(start);
-        var to = new Date(end);
-        var days = [getEventTimestamp(from)];
-        while (differenceInDays(to, from)) {
+        const from = new Date(start);
+        const to = new Date(end);
+        const days = [
+            getEventTimestamp(from)
+        ];
+        while(differenceInDays(to, from)){
             // console.log(title, differenceInDays(to, from))
             from.setDate(from.getDate() + 1);
             days.push(getEventTimestamp(from));
@@ -110,20 +80,20 @@ function transformCalendarEventFromGoogle(event, calendar) {
         return days;
     }
     return {
-        calendar: calendar,
-        created: created,
-        link: link,
-        title: title,
-        status: status,
-        start: start,
-        end: end,
-        days: days,
-        daysMap: daysMap,
-        multi: multi,
-        color: color,
-        allDay: allDay,
-        location: location,
-        description: description,
-        uid: uid,
+        calendar,
+        created,
+        link,
+        title,
+        status,
+        start,
+        end,
+        days,
+        daysMap,
+        multi,
+        color,
+        allDay,
+        location,
+        description,
+        uid
     };
 }

package/Calendar/types.mjs

@@ -1 +1 @@
-export {};
+export { };

package/Calendar/useCalendar.d.ts

@@ -1,8 +1,8 @@
 /// <reference types="react" />
-import type { Calendars, CalendarEvent, CalendarEventsMap, CalendarView } from "./types";
-import type { KoineCalendarLegendProps } from "./CalendarLegend";
 import type { KoineCalendarDaygridNavProps } from "./CalendarDaygridNav";
 import type { KoineCalendarDaygridTableProps } from "./CalendarDaygridTable";
+import type { KoineCalendarLegendProps } from "./CalendarLegend";
+import type { CalendarEvent, CalendarEventsMap, CalendarView, Calendars } from "./types";
 export type UseCalendarProps = {
     /** The locale to format with `date-fns` */
     locale: string;

package/Calendar/useCalendar.mjs

@@ -1,183 +1,225 @@
-import { __assign, __awaiter, __generator } from "tslib";
 import { useCallback, useEffect, useReducer, useState } from "react";
 import { getCalendarsEventsFromGoogle } from "./calendar-api-google";
-import { getStartDate, getEndDate, getPrevDate, getNextDate, isTodayInView, } from "./utils";
-export function useCalendar(_a) {
-    var _this = this;
-    var locale = _a.locale, apiKey = _a.apiKey, calendars = _a.calendars, initialEvents = _a.events, initialStart = _a.start, initialEnd = _a.end, _b = _a.view, initialView = _b === void 0 ? "month" : _b, _c = _a.timeZone, timeZone = _c === void 0 ? "" : _c, onError = _a.onError;
-    var _d = useState(initialView), view = _d[0], setView = _d[1];
-    var start = initialStart || getStartDate(new Date(), view);
-    var end = initialEnd || getEndDate(start, view);
-    var _e = useState([start, end]), range = _e[0], setRange = _e[1];
-    var _f = useState(isTodayInView(start, end)), todayInView = _f[0], setTodayInView = _f[1];
-    var _g = useState(initialEvents || {}), events = _g[0], setEvents = _g[1];
-    var _h = useState(null), eventHovered = _h[0], setEventHovered = _h[1];
-    var _j = useState(null), eventClicked = _j[0], setEventClicked = _j[1];
-    var _k = useReducer(function (state, action) {
-        var _a;
-        var type = action.type;
-        switch (type) {
-            case "events": {
-                var events_1 = action.payload;
-                return Object.entries(state).reduce(function (map, _a) {
-                    var id = _a[0], calendar = _a[1];
-                    map[id] = __assign(__assign({}, calendar), { events: events_1[id] || 0 });
-                    return map;
-                }, {});
-            }
-            case "visibility": {
-                var visible_1 = action.payload;
-                if (typeof visible_1 === "string") {
-                    return __assign(__assign({}, state), (_a = {}, _a[visible_1] = __assign(__assign({}, state[visible_1]), { on: !state[visible_1].on }), _a));
-                }
-                else {
-                    return Object.entries(state).reduce(function (map, _a) {
-                        var id = _a[0], calendar = _a[1];
-                        map[id] = __assign(__assign({}, calendar), { on: visible_1.indexOf(id) > -1 });
+import { getEndDate, getNextDate, getPrevDate, getStartDate, isTodayInView } from "./utils";
+export function useCalendar({ locale, apiKey, calendars, events: initialEvents, start: initialStart, end: initialEnd, view: initialView = "month", timeZone = "", onError }) {
+    const [view, setView] = useState(initialView);
+    const start = initialStart || getStartDate(new Date(), view);
+    const end = initialEnd || getEndDate(start, view);
+    const [range, setRange] = useState([
+        start,
+        end
+    ]);
+    const [todayInView, setTodayInView] = useState(isTodayInView(start, end));
+    const [events, setEvents] = useState(initialEvents || {});
+    const [eventHovered, setEventHovered] = useState(null);
+    const [eventClicked, setEventClicked] = useState(null);
+    const [calendarsMap, updateCalendars] = useReducer((state, action)=>{
+        const { type } = action;
+        switch(type){
+            case "events":
+                {
+                    const events = action.payload;
+                    return Object.entries(state).reduce((map, [id, calendar])=>{
+                        map[id] = {
+                            ...calendar,
+                            events: events[id] || 0
+                        };
                         return map;
                     }, {});
                 }
-            }
+            case "visibility":
+                {
+                    const visible = action.payload;
+                    if (typeof visible === "string") {
+                        return {
+                            ...state,
+                            [visible]: {
+                                ...state[visible],
+                                on: !state[visible].on
+                            }
+                        };
+                    } else {
+                        return Object.entries(state).reduce((map, [id, calendar])=>{
+                            map[id] = {
+                                ...calendar,
+                                on: visible.indexOf(id) > -1
+                            };
+                            return map;
+                        }, {});
+                    }
+                }
             default:
                 return state;
         }
-    }, 
-    // initial state
-    calendars.reduce(function (map, calendar) {
-        map[calendar.id] = __assign(__assign({}, calendar), { name: calendar.name || "", on: true, events: 0 });
+    }, // initial state
+    calendars.reduce((map, calendar)=>{
+        map[calendar.id] = {
+            ...calendar,
+            name: calendar.name || "",
+            on: true,
+            events: 0
+        };
         return map;
-    }, {})), calendarsMap = _k[0], updateCalendars = _k[1];
-    var toggleCalendarVisibility = useCallback(function (idOrIds) {
-        updateCalendars({ type: "visibility", payload: idOrIds });
-    }, [updateCalendars]);
-    var updateCalendarsBasedOnEvents = useCallback(function (events) {
-        var payload = {};
-        for (var uid in events) {
-            var id = events[uid].calendar.id;
+    }, {}));
+    const toggleCalendarVisibility = useCallback((idOrIds)=>{
+        updateCalendars({
+            type: "visibility",
+            payload: idOrIds
+        });
+    }, [
+        updateCalendars
+    ]);
+    const updateCalendarsBasedOnEvents = useCallback((events)=>{
+        const payload = {};
+        for(const uid in events){
+            const { id } = events[uid].calendar;
             payload[id] = payload[id] || 0;
             payload[id]++;
         }
-        updateCalendars({ type: "events", payload: payload });
-    }, []);
-    var loadCalendars = useCallback(function (calendars, start, end) { return __awaiter(_this, void 0, void 0, function () {
-        var newEvents, e_1;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0:
-                    _a.trys.push([0, 2, , 3]);
-                    return [4 /*yield*/, getCalendarsEventsFromGoogle({
-                            apiKey: apiKey,
-                            calendars: calendars,
-                            timeZone: timeZone,
-                            start: start,
-                            end: end,
-                        })];
-                case 1:
-                    newEvents = _a.sent();
-                    // setEvents(mergeCalendarEvents(events, newEvents));
-                    setEvents(newEvents);
-                    return [3 /*break*/, 3];
-                case 2:
-                    e_1 = _a.sent();
-                    if (onError)
-                        onError(e_1);
-                    return [3 /*break*/, 3];
-                case 3: return [2 /*return*/];
-            }
+        updateCalendars({
+            type: "events",
+            payload
         });
-    }); }, [setEvents, apiKey, timeZone, onError]);
-    var handleToday = useCallback(function () {
-        var start = range[0], end = range[1];
-        var newStart = getStartDate(new Date(), view);
-        var newEnd = getEndDate(newStart, view);
-        setRange([newStart, newEnd]);
+    }, []);
+    const loadCalendars = useCallback(async (calendars, start, end)=>{
+        try {
+            const newEvents = await getCalendarsEventsFromGoogle({
+                apiKey,
+                calendars,
+                timeZone,
+                start,
+                end
+            });
+            // setEvents(mergeCalendarEvents(events, newEvents));
+            setEvents(newEvents);
+        } catch (e) {
+            if (onError) onError(e);
+        }
+    }, [
+        setEvents,
+        apiKey,
+        timeZone,
+        onError
+    ]);
+    const handleToday = useCallback(()=>{
+        const [start, end] = range;
+        const newStart = getStartDate(new Date(), view);
+        const newEnd = getEndDate(newStart, view);
+        setRange([
+            newStart,
+            newEnd
+        ]);
         // reset event only if we are not on the current view already
-        if (start.getTime() !== newStart.getTime() ||
-            end.getTime() !== newEnd.getTime()) {
+        if (start.getTime() !== newStart.getTime() || end.getTime() !== newEnd.getTime()) {
             setEventClicked(null);
             setEventHovered(null);
         }
-    }, [view, range]);
-    var handlePrev = useCallback(function () {
-        setRange(function (_a) {
-            var start = _a[0];
-            var newStart = getPrevDate(start, view);
-            var newEnd = getEndDate(newStart, view);
-            return [newStart, newEnd];
+    }, [
+        view,
+        range
+    ]);
+    const handlePrev = useCallback(()=>{
+        setRange(([start])=>{
+            const newStart = getPrevDate(start, view);
+            const newEnd = getEndDate(newStart, view);
+            return [
+                newStart,
+                newEnd
+            ];
         });
         setEventClicked(null);
         setEventHovered(null);
-    }, [view]);
-    var handleNext = useCallback(function () {
-        setRange(function (_a) {
-            var start = _a[0];
-            var newStart = getNextDate(start, view);
-            var newEnd = getEndDate(newStart, view);
-            return [newStart, newEnd];
+    }, [
+        view
+    ]);
+    const handleNext = useCallback(()=>{
+        setRange(([start])=>{
+            const newStart = getNextDate(start, view);
+            const newEnd = getEndDate(newStart, view);
+            return [
+                newStart,
+                newEnd
+            ];
         });
         setEventClicked(null);
         setEventHovered(null);
-    }, [view]);
-    var handleView = useCallback(function (newView) {
-        var newStart = getStartDate(start, newView);
-        var newEnd = getEndDate(newStart, newView);
-        setRange([newStart, newEnd]);
+    }, [
+        view
+    ]);
+    const handleView = useCallback((newView)=>{
+        const newStart = getStartDate(start, newView);
+        const newEnd = getEndDate(newStart, newView);
+        setRange([
+            newStart,
+            newEnd
+        ]);
         setView(newView);
         setEventClicked(null);
         setEventHovered(null);
-    }, [start]);
-    useEffect(function () {
-        var start = range[0], end = range[1];
+    }, [
+        start
+    ]);
+    useEffect(()=>{
+        const [start, end] = range;
         loadCalendars(calendars, start, end);
         setTodayInView(isTodayInView(start, end));
-        // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [range]);
-    useEffect(function () {
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, [
+        range
+    ]);
+    useEffect(()=>{
         if (events) {
             updateCalendarsBasedOnEvents(events);
         }
-    }, [events, updateCalendarsBasedOnEvents]);
+    }, [
+        events,
+        updateCalendarsBasedOnEvents
+    ]);
     // when toggling a calendar we also remove the clicked event if that belongs
     // to a now hidden calendar
-    useEffect(function () {
+    useEffect(()=>{
         if (eventClicked) {
             if (!calendarsMap[eventClicked.calendar.id].on) {
                 setEventClicked(null);
             }
         }
-    }, [calendarsMap, eventClicked, setEventClicked]);
+    }, [
+        calendarsMap,
+        eventClicked,
+        setEventClicked
+    ]);
     return {
-        view: view,
-        eventClicked: eventClicked,
-        setEventClicked: setEventClicked,
-        eventHovered: eventHovered,
-        setEventHovered: setEventHovered,
-        getDaygridNavProps: function () { return ({
-            locale: locale,
-            handlePrev: handlePrev,
-            handleNext: handleNext,
-            handleToday: handleToday,
-            handleView: handleView,
-            todayInView: todayInView,
-            range: range,
-            view: view,
-        }); },
-        getDaygridTableProps: function () { return ({
-            locale: locale,
-            events: events,
-            eventClicked: eventClicked,
-            setEventClicked: setEventClicked,
-            eventHovered: eventHovered,
-            setEventHovered: setEventHovered,
-            handlePrev: handlePrev,
-            handleNext: handleNext,
-            calendarsMap: calendarsMap,
-            range: range,
-            view: view,
-        }); },
-        getLegendProps: function () { return ({
-            calendarsMap: calendarsMap,
-            toggleCalendarVisibility: toggleCalendarVisibility,
-        }); },
+        view,
+        eventClicked,
+        setEventClicked,
+        eventHovered,
+        setEventHovered,
+        getDaygridNavProps: ()=>({
+                locale,
+                handlePrev,
+                handleNext,
+                handleToday,
+                handleView,
+                todayInView,
+                range,
+                view
+            }),
+        getDaygridTableProps: ()=>({
+                locale,
+                events,
+                eventClicked,
+                setEventClicked,
+                eventHovered,
+                setEventHovered,
+                handlePrev,
+                handleNext,
+                calendarsMap,
+                range,
+                view
+            }),
+        getLegendProps: ()=>({
+                calendarsMap,
+                toggleCalendarVisibility
+            })
     };
 }