Skip to content

Fix incorrect calculation of onMouseEnter/Leave component path #11164

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gaearon merged 4 commits into from
Oct 9, 2017
Merged

Fix incorrect calculation of onMouseEnter/Leave component path #11164

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ba39259
Add a regression test for #10906
gaearon Oct 9, 2017
28b0473
Turn while conditions into breaks without changing the logic
gaearon Oct 9, 2017
2e099be
var => const/let
gaearon Oct 9, 2017
ef6d6fc
Check alternates when comparing to the common ancestor
gaearon Oct 9, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
var => const/let 
So that I can add a block scoped variable.
  • Loading branch information
@gaearon
gaearon committed Oct 9, 2017
commit 2e099be61b72434c7c28109d78048cbd4972b926
8 changes: 4 additions & 4 deletions src/renderers/shared/shared/ReactTreeTraversal.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,8 +110,8 @@ function traverseTwoPhase(inst, fn, arg) {
* "entered" or "left" that element.
*/
function traverseEnterLeave(from, to, fn, argFrom, argTo) {
var common = from && to ? getLowestCommonAncestor(from, to) : null;
var pathFrom = [];
const common = from && to ? getLowestCommonAncestor(from, to) : null;
const pathFrom = [];
while (true) {
Copy link
Collaborator

@sebmarkbage sebmarkbage Oct 9, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We try to avoid while (true) since (at least in older versions) it has been known to deopt.

I appreciate the rewrite for the temp variable and easy of read. But arguably this just make the condition seem a lot more complicated than it really is.

Copy link
Collaborator Author

@gaearon gaearon Oct 9, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Didn't it deopt when you have continues rather than break? I don't remember. @trueadm

if (!from) {
break;
Expand All @@ -122,7 +122,7 @@ function traverseEnterLeave(from, to, fn, argFrom, argTo) {
pathFrom.push(from);
from = getParent(from);
}
var pathTo = [];
const pathTo = [];
while (true) {
if (!to) {
break;
Expand All @@ -133,7 +133,7 @@ function traverseEnterLeave(from, to, fn, argFrom, argTo) {
pathTo.push(to);
to = getParent(to);
}
var i;
let i;
for (i = 0; i < pathFrom.length; i++) {
fn(pathFrom[i], 'bubbled', argFrom);
}
Expand Down