@widergy/energy-ui 3.83.0 → 3.83.1

package/CHANGELOG.md

@@ -1,3 +1,10 @@
+## [3.83.1](https://github.com/widergy/energy-ui/compare/v3.83.0...v3.83.1) (2025-06-23)
+
+
+### Bug Fixes
+
+* [OAG-1369] date search error ([#621](https://github.com/widergy/energy-ui/issues/621)) ([7133f09](https://github.com/widergy/energy-ui/commit/7133f09385cd3bee092abf55b2b05cd99b64a4db))
+
 # [3.83.0](https://github.com/widergy/energy-ui/compare/v3.82.2...v3.83.0) (2025-06-19)
 
 

package/dist/components/UTDatePicker/index.js

@@ -11,6 +11,7 @@ var _dayjs = _interopRequireDefault(require("@date-io/dayjs"));
 var _dayjs2 = _interopRequireDefault(require("dayjs"));
 var _es = _interopRequireDefault(require("dayjs/locale/es"));
 var _customParseFormat = _interopRequireDefault(require("dayjs/plugin/customParseFormat"));
+var _isBetween = _interopRequireDefault(require("dayjs/plugin/isBetween"));
 var _form = require("@widergy/web-utils/lib/form");
 var _isEmpty = _interopRequireDefault(require("lodash/isEmpty"));
 var _UTLabel = _interopRequireDefault(require("../UTLabel"));
@@ -51,6 +52,7 @@ CalendarIcon.defaultProps = {
   xmlnsXlink: "http://www.w3.org/1999/xlink"
 };
 _dayjs2.default.extend(_customParseFormat.default);
+_dayjs2.default.extend(_isBetween.default);
 class CustomUtils extends _dayjs.default {
   constructor() {
     super(...arguments);
@@ -90,20 +92,20 @@ const UTDatePicker = _ref => {
   const onlyPastMonth = (field === null || field === void 0 || (_field$configuration2 = field.configuration) === null || _field$configuration2 === void 0 || (_field$configuration2 = _field$configuration2.customDateValidations) === null || _field$configuration2 === void 0 || (_field$configuration2 = _field$configuration2.onlyPastMonth) === null || _field$configuration2 === void 0 ? void 0 : _field$configuration2.active) || false;
   const avoidFutureDates = (field === null || field === void 0 || (_field$configuration3 = field.configuration) === null || _field$configuration3 === void 0 || (_field$configuration3 = _field$configuration3.customDateValidations) === null || _field$configuration3 === void 0 || (_field$configuration3 = _field$configuration3.avoidFutureDates) === null || _field$configuration3 === void 0 ? void 0 : _field$configuration3.active) || false;
   const {
-    minDate,
-    maxDate
-  } = (onlyPastMonth ? (0, _utils2.getPastMonthDates)() : avoidFutureDates ? (0, _utils2.getMaxDate)() : range) || {};
+    maxDate,
+    minDate
+  } = onlyPastMonth ? (0, _utils2.getPastMonthDates)() : avoidFutureDates ? (0, _utils2.getMaxDate)() : range || pickerProps || {};
   const [pickedDate, setPickedDate] = (0, _react.useState)(null);
   const [internalError, setInternalError] = (0, _react.useState)(null);
   const handleChange = date => {
-    setPickedDate(date);
-    const newValue = (0, _dayjs2.default)(date, _constants.OUTPUT_LABEL_MASK, true);
-    if ((0, _utils2.isValidDate)({
-      avoidFutureDates,
-      newValue,
-      onlyPastMonth,
-      range
-    })) input.onChange(newValue.format(configMask));else input.onChange('');
+    const finalDate = (0, _utils2.getFinalDate)({
+      date,
+      maxDate,
+      minDate
+    });
+    setPickedDate(finalDate);
+    const newValue = (0, _dayjs2.default)(finalDate, _constants.OUTPUT_LABEL_MASK, true);
+    if (newValue.isValid()) input.onChange(newValue.format(configMask));else input.onChange('');
   };
   (0, _react.useEffect)(() => {
     if (!input.value && pickedDate !== null && pickedDate !== void 0 && pickedDate.isValid()) setPickedDate(null);else if ((0, _utils2.dateMatchesFormat)(input.value, configMask)) setPickedDate((0, _dayjs2.default)(input.value, configMask));
@@ -172,10 +174,11 @@ const UTDatePicker = _ref => {
     PopoverProps: {
       ...(iconAnchor ? (0, _constants.iconAnchorProps)(operenerIconReference) : {}),
       ...popoverProps
-    },
+    }
+  }, pickerProps, {
     minDate: minDate,
     maxDate: maxDate
-  }, pickerProps))));
+  }))));
 };
 UTDatePicker.propTypes = {
   actions: (0, _propTypes.arrayOf)(_buttonTypes.buttonTypes),

package/dist/components/UTDatePicker/utils.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.isValidDate = exports.isSelected = exports.getPastMonthDates = exports.getMaxDate = exports.dateMatchesFormat = void 0;
+exports.isSelected = exports.getPastMonthDates = exports.getMaxDate = exports.getFinalDate = exports.dateMatchesFormat = void 0;
 var _dayjs = _interopRequireDefault(require("dayjs"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 const isSelected = (date, selectedDate) => selectedDate && date.isSame(selectedDate, 'day');
@@ -27,24 +27,15 @@ const getMaxDate = () => {
   };
 };
 exports.getMaxDate = getMaxDate;
-const avoidFutureDatesValidation = date => !(0, _dayjs.default)().isBefore(date);
-const rangeValidation = (date, range) => {
-  const {
-    minDate,
-    maxDate
-  } = range;
-  return date.isBetween(minDate, maxDate, null, '[]');
-};
-const isValidDate = _ref => {
+const getFinalDate = _ref => {
   let {
-    avoidFutureDates,
-    newValue,
-    onlyPastMonth,
-    range
+    date,
+    maxDate,
+    minDate
   } = _ref;
-  if (avoidFutureDates && !avoidFutureDatesValidation(newValue)) return false;
-  if (onlyPastMonth && !rangeValidation(newValue, getPastMonthDates())) return false;
-  if (range && !rangeValidation(newValue, range)) return false;
-  return newValue.isValid();
+  const formattedDate = (0, _dayjs.default)(date);
+  if (maxDate && formattedDate !== null && formattedDate !== void 0 && formattedDate.isAfter(maxDate)) return (0, _dayjs.default)(maxDate);
+  if (minDate && formattedDate !== null && formattedDate !== void 0 && formattedDate.isBefore(minDate)) return (0, _dayjs.default)(minDate);
+  return formattedDate;
 };
-exports.isValidDate = isValidDate;
+exports.getFinalDate = getFinalDate;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@widergy/energy-ui",
-  "version": "3.83.0",
+  "version": "3.83.1",
   "description": "Widergy Web Components",
   "author": "widergy",
   "license": "MIT",