@kdcloudjs/kdesign 1.8.16 → 1.8.18

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.
Files changed (12) hide show
  1. package/dist/kdesign.css +1 -1
  2. package/dist/kdesign.css.map +1 -1
  3. package/dist/kdesign.js +8 -4
  4. package/dist/kdesign.js.map +1 -1
  5. package/dist/kdesign.min.css +1 -1
  6. package/dist/kdesign.min.js +2 -2
  7. package/dist/kdesign.min.js.map +1 -1
  8. package/es/city-picker/city-picker.js +2 -0
  9. package/es/popper/index.js +5 -3
  10. package/lib/city-picker/city-picker.js +2 -0
  11. package/lib/popper/index.js +5 -3
  12. package/package.json +1 -1
package/es/city-picker/city-picker.js CHANGED
@@ -409,6 +409,8 @@ var InternalSelect = function InternalSelect(props, ref) {
409
409
  break;
410
410
  }
411
411
  case KeyCode.ESC:
412
+ e.stopPropagation();
413
+ e.nativeEvent.stopImmediatePropagation();
412
414
  handleVisibleChange(false);
413
415
  break;
414
416
  default:
package/es/popper/index.js CHANGED
@@ -266,7 +266,9 @@ export var Popper = forwardRef(function (props, ref) {
266
266
  triggerOpen(nextOpen, triggerType, delay);
267
267
  };
268
268
  var onClick = function onClick() {
269
- onTriggerInner(!visibleInner, 'click');
269
+ if (clickToClose || !visibleInner) {
270
+ onTriggerInner(!visibleInner, 'click');
271
+ }
270
272
  };
271
273
  var onFocus = function onFocus() {
272
274
  onTriggerInner(true, 'focus');
@@ -351,11 +353,11 @@ export var Popper = forwardRef(function (props, ref) {
351
353
  var isPopper = popperRefDom.current ? popperRefDom.current === e.target || ((_b = (_a = popperRefDom.current).contains) === null || _b === void 0 ? void 0 : _b.call(_a, e.target)) : false;
352
354
  var domReference = getRealDom(referenceRef, referenceElement);
353
355
  var isReference = domReference ? domReference === e.target || ((_c = domReference === null || domReference === void 0 ? void 0 : domReference.contains) === null || _c === void 0 ? void 0 : _c.call(domReference, e.target)) : false;
354
- var isTarget = trigger === 'contextMenu' ? isPopper : isPopper || isReference;
356
+ var isTarget = isPopper || isReference;
355
357
  if (!isTarget && !isSubPopper(e)) {
356
358
  triggerOpen(false, 'clickOutside', 0);
357
359
  }
358
- if (clickToClose && isPopper) {
360
+ if (clickToClose && isReference && trigger !== 'focus') {
359
361
  triggerOpen(false, 'clickToClose', 0);
360
362
  }
361
363
  }
package/lib/city-picker/city-picker.js CHANGED
@@ -421,6 +421,8 @@ var InternalSelect = function InternalSelect(props, ref) {
421
421
  break;
422
422
  }
423
423
  case _KeyCode.default.ESC:
424
+ e.stopPropagation();
425
+ e.nativeEvent.stopImmediatePropagation();
424
426
  handleVisibleChange(false);
425
427
  break;
426
428
  default:
package/lib/popper/index.js CHANGED
@@ -281,7 +281,9 @@ var Popper = (0, _react.forwardRef)(function (props, ref) {
281
281
  triggerOpen(nextOpen, triggerType, delay);
282
282
  };
283
283
  var onClick = function onClick() {
284
- onTriggerInner(!visibleInner, 'click');
284
+ if (clickToClose || !visibleInner) {
285
+ onTriggerInner(!visibleInner, 'click');
286
+ }
285
287
  };
286
288
  var onFocus = function onFocus() {
287
289
  onTriggerInner(true, 'focus');
@@ -366,11 +368,11 @@ var Popper = (0, _react.forwardRef)(function (props, ref) {
366
368
  var isPopper = popperRefDom.current ? popperRefDom.current === e.target || ((_b = (_a = popperRefDom.current).contains) === null || _b === void 0 ? void 0 : _b.call(_a, e.target)) : false;
367
369
  var domReference = getRealDom(referenceRef, referenceElement);
368
370
  var isReference = domReference ? domReference === e.target || ((_c = domReference === null || domReference === void 0 ? void 0 : domReference.contains) === null || _c === void 0 ? void 0 : _c.call(domReference, e.target)) : false;
369
- var isTarget = trigger === 'contextMenu' ? isPopper : isPopper || isReference;
371
+ var isTarget = isPopper || isReference;
370
372
  if (!isTarget && !isSubPopper(e)) {
371
373
  triggerOpen(false, 'clickOutside', 0);
372
374
  }
373
- if (clickToClose && isPopper) {
375
+ if (clickToClose && isReference && trigger !== 'focus') {
374
376
  triggerOpen(false, 'clickToClose', 0);
375
377
  }
376
378
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@kdcloudjs/kdesign",
3
- "version": "1.8.16",
3
+ "version": "1.8.18",
4
4
  "description": "KDesign 金蝶前端react 组件库",
5
5
  "title": "kdesign",
6
6
  "keywords": [