ublo-lib 1.18.1 → 1.18.3

package/es/common/components/date-picker/calendar.js

@@ -20,6 +20,8 @@ function Calendar({
   setMode,
   display,
   stayDates = [],
+  min,
+  max,
   onSubmit,
   specialRule,
   setSpecialRule,
@@ -27,7 +29,8 @@ function Calendar({
   hideModes,
   singleDate,
   submitOnSelectionEnd,
-  availabilities
+  availabilities,
+  disableConfirmModal
 }) {
   const isDateObject = Utils.isDate(date);
   const _date = isDateObject ? date : new Date();
@@ -66,7 +69,7 @@ function Calendar({
   };
   const submit = dates => {
     const hasCart = window.sessionStorage.cartId !== undefined;
-    if (hasCart) {
+    if (!disableConfirmModal && hasCart) {
       setShowPopup(true);
     } else {
       onSubmit(dates);
@@ -189,6 +192,8 @@ function Calendar({
       display: display,
       month: month,
       year: year,
+      min: min,
+      max: max,
       selecting: selecting,
       setSelecting: setSelecting,
       selectedDates: selectedDates,
@@ -207,6 +212,8 @@ function Calendar({
       display: display,
       month: monthAlt,
       year: yearAlt,
+      min: min,
+      max: max,
       selecting: selecting,
       setSelecting: setSelecting,
       selectedDates: selectedDates,

package/es/common/components/date-picker/date-item.js

@@ -10,6 +10,8 @@ const DateItem = ({
   index,
   month,
   year,
+  min,
+  max,
   selectedDates,
   setSelectedDates,
   setFirstSelectedDate,
@@ -92,13 +94,14 @@ const DateItem = ({
     }
   };
   const isSelected = !!selectedDates.find(d => d.getTime() === _date.getTime());
+  const isDisabled = Utils.isBefore(date, min) || Utils.isAfter(date, max);
   const classes = classNames(styles.date, {
     [styles.dateToday]: isToday,
     [styles.dateSelected]: isSelected,
     [styles.dateFirstSelected]: isFirstSelected,
     [styles.dateLastSelected]: isLastSelected,
     [styles.dateNotInMonth]: !inMonth,
-    [styles.dateIsPast]: isPastDate,
+    [styles.dateIsPast]: isPastDate || isDisabled,
     [styles.dateSaturday]: mode === Data.MODES.SATURDAY && Utils.isSaturday(date),
     [styles.dateSunday]: mode === Data.MODES.SUNDAY && Utils.isSunday(date),
     [styles.available]: enableAvailability && isAvailable,

package/es/common/components/date-picker/date-picker.js

@@ -17,11 +17,14 @@ const DatePicker = ({
   popup = true,
   close,
   hideModes,
+  min,
+  max,
   defaultMode = Data.MODES[DEFAULT_MODE],
   rules,
   singleDate,
   submitOnSelectionEnd,
-  availabilities
+  availabilities,
+  disableConfirmModal
 }) => {
   const [display, setDisplay] = React.useState(Data.DISPLAYS.DESKTOP);
   const [specialRule, setSpecialRule] = React.useState();
@@ -30,12 +33,20 @@ const DatePicker = ({
   } = useUbloContext();
   const showModes = display !== Data.DISPLAYS.PHONE && !hideModes;
   const getDefaultMode = () => {
-    if (!showModes) return Data.MODES.CUSTOM;
-    if (stayDates.length === 0) return defaultMode;
+    if (!showModes) {
+      return Data.MODES.CUSTOM;
+    }
+    if (stayDates.length === 0) {
+      return defaultMode;
+    }
     const firstDate = stayDates[0];
     const lastDate = stayDates[stayDates.length - 1];
-    if (Utils.isSaturday(firstDate) && Utils.isSaturday(lastDate)) return Data.MODES.SATURDAY;
-    if (Utils.isSunday(firstDate) && Utils.isSunday(lastDate)) return Data.MODES.SUNDAY;
+    if (Utils.isSaturday(firstDate) && Utils.isSaturday(lastDate)) {
+      return Data.MODES.SATURDAY;
+    }
+    if (Utils.isSunday(firstDate) && Utils.isSunday(lastDate)) {
+      return Data.MODES.SUNDAY;
+    }
     return Data.MODES.CUSTOM;
   };
   const [currentMode, setCurrentMode] = React.useState(getDefaultMode());
@@ -84,6 +95,8 @@ const DatePicker = ({
         setMode: setCurrentMode,
         display: display,
         stayDates: stayDates,
+        min: min,
+        max: max,
         onSubmit: onSubmit,
         rules: rules,
         specialRule: specialRule,
@@ -91,7 +104,8 @@ const DatePicker = ({
         hideModes: hideModes,
         singleDate: singleDate,
         submitOnSelectionEnd: submitOnSelectionEnd,
-        availabilities: availabilities
+        availabilities: availabilities,
+        disableConfirmModal: disableConfirmModal
       }), specialRule && _jsxs("div", {
         className: styles.specialRule,
         children: [_jsx(Icons.Info, {}), _jsxs("div", {

package/es/common/components/date-picker/month.js

@@ -12,6 +12,8 @@ const Month = ({
   display,
   month,
   year,
+  min,
+  max,
   selecting,
   setSelecting,
   selectedDates,
@@ -58,6 +60,8 @@ const Month = ({
           date: date,
           month: month,
           year: year,
+          min: min,
+          max: max,
           selectedDates: selectedDates,
           setSelectedDates: setSelectedDates,
           setFirstSelectedDate: setFirstSelectedDate,

package/es/common/components/date-picker/utils.js

@@ -59,6 +59,7 @@ export const isPast = date => {
   return _date < now;
 };
 export const isBefore = (date, ref) => {
+  if (!date || !ref) return false;
   const d = Array.isArray(date) ? date.join("-") : date;
   const r = Array.isArray(ref) ? ref.join("-") : ref;
   const _date = new Date(d);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ublo-lib",
-  "version": "1.18.1",
+  "version": "1.18.3",
   "peerDependencies": {
     "dt-design-system": "^2.9.0",
     "leaflet": "^1.9.1",