8000 fix: fix _prePointTargetCache error in EventManager by Rui-Sun · Pull Request #344 · VisActor/VRender · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

fix: fix _prePointTargetCache error in EventManager #344

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.

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
merged 1 commit into from
Aug 21, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 10 additions & 0 deletions common/changes/@visactor/vrender/fix-event-point-cache_2023-08-21-09-53.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"changes": [
{
"packageName": "@visactor/vrender",
"comment": "fix: fix _prePointTargetCache error in EventManager",
"type": "patch"
}
],
"packageName": "@visactor/vrender"
}
13 changes: 9 additions & 4 deletions packages/vrender/src/event/event-manager.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import type { IEventTarget } from '../interface/event';
import { WILDCARD } from './constant';
import type { FederatedEvent } from './federated-event/base-event';
import { clock } from './util';
import type { Cursor } from '../interface';
import type { Cursor, IGraphic } from '../interface';
/**
* 代码参考自 https://github.com/pixijs/pixijs
* The MIT License
Expand Down Expand Up @@ -77,7 +77,7 @@ export class EventManager {
protected eventPool: Map<typeof FederatedEvent, FederatedEvent[]> = new Map();

// 缓存上一个坐标点的拾取结果,用于优化在同一个点连续触发事件的拾取逻辑
private _prePointTargetCache: Dict<IEventTarget>;
private _prePointTargetCache: Dict<IEventTarget> & { stageRenderCount: number };

constructor(root: IEventTarget) {
this.rootTarget = root;
Expand Down Expand Up @@ -120,13 +120,18 @@ export class EventManager {

let target;
const cacheKey = `${e.canvasX}-${e.canvasY}`;
if (this._prePointTargetCache?.[cacheKey]) {
if (
this._prePointTargetCache?.[cacheKey] &&
(this._prePointTargetCache?.[cacheKey] as unknown as IGraphic)?.stage.renderCount ===
(this._prePointTargetCache?.stageRenderCount as number)
) {
target = this._prePointTargetCache[cacheKey];
} else {
target = this.pickTarget(e.canvasX, e.canvasY);
// 缓存上一个坐标点的拾取结果,减少拾取的次数,如 pointermove pointerdown 和 pointerup 在同一个点触发
this._prePointTargetCache = {
[cacheKey]: target
[cacheKey]: target,
stageRenderCount: target?.stage.renderCount ?? -1
};
}

Expand Down
0