@pisell/date-picker 1.0.84 → 1.0.86

package/es/PisellDateRangePicker/index.js

@@ -92,9 +92,10 @@ var PisellDateRangePicker = function PisellDateRangePicker(props) {
     _useState4 = _slicedToArray(_useState3, 2),
     currentShortcut = _useState4[0],
     setCurrentShortcut = _useState4[1];
-
-  // const [rangePosition, setRangePosition] = useState('start');
-
+  var _useState5 = useState('start'),
+    _useState6 = _slicedToArray(_useState5, 2),
+    rangePosition = _useState6[0],
+    setRangePosition = _useState6[1];
   var lastConfirmShortcut = useRef(isString(propsValue) ? propsValue : null);
   useEffect(function () {
     isBoolean(propsOpen) && setOpen(propsOpen);
@@ -102,12 +103,12 @@ var PisellDateRangePicker = function PisellDateRangePicker(props) {
   var _presets = useMemo(function () {
     return formatPresets(presets || defaultPresets, locale);
   }, [presets]);
-  var _useState5 = useState(function () {
+  var _useState7 = useState(function () {
       return transDayjsArr(propsValue, defaultValue, _presets);
     }),
-    _useState6 = _slicedToArray(_useState5, 2),
-    _value = _useState6[0],
-    setValue = _useState6[1];
+    _useState8 = _slicedToArray(_useState7, 2),
+    _value = _useState8[0],
+    setValue = _useState8[1];
   useEffect(function () {
     setValue(transDayjsArr(propsValue, defaultValue, _presets));
     if (isString(propsValue)) {
@@ -162,11 +163,12 @@ var PisellDateRangePicker = function PisellDateRangePicker(props) {
         return item || null;
       });
     }
-    if (!clearEndOnSelection) {
-      if (newVal[0] && !newVal[1]) {
-        newVal[1] = newVal[0];
-      } else if (newVal[1] && !newVal[0]) {
-        newVal[0] = newVal[1];
+    if (!clearEndOnSelection && type !== "shortcuts" && type !== "write") {
+      if (rangePosition === 'start') {
+        newVal = [newVal[0], newVal[0]];
+      }
+      if (!newVal[1]) {
+        newVal = [newVal[0], newVal[0]];
       }
     }
     if (clearEndOnSelection && type !== "set" && _value.filter(Boolean).length === 2) {
@@ -207,7 +209,7 @@ var PisellDateRangePicker = function PisellDateRangePicker(props) {
     if (inputReadOnly) {
       return {
         readOnly: true,
-        selectedSections: null
+        selectedSections: 0
       };
     }
     return {};
@@ -262,18 +264,13 @@ var PisellDateRangePicker = function PisellDateRangePicker(props) {
     onClose: handleClose,
     onChange: handleChange,
     onOpen: handleOpen,
-    open: open
-    // onRangePositionChange={(rp) => {
-    //   console.log(rp, "rangePosition");
-    //   // if (_value.every(item => !Boolean(item))) {
-    //   //   return
-    //   // } else {
-    //     setRangePosition(rp)
-    //   // }
-    // }}
+    open: open,
+    onRangePositionChange: function onRangePositionChange(rp) {
+      setRangePosition(rp);
+    }
     // defaultRangePosition="start"
-    // rangePosition={rangePosition}
     ,
+    rangePosition: rangePosition,
     defaultCalendarMonth: defaultCalendarMonth,
     shouldDisableDate: function shouldDisableDate(current, position) {
       return disabledDate === null || disabledDate === void 0 ? void 0 : disabledDate(current, position, _value);
@@ -290,6 +287,7 @@ var PisellDateRangePicker = function PisellDateRangePicker(props) {
     dayOfWeekFormatter: function dayOfWeekFormatter(day) {
       return day;
     },
+    disableDragEditing: true,
     slotProps: {
       shortcuts: {
         items: [],

package/es/Toolbar/index.js

@@ -60,14 +60,14 @@ var Toolbar = function Toolbar(props) {
   var handleStartChange = function handleStartChange(e) {
     var val = e.target.value;
     setStartStr(val);
-    if (isValidDate(val, format)) {
+    if (isValidDate(val, format) && (value[1] ? dayjs(val, format) <= value[1] : true)) {
       var _start$set, _start$set$set;
       setStartError(false);
       var valDate = dayjs(val, format);
       var newValue = _toConsumableArray(value);
       var start = newValue[0] || dayjs();
       newValue[0] = (start === null || start === void 0 ? void 0 : (_start$set = start.set('year', (valDate === null || valDate === void 0 ? void 0 : valDate.get('year')) || 0)) === null || _start$set === void 0 ? void 0 : (_start$set$set = _start$set.set('month', (valDate === null || valDate === void 0 ? void 0 : valDate.get('month')) || 0)) === null || _start$set$set === void 0 ? void 0 : _start$set$set.set('date', (valDate === null || valDate === void 0 ? void 0 : valDate.get('date')) || 0)) || null;
-      onChange(newValue);
+      onChange(newValue, 'write');
     } else {
       setStartError(true);
     }
@@ -75,14 +75,14 @@ var Toolbar = function Toolbar(props) {
   var handleEndChange = function handleEndChange(e) {
     var val = e.target.value;
     setEndStr(val);
-    if (isValidDate(val, format)) {
+    if (isValidDate(val, format) && (value[0] ? dayjs(val, format) >= value[0] : true)) {
       var _end$set, _end$set$set;
       setEndError(false);
       var valDate = dayjs(val, format);
       var newValue = _toConsumableArray(value);
       var end = newValue[1] || dayjs();
       newValue[1] = (end === null || end === void 0 ? void 0 : (_end$set = end.set('year', (valDate === null || valDate === void 0 ? void 0 : valDate.get('year')) || 0)) === null || _end$set === void 0 ? void 0 : (_end$set$set = _end$set.set('month', (valDate === null || valDate === void 0 ? void 0 : valDate.get('month')) || 0)) === null || _end$set$set === void 0 ? void 0 : _end$set$set.set('date', (valDate === null || valDate === void 0 ? void 0 : valDate.get('date')) || 0)) || null;
-      onChange(newValue);
+      onChange(newValue, 'write');
     } else {
       setEndError(true);
     }

package/lib/PisellDateRangePicker/index.js

@@ -101,6 +101,7 @@ var PisellDateRangePicker = (props) => {
   const [open, setOpen] = (0, import_react.useState)(propsOpen ?? false);
   const { locale } = (0, import_react.useContext)(import_LocaleContext.LocaleContext) || {};
   const [currentShortcut, setCurrentShortcut] = (0, import_react.useState)("");
+  const [rangePosition, setRangePosition] = (0, import_react.useState)("start");
   const lastConfirmShortcut = (0, import_react.useRef)((0, import_utils.isString)(propsValue) ? propsValue : null);
   (0, import_react.useEffect)(() => {
     (0, import_utils.isBoolean)(propsOpen) && setOpen(propsOpen);
@@ -164,11 +165,12 @@ var PisellDateRangePicker = (props) => {
         return item || null;
       });
     }
-    if (!clearEndOnSelection) {
-      if (newVal[0] && !newVal[1]) {
-        newVal[1] = newVal[0];
-      } else if (newVal[1] && !newVal[0]) {
-        newVal[0] = newVal[1];
+    if (!clearEndOnSelection && type !== "shortcuts" && type !== "write") {
+      if (rangePosition === "start") {
+        newVal = [newVal[0], newVal[0]];
+      }
+      if (!newVal[1]) {
+        newVal = [newVal[0], newVal[0]];
       }
     }
     if (clearEndOnSelection && type !== "set" && _value.filter(Boolean).length === 2) {
@@ -210,7 +212,7 @@ var PisellDateRangePicker = (props) => {
     if (inputReadOnly) {
       return {
         readOnly: true,
-        selectedSections: null
+        selectedSections: 0
       };
     }
     return {};
@@ -262,6 +264,10 @@ var PisellDateRangePicker = (props) => {
         onChange: handleChange,
         onOpen: handleOpen,
         open,
+        onRangePositionChange: (rp) => {
+          setRangePosition(rp);
+        },
+        rangePosition,
         defaultCalendarMonth,
         shouldDisableDate: (current, position) => disabledDate == null ? void 0 : disabledDate(current, position, _value),
         slots: {
@@ -276,6 +282,7 @@ var PisellDateRangePicker = (props) => {
         dayOfWeekFormatter: (day) => {
           return day;
         },
+        disableDragEditing: true,
         slotProps: {
           shortcuts: {
             items: [],

package/lib/Toolbar/index.js

@@ -74,13 +74,13 @@ var Toolbar = (props) => {
     var _a, _b;
     const val = e.target.value;
     setStartStr(val);
-    if (isValidDate(val, format)) {
+    if (isValidDate(val, format) && (value[1] ? (0, import_dayjs.default)(val, format) <= value[1] : true)) {
       setStartError(false);
       const valDate = (0, import_dayjs.default)(val, format);
       const newValue = [...value];
       const start = newValue[0] || (0, import_dayjs.default)();
       newValue[0] = ((_b = (_a = start == null ? void 0 : start.set("year", (valDate == null ? void 0 : valDate.get("year")) || 0)) == null ? void 0 : _a.set("month", (valDate == null ? void 0 : valDate.get("month")) || 0)) == null ? void 0 : _b.set("date", (valDate == null ? void 0 : valDate.get("date")) || 0)) || null;
-      onChange(newValue);
+      onChange(newValue, "write");
     } else {
       setStartError(true);
     }
@@ -89,13 +89,13 @@ var Toolbar = (props) => {
     var _a, _b;
     const val = e.target.value;
     setEndStr(val);
-    if (isValidDate(val, format)) {
+    if (isValidDate(val, format) && (value[0] ? (0, import_dayjs.default)(val, format) >= value[0] : true)) {
       setEndError(false);
       const valDate = (0, import_dayjs.default)(val, format);
       const newValue = [...value];
       const end = newValue[1] || (0, import_dayjs.default)();
       newValue[1] = ((_b = (_a = end == null ? void 0 : end.set("year", (valDate == null ? void 0 : valDate.get("year")) || 0)) == null ? void 0 : _a.set("month", (valDate == null ? void 0 : valDate.get("month")) || 0)) == null ? void 0 : _b.set("date", (valDate == null ? void 0 : valDate.get("date")) || 0)) || null;
-      onChange(newValue);
+      onChange(newValue, "write");
     } else {
       setEndError(true);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/date-picker",
-  "version": "1.0.84",
+  "version": "1.0.86",
   "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.25"
   },
   "files": [
     "es",