@apexcura/ui-components 0.0.14-Beta278 → 0.0.14-Beta279

package/dist/index.js

@@ -874,48 +874,47 @@ var DatePickerElement = (props) => {
 var import_react21 = __toESM(require("react"));
 var import_antd15 = require("antd");
 var import_dayjs2 = __toESM(require("dayjs"));
+var import_moment2 = __toESM(require("moment"));
 var DateRangePickerElement = (props) => {
   const { value } = props;
   const { RangePicker } = import_antd15.DatePicker;
   const dateValues = value ? value.map((date) => (0, import_dayjs2.default)(date, "DD-MM-YYYY")) : null;
-  const today = (0, import_dayjs2.default)();
   const handleChange = (dates, dateStrings) => {
     if (dates) {
-      if (props.weekrange) {
-        const updatedDates = [today, dates[1] || dates[0]];
-        const updatedDateStrings = updatedDates.map((date) => date && date.format("DD-MM-YYYY"));
-        props.onChange && props.onChange(updatedDateStrings);
-      } else {
-        props.onChange && props.onChange(dateStrings);
+      let [start, end] = dates;
+      const today2 = (0, import_dayjs2.default)();
+      if (end && end.isAfter(today2)) {
+        start = today2;
+      }
+      if (start && start.isBefore(today2)) {
+        end = today2;
       }
+      const adjustedDates = [start, end].map((date) => date ? date.format("DD-MM-YYYY") : null);
+      props.onChange && props.onChange(adjustedDates);
     } else {
       props.onChange && props.onChange("");
     }
   };
+  const today = (0, import_dayjs2.default)();
   let rangePresets = [
     { label: "Last 7 Days", value: [(0, import_dayjs2.default)().subtract(6, "d"), today] },
     { label: "Last 14 Days", value: [(0, import_dayjs2.default)().subtract(13, "d"), today] },
     { label: "Last 30 Days", value: [(0, import_dayjs2.default)().subtract(29, "d"), today] },
     { label: "Last 90 Days", value: [(0, import_dayjs2.default)().subtract(89, "d"), today] }
   ];
+  let disabledDate;
   if (props.weekrange) {
-    rangePresets = [
-      {
-        label: "This Week",
-        value: [today.startOf("week"), today.endOf("week")]
-      },
-      {
-        label: "Last Week",
-        value: [today.startOf("week").subtract(1, "week"), today.endOf("week").subtract(1, "week")]
+    disabledDate = (current) => {
+      if (props.weekrange) {
+        return current && (current < today.subtract(7, "d") || current > today.add(7, "d"));
       }
-    ];
+      return current && (current > today.add(7, "d") || current < today.subtract(7, "d"));
+    };
+  } else {
+    disabledDate = (current) => {
+      return current && current > (0, import_moment2.default)();
+    };
   }
-  const disabledDate = (current) => {
-    if (props.weekrange) {
-      return current && (current < today.subtract(7, "d") || current > today.add(7, "d"));
-    }
-    return current && (current > today.add(7, "d") || current < today.subtract(7, "d"));
-  };
   return /* @__PURE__ */ import_react21.default.createElement(import_antd15.Space, { direction: "vertical", size: 12 }, /* @__PURE__ */ import_react21.default.createElement(
     RangePicker,
     {

package/dist/index.mjs

@@ -807,48 +807,47 @@ var DatePickerElement = (props) => {
 import React21 from "react";
 import { DatePicker as DatePicker2, Space } from "antd";
 import dayjs2 from "dayjs";
+import moment2 from "moment";
 var DateRangePickerElement = (props) => {
   const { value } = props;
   const { RangePicker } = DatePicker2;
   const dateValues = value ? value.map((date) => dayjs2(date, "DD-MM-YYYY")) : null;
-  const today = dayjs2();
   const handleChange = (dates, dateStrings) => {
     if (dates) {
-      if (props.weekrange) {
-        const updatedDates = [today, dates[1] || dates[0]];
-        const updatedDateStrings = updatedDates.map((date) => date && date.format("DD-MM-YYYY"));
-        props.onChange && props.onChange(updatedDateStrings);
-      } else {
-        props.onChange && props.onChange(dateStrings);
+      let [start, end] = dates;
+      const today2 = dayjs2();
+      if (end && end.isAfter(today2)) {
+        start = today2;
+      }
+      if (start && start.isBefore(today2)) {
+        end = today2;
       }
+      const adjustedDates = [start, end].map((date) => date ? date.format("DD-MM-YYYY") : null);
+      props.onChange && props.onChange(adjustedDates);
     } else {
       props.onChange && props.onChange("");
     }
   };
+  const today = dayjs2();
   let rangePresets = [
     { label: "Last 7 Days", value: [dayjs2().subtract(6, "d"), today] },
     { label: "Last 14 Days", value: [dayjs2().subtract(13, "d"), today] },
     { label: "Last 30 Days", value: [dayjs2().subtract(29, "d"), today] },
     { label: "Last 90 Days", value: [dayjs2().subtract(89, "d"), today] }
   ];
+  let disabledDate;
   if (props.weekrange) {
-    rangePresets = [
-      {
-        label: "This Week",
-        value: [today.startOf("week"), today.endOf("week")]
-      },
-      {
-        label: "Last Week",
-        value: [today.startOf("week").subtract(1, "week"), today.endOf("week").subtract(1, "week")]
+    disabledDate = (current) => {
+      if (props.weekrange) {
+        return current && (current < today.subtract(7, "d") || current > today.add(7, "d"));
       }
-    ];
+      return current && (current > today.add(7, "d") || current < today.subtract(7, "d"));
+    };
+  } else {
+    disabledDate = (current) => {
+      return current && current > moment2();
+    };
   }
-  const disabledDate = (current) => {
-    if (props.weekrange) {
-      return current && (current < today.subtract(7, "d") || current > today.add(7, "d"));
-    }
-    return current && (current > today.add(7, "d") || current < today.subtract(7, "d"));
-  };
   return /* @__PURE__ */ React21.createElement(Space, { direction: "vertical", size: 12 }, /* @__PURE__ */ React21.createElement(
     RangePicker,
     {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@apexcura/ui-components",
-  "version": "0.0.14-Beta278",
+  "version": "0.0.14-Beta279",
   "description": "Apex cura React components library",
   "keywords": [
     "apex cura",