Skip to content

Commit 30aa52a

Browse files
bplok20010bplok20010
committed
add checkDefaultPrevented
1 parent fbe5d9b commit 30aa52a

File tree

7 files changed

+61
-12
lines changed

7 files changed

+61
-12
lines changed

‎docs/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,6 @@
2020
<body style="background:#F5F5F5">
2121
<div class="demo" id="demo">
2222
</div>
23-
<script src="static\js\vendors.aed3cfaf.chunk.js"></script><script src="static\js\index.f2e49df6.js"></script></body>
23+
<script src="static\js\vendors.aed3cfaf.chunk.js"></script><script src="static\js\index.e5562d28.js"></script></body>
2424

2525
</html>

‎docs/static/js/index.f2e49df6.js renamed to ‎docs/static/js/index.e5562d28.js

Lines changed: 24 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎docs/static/js/index.e5562d28.js.map

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎docs/static/js/index.f2e49df6.js.map

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎lib/index.js

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,8 @@ var propTypes = {
8080
destroyPopupOnHide: _propTypes.default.bool,
8181
popupStyle: _propTypes.default.object,
8282
popupMaskStyle: _propTypes.default.object,
83-
zIndex: _propTypes.default.number
83+
zIndex: _propTypes.default.number,
84+
checkDefaultPrevented: _propTypes.default.bool
8485
};
8586

8687
function noop() {}
@@ -494,7 +495,9 @@ function (_React$Component) {
494495
value: function render() {
495496
var _this3 = this;
496497

497-
var getPopupContainer = this.props.getPopupContainer;
498+
var _this$props10 = this.props,
499+
getPopupContainer = _this$props10.getPopupContainer,
500+
checkDefaultPrevented = _this$props10.checkDefaultPrevented;
498501
var popupVisible = this.state.popupVisible;
499502

500503
var child = _react.default.Children.only(this.props.children);
@@ -507,6 +510,8 @@ function (_React$Component) {
507510
child.props.onContextMenu(e);
508511
}
509512

513+
if (checkDefaultPrevented && e.defaultPrevented) return;
514+
510515
_this3.clearDelayTimer();
511516

512517
_this3.onContextMenu(e);
@@ -519,6 +524,8 @@ function (_React$Component) {
519524
child.props.onClick(e);
520525
}
521526

527+
if (checkDefaultPrevented && e.defaultPrevented) return;
528+
522529
_this3.clearDelayTimer();
523530

524531
_this3.onClick(e);
@@ -531,6 +538,8 @@ function (_React$Component) {
531538
child.props.onMouseEnter(e);
532539
}
533540

541+
if (checkDefaultPrevented && e.defaultPrevented) return;
542+
534543
_this3.clearDelayTimer();
535544

536545
_this3.onMouseEnter(e);
@@ -543,6 +552,8 @@ function (_React$Component) {
543552
child.props.onMouseLeave(e);
544553
}
545554

555+
if (checkDefaultPrevented && e.defaultPrevented) return;
556+
546557
_this3.clearDelayTimer();
547558

548559
_this3.onMouseLeave(e);
@@ -555,6 +566,8 @@ function (_React$Component) {
555566
child.props.onFocus(e);
556567
}
557568

569+
if (checkDefaultPrevented && e.defaultPrevented) return;
570+
558571
_this3.clearDelayTimer();
559572

560573
_this3.onFocus(e);
@@ -565,6 +578,8 @@ function (_React$Component) {
565578
child.props.onBlur(e);
566579
}
567580

581+
if (checkDefaultPrevented && e.defaultPrevented) return;
582+
568583
_this3.clearDelayTimer();
569584

570585
_this3.onBlur(e);
@@ -616,5 +631,6 @@ exports.default = Trigger;
616631
popupRootComponent: _PopupRootComponent.default,
617632
popupStyle: {},
618633
popupMaskStyle: {},
619-
zIndex: null
634+
zIndex: null,
635+
checkDefaultPrevented: false
620636
});

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "react-widget-trigger",
3-
"version": "1.1.2",
3+
"version": "1.1.3",
44
"description": "trigger",
55
"main": "index.js",
66
"files": [

‎src/index.js

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ const propTypes = {
4848
popupStyle: PropTypes.object,
4949
popupMaskStyle: PropTypes.object,
5050
zIndex: PropTypes.number,
51+
checkDefaultPrevented: PropTypes.bool,
5152
}
5253

5354
function noop() { }
@@ -76,6 +77,7 @@ export default class Trigger extends React.Component {
7677
popupStyle: {},
7778
popupMaskStyle: {},
7879
zIndex: null,
80+
checkDefaultPrevented: false,
7981
}
8082

8183
static getDerivedStateFromProps(props, state) {
@@ -465,7 +467,7 @@ export default class Trigger extends React.Component {
465467
}
466468

467469
render() {
468-
const { getPopupContainer } = this.props;
470+
const { getPopupContainer, checkDefaultPrevented } = this.props;
469471
const { popupVisible } = this.state;
470472

471473
const child = React.Children.only(this.props.children);
@@ -478,6 +480,8 @@ export default class Trigger extends React.Component {
478480
child.props.onContextMenu(e);
479481
}
480482

483+
if (checkDefaultPrevented && e.defaultPrevented) return;
484+
481485
this.clearDelayTimer();
482486

483487
this.onContextMenu(e);
@@ -490,6 +494,8 @@ export default class Trigger extends React.Component {
490494
child.props.onClick(e);
491495
}
492496

497+
if (checkDefaultPrevented && e.defaultPrevented) return;
498+
493499
this.clearDelayTimer();
494500

495501
this.onClick(e);
@@ -502,6 +508,8 @@ export default class Trigger extends React.Component {
502508
child.props.onMouseEnter(e);
503509
}
504510

511+
if (checkDefaultPrevented && e.defaultPrevented) return;
512+
505513
this.clearDelayTimer();
506514

507515
this.onMouseEnter(e);
@@ -514,6 +522,8 @@ export default class Trigger extends React.Component {
514522
child.props.onMouseLeave(e);
515523
}
516524

525+
if (checkDefaultPrevented && e.defaultPrevented) return;
526+
517527
this.clearDelayTimer();
518528

519529
this.onMouseLeave(e);
@@ -526,6 +536,8 @@ export default class Trigger extends React.Component {
526536
child.props.onFocus(e);
527537
}
528538

539+
if (checkDefaultPrevented && e.defaultPrevented) return;
540+
529541
this.clearDelayTimer();
530542

531543
this.onFocus(e);
@@ -535,6 +547,8 @@ export default class Trigger extends React.Component {
535547
child.props.onBlur(e);
536548
}
537549

550+
if (checkDefaultPrevented && e.defaultPrevented) return;
551+
538552
this.clearDelayTimer();
539553

540554
this.onBlur(e);

0 commit comments

Comments
 (0)