Skip to content

fix geo/baseobject not fire mouseout when has repeat id #2432

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
fuzhenn merged 1 commit into from
Sep 29, 2024
Merged

fix geo/baseobject not fire mouseout when has repeat id #2432

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 11 additions & 7 deletions src/map/handler/Map.GeometryEvents.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -336,22 +336,26 @@ class MapGeometryEventsHandler extends Handler {
return geos || [];
};

const oldGeosMouseout = (oldTargets = [], geoMap = {}) => {
const oldGeosMouseout = (oldTargets = [], newTargets = []) => {
if (oldTargets && oldTargets.length > 0) {
for (let i = oldTargets.length - 1; i >= 0; i--) {
const oldTarget = oldTargets[i];
if (!isGeo(oldTarget)) {
continue;
}
// const oldTargetId = oldTargets[i]._getInternalId();
const oldTargetId = getGeoId(oldTargets[i]);
/**
* 鼠标经过的新位置中不包含老的目标geometry
*/
if (!geoMap[oldTargetId]) {
// propagation = oldTarget._onEvent(domEvent, 'mouseout');
if (newTargets.indexOf(oldTarget) === -1) {
propagation = fireGeoEvent(oldTarget, domEvent, 'mouseout');
}
// // const oldTargetId = oldTargets[i]._getInternalId();
// const oldTargetId = getGeoId(oldTargets[i]);

// if (!geoMap[oldTargetId]) {
// // propagation = oldTarget._onEvent(domEvent, 'mouseout');
// propagation = fireGeoEvent(oldTarget, domEvent, 'mouseout');
// }
}
}
};
Expand All @@ -362,7 +366,7 @@ class MapGeometryEventsHandler extends Handler {
'geos': [],
'geomap': {}
};
oldGeosMouseout(oldTargets, {});
oldGeosMouseout(oldTargets, []);
} else if (eventType === 'mousemove') {
const geoMap = {};
if (geometries.length > 0) {
Expand Down Expand Up @@ -391,7 +395,7 @@ class MapGeometryEventsHandler extends Handler {
'geos': geometries,
'geomap': geoMap
};
oldGeosMouseout(oldTargets, geoMap);
oldGeosMouseout(oldTargets, geometries);

} else {
if (!geometries || !geometries.length) { return; }
Expand Down