@react-fabric/date 1.0.0-beta.4 → 1.0.0-beta.41

package/dist/types/hijri/safe.d.ts

@@ -0,0 +1,3 @@
+export function toHijri(gregDate: any): HijriDate;
+export default HijriDate;
+import HijriDate from './HijriDate';

package/dist/types/index.d.ts

@@ -1,7 +1,11 @@
 import "./hijri";
 import "./i18n";
+export { DateHeader } from "./components/DateHeader";
+export { DecadePage } from "./components/DecadePage";
+export { YearPage } from "./components/YearPage";
 export { DateDisplay } from "./display/DateDisplay";
 export { DatePanel } from "./panels/DatePanel";
+export { EventPanel } from "./panels/EventPanel";
 export { RangePanel } from "./panels/RangePanel";
-export { SuperDate } from "./superdate/Superdate";
 export { DateUtil } from "./utils/dateUtil";
+export * from "./types";

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

@@ -0,0 +1,17 @@
+import { type EventType } from "../types";
+export interface EventProps {
+    isHijri?: boolean;
+    /**
+     * list of calendar events
+     */
+    events?: EventType[];
+    /**
+     * list of calendar events
+     */
+    recurringEvents?: EventType[];
+    /**
+     * change handler
+     */
+    onChange?: (value: string, dates: [string, string]) => void;
+}
+export declare const EventPanel: ({ isHijri, onChange, events, recurringEvents, }: EventProps) => import("react/jsx-runtime").JSX.Element;

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

@@ -1,4 +1,4 @@
-import { type ColorType, type CssProp, type TestProps } from "@react-fabric/core/dist/types/types";
+import { type CssProp, type TestProps } from "@react-fabric/core/dist/types/types";
 export type DateLike = Date | string | number;
 export type DateParsed = Date | undefined;
 export declare enum PageType {
@@ -18,6 +18,13 @@ export declare enum DatePart {
     YEAR = "$year",
     DECADE = "$decade"
 }
+export interface EventType<D = DateLike> {
+    label: string;
+    icon?: string;
+    start: D;
+    end: D;
+    hijri?: boolean;
+}
 export interface BaseProps {
     min?: DateLike;
     max?: DateLike;
@@ -34,37 +41,3 @@ export interface RangeProps extends BaseProps, CssProp, TestProps {
     onChange?: (dates: [start: string, end: string]) => void;
     presets?: Record<string, [DateLike, DateLike]>;
 }
-export interface EventType<D = DateLike> {
-    label: string;
-    icon?: string;
-    start: D;
-    end: D;
-    hijri?: boolean;
-}
-export interface PresetType {
-    value: string;
-    label: string;
-}
-export interface SuperDateProps {
-    as?: "button" | "chip";
-    color?: ColorType;
-    variant?: "solid" | "outline" | "link";
-    /**
-     * relative date value
-     */
-    value?: string;
-    /**
-     * change handler
-     */
-    onChange?: (value: string, dates: [string, string]) => void;
-    /**
-     * list of calendar events
-     */
-    events?: EventType[];
-    /**
-     * list of relative presets
-     *
-     * {value:'$year-5|$year', label:'last 5 years'}
-     */
-    presets?: PresetType[];
-}

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.4",
+  "version": "1.0.0-beta.41",
   "description": "RUF: Date package",
   "author": "Adarsh Pastakia <adarshpastakia@outlook.com>",
   "license": "MIT",
@@ -11,9 +11,11 @@
   "types": "dist/types/index.d.ts",
   "directories": {
     "src": "src",
+    "styles": "css",
     "test": "tests"
   },
   "files": [
+    "css",
     "src",
     "dist"
   ],
@@ -33,18 +35,16 @@
     "watch": "npm-run-all -p watch:rollup watch:dts"
   },
   "dependencies": {
-    "@floating-ui/react": "^0.26.24",
-    "@react-fabric/core": "^1.0.0-beta.4",
-    "@react-fabric/form": "^1.0.0-beta.4",
-    "@react-fabric/utilities": "^1.0.0-beta.4",
+    "@react-fabric/core": "^1.0.0-beta.41",
+    "@react-fabric/utilities": "^1.0.0-beta.41",
     "classnames": "^2.5.1",
     "date-fns": "^4.0.0",
     "resize-observer-polyfill": "^1.5.1"
   },
   "peerDependencies": {
     "i18next": "^23.15.1",
-    "react": ">=18.0.0 <20.0.0",
-    "react-dom": ">=18.0.0 <20.0.0",
+    "react": "^19.0.0",
+    "react-dom": "^19.0.0",
     "react-i18next": "^15.0.2"
   },
   "devDependencies": {
@@ -54,5 +54,5 @@
     "node": ">=18.12.0",
     "npm": ">=8.19.0"
   },
-  "gitHead": "47b0aede19252a3a3ef8df75c08a21caabde8100"
+  "gitHead": "bc737416d3c6a217a6b8c47291c3975a22722d80"
 }

