Skip to content
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

Fix the default listener target for InputManager pointer #1393

Merged
merged 1 commit into from
Mar 3, 2023
Merged

Fix the default listener target for InputManager pointer #1393

Show file tree
Hide file tree
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
11 changes: 11 additions & 0 deletions packages/core/src/input/keyboard/KeyboardManager.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,17 @@ export class KeyboardManager implements IInput {
}
curFrameUpList.add(codeKey);
upKeyToFrameCountMap[codeKey] = frameCount;
// @todo
// Because on the mac, the keyup event is not responded to when the meta key is held down,
// in order to maintain the correct keystroke record, it is necessary to clear the record
// when the meta key is lifted.
// link: https://stackoverflow.com/questions/11818637/why-does-javascript-drop-keyup-events-when-the-metakey-is-pressed-on-mac-browser
// if (codeKey === Keys.MetaLeft || codeKey === Keys.MetaRight) {
// for (let i = 0, len = curFrameHeldDownList.length; i < len; i++) {
// curHeldDownKeyToIndexMap[curFrameHeldDownList.get(i)] = null;
// }
// curFrameHeldDownList.length = 0;
// }
break;
default:
break;
Expand Down
28 changes: 14 additions & 14 deletions packages/core/src/input/pointer/PointerManager.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,10 +112,10 @@ export class PointerManager implements IInput {
if (!this._hadListener) {
const { _htmlCanvas: htmlCanvas, _onPointerEvent: onPointerEvent } = this;
htmlCanvas.addEventListener("pointerdown", onPointerEvent);
htmlCanvas.addEventListener("pointerup", onPointerEvent);
htmlCanvas.addEventListener("pointerout", onPointerEvent);
htmlCanvas.addEventListener("pointermove", onPointerEvent);
htmlCanvas.addEventListener("pointercancel", onPointerEvent);
document.addEventListener("pointermove", onPointerEvent);
document.addEventListener("pointerup", onPointerEvent);
document.addEventListener("pointerleave", onPointerEvent);
document.addEventListener("pointercancel", onPointerEvent);
this._hadListener = true;
}
}
Expand All @@ -127,10 +127,10 @@ export class PointerManager implements IInput {
if (this._hadListener) {
const { _htmlCanvas: htmlCanvas, _onPointerEvent: onPointerEvent } = this;
htmlCanvas.removeEventListener("pointerdown", onPointerEvent);
htmlCanvas.removeEventListener("pointerup", onPointerEvent);
htmlCanvas.removeEventListener("pointerout", onPointerEvent);
htmlCanvas.removeEventListener("pointermove", onPointerEvent);
htmlCanvas.removeEventListener("pointercancel", onPointerEvent);
document.removeEventListener("pointermove", onPointerEvent);
document.removeEventListener("pointerup", onPointerEvent);
document.removeEventListener("pointerleave", onPointerEvent);
document.removeEventListener("pointercancel", onPointerEvent);
this._hadListener = false;
this._downList.length = 0;
this._upList.length = 0;
Expand All @@ -150,10 +150,10 @@ export class PointerManager implements IInput {
if (this._hadListener) {
const { _htmlCanvas: htmlCanvas, _onPointerEvent: onPointerEvent } = this;
htmlCanvas.removeEventListener("pointerdown", onPointerEvent);
htmlCanvas.removeEventListener("pointerup", onPointerEvent);
htmlCanvas.removeEventListener("pointerout", onPointerEvent);
htmlCanvas.removeEventListener("pointermove", onPointerEvent);
htmlCanvas.removeEventListener("pointercancel", onPointerEvent);
document.removeEventListener("pointermove", onPointerEvent);
document.removeEventListener("pointerup", onPointerEvent);
document.removeEventListener("pointerleave", onPointerEvent);
document.removeEventListener("pointercancel", onPointerEvent);
this._hadListener = false;
}
this._pointerPool.length = 0;
Expand Down Expand Up @@ -287,7 +287,7 @@ export class PointerManager implements IInput {
pointer.phase = PointerPhase.Up;
pointer._firePointerUpAndClick(rayCastEntity);
break;
case "pointerout":
case "pointerleave":
case "pointercancel":
pointer.phase = PointerPhase.Leave;
pointer._firePointerExitAndEnter(null);
Expand Down Expand Up @@ -345,7 +345,7 @@ export class PointerManager implements IInput {
case "pointermove":
pointer.phase = PointerPhase.Move;
break;
case "pointerout":
case "pointerleave":
case "pointercancel":
pointer.phase = PointerPhase.Leave;
default:
Expand Down