@kdcloudjs/kdesign 1.7.56 → 1.7.58

package/es/_utils/usePopper.js

@@ -113,6 +113,7 @@ var getRealDom = function getRealDom(locatorRef, locatorElement) {
   var name = REF_NAME_OBJ[(_a = locatorElement === null || locatorElement === void 0 ? void 0 : locatorElement.type) === null || _a === void 0 ? void 0 : _a.displayName];
   return locatorRef === null || locatorRef === void 0 ? void 0 : locatorRef.current[name];
 };
+var DEFAULT_PLACEMENT = 'top';
 function usePopper(locatorElement, popperElement, props) {
   var _context3, _context4, _arrowStyle;
   var prefixCls = props.prefixCls,
@@ -131,7 +132,7 @@ function usePopper(locatorElement, popperElement, props) {
     _props$trigger = props.trigger,
     trigger = _props$trigger === void 0 ? 'click' : _props$trigger,
     _props$placement = props.placement,
-    placement = _props$placement === void 0 ? 'top' : _props$placement,
+    placement = _props$placement === void 0 ? DEFAULT_PLACEMENT : _props$placement,
     _props$gap = props.gap,
     defaultGap = _props$gap === void 0 ? 4 : _props$gap,
     _props$scrollHidden = props.scrollHidden,
@@ -228,10 +229,15 @@ function usePopper(locatorElement, popperElement, props) {
     _useState16 = _slicedToArray(_useState15, 2),
     align = _useState16[0],
     setAlign = _useState16[1];
-  var _useState17 = useState(placement),
+  var _useState17 = useState(_includesInstanceProperty(Placements).call(Placements, placement) ? placement : DEFAULT_PLACEMENT),
     _useState18 = _slicedToArray(_useState17, 2),
     nextPlacement = _useState18[0],
     setNextPlacement = _useState18[1];
+  useEffect(function () {
+    if (nextPlacement !== placement && _includesInstanceProperty(Placements).call(Placements, placement)) {
+      setNextPlacement(placement);
+    }
+  }, [placement]);
   var alignPopper = useCallback(function () {
     var realDom = getRealDom(locatorRef, locatorElement);
     if (realDom && (popperRef === null || popperRef === void 0 ? void 0 : popperRef.current)) {
@@ -245,6 +251,10 @@ function usePopper(locatorElement, popperElement, props) {
         right = _realDom$getBoundingC.right,
         height = _realDom$getBoundingC.height,
         width = _realDom$getBoundingC.width;
+      if (height === 0 && width === 0) {
+        hidePopper();
+        return;
+      }
       var _getOffsetPos = getOffsetPos(container),
         containerTop = _getOffsetPos.top,
         containerLeft = _getOffsetPos.left;
@@ -415,7 +425,7 @@ function usePopper(locatorElement, popperElement, props) {
       setArrowPos(_arrowPos);
       setNextPlacement(currentPlacement);
     }
-  }, [locatorRef, popperRef, container, trigger, mousePos, autoPlacement, gap, arrowOffset, arrowSize, arrowWidth, align === null || align === void 0 ? void 0 : align.left, align === null || align === void 0 ? void 0 : align.top]);
+  }, [locatorRef, popperRef, container, trigger, mousePos, autoPlacement, gap, arrowOffset, arrowSize, arrowWidth, align === null || align === void 0 ? void 0 : align.left, align === null || align === void 0 ? void 0 : align.top, nextPlacement]);
   useEffect(function () {
     if (canAlign) {
       alignPopper();
@@ -540,13 +550,9 @@ function usePopper(locatorElement, popperElement, props) {
       }, 10);
       window.addEventListener('resize', alignPopper);
       document.addEventListener('scroll', scrollAlign, true);
-      locatorNode === null || locatorNode === void 0 ? void 0 : locatorNode.addEventListener('DOMSubtreeModified', alignPopper);
-      exist && (popperNode === null || popperNode === void 0 ? void 0 : popperNode.addEventListener('DOMSubtreeModified', alignPopper));
       return function () {
         window.removeEventListener('resize', alignPopper);
         document.removeEventListener('scroll', scrollAlign, true);
-        locatorNode === null || locatorNode === void 0 ? void 0 : locatorNode.removeEventListener('DOMSubtreeModified', alignPopper);
-        exist && (popperNode === null || popperNode === void 0 ? void 0 : popperNode.removeEventListener('DOMSubtreeModified', alignPopper));
       };
     }
   }, [alignPopper, exist, onVisibleChange, popperNode, props.visible, scrollHidden, locatorNode, visible, popperRef]);

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

@@ -150,7 +150,7 @@ var InternalDatePicker = function InternalDatePicker(props, ref) {
         if (newText === '') {
           triggerChange(null);
           setViewDate(null);
-        } else if (newText && newText.length === _format.length) {
+        } else if (newText && newText.length >= _format.length) {
           var inputTempDate = parseDate(newText, _format);
           if (inputTempDate && (!disabledDate || !disabledDate(inputTempDate))) {
             if (picker !== 'year') {
@@ -217,6 +217,9 @@ var InternalDatePicker = function InternalDatePicker(props, ref) {
       if (valueText !== text) {
         resetText();
       }
+      if (hoverValue) {
+        onLeave();
+      }
     } else {
       setInnerPicker(undefined);
     }

package/es/date-picker/hooks/use-picker-input.js

@@ -29,8 +29,6 @@ export default function usePickerInput(_ref) {
     },
     onKeyDown: function onKeyDown(e) {
       var _context;
-      setTyping(true);
-      triggerOpen(true);
       switch (e.which) {
         case KeyCode.ENTER:
           {
@@ -46,8 +44,9 @@ export default function usePickerInput(_ref) {
           {
             if (typing && open && !e.shiftKey) {
               setTyping(false);
-              e.preventDefault();
+              // e.preventDefault()
             }
+
             return;
           }
         case KeyCode.ESC:

package/es/date-picker/range-picker.js

@@ -229,7 +229,7 @@ var InternalRangePicker = function InternalRangePicker(props, ref) {
     var inputTempDate;
     if (newText === '') {
       triggerChange(updateValues(selectedValue, null, index), index);
-    } else if (newText && newText.length === _format.length) {
+    } else if (newText && newText.length >= _format.length) {
       inputTempDate = parseDate(newText, _format);
       var disabledFunc = index === 0 ? disabledStartDate : disabledEndDate;
       if (inputTempDate && (!disabledFunc || !disabledFunc(inputTempDate))) {
@@ -445,6 +445,8 @@ var InternalRangePicker = function InternalRangePicker(props, ref) {
       setSelectedValue(dateValue);
       setViewDate(null, 0);
       setViewDate(null, 1);
+      resetStartText();
+      resetEndText();
       setHoverRangedValue([null, null]);
     } else {
       setInnerPicker(undefined);

package/es/date-picker/utils/date-fns.js

@@ -273,10 +273,12 @@ export var setYearOrMonthOfDate = function setYearOrMonthOfDate(date1, date2) {
   var type = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 'year';
   var d1 = new Date(date1 || 0);
   var d2 = new Date(date2 || 0);
-  if (type === 'year') {
+  if (type === 'year' && d1.getFullYear() !== d2.getFullYear()) {
+    d1.setDate(1);
     d1.setFullYear(d2.getFullYear());
   }
-  if (type === 'month') {
+  if (type === 'month' && d1.getMonth() !== d2.getMonth()) {
+    d1.setDate(1);
     d1.setMonth(d2.getMonth());
   }
   return d1;

package/lib/_utils/usePopper.js

@@ -127,6 +127,7 @@ var getRealDom = function getRealDom(locatorRef, locatorElement) {
   var name = REF_NAME_OBJ[(_a = locatorElement === null || locatorElement === void 0 ? void 0 : locatorElement.type) === null || _a === void 0 ? void 0 : _a.displayName];
   return locatorRef === null || locatorRef === void 0 ? void 0 : locatorRef.current[name];
 };
+var DEFAULT_PLACEMENT = 'top';
 function usePopper(locatorElement, popperElement, props) {
   var _context3, _context4, _arrowStyle;
   var prefixCls = props.prefixCls,
@@ -145,7 +146,7 @@ function usePopper(locatorElement, popperElement, props) {
     _props$trigger = props.trigger,
     trigger = _props$trigger === void 0 ? 'click' : _props$trigger,
     _props$placement = props.placement,
-    placement = _props$placement === void 0 ? 'top' : _props$placement,
+    placement = _props$placement === void 0 ? DEFAULT_PLACEMENT : _props$placement,
     _props$gap = props.gap,
     defaultGap = _props$gap === void 0 ? 4 : _props$gap,
     _props$scrollHidden = props.scrollHidden,
@@ -242,10 +243,15 @@ function usePopper(locatorElement, popperElement, props) {
     _useState16 = (0, _slicedToArray2.default)(_useState15, 2),
     align = _useState16[0],
     setAlign = _useState16[1];
-  var _useState17 = (0, _react.useState)(placement),
+  var _useState17 = (0, _react.useState)((0, _includes.default)(Placements).call(Placements, placement) ? placement : DEFAULT_PLACEMENT),
     _useState18 = (0, _slicedToArray2.default)(_useState17, 2),
     nextPlacement = _useState18[0],
     setNextPlacement = _useState18[1];
+  (0, _react.useEffect)(function () {
+    if (nextPlacement !== placement && (0, _includes.default)(Placements).call(Placements, placement)) {
+      setNextPlacement(placement);
+    }
+  }, [placement]);
   var alignPopper = (0, _react.useCallback)(function () {
     var realDom = getRealDom(locatorRef, locatorElement);
     if (realDom && (popperRef === null || popperRef === void 0 ? void 0 : popperRef.current)) {
@@ -259,6 +265,10 @@ function usePopper(locatorElement, popperElement, props) {
         right = _realDom$getBoundingC.right,
         height = _realDom$getBoundingC.height,
         width = _realDom$getBoundingC.width;
+      if (height === 0 && width === 0) {
+        hidePopper();
+        return;
+      }
       var _getOffsetPos = getOffsetPos(container),
         containerTop = _getOffsetPos.top,
         containerLeft = _getOffsetPos.left;
@@ -429,7 +439,7 @@ function usePopper(locatorElement, popperElement, props) {
       setArrowPos(_arrowPos);
       setNextPlacement(currentPlacement);
     }
-  }, [locatorRef, popperRef, container, trigger, mousePos, autoPlacement, gap, arrowOffset, arrowSize, arrowWidth, align === null || align === void 0 ? void 0 : align.left, align === null || align === void 0 ? void 0 : align.top]);
+  }, [locatorRef, popperRef, container, trigger, mousePos, autoPlacement, gap, arrowOffset, arrowSize, arrowWidth, align === null || align === void 0 ? void 0 : align.left, align === null || align === void 0 ? void 0 : align.top, nextPlacement]);
   (0, _react.useEffect)(function () {
     if (canAlign) {
       alignPopper();
@@ -554,13 +564,9 @@ function usePopper(locatorElement, popperElement, props) {
       }, 10);
       window.addEventListener('resize', alignPopper);
       document.addEventListener('scroll', scrollAlign, true);
-      locatorNode === null || locatorNode === void 0 ? void 0 : locatorNode.addEventListener('DOMSubtreeModified', alignPopper);
-      exist && (popperNode === null || popperNode === void 0 ? void 0 : popperNode.addEventListener('DOMSubtreeModified', alignPopper));
       return function () {
         window.removeEventListener('resize', alignPopper);
         document.removeEventListener('scroll', scrollAlign, true);
-        locatorNode === null || locatorNode === void 0 ? void 0 : locatorNode.removeEventListener('DOMSubtreeModified', alignPopper);
-        exist && (popperNode === null || popperNode === void 0 ? void 0 : popperNode.removeEventListener('DOMSubtreeModified', alignPopper));
       };
     }
   }, [alignPopper, exist, onVisibleChange, popperNode, props.visible, scrollHidden, locatorNode, visible, popperRef]);

package/lib/date-picker/date-picker.js

@@ -162,7 +162,7 @@ var InternalDatePicker = function InternalDatePicker(props, ref) {
         if (newText === '') {
           triggerChange(null);
           setViewDate(null);
-        } else if (newText && newText.length === _format.length) {
+        } else if (newText && newText.length >= _format.length) {
           var inputTempDate = (0, _dateFns.parseDate)(newText, _format);
           if (inputTempDate && (!disabledDate || !disabledDate(inputTempDate))) {
             if (picker !== 'year') {
@@ -229,6 +229,9 @@ var InternalDatePicker = function InternalDatePicker(props, ref) {
       if (valueText !== text) {
         resetText();
       }
+      if (hoverValue) {
+        onLeave();
+      }
     } else {
       setInnerPicker(undefined);
     }

package/lib/date-picker/hooks/use-picker-input.js

@@ -36,8 +36,6 @@ function usePickerInput(_ref) {
     },
     onKeyDown: function onKeyDown(e) {
       var _context;
-      setTyping(true);
-      triggerOpen(true);
       switch (e.which) {
         case _KeyCode.default.ENTER:
           {
@@ -53,8 +51,9 @@ function usePickerInput(_ref) {
           {
             if (typing && open && !e.shiftKey) {
               setTyping(false);
-              e.preventDefault();
+              // e.preventDefault()
             }
+
             return;
           }
         case _KeyCode.default.ESC:

package/lib/date-picker/range-picker.js

@@ -241,7 +241,7 @@ var InternalRangePicker = function InternalRangePicker(props, ref) {
     var inputTempDate;
     if (newText === '') {
       triggerChange((0, _utils2.updateValues)(selectedValue, null, index), index);
-    } else if (newText && newText.length === _format.length) {
+    } else if (newText && newText.length >= _format.length) {
       inputTempDate = (0, _dateFns.parseDate)(newText, _format);
       var disabledFunc = index === 0 ? disabledStartDate : disabledEndDate;
       if (inputTempDate && (!disabledFunc || !disabledFunc(inputTempDate))) {
@@ -457,6 +457,8 @@ var InternalRangePicker = function InternalRangePicker(props, ref) {
       setSelectedValue(dateValue);
       setViewDate(null, 0);
       setViewDate(null, 1);
+      resetStartText();
+      resetEndText();
       setHoverRangedValue([null, null]);
     } else {
       setInnerPicker(undefined);

package/lib/date-picker/utils/date-fns.js

@@ -477,10 +477,12 @@ var setYearOrMonthOfDate = function setYearOrMonthOfDate(date1, date2) {
   var type = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 'year';
   var d1 = new Date(date1 || 0);
   var d2 = new Date(date2 || 0);
-  if (type === 'year') {
+  if (type === 'year' && d1.getFullYear() !== d2.getFullYear()) {
+    d1.setDate(1);
     d1.setFullYear(d2.getFullYear());
   }
-  if (type === 'month') {
+  if (type === 'month' && d1.getMonth() !== d2.getMonth()) {
+    d1.setDate(1);
     d1.setMonth(d2.getMonth());
   }
   return d1;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kdcloudjs/kdesign",
-  "version": "1.7.56",
+  "version": "1.7.58",
   "description": "KDesign 金蝶前端react 组件库",
   "title": "kdesign",
   "keywords": [