@react-fabric/date 1.0.0-beta.8 → 1.0.1

package/src/display/DateDisplay.tsx

@@ -21,23 +21,15 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-import { Dropdown, Tooltip, useGlobals } from "@react-fabric/core";
-import { type MenuItemProps } from "@react-fabric/core/dist/types/components/menu/types";
-import {
-  type AriaProps,
-  type ChildrenProp,
-  type CssProp,
-  type TestProps,
-} from "@react-fabric/core/dist/types/types";
+import { Dropdown, Tooltip, useApplicationContext } from "@react-fabric/core";
+import { type MenuProps } from "@react-fabric/core/dist/types/components/menu/types";
+import { type ChildrenProp, type CssProp, type TestProps } from "@react-fabric/core/dist/types/types";
+import { cn } from "@react-fabric/utilities";
 import { type ElementType } from "react";
 import { type DateLike } from "../types";
 import { DateUtil } from "../utils/dateUtil";
 
-export interface Props
-  extends CssProp,
-    AriaProps,
-    TestProps,
-    Partial<ChildrenProp<ElementType<MenuItemProps>>> {
+export interface Props extends CssProp, TestProps, Partial<ChildrenProp<ElementType<MenuProps>>> {
   /**
    * date like value
    */
@@ -46,43 +38,39 @@ export interface Props
    * date format
    */
   format?: string;
+
+  showAlternateDate?: boolean;
 }
 
-export const DateDisplay = ({
-  date,
-  className,
-  format = "eee, PPpp",
-  children,
-  ...aria
-}: Props) => {
-  const { currentCalendar, currentLocale } = useGlobals();
+/**
+ * DateDisplay component to display a formatted gregorian or hijri date with optional tooltip and dropdown.
+ * It uses the current calendar and locale from the global context.
+ * It formats the date using the provided format or a default format.
+ * If `showAlternateDate` is true, it shows a tooltip with the formatted date.
+ * If `children` are provided, it wraps the date in a dropdown.
+ *
+ * @example
+ * ```jsx
+ * <DateDisplay date={new Date()} />
+ * ```
+ */
+export function DateDisplay({ date, className, format = "eee, PPpp", children, showAlternateDate, ...aria }: Props) {
+  const { currentCalendar, currentLocale } = useApplicationContext();
 
   const dtLabel = (
-    <Tooltip
-      content={DateUtil.format(
-        date,
-        format,
-        currentLocale,
-        currentCalendar !== "hijri",
-      )}
-    >
-      <span className={className} {...aria}>
-        {DateUtil.format(
-          date,
-          format,
-          currentLocale,
-          currentCalendar === "hijri",
-        )}
+    <Tooltip disabled={!showAlternateDate} content={DateUtil.format(date, format, currentLocale, currentCalendar !== "hijri")}>
+      <span className={cn(className, !!children && "underline decoration-dotted cursor-pointer")} {...aria}>
+        {DateUtil.format(date, format, currentLocale, currentCalendar === "hijri")}
       </span>
     </Tooltip>
   );
 
   return children ? (
-    <Dropdown>
+    <Dropdown showArrow closeOnClick>
       {dtLabel}
       {children}
     </Dropdown>
   ) : (
     dtLabel
   );
-};
+}

package/src/display/DateDuration.tsx

@@ -0,0 +1,170 @@
+/*
+ * React Fabric
+ * @version: 1.0.0
+ *
+ *
+ * The MIT License (MIT)
+ * Copyright (c) 2025 Adarsh Pastakia
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this software
+ * and associated documentation files (the "Software"), to deal in the Software without restriction,
+ * including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies or substantial
+ * portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+ * TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+import { Dropdown, Tooltip } from "@react-fabric/core";
+import { type MenuProps } from "@react-fabric/core/dist/types/components/menu/types";
+import { type ChildrenProp, type CssProp, type TestProps } from "@react-fabric/core/dist/types/types";
+import { cn, Format } from "@react-fabric/utilities";
+import { intervalToDuration, isBefore } from "date-fns";
+import { useEffect, useMemo, useState } from "react";
+import { useTranslation } from "react-i18next";
+import { type DateLike } from "../types";
+import { DateUtil } from "../utils/dateUtil";
+
+export interface Props extends CssProp, TestProps, Partial<ChildrenProp<MenuProps>> {
+  /**
+   * date like value
+   */
+  date: DateLike;
+  /**
+   * date format
+   */
+  format?: string;
+}
+
+/**
+ * DateDuration component to display the duration from a given date to now.
+ * It calculates the difference in years, months, weeks, days, hours, minutes, and seconds,
+ * and displays it in a human-readable format.
+ * It uses the current locale for translations.
+ *
+ * @example
+ * ```jsx
+ * <DateDuration date={new Date("2020-01-01")} />
+ * ```
+ */
+export function DateDuration({ date, children, className, format = "PPpp", ...props }: Props) {
+  const { t } = useTranslation("date");
+  const [dateInterval, setDateInterval] = useState<ReturnType<typeof intervalToDuration>>(() => ({}));
+
+  useEffect(() => {
+    // eslint-disable-next-line @eslint-react/set-state-in-effect
+    setDateInterval(intervalToDuration({ start: new Date(date), end: new Date() }));
+    // update interval every minute
+    const tmr = setInterval(() => {
+      setDateInterval(intervalToDuration({ start: new Date(date), end: new Date() }));
+    }, 60 * 1000);
+    return () => clearInterval(tmr);
+  }, [date]);
+
+  const label = useMemo(() => {
+    const before = isBefore(DateUtil.parseDate(date), new Date());
+    const tkey = before ? "relative.before" : "relative.after";
+    let part = "now";
+    let count = 0;
+    if (dateInterval.years && dateInterval.years > 0) {
+      part = "years";
+      count = dateInterval.years;
+      if ((dateInterval.months ?? 0) > 10) {
+        part = "yearsX";
+        count += 1;
+      }
+    } else if (dateInterval.months && dateInterval.months > 0) {
+      part = "months";
+      count = dateInterval.months;
+      if (dateInterval.months > 10) {
+        part = "yearsX";
+        count = 1;
+      } else if ((dateInterval.weeks ?? 0) > 3) {
+        part = "monthsX";
+        count += 1;
+      }
+    } else if (dateInterval.weeks && dateInterval.weeks > 0) {
+      part = "weeks";
+      count = dateInterval.weeks;
+      if (dateInterval.weeks > 3) {
+        part = "monthsX";
+        count = 1;
+      } else if ((dateInterval.days ?? 0) > 5) {
+        part = "weeksX";
+        count += 1;
+      }
+    } else if (dateInterval.days && dateInterval.days > 0) {
+      part = "days";
+      count = dateInterval.days;
+      if (dateInterval.days > 5) {
+        part = "weeksX";
+        count = 1;
+      } else if ((dateInterval.hours ?? 0) > 20) {
+        part = "daysX";
+        count += 1;
+      }
+    } else if (dateInterval.hours && dateInterval.hours > 0) {
+      part = "hours";
+      count = dateInterval.hours;
+      if (dateInterval.hours > 20) {
+        part = "daysX";
+        count = 1;
+      } else if ((dateInterval.minutes ?? 0) > 45) {
+        part = "hoursX";
+        count += 1;
+      }
+    } else if (dateInterval.minutes && dateInterval.minutes > 0) {
+      part = "minutes";
+      count = dateInterval.minutes;
+      if (dateInterval.minutes > 45) {
+        part = "hoursX";
+        count = 1;
+      } else if ((dateInterval.seconds ?? 0) > 45) {
+        part = "minuteX";
+        count += 1;
+      }
+    } else if (dateInterval.seconds && dateInterval.seconds > 15) {
+      part = "seconds";
+      count = dateInterval.seconds;
+      if (dateInterval.seconds > 45) {
+        part = "minutesX";
+        count = 1;
+      }
+    }
+
+    return t(`${tkey}.${part}`, { count });
+  }, [
+    date,
+    dateInterval.days,
+    dateInterval.hours,
+    dateInterval.minutes,
+    dateInterval.months,
+    dateInterval.seconds,
+    dateInterval.weeks,
+    dateInterval.years,
+    t,
+  ]);
+
+  const dtLabel = (
+    <Tooltip content={Format.date(date, format)}>
+      <span className={cn(className, !!children && "underline decoration-dotted cursor-pointer")} {...props}>
+        {label}
+      </span>
+    </Tooltip>
+  );
+
+  return children ? (
+    <Dropdown showArrow closeOnClick>
+      {dtLabel}
+      {children}
+    </Dropdown>
+  ) : (
+    dtLabel
+  );
+}

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,134 @@
+import HijriDate from "./HijriDate";
+
+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 } = HijriDate;
+    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;