@m4l/components 9.3.19 → 9.3.21-JAEBeta.0

package/utils/formatDistanceToNow/formatDistanteToNow.js

@@ -9,7 +9,7 @@ const replaceValues = (label, ...values) => {
 };
 const formatDistanceToNow = (type, date, dictionary) => {
   if (!(date instanceof Date)) {
-    return "No date";
+    return { time: "No date", value: "", unit: "" };
   }
   const now = /* @__PURE__ */ new Date();
   const diff = now.getTime() - date.getTime();
@@ -19,6 +19,8 @@ const formatDistanceToNow = (type, date, dictionary) => {
   const days = Math.floor(hours / 24);
   const months = Math.floor(days / 30);
   const years = Math.floor(months / 12);
+  let value;
+  let unit;
   let timeElaped = "";
   const unitYears = years > 1 ? dictionary.label_unit_time_years : dictionary.label_unit_time_year;
   const unitMonths = months % 12 > 1 ? dictionary.label_unit_time_months : dictionary.label_unit_time_month;
@@ -32,6 +34,8 @@ const formatDistanceToNow = (type, date, dictionary) => {
   } else if (type === "future") {
     label = dictionary.label_sentence_future_others;
   }
+  const separatorTime = ":";
+  const separatorDate = "-";
   if (seconds < 60) {
     if (type === "past") {
       timeElaped = replaceValues(dictionary.label_sentence_past_seconds, seconds + "", unitSeconds);
@@ -48,34 +52,46 @@ const formatDistanceToNow = (type, date, dictionary) => {
         unitSeconds
       );
     }
+    value = seconds.toString().padStart(2, "0") + "";
+    unit = dictionary.label_unit_time_seconds_short;
   } else if (minutes < 60) {
     timeElaped = replaceValues(label, `${minutes}`, unitMinutes);
+    value = minutes.toString().padStart(2, "0") + ":" + (seconds % 60).toString().padStart(2, "0");
+    unit = dictionary.label_unit_time_minutes_short + dictionary.label_separator_time + dictionary.label_unit_time_seconds_short;
   } else if (hours < 24) {
     if (minutes % 60 > 0) {
       timeElaped = replaceValues(label, `${hours} ${unitHours} ${minutes % 60} ${unitMinutes}`, "");
     } else {
       timeElaped = replaceValues(label, `${hours} ${unitHours}`, "");
     }
+    value = hours.toString().padStart(2, "0") + ":" + (minutes % 60).toString().padStart(2, "0");
+    unit = dictionary.label_unit_time_hours_short + separatorTime + dictionary.label_unit_time_minutes_short;
   } else if (days < 30) {
     if (hours % 24 > 0) {
       timeElaped = replaceValues(label, `${days} ${unitDays} ${hours % 24} ${unitHours}`, "");
     } else {
       timeElaped = replaceValues(label, `${days} ${unitDays}`, "");
     }
+    value = days.toString().padStart(2, "0") + " " + (hours % 24).toString().padStart(2, "0");
+    unit = dictionary.label_unit_time_days_short + " " + dictionary.label_unit_time_hours_short;
   } else if (months < 12) {
     if (days % 30 > 0) {
       timeElaped = replaceValues(label, `${months} ${unitMonths} ${days % 30} ${unitDays}`, "");
     } else {
       timeElaped = replaceValues(label, `${months} ${unitMonths}`, "");
     }
+    value = months.toString().padStart(2, "0") + separatorDate + (days % 30).toString().padStart(2, "0");
+    unit = dictionary.label_unit_time_months_short + separatorDate + dictionary.label_unit_time_days_short;
   } else {
     if (months % 12 > 0) {
       timeElaped = replaceValues(label, `${years} ${unitYears} ${months % 12} ${unitMonths}`, "");
     } else {
       timeElaped = replaceValues(label, `${years} ${unitYears}`, "");
     }
+    value = years.toString().padStart(2, "0") + separatorDate + (months % 12).toString().padStart(2, "0");
+    unit = dictionary.label_unit_time_years_short + separatorDate + dictionary.label_unit_time_months_short;
   }
-  return timeElaped;
+  return { time: timeElaped, value, unit };
 };
 export {
   formatDistanceToNow as f

package/utils/formatDistanceToNow/types.d.ts

@@ -13,9 +13,22 @@ export type FormatDistanteToNowDictionary = {
     label_unit_time_month: string;
     label_unit_time_year: string;
     label_unit_time_seconds: string;
+    label_unit_time_seconds_short: string;
     label_unit_time_minutes: string;
+    label_unit_time_minutes_short: string;
     label_unit_time_hours: string;
+    label_unit_time_hours_short: string;
     label_unit_time_days: string;
+    label_unit_time_days_short: string;
     label_unit_time_months: string;
+    label_unit_time_months_short: string;
     label_unit_time_years: string;
+    label_unit_time_years_short: string;
+    label_separator_time: string;
+    label_separator_date: string;
+};
+export type FormatDistanceToNowReturn = {
+    time: string;
+    value: string;
+    unit: string;
 };

package/utils/index.d.ts

@@ -11,3 +11,4 @@ export { getSizeStyles } from './getSizeStyles';
 export * from './formatDistanceToNow';
 export * from './getValidDate';
 export * from './getNullGuard';
+export * from './deepShallow';