@kdcloudjs/kdesign 1.8.68 → 1.8.70
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/kdesign.css +1 -1
- package/dist/kdesign.css.map +1 -1
- package/dist/kdesign.js +13 -4
- package/dist/kdesign.js.map +1 -1
- package/dist/kdesign.min.css +1 -1
- package/dist/kdesign.min.js +2 -2
- package/dist/kdesign.min.js.map +1 -1
- package/es/_utils/usePopper.d.ts +1 -0
- package/es/_utils/usePopper.js +11 -3
- package/es/select/select.js +1 -0
- package/lib/_utils/usePopper.d.ts +1 -0
- package/lib/_utils/usePopper.js +11 -3
- package/lib/select/select.js +1 -0
- package/package.json +1 -1
package/dist/kdesign.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
/*!
|
|
2
2
|
*
|
|
3
|
-
* @kdcloudjs/kdesign v1.8.
|
|
3
|
+
* @kdcloudjs/kdesign v1.8.70
|
|
4
4
|
*
|
|
5
5
|
* Copyright 2020-present, Kingdee, Inc.
|
|
6
6
|
* All rights reserved.
|
|
@@ -2387,6 +2387,8 @@ function usePopper(locatorElement, popperElement, props) {
|
|
|
2387
2387
|
_props$clickToClose = props.clickToClose,
|
|
2388
2388
|
clickToClose = _props$clickToClose === void 0 ? true : _props$clickToClose,
|
|
2389
2389
|
isMobile = props.isMobile,
|
|
2390
|
+
_props$triggerScroll = props.triggerScroll,
|
|
2391
|
+
triggerScroll = _props$triggerScroll === void 0 ? false : _props$triggerScroll,
|
|
2390
2392
|
_props$getTriggerElem = props.getTriggerElement,
|
|
2391
2393
|
getTriggerElement = _props$getTriggerElem === void 0 ? function (locatorNode) {
|
|
2392
2394
|
return locatorNode;
|
|
@@ -2900,10 +2902,16 @@ function usePopper(locatorElement, popperElement, props) {
|
|
|
2900
2902
|
Object(react__WEBPACK_IMPORTED_MODULE_19__["useEffect"])(function () {
|
|
2901
2903
|
if (visible) {
|
|
2902
2904
|
var scrollAlign = lodash_debounce__WEBPACK_IMPORTED_MODULE_22___default()(function (e) {
|
|
2903
|
-
var
|
|
2904
|
-
|
|
2905
|
+
var target = e.target;
|
|
2906
|
+
var popperNode = popperRef.current;
|
|
2907
|
+
var realDom = getRealDom(locatorRef, locatorElement);
|
|
2908
|
+
var triggerNode = realDom ? getTriggerElement(realDom) : null;
|
|
2909
|
+
var isPopperScroll = popperNode && target && (target === popperNode || popperNode.contains(target));
|
|
2910
|
+
var isTriggerScroll = triggerNode && target && (target === triggerNode || triggerNode.contains(target)) && triggerScroll;
|
|
2911
|
+
if (scrollHidden && !isPopperScroll && !isTriggerScroll) {
|
|
2905
2912
|
props.visible === undefined && setVisible(false);
|
|
2906
2913
|
onVisibleChange && onVisibleChange(false);
|
|
2914
|
+
return;
|
|
2907
2915
|
}
|
|
2908
2916
|
alignPopper();
|
|
2909
2917
|
}, 10);
|
|
@@ -2914,7 +2922,7 @@ function usePopper(locatorElement, popperElement, props) {
|
|
|
2914
2922
|
document.removeEventListener('scroll', scrollAlign, true);
|
|
2915
2923
|
};
|
|
2916
2924
|
}
|
|
2917
|
-
}, [alignPopper,
|
|
2925
|
+
}, [visible, alignPopper, scrollHidden, onVisibleChange, props.visible, popperRef, locatorRef, locatorElement, getTriggerElement]);
|
|
2918
2926
|
Object(react__WEBPACK_IMPORTED_MODULE_19__["useEffect"])(function () {
|
|
2919
2927
|
var realDom = getRealDom(locatorRef, locatorElement);
|
|
2920
2928
|
var triggerNode = getTriggerElement(realDom);
|
|
@@ -33847,6 +33855,7 @@ var InternalSelect = function InternalSelect(props, ref) {
|
|
|
33847
33855
|
popperStyle: catchStyle(),
|
|
33848
33856
|
defaultVisible: optionShow,
|
|
33849
33857
|
visible: optionShow,
|
|
33858
|
+
triggerScroll: true,
|
|
33850
33859
|
onVisibleChange: handleVisibleChange,
|
|
33851
33860
|
clickToClose: !(isShowSearch && searchValue)
|
|
33852
33861
|
});
|