package/src/components/DatePage.tsx

@@ -28,7 +28,6 @@ import { DateUtil } from "../utils/dateUtil";
 import { DateCell, type DateCellProps } from "./DateCell";
 import classNames from "classnames";
 import { PageType } from "../types";
-import classes from "./Date.module.css";
 
 const rows = [0, 1, 2, 3, 4, 5];
 const cols = [0, 1, 2, 3, 4, 5, 6];
@@ -57,7 +56,7 @@ export const DatePage = ({ pageDate, isHijri, ...props }: Props) => {
     >
       <div
         className={classNames(
-          classes.dateHeader,
+          "fabric-dateHeader",
           "px-1 text-center bg-tint-50 h-7",
         )}
       ></div>
@@ -67,7 +66,7 @@ export const DatePage = ({ pageDate, isHijri, ...props }: Props) => {
           <div
             key={dt.toISOString()}
             className={classNames(
-              classes.dateHeader,
+              "fabric-dateHeader",
               "font-medium text-sm p-1 mx-px text-center text-muted bg-tint-50 h-7",
             )}
           >

package/src/components/TimeSliders.tsx

@@ -24,7 +24,6 @@
 import { useDebounce } from "@react-fabric/core";
 import classNames from "classnames";
 import { useCallback, useEffect, useRef, useState } from "react";
-import classes from "./Date.module.css";
 
 interface Props {
   hour: number;
@@ -80,7 +79,7 @@ export const TimeSlider = ({ hour = 0, minute = 0, onTimeChange }: Props) => {
       <div className="flex">
         <div
           className={classNames(
-            classes.dateHeader,
+            "fabric-dateHeader",
             "flex-1 font-medium text-muted text-sm p-1 mx-px text-center bg-tint-50",
           )}
         >
@@ -88,18 +87,18 @@ export const TimeSlider = ({ hour = 0, minute = 0, onTimeChange }: Props) => {
         </div>
         <div
           className={classNames(
-            classes.dateHeader,
+            "fabric-dateHeader",
             "flex-1 font-medium text-muted text-sm p-1 mx-px text-center bg-tint-50",
           )}
         >
           M
         </div>
       </div>
-      <div className="flex flex-1 flex-nowrap overflow-hidden relative">
+      <div className="flex flex-1 flex-nowrap items-stretch overflow-hidden relative">
         <div
           className={classNames(
             "flex-1 overflow-auto scroll-hide snap-y snap-mandatory",
-            classes.timeSlider,
+            "fabric-date-timeSlider",
           )}
           onScroll={calculateTime}
           ref={hourRef}
@@ -144,7 +143,7 @@ export const TimeSlider = ({ hour = 0, minute = 0, onTimeChange }: Props) => {
         <div
           className={classNames(
             "flex-1 overflow-auto scroll-hide snap-y snap-mandatory",
-            classes.timeSlider,
+            "fabric-date-timeSlider",
           )}
           onScroll={calculateTime}
           ref={minuteRef}

package/src/display/DateDisplay.tsx

@@ -46,6 +46,8 @@ export interface Props
    * date format
    */
   format?: string;
+
+  showAlternateDate?: boolean;
 }
 
 export const DateDisplay = ({
@@ -53,12 +55,14 @@ export const DateDisplay = ({
   className,
   format = "eee, PPpp",
   children,
+  showAlternateDate,
   ...aria
 }: Props) => {
   const { currentCalendar, currentLocale } = useGlobals();
 
   const dtLabel = (
     <Tooltip
+      disabled={!showAlternateDate}
       content={DateUtil.format(
         date,
         format,
@@ -78,7 +82,7 @@ export const DateDisplay = ({
   );
 
   return children ? (
-    <Dropdown>
+    <Dropdown showArrow closeOnClick>
       {dtLabel}
       {children}
     </Dropdown>

package/src/hijri/DateConverter.js

@@ -0,0 +1,175 @@
+function intPart(floatNum) {
+  if (floatNum < -0.0000001) {
+    return Math.ceil(floatNum - 0.0000001)
+  }
+  return Math.floor(floatNum + 0.0000001)
+}
+var delta = 1
+
+function GregToIsl(arg) {
+
+  let d = parseInt(arg.CDay.value)
+  let m = parseInt(arg.CMonth.value)
+  let y = parseInt(arg.CYear.value)
+  let jd, l, jd1, n, j, delta = 1;
+  if ((y > 1582) || ((y == 1582) && (m > 10)) || ((y == 1582) && (m == 10) && (d > 14))) {
+    //added delta=1 on jd to comply isna rulling 2007
+    jd = intPart((1461 * (y + 4800 + intPart((m - 14) / 12))) / 4) + intPart((367 * (m - 2 - 12 * (intPart((m - 14) / 12)))) / 12) -
+      intPart((3 * (intPart((y + 4900 + intPart((m - 14) / 12)) / 100))) / 4) + d - 32075 + delta
+  } else {
+    //added +1 on jd to comply isna rulling
+    jd = 367 * y - intPart((7 * (y + 5001 + intPart((m - 9) / 7))) / 4) + intPart((275 * m) / 9) + d + 1729777 + delta
+  }
+
+    //added -1 on jd1 to comply isna rulling
+  jd1 = jd - delta
+  l = jd - 1948440 + 10632
+  n = intPart((l - 1) / 10631)
+  l = l - 10631 * n + 354
+  j = (intPart((10985 - l) / 5316)) * (intPart((50 * l) / 17719)) + (intPart(l / 5670)) * (intPart((43 * l) / 15238))
+  l = l - (intPart((30 - j) / 15)) * (intPart((17719 * j) / 50)) - (intPart(j / 16)) * (intPart((15238 * j) / 43)) + 29
+  m = intPart((24 * l) / 709)
+  d = l - intPart((709 * m) / 24)
+  y = 30 * n + j - 30
+
+  return {
+    d,
+    m,
+    y,
+    dateOfWeek: jd1 % 7,
+    dayName:weekDay(jd1 % 7),
+  };
+
+}
+
+function IslToGreg(arg) {
+
+
+  let d = parseInt(arg.HDay.value)
+  let m = parseInt(arg.HMonth.value)
+  let y = parseInt(arg.HYear.value)
+    //added - delta=1 on jd to comply isna rulling
+  let jd = intPart((11 * y + 3) / 30) + 354 * y + 30 * m - intPart((m - 1) / 2) + d + 1948440 - 385 - delta
+
+  let l,n ,i ,j,k ;
+
+  if (jd > 2299160) {
+    l = jd + 68569
+    n = intPart((4 * l) / 146097)
+    l = l - intPart((146097 * n + 3) / 4)
+    i = intPart((4000 * (l + 1)) / 1461001)
+    l = l - intPart((1461 * i) / 4) + 31
+    j = intPart((80 * l) / 2447)
+    d = l - intPart((2447 * j) / 80)
+    l = intPart(j / 11)
+    m = j + 2 - 12 * l
+    y = 100 * (n - 49) + i + l
+  } else {
+    j = jd + 1402
+    k = intPart((j - 1) / 1461)
+    l = j - 1461 * k
+    n = intPart((l - 1) / 365) - intPart(l / 1461)
+    i = l - 365 * n + 30
+    j = intPart((80 * i) / 2447)
+    d = i - intPart((2447 * j) / 80)
+    i = intPart(j / 11)
+    m = j + 2 - 12 * i
+    y = 4 * k + n + i - 4716
+  }
+
+  //arg.CDay.value=d
+  //arg.CMonth.value=m
+  //arg.CYear.value=y
+
+  return {
+    d,
+    m,
+    y,
+    dateOfWeek: jd % 7,
+    dayName: weekDay(jd % 7),
+  };
+}
+
+
+
+
+export function weekDay(wdn) {
+  if (wdn == 0) {
+    return "Mon"
+  }
+  if (wdn == 1) {
+    return "Tue"
+  }
+  if (wdn == 2) {
+    return "Wed"
+  }
+  if (wdn == 3) {
+    return "Thu"
+  }
+  if (wdn == 4) {
+    return "Fri"
+  }
+  if (wdn == 5) {
+    return "Sat"
+  }
+  if (wdn == 6) {
+    return "Sun"
+  }
+  return ""
+
+}
+
+function GregToHijri(gregDate) {
+  const hijriDate = GregToIsl({
+    CDay: {
+      value: gregDate.getDate()
+    },
+    CYear: {
+      value: gregDate.getFullYear()
+    },
+    CMonth: {
+      value: gregDate.getMonth() + 1
+    }
+  });
+
+  return {
+    year: hijriDate.y,
+    month: hijriDate.m,
+    date: hijriDate.d,
+    hours: gregDate.getHours(),
+    minutes: gregDate.getMinutes(),
+    seconds: gregDate.getSeconds(),
+    milliseconds: gregDate.getMilliseconds(),
+    day: hijriDate.dateOfWeek,
+    dayName: hijriDate.dayName
+  };
+
+};
+
+function HijriToGreg(hijriDate) {
+  const gregDate =  IslToGreg({
+    HDay: {
+      value: hijriDate._date || hijriDate.date
+    },
+    HYear: {
+      value: hijriDate._year || hijriDate.year
+    },
+    HMonth: {
+      value: hijriDate._month || hijriDate.month
+    }
+  });
+
+  return new Date(gregDate.y,
+    gregDate.m -1 ,
+    gregDate.d,
+    hijriDate.getHours(),
+    hijriDate.getMinutes() ,
+    hijriDate.getSeconds(),
+    hijriDate.getMilliseconds()
+  )
+
+};
+
+export {GregToHijri};
+
+export {HijriToGreg};

package/src/hijri/FormatDate.js

@@ -0,0 +1,132 @@
+const dateFormat = (function () {
+  const token =
+      /P{1,4}|p{1,4}|d{1,2}|e{3,6}|M{1,4}|yy(?:yy)?|([Hhms])\1?|[a]{1,4}|[LloSZ]|('at')|"[^"]*"|'[^']*'/g,
+    timezone =
+      /\b(?:[PMCEA][SDP]T|(?:Pacific|Mountain|Central|Eastern|Atlantic) (?:Standard|Daylight|Prevailing) Time|(?:GMT|UTC)(?:[-+]\d{4})?)\b/g,
+    timezoneClip = /[^-+\dA-Z]/g,
+    pad = function (val, len) {
+      val = String(val);
+      len = len || 2;
+      while (val.length < len) val = "0" + val;
+      return val;
+    };
+
+  // Regexes and supporting functions are cached through closure
+  return function (
+    date,
+    mask,
+    options = {
+      utc: false,
+    },
+  ) {
+    const { locales, defaultLocale } = require("./HijriDate").default;
+    options.locale = options.locale || defaultLocale;
+    if (!locales[options.locale]) {
+      throw new Error(`Locale ${options.locale} is not supported yet .
+          Please, try to extend "HijriDate.locales" :
+             i.e: HijriDate.locales.${options.locale} = {dayNames:[..14 items..], monthNames:[..24 items..]}
+        `);
+      return;
+    }
+    // You can't provide utc if you skip other args (use the "UTC:" mask prefix)
+    if (
+      arguments.length == 1 &&
+      Object.prototype.toString.call(date) == "[object String]" &&
+      !/\d/.test(date)
+    ) {
+      mask = date;
+      date = undefined;
+    }
+
+    mask = String(masks[mask] || mask || masks["default"]);
+
+    // Allow setting the utc argument via the mask
+    if (mask.slice(0, 4) == "UTC:") {
+      mask = mask.slice(4);
+      options.utc = true;
+    }
+
+    var _ = options.utc ? "getUTC" : "get",
+      d = date[_ + "Date"](),
+      D = date[_ + "Day"](),
+      M = date[_ + "Month"](),
+      mIndex = date[_ + "MonthIndex"](),
+      y = date[_ + "FullYear"](),
+      H = date[_ + "Hours"](),
+      m = date[_ + "Minutes"](),
+      s = date[_ + "Seconds"](),
+      L = date[_ + "Milliseconds"](),
+      o = options.utc ? 0 : date.getTimezoneOffset(),
+      flags = {
+        d: d,
+        dd: pad(d),
+        ddd: locales[options.locale].dayNames[D === 7 ? 0 : D + 1],
+        dddd: locales[options.locale].dayNames[(D === 7 ? 0 : D + 1) + 7],
+        ee: locales[options.locale].dayNames[D],
+        eee: locales[options.locale].dayNames[D + 7],
+        eeee: locales[options.locale].dayNames[D + 14],
+        eeeeee: locales[options.locale].dayNames[D],
+        M,
+        MM: pad(M),
+        MMM: locales[options.locale].monthNames[mIndex],
+        MMMM: locales[options.locale].monthNames[mIndex + 12],
+        yy: String(y).slice(2),
+        yyyy: y,
+        h: H % 12 || 12,
+        hh: pad(H % 12 || 12),
+        H: H,
+        HH: pad(H),
+        m,
+        mm: pad(m),
+        s: s,
+        ss: pad(s),
+        l: pad(L, 3),
+        L: pad(L > 99 ? Math.round(L / 10) : L),
+        a: H < 12 ? locales[options.locale].am : locales[options.locale].pm,
+        aa: H < 12 ? locales[options.locale].am : locales[options.locale].pm,
+        aaa: H < 12 ? locales[options.locale].am : locales[options.locale].pm,
+        aaaa: H < 12 ? locales[options.locale].am : locales[options.locale].pm,
+        aaaaa: H < 12 ? locales[options.locale].am : locales[options.locale].pm,
+        "'at'": locales[options.locale].separator,
+        t: H < 12 ? "a" : "p",
+        tt: H < 12 ? "am" : "pm",
+        T: H < 12 ? "A" : "P",
+        TT: H < 12 ? "AM" : "PM",
+        //  Z: options.utc ? "UTC" : (String(date).match(timezone) || [""]).pop().replace(timezoneClip, ""),
+        o:
+          (o > 0 ? "-" : "+") +
+          pad(Math.floor(Math.abs(o) / 60) * 100 + (Math.abs(o) % 60), 4),
+        S: ["th", "st", "nd", "rd"][
+          d % 10 > 3 ? 0 : (((d % 100) - (d % 10) != 10) * d) % 10
+        ],
+      };
+
+    return mask.replace(token, function ($0) {
+      if ($0 === "P") return `${flags.d}/${flags.M}/${flags.yyyy} `;
+      if ($0.startsWith("PP"))
+        return `${flags.MMM} ${flags.dd}, ${flags.yyyy} `;
+      if ($0 === "p") return `${flags.h}:${flags.m} ${flags.a}`;
+      if ($0.startsWith("pp"))
+        return `${flags.hh}:${flags.mm}:${flags.ss} ${flags.a}`;
+      return $0 in flags ? flags[$0] : $0.slice(1, $0.length - 1);
+    });
+  };
+})();
+
+// Some common format strings
+export const masks = {
+  default: "ddd MMM dd yyyy HH:mm:ss",
+  shortDate: "M/d/yy",
+  mediumDate: "MMM d, yyyy",
+  longDate: "MMMM d, yyyy",
+  fullDate: "dddd, MMMM d, yyyy",
+  shortTime: "h:mm TT",
+  mediumTime: "h:mm:ss TT",
+  longTime: "h:mm:ss TT Z",
+  isoDate: "yyyy-MM-dd",
+  isoTime: "HH:mm:ss",
+  isoDateTime: "yyyy-MM-dd'T'HH:mm:ss",
+  isoUtcDateTime: "UTC:yyyy-MM-dd'T'HH:mm:ss'Z'",
+};
+
+export default dateFormat;