@react-fabric/date 1.0.0-beta.5 → 1.0.0-beta.6

package/dist/cjs/superdate/EventPanel.js

@@ -19,8 +19,18 @@ var jsxRuntime = require('react/jsx-runtime');
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var makeList = function makeList(year) {
-  var predefined = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
+  var recurring = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
+  var predefined = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : [];
   var list = _toConsumableArray(predefined);
+  recurring.forEach(function (evt) {
+    return list.push({
+      label: evt.label,
+      hijri: evt.hijri,
+      icon: evt.icon,
+      start: dateFns.setYear(dateUtil.DateUtil.parseDate(evt.start), year),
+      end: dateFns.setYear(dateUtil.DateUtil.parseDate(evt.end), year)
+    });
+  });
   list.push({
     label: "superdate:event.newYear",
     start: dateFns.startOfDay(new Date("".concat(year - 1, "-12-31"))),
@@ -51,7 +61,9 @@ var EventPanel = function EventPanel(_ref) {
   var isHijri = _ref.isHijri,
     onChange = _ref.onChange,
     _ref$events = _ref.events,
-    events = _ref$events === void 0 ? utilities.EMPTY_ARRAY : _ref$events;
+    events = _ref$events === void 0 ? utilities.EMPTY_ARRAY : _ref$events,
+    _ref$recurringEvents = _ref.recurringEvents,
+    recurringEvents = _ref$recurringEvents === void 0 ? utilities.EMPTY_ARRAY : _ref$recurringEvents;
   var _useTranslation = reactI18next.useTranslation(),
     t = _useTranslation.t;
   var _useState = react.useState({}),
@@ -77,7 +89,7 @@ var EventPanel = function EventPanel(_ref) {
       if (resetList) {
         var _predefined$year;
         var year = state.pageDate.getFullYear();
-        state.events = makeList(year, (_predefined$year = predefined[year]) !== null && _predefined$year !== void 0 ? _predefined$year : []);
+        state.events = makeList(year, recurringEvents !== null && recurringEvents !== void 0 ? recurringEvents : [], (_predefined$year = predefined[year]) !== null && _predefined$year !== void 0 ? _predefined$year : []);
       }
       return _objectSpread({}, state);
     }, {

package/dist/cjs/superdate/Superdate.js

@@ -16,13 +16,14 @@ var RelativePanel = require('./RelativePanel.js');
 var SuperDate_module = require('./SuperDate.module.css');
 var jsxRuntime = require('react/jsx-runtime');
 
-var _excluded = ["as", "color", "variant", "onChange", "value"];
+var _excluded = ["as", "color", "variant", "disabled", "onChange", "value", "data-test-value", "data-testid"];
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var SuperDateTabs = function SuperDateTabs(_ref) {
   var events = _ref.events,
     value = _ref.value,
     presets = _ref.presets,
+    recurringEvents = _ref.recurringEvents,
     onChange = _ref.onChange;
   var _useTranslation = reactI18next.useTranslation("superdate"),
     t = _useTranslation.t;
@@ -97,7 +98,8 @@ var SuperDateTabs = function SuperDateTabs(_ref) {
         children: /*#__PURE__*/jsxRuntime.jsx(EventPanel.EventPanel, {
           isHijri: isHijri,
           onChange: handleChange,
-          events: events
+          events: events,
+          recurringEvents: recurringEvents
         })
       })]
     })
@@ -125,8 +127,11 @@ var SuperDate = function SuperDate(_ref4) {
     _ref4$color = _ref4.color,
     color = _ref4$color === void 0 ? "primary" : _ref4$color,
     variant = _ref4.variant,
+    disabled = _ref4.disabled,
     onChange = _ref4.onChange,
     value = _ref4.value,
+    testValue = _ref4["data-test-value"],
+    testId = _ref4["data-testid"],
     props = _objectWithoutProperties(_ref4, _excluded);
   var _useGlobals2 = core.useGlobals(),
     currentCalendar = _useGlobals2.currentCalendar,
@@ -155,7 +160,10 @@ var SuperDate = function SuperDate(_ref4) {
       children: /*#__PURE__*/jsxRuntime.jsx(E, {
         icon: core.CoreIcons.clock,
         color: color,
+        disabled: disabled,
         variant: variant,
+        "data-test-value": testValue,
+        "data-testid": testId,
         children: (_DateUtil$relativeLab = dateUtil.DateUtil.relativeLabel(relValue, isHijri)) !== null && _DateUtil$relativeLab !== void 0 ? _DateUtil$relativeLab : ""
       })
     }), /*#__PURE__*/jsxRuntime.jsx(SuperDateTabs, _objectSpread(_objectSpread({}, props), {}, {

package/dist/cjs/utils/dateUtil.js

@@ -81,7 +81,7 @@ exports.DateUtil = void 0;
     return formatted;
   };
   var isRelative = _DateUtil.isRelative = function (date) {
-    return utilities.isString(date) && date.match(/^(\$\w+)([+-])(\d+)?$/) !== null;
+    return utilities.isString(date) && date.match(/^(\$\w+)([+-])?(\d+)?$/) !== null;
   };
   _DateUtil.isRelativeRange = function (date) {
     return utilities.isString(date) && date.match(/^(\$\w+)([+-])(\d+)?\|(\$\w+)([+-])(\d+)?$/) !== null;
@@ -375,6 +375,7 @@ exports.DateUtil = void 0;
   };
   var _parse = function _parse(dt, rounded) {
     var _dt$match2;
+    if (!isRelative(dt)) return new Date(dt);
     var _ref3 = (_dt$match2 = dt.match(/^(\$\w+)([+-]\d+)?$/)) !== null && _dt$match2 !== void 0 ? _dt$match2 : [],
       _ref4 = _slicedToArray(_ref3, 3),
       part = _ref4[1],

package/dist/esm/superdate/EventPanel.js

@@ -5,7 +5,7 @@ import _slicedToArray from '@babel/runtime/helpers/slicedToArray';
 import _toConsumableArray from '@babel/runtime/helpers/toConsumableArray';
 import { Section, Content } from '@react-fabric/core';
 import { EMPTY_ARRAY } from '@react-fabric/utilities';
-import { startOfDay, endOfDay, isSameMonth } from 'date-fns';
+import { startOfDay, endOfDay, isSameMonth, setYear } from 'date-fns';
 import i18next from 'i18next';
 import { useState, useReducer, useEffect } from 'react';
 import { useTranslation } from 'react-i18next';
@@ -19,8 +19,18 @@ import { jsxs, jsx } from 'react/jsx-runtime';
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var makeList = function makeList(year) {
-  var predefined = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
+  var recurring = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
+  var predefined = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : [];
   var list = _toConsumableArray(predefined);
+  recurring.forEach(function (evt) {
+    return list.push({
+      label: evt.label,
+      hijri: evt.hijri,
+      icon: evt.icon,
+      start: setYear(DateUtil.parseDate(evt.start), year),
+      end: setYear(DateUtil.parseDate(evt.end), year)
+    });
+  });
   list.push({
     label: "superdate:event.newYear",
     start: startOfDay(new Date("".concat(year - 1, "-12-31"))),
@@ -51,7 +61,9 @@ var EventPanel = function EventPanel(_ref) {
   var isHijri = _ref.isHijri,
     onChange = _ref.onChange,
     _ref$events = _ref.events,
-    events = _ref$events === void 0 ? EMPTY_ARRAY : _ref$events;
+    events = _ref$events === void 0 ? EMPTY_ARRAY : _ref$events,
+    _ref$recurringEvents = _ref.recurringEvents,
+    recurringEvents = _ref$recurringEvents === void 0 ? EMPTY_ARRAY : _ref$recurringEvents;
   var _useTranslation = useTranslation(),
     t = _useTranslation.t;
   var _useState = useState({}),
@@ -77,7 +89,7 @@ var EventPanel = function EventPanel(_ref) {
       if (resetList) {
         var _predefined$year;
         var year = state.pageDate.getFullYear();
-        state.events = makeList(year, (_predefined$year = predefined[year]) !== null && _predefined$year !== void 0 ? _predefined$year : []);
+        state.events = makeList(year, recurringEvents !== null && recurringEvents !== void 0 ? recurringEvents : [], (_predefined$year = predefined[year]) !== null && _predefined$year !== void 0 ? _predefined$year : []);
       }
       return _objectSpread({}, state);
     }, {

package/dist/esm/superdate/Superdate.js

@@ -16,13 +16,14 @@ import { RelativePanel } from './RelativePanel.js';
 import classes from './SuperDate.module.css';
 import { jsxs, jsx } from 'react/jsx-runtime';
 
-var _excluded = ["as", "color", "variant", "onChange", "value"];
+var _excluded = ["as", "color", "variant", "disabled", "onChange", "value", "data-test-value", "data-testid"];
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var SuperDateTabs = function SuperDateTabs(_ref) {
   var events = _ref.events,
     value = _ref.value,
     presets = _ref.presets,
+    recurringEvents = _ref.recurringEvents,
     onChange = _ref.onChange;
   var _useTranslation = useTranslation("superdate"),
     t = _useTranslation.t;
@@ -97,7 +98,8 @@ var SuperDateTabs = function SuperDateTabs(_ref) {
         children: /*#__PURE__*/jsx(EventPanel, {
           isHijri: isHijri,
           onChange: handleChange,
-          events: events
+          events: events,
+          recurringEvents: recurringEvents
         })
       })]
     })
@@ -125,8 +127,11 @@ var SuperDate = function SuperDate(_ref4) {
     _ref4$color = _ref4.color,
     color = _ref4$color === void 0 ? "primary" : _ref4$color,
     variant = _ref4.variant,
+    disabled = _ref4.disabled,
     onChange = _ref4.onChange,
     value = _ref4.value,
+    testValue = _ref4["data-test-value"],
+    testId = _ref4["data-testid"],
     props = _objectWithoutProperties(_ref4, _excluded);
   var _useGlobals2 = useGlobals(),
     currentCalendar = _useGlobals2.currentCalendar,
@@ -155,7 +160,10 @@ var SuperDate = function SuperDate(_ref4) {
       children: /*#__PURE__*/jsx(E, {
         icon: CoreIcons.clock,
         color: color,
+        disabled: disabled,
         variant: variant,
+        "data-test-value": testValue,
+        "data-testid": testId,
         children: (_DateUtil$relativeLab = DateUtil.relativeLabel(relValue, isHijri)) !== null && _DateUtil$relativeLab !== void 0 ? _DateUtil$relativeLab : ""
       })
     }), /*#__PURE__*/jsx(SuperDateTabs, _objectSpread(_objectSpread({}, props), {}, {

package/dist/esm/utils/dateUtil.js

@@ -81,7 +81,7 @@ var DateUtil;
     return formatted;
   };
   var isRelative = _DateUtil.isRelative = function (date) {
-    return isString(date) && date.match(/^(\$\w+)([+-])(\d+)?$/) !== null;
+    return isString(date) && date.match(/^(\$\w+)([+-])?(\d+)?$/) !== null;
   };
   _DateUtil.isRelativeRange = function (date) {
     return isString(date) && date.match(/^(\$\w+)([+-])(\d+)?\|(\$\w+)([+-])(\d+)?$/) !== null;
@@ -375,6 +375,7 @@ var DateUtil;
   };
   var _parse = function _parse(dt, rounded) {
     var _dt$match2;
+    if (!isRelative(dt)) return new Date(dt);
     var _ref3 = (_dt$match2 = dt.match(/^(\$\w+)([+-]\d+)?$/)) !== null && _dt$match2 !== void 0 ? _dt$match2 : [],
       _ref4 = _slicedToArray(_ref3, 3),
       part = _ref4[1],

package/dist/types/superdate/EventPanel.d.ts

@@ -1,4 +1,4 @@
 import { type SuperDateProps } from "../types";
-export declare const EventPanel: ({ isHijri, onChange, events, }: {
+export declare const EventPanel: ({ isHijri, onChange, events, recurringEvents, }: {
     isHijri: boolean;
 } & Partial<SuperDateProps>) => import("react/jsx-runtime").JSX.Element;

package/dist/types/superdate/Superdate.d.ts

@@ -1,5 +1,5 @@
 import { type SuperDateProps } from "../types";
-export declare const SuperDateTabs: ({ events, value, presets, onChange, }: SuperDateProps) => import("react/jsx-runtime").JSX.Element;
+export declare const SuperDateTabs: ({ events, value, presets, recurringEvents, onChange, }: SuperDateProps) => import("react/jsx-runtime").JSX.Element;
 /**
  * Superdate panel provides ability to select relative and absolute dates
  *
@@ -14,4 +14,4 @@ export declare const SuperDateTabs: ({ events, value, presets, onChange, }: Supe
  * `$year`,
  * `$decade`
  */
-export declare const SuperDate: ({ as, color, variant, onChange, value, ...props }: SuperDateProps) => import("react/jsx-runtime").JSX.Element;
+export declare const SuperDate: ({ as, color, variant, disabled, onChange, value, "data-test-value": testValue, "data-testid": testId, ...props }: SuperDateProps) => import("react/jsx-runtime").JSX.Element;

package/dist/types/types/index.d.ts

@@ -45,10 +45,11 @@ export interface PresetType {
     value: string;
     label: string;
 }
-export interface SuperDateProps {
+export interface SuperDateProps extends TestProps {
     as?: "button" | "chip";
     color?: ColorType;
     variant?: "solid" | "outline" | "link";
+    disabled?: boolean;
     /**
      * relative date value
      */
@@ -61,6 +62,10 @@ export interface SuperDateProps {
      * list of calendar events
      */
     events?: EventType[];
+    /**
+     * list of calendar events
+     */
+    recurringEvents?: EventType[];
     /**
      * list of relative presets
      *

package/dist/types/utils/dateUtil.d.ts

@@ -23,7 +23,7 @@ export declare namespace DateUtil {
     const isSameMonth: (date: Date, compare: Date, isHijri?: boolean) => boolean;
     const isSameYear: (date: Date, compare: Date, isHijri?: boolean) => boolean;
     const isDisabled: (date: Date, page: PageType, min?: DateLike, max?: DateLike) => boolean;
-    const parseDate: (datelike: string) => Date;
+    const parseDate: (datelike: DateLike) => Date;
     const parseRange: (datelike: string) => [Date, Date];
     const relativeTooltip: (datelike?: string, isHijri?: boolean) => string;
     const relativeLabel: (datelike?: string, isHijri?: boolean) => string | undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-fabric/date",
-  "version": "1.0.0-beta.5",
+  "version": "1.0.0-beta.6",
   "description": "RUF: Date package",
   "author": "Adarsh Pastakia <adarshpastakia@outlook.com>",
   "license": "MIT",
@@ -34,9 +34,9 @@
   },
   "dependencies": {
     "@floating-ui/react": "^0.26.24",
-    "@react-fabric/core": "^1.0.0-beta.5",
-    "@react-fabric/form": "^1.0.0-beta.5",
-    "@react-fabric/utilities": "^1.0.0-beta.5",
+    "@react-fabric/core": "^1.0.0-beta.6",
+    "@react-fabric/form": "^1.0.0-beta.6",
+    "@react-fabric/utilities": "^1.0.0-beta.6",
     "classnames": "^2.5.1",
     "date-fns": "^4.0.0",
     "resize-observer-polyfill": "^1.5.1"
@@ -54,5 +54,5 @@
     "node": ">=18.12.0",
     "npm": ">=8.19.0"
   },
-  "gitHead": "7d4a7ed1ea9890652826bef58d01c31280d761c8"
+  "gitHead": "21167df13cedeae8b365e87b9bab6d7401298cb6"
 }

package/src/superdate/EventPanel.tsx

@@ -23,7 +23,7 @@
 
 import { Content, Section } from "@react-fabric/core";
 import { EMPTY_ARRAY } from "@react-fabric/utilities";
-import { endOfDay, isSameMonth, startOfDay } from "date-fns";
+import { endOfDay, isSameMonth, setYear, startOfDay } from "date-fns";
 import i18next from "i18next";
 import { useEffect, useReducer, useState } from "react";
 import { useTranslation } from "react-i18next";
@@ -44,8 +44,21 @@ type EventActions =
   | { type: "changePage"; page: PageType }
   | { type: "changePageDate"; date: Date; changePage?: boolean };
 
-const makeList = (year: number, predefined: Array<EventType<Date>> = []) => {
+const makeList = (
+  year: number,
+  recurring: EventType[] = [],
+  predefined: Array<EventType<Date>> = [],
+) => {
   const list = [...predefined];
+  recurring.forEach((evt) =>
+    list.push({
+      label: evt.label,
+      hijri: evt.hijri,
+      icon: evt.icon,
+      start: setYear(DateUtil.parseDate(evt.start), year),
+      end: setYear(DateUtil.parseDate(evt.end), year),
+    }),
+  );
   list.push({
     label: "superdate:event.newYear",
     start: startOfDay(new Date(`${year - 1}-12-31`)),
@@ -81,6 +94,7 @@ export const EventPanel = ({
   isHijri,
   onChange,
   events = EMPTY_ARRAY,
+  recurringEvents = EMPTY_ARRAY,
 }: { isHijri: boolean } & Partial<SuperDateProps>) => {
   const { t } = useTranslation();
   const [predefined, setPredefined] = useState<
@@ -106,7 +120,11 @@ export const EventPanel = ({
       }
       if (resetList) {
         const year = state.pageDate.getFullYear();
-        state.events = makeList(year, predefined[year] ?? []);
+        state.events = makeList(
+          year,
+          recurringEvents ?? [],
+          predefined[year] ?? [],
+        );
       }
       return { ...state };
     },

package/src/superdate/Superdate.tsx

@@ -48,6 +48,7 @@ export const SuperDateTabs = ({
   events,
   value,
   presets,
+  recurringEvents,
   onChange,
 }: SuperDateProps) => {
   const { t } = useTranslation("superdate");
@@ -121,6 +122,7 @@ export const SuperDateTabs = ({
             isHijri={isHijri}
             onChange={handleChange}
             events={events}
+            recurringEvents={recurringEvents}
           />
         </Tab>
       </TabPanel>
@@ -146,8 +148,11 @@ export const SuperDate = ({
   as = "button",
   color = "primary",
   variant,
+  disabled,
   onChange,
   value,
+  "data-test-value": testValue,
+  "data-testid": testId,
   ...props
 }: SuperDateProps) => {
   const { currentCalendar, currentLocale } = useGlobals();
@@ -176,7 +181,14 @@ export const SuperDate = ({
   return (
     <Dropdown showArrow>
       <Tooltip content={DateUtil.relativeTooltip(relValue, isHijri)}>
-        <E icon={CoreIcons.clock} color={color} variant={variant as AnyObject}>
+        <E
+          icon={CoreIcons.clock}
+          color={color}
+          disabled={disabled}
+          variant={variant as AnyObject}
+          data-test-value={testValue}
+          data-testid={testId}
+        >
           {DateUtil.relativeLabel(relValue, isHijri) ?? ""}
         </E>
       </Tooltip>

package/src/types/index.ts

@@ -96,10 +96,11 @@ export interface PresetType {
   label: string;
 }
 
-export interface SuperDateProps {
+export interface SuperDateProps extends TestProps {
   as?: "button" | "chip";
   color?: ColorType;
   variant?: "solid" | "outline" | "link";
+  disabled?: boolean;
   /**
    * relative date value
    */
@@ -112,6 +113,10 @@ export interface SuperDateProps {
    * list of calendar events
    */
   events?: EventType[];
+  /**
+   * list of calendar events
+   */
+  recurringEvents?: EventType[];
   /**
    * list of relative presets
    *

package/src/utils/dateUtil.ts

@@ -157,7 +157,7 @@ export namespace DateUtil {
   };
 
   export const isRelative = (date: DateLike): date is string => {
-    return isString(date) && date.match(/^(\$\w+)([+-])(\d+)?$/) !== null;
+    return isString(date) && date.match(/^(\$\w+)([+-])?(\d+)?$/) !== null;
   };
 
   export const isRelativeRange = (date: DateLike): date is string => {
@@ -407,7 +407,7 @@ export namespace DateUtil {
     );
   };
 
-  export const parseDate = (datelike: string): Date => {
+  export const parseDate = (datelike: DateLike): Date => {
     return _parse(datelike);
   };
 
@@ -490,7 +490,8 @@ export namespace DateUtil {
     }
   };
 
-  const _parse = (dt: string, rounded?: "start" | "end") => {
+  const _parse = (dt: DateLike, rounded?: "start" | "end") => {
+    if (!isRelative(dt)) return new Date(dt);
     const [, part, diff = "0"] = dt.match(/^(\$\w+)([+-]\d+)?$/) ?? [];
     if (part) {
       let date = startOfMinute(new Date());