@pisell/date-picker 1.0.88 → 1.0.90

package/es/PisellDateRangePicker/index.js

@@ -141,6 +141,12 @@ var PisellDateRangePicker = function PisellDateRangePicker(props) {
     setCurrentShortcut(lastConfirmShortcut.current);
   };
   var handleOk = function handleOk() {
+    var val = getVal();
+    if (val.some(function (item) {
+      return !item;
+    })) {
+      return;
+    }
     setOpen(false);
     onClose === null || onClose === void 0 ? void 0 : onClose();
     propsOnChange === null || propsOnChange === void 0 ? void 0 : propsOnChange(getVal());
@@ -310,7 +316,9 @@ var PisellDateRangePicker = function PisellDateRangePicker(props) {
         locale: locale,
         onChange: handleChange,
         currentShortcut: currentShortcut,
-        setCurrentShortcut: setCurrentShortcut
+        setCurrentShortcut: setCurrentShortcut,
+        disabledDate: disabledDate,
+        value: _value
       },
       layout: {
         orientation: "portrait"

package/es/Toolbar/index.js

@@ -8,7 +8,7 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-import React, { useMemo, useState, useEffect } from 'react';
+import React, { useMemo, useState, useEffect, useRef } from 'react';
 import { Input } from 'antd';
 import dayjs from 'dayjs';
 import BrowserSelect from "../browserSelect";
@@ -25,7 +25,8 @@ var Toolbar = function Toolbar(props) {
     locale = props.locale,
     onChange = props.onChange,
     currentShortcut = props.currentShortcut,
-    setCurrentShortcut = props.setCurrentShortcut;
+    setCurrentShortcut = props.setCurrentShortcut,
+    disabledDate = props.disabledDate;
   var format = locale === 'en' || locale === 'en-US' ? 'DD/MM/YYYY' : 'YYYY/MM/DD';
   var _useState = useState(''),
     _useState2 = _slicedToArray(_useState, 2),
@@ -43,6 +44,8 @@ var Toolbar = function Toolbar(props) {
     _useState8 = _slicedToArray(_useState7, 2),
     endError = _useState8[0],
     setEndError = _useState8[1];
+  var valueRef = useRef(value);
+  valueRef.current = value;
   useEffect(function () {
     if (value !== null && value !== void 0 && value[0]) {
       setStartStr(value[0].format(format));
@@ -57,10 +60,22 @@ var Toolbar = function Toolbar(props) {
       setEndStr('');
     }
   }, [value]);
+  var checkDateDisabled = function checkDateDisabled(position) {
+    var val = valueRef.current;
+    if (position === 'start' && val[0] && disabledDate !== null && disabledDate !== void 0 && disabledDate(val[1], position, val)) {
+      setStartError(true);
+      onChange([null, val[1]], 'write');
+    }
+    if (position === 'end' && val[1] && disabledDate !== null && disabledDate !== void 0 && disabledDate(val[1], position, val)) {
+      setEndError(true);
+      onChange([val[0], null], 'write');
+    }
+  };
   var handleStartChange = function handleStartChange(e) {
     var val = e.target.value;
     setStartStr(val);
-    if (isValidDate(val, format) && (value[1] ? dayjs(val, format) <= value[1] : true)) {
+    var objValue = dayjs(val, format);
+    if (isValidDate(val, format) && (value[1] ? objValue <= value[1] : true) && !(disabledDate !== null && disabledDate !== void 0 && disabledDate(objValue, 'start', value))) {
       var _start$set, _start$set$set;
       setStartError(false);
       var valDate = dayjs(val, format);
@@ -71,11 +86,15 @@ var Toolbar = function Toolbar(props) {
     } else {
       setStartError(true);
     }
+    setTimeout(function () {
+      checkDateDisabled('end');
+    }, 200);
   };
   var handleEndChange = function handleEndChange(e) {
     var val = e.target.value;
     setEndStr(val);
-    if (isValidDate(val, format) && (value[0] ? dayjs(val, format) >= value[0] : true)) {
+    var objValue = dayjs(val, format);
+    if (isValidDate(val, format) && (value[0] ? objValue >= value[0] : true) && !(disabledDate !== null && disabledDate !== void 0 && disabledDate(objValue, 'end', value))) {
       var _end$set, _end$set$set;
       setEndError(false);
       var valDate = dayjs(val, format);
@@ -86,6 +105,9 @@ var Toolbar = function Toolbar(props) {
     } else {
       setEndError(true);
     }
+    setTimeout(function () {
+      checkDateDisabled('start');
+    }, 200);
   };
   var handleSelectChange = function handleSelectChange(e) {
     var val = e.target.value;
@@ -122,7 +144,7 @@ var Toolbar = function Toolbar(props) {
   }, /*#__PURE__*/React.createElement("div", {
     className: "date-picker-toolbar-start-wrap"
   }, /*#__PURE__*/React.createElement("span", null, getText('toolbar-date-range-shortcut-starting', pLocaleMap[locale])), /*#__PURE__*/React.createElement(Input, {
-    status: startError ? "error" : "",
+    status: startError ? 'error' : '',
     size: "large",
     value: startStr,
     onChange: handleStartChange,
@@ -132,7 +154,7 @@ var Toolbar = function Toolbar(props) {
   }, getText('toolbar-date-range-invalid-start-date', pLocaleMap[locale]))), /*#__PURE__*/React.createElement("div", {
     className: "date-picker-toolbar-end-wrap"
   }, /*#__PURE__*/React.createElement("span", null, getText('toolbar-date-range-shortcut-ending', pLocaleMap[locale])), /*#__PURE__*/React.createElement(Input, {
-    status: endError ? "error" : "",
+    status: endError ? 'error' : '',
     size: "large",
     value: endStr,
     onChange: handleEndChange,

package/lib/PisellDateRangePicker/index.js

@@ -144,6 +144,10 @@ var PisellDateRangePicker = (props) => {
     setCurrentShortcut(lastConfirmShortcut.current);
   };
   const handleOk = () => {
+    const val = getVal();
+    if (val.some((item) => !item)) {
+      return;
+    }
     setOpen(false);
     onClose == null ? void 0 : onClose();
     propsOnChange == null ? void 0 : propsOnChange(getVal());
@@ -305,7 +309,9 @@ var PisellDateRangePicker = (props) => {
             locale,
             onChange: handleChange,
             currentShortcut,
-            setCurrentShortcut
+            setCurrentShortcut,
+            disabledDate,
+            value: _value
           },
           layout: {
             orientation: "portrait"

package/lib/Toolbar/index.js

@@ -49,13 +49,16 @@ var Toolbar = (props) => {
     locale,
     onChange,
     currentShortcut,
-    setCurrentShortcut
+    setCurrentShortcut,
+    disabledDate
   } = props;
   const format = locale === "en" || locale === "en-US" ? "DD/MM/YYYY" : "YYYY/MM/DD";
   const [startStr, setStartStr] = (0, import_react.useState)("");
   const [endStr, setEndStr] = (0, import_react.useState)("");
   const [startError, setStartError] = (0, import_react.useState)(false);
   const [endError, setEndError] = (0, import_react.useState)(false);
+  const valueRef = (0, import_react.useRef)(value);
+  valueRef.current = value;
   (0, import_react.useEffect)(() => {
     if (value == null ? void 0 : value[0]) {
       setStartStr(value[0].format(format));
@@ -70,11 +73,23 @@ var Toolbar = (props) => {
       setEndStr("");
     }
   }, [value]);
+  const checkDateDisabled = (position) => {
+    const val = valueRef.current;
+    if (position === "start" && val[0] && (disabledDate == null ? void 0 : disabledDate(val[1], position, val))) {
+      setStartError(true);
+      onChange([null, val[1]], "write");
+    }
+    if (position === "end" && val[1] && (disabledDate == null ? void 0 : disabledDate(val[1], position, val))) {
+      setEndError(true);
+      onChange([val[0], null], "write");
+    }
+  };
   const handleStartChange = (e) => {
     var _a, _b;
     const val = e.target.value;
     setStartStr(val);
-    if (isValidDate(val, format) && (value[1] ? (0, import_dayjs.default)(val, format) <= value[1] : true)) {
+    const objValue = (0, import_dayjs.default)(val, format);
+    if (isValidDate(val, format) && (value[1] ? objValue <= value[1] : true) && !(disabledDate == null ? void 0 : disabledDate(objValue, "start", value))) {
       setStartError(false);
       const valDate = (0, import_dayjs.default)(val, format);
       const newValue = [...value];
@@ -84,12 +99,16 @@ var Toolbar = (props) => {
     } else {
       setStartError(true);
     }
+    setTimeout(() => {
+      checkDateDisabled("end");
+    }, 200);
   };
   const handleEndChange = (e) => {
     var _a, _b;
     const val = e.target.value;
     setEndStr(val);
-    if (isValidDate(val, format) && (value[0] ? (0, import_dayjs.default)(val, format) >= value[0] : true)) {
+    const objValue = (0, import_dayjs.default)(val, format);
+    if (isValidDate(val, format) && (value[0] ? objValue >= value[0] : true) && !(disabledDate == null ? void 0 : disabledDate(objValue, "end", value))) {
       setEndError(false);
       const valDate = (0, import_dayjs.default)(val, format);
       const newValue = [...value];
@@ -99,6 +118,9 @@ var Toolbar = (props) => {
     } else {
       setEndError(true);
     }
+    setTimeout(() => {
+      checkDateDisabled("start");
+    }, 200);
   };
   const handleSelectChange = (e) => {
     const val = e.target.value;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/date-picker",
-  "version": "1.0.88",
+  "version": "1.0.90",
   "sideEffects": [
     "*.less"
   ],
@@ -26,7 +26,7 @@
     "antd": "^5.5.0",
     "react": "^18.0.0",
     "react-dom": "^18.0.0",
-    "@pisell/utils": "1.0.27"
+    "@pisell/utils": "1.0.28"
   },
   "files": [
     "es",