Skip to content
New issue

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

#

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

Already on GitHub? # to your account

Fixed the problem of modifying component.enable when dispatching UI events, resulting in error reporting #2549

Merged
merged 3 commits into from
Feb 12, 2025
Merged

Fixed the problem of modifying component.enable when dispatching UI events, resulting in error reporting #2549

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9ee92e9
feat: udpate code
cptbtptpbcptdtptp Feb 11, 2025
a04b8ea
feat: udpate code
cptbtptpbcptdtptp Feb 11, 2025
3fc4620
feat: udpate code
cptbtptpbcptdtptp Feb 11, 2025
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
175 changes: 111 additions & 64 deletions packages/ui/src/input/UIPointerEventEmitter.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,14 @@
@registerPointerEventEmitter()
export class UIPointerEventEmitter extends PointerEventEmitter {
private static _MAX_PATH_DEPTH = 2048;
private static _path0: Entity[] = [];
private static _path1: Entity[] = [];
private static _tempSet: Set<number> = new Set();
private static _path: Entity[] = [];
private static _tempArray0: Entity[] = [];
private static _tempArray1: Entity[] = [];

private _enteredElement: UIRenderer;
private _pressedElement: UIRenderer;
private _draggedElement: UIRenderer;
private _enteredPath: Entity[] = [];
private _pressedPath: Entity[] = [];
private _draggedPath: Entity[] = [];

_init(): void {
this._hitResult = new UIHitResult();
Expand Down Expand Up @@ -98,96 +100,94 @@
}

override processDrag(pointer: Pointer): void {
if (this._draggedElement) {
this._bubble(this._composedPath(this._draggedElement, UIPointerEventEmitter._path0), pointer, this._fireDrag);
const draggedPath = this._draggedPath;
if (draggedPath.length > 0) {
this._bubble(draggedPath, pointer, this._fireDrag);
draggedPath.length = 0;

Check warning on line 106 in packages/ui/src/input/UIPointerEventEmitter.ts

View check run for this annotation

Codecov / codecov/patch

packages/ui/src/input/UIPointerEventEmitter.ts#L105-L106 

Added lines #L105 - L106 were not covered by tests
}
}

override processDown(pointer: Pointer): void {
const element = (this._pressedElement = this._draggedElement = this._enteredElement);
if (element) {
const path = this._composedPath(element, UIPointerEventEmitter._path0);
this._bubble(path, pointer, this._fireDown);
this._bubble(path, pointer, this._fireBeginDrag);
const enteredPath = this._enteredPath;
const pressedPath = this._pressedPath;
const draggedPath = this._draggedPath;
const length = (draggedPath.length = pressedPath.length = enteredPath.length);
if (length > 0) {
for (let i = 0; i < length; i++) {
pressedPath[i] = draggedPath[i] = enteredPath[i];
}
this._bubble(pressedPath, pointer, this._fireDown);
this._bubble(draggedPath, pointer, this._fireBeginDrag);
}
}

override processUp(pointer: Pointer): void {
const liftedPath = UIPointerEventEmitter._path0;
const enteredElement = this._enteredElement;
if (enteredElement) {
this._composedPath(enteredElement, liftedPath);
this._bubble(liftedPath, pointer, this._fireUp);
if (this._pressedElement) {
const pressedPath = this._composedPath(this._pressedElement, UIPointerEventEmitter._path1);
const enterLength = liftedPath.length;
const pressLength = pressedPath.length;
const minLength = Math.min(enterLength, pressLength);
let i = 0;
for (; i < minLength; i++) {
if (liftedPath[enterLength - 1 - i] !== pressedPath[pressLength - 1 - i]) {
break;
const enteredPath = this._enteredPath;
const pressedPath = this._pressedPath;
if (enteredPath.length > 0) {
this._bubble(enteredPath, pointer, this._fireUp);
if (pressedPath.length > 0) {
const common = UIPointerEventEmitter._tempArray0;
if (this._findCommonInPath(enteredPath, pressedPath, common)) {
const eventData = this._createEventData(pointer);
for (let i = 0, n = common.length; i < n; i++) {
this._fireClick(common[i], eventData);
}
}
const targetIndex = enterLength - i;
const eventData = this._createEventData(pointer);
for (let j = targetIndex; j < enterLength; j++) {
this._fireClick(liftedPath[j], eventData);
}
this._pressedElement = null;
}
}

if (this._draggedElement) {
this._bubble(this._composedPath(this._draggedElement, UIPointerEventEmitter._path1), pointer, this._fireEndDrag);
this._draggedElement = null;
pressedPath.length = 0;

const draggedPath = this._draggedPath;
if (draggedPath.length > 0) {
this._bubble(draggedPath, pointer, this._fireEndDrag);
draggedPath.length = 0;
}

if (enteredElement) {
this._bubble(liftedPath, pointer, this._fireDrop);
if (enteredPath.length > 0) {
this._bubble(enteredPath, pointer, this._fireDrop);
}
}

override processLeave(pointer: Pointer): void {
const path = UIPointerEventEmitter._path0;
if (this._enteredElement) {
this._bubble(this._composedPath(this._enteredElement, path), pointer, this._fireExit);
this._enteredElement = null;
const enteredPath = this._enteredPath;
if (enteredPath.length > 0) {
this._bubble(enteredPath, pointer, this._fireExit);
enteredPath.length = 0;

Check warning on line 157 in packages/ui/src/input/UIPointerEventEmitter.ts

View check run for this annotation

Codecov / codecov/patch

packages/ui/src/input/UIPointerEventEmitter.ts#L154-L157 

Added lines #L154 - L157 were not covered by tests
}
if (this._draggedElement) {
this._bubble(this._composedPath(this._draggedElement, path), pointer, this._fireEndDrag);
this._draggedElement = null;

const draggedPath = this._draggedPath;
if (draggedPath.length > 0) {
this._bubble(draggedPath, pointer, this._fireEndDrag);
draggedPath.length = 0;

Check warning on line 163 in packages/ui/src/input/UIPointerEventEmitter.ts

View check run for this annotation

Codecov / codecov/patch

packages/ui/src/input/UIPointerEventEmitter.ts#L159-L163 

Added lines #L159 - L163 were not covered by tests
}

this._pressedElement = null;
this._pressedPath.length = 0;

Check warning on line 166 in packages/ui/src/input/UIPointerEventEmitter.ts

View check run for this annotation

Codecov / codecov/patch

packages/ui/src/input/UIPointerEventEmitter.ts#L166 

Added line #L166 was not covered by tests
}

override dispose(): void {
this._enteredElement = this._pressedElement = this._draggedElement = null;
this._enteredPath.length = this._pressedPath.length = this._draggedPath.length = 0;

Check warning on line 170 in packages/ui/src/input/UIPointerEventEmitter.ts

View check run for this annotation

Codecov / codecov/patch

packages/ui/src/input/UIPointerEventEmitter.ts#L170 

Added line #L170 was not covered by tests
}

private _updateRaycast(element: UIRenderer, pointer: Pointer = null): void {
const enteredElement = this._enteredElement;
if (element !== enteredElement) {
let prePath = this._composedPath(enteredElement, UIPointerEventEmitter._path0);
let curPath = this._composedPath(element, UIPointerEventEmitter._path1);
const preLength = prePath.length;
const curLength = curPath.length;
const minLength = Math.min(preLength, curLength);
let i = 0;
for (; i < minLength; i++) {
if (prePath[preLength - i - 1] !== curPath[curLength - i - 1]) {
break;
}
}
const enteredPath = this._enteredPath;
const curPath = this._composedPath(element, UIPointerEventEmitter._path);
const add = UIPointerEventEmitter._tempArray0;
const del = UIPointerEventEmitter._tempArray1;
if (this._findDiffInPath(enteredPath, curPath, add, del)) {
const eventData = this._createEventData(pointer);
for (let j = 0, n = preLength - i; j < n; j++) {
this._fireExit(prePath[j], eventData);
for (let i = 0, n = add.length; i < n; i++) {
this._fireEnter(add[i], eventData);
}
for (let j = 0, n = curLength - i; j < n; j++) {
this._fireEnter(curPath[j], eventData);
for (let i = 0, n = del.length; i < n; i++) {
this._fireExit(del[i], eventData);
}

const length = (enteredPath.length = curPath.length);
for (let i = 0; i < length; i++) {
enteredPath[i] = curPath[i];
}
this._enteredElement = element;
}
}

Expand All @@ -206,6 +206,53 @@
return path;
}

private _findCommonInPath(prePath: Entity[], curPath: Entity[], common: Entity[]): boolean {
common.length = 0;
const idSet = UIPointerEventEmitter._tempSet;
idSet.clear();
for (let i = 0, n = prePath.length; i < n; i++) {
idSet.add(prePath[i].instanceId);
}
let hasCommon = false;
for (let i = 0, n = curPath.length; i < n; i++) {
const entity = curPath[i];
if (idSet.has(entity.instanceId)) {
common.push(entity);
hasCommon = true;
}
}
return hasCommon;
}

private _findDiffInPath(prePath: Entity[], curPath: Entity[], add: Entity[], del: Entity[]): boolean {
add.length = del.length = 0;
const idSet = UIPointerEventEmitter._tempSet;
idSet.clear();
let changed = false;
for (let i = 0, n = prePath.length; i < n; i++) {
idSet.add(prePath[i].instanceId);
}
for (let i = 0, n = curPath.length; i < n; i++) {
const entity = curPath[i];
if (!idSet.has(entity.instanceId)) {
add.push(entity);
changed = true;
}
}
idSet.clear();
for (let i = 0, n = curPath.length; i < n; i++) {
idSet.add(curPath[i].instanceId);
}
for (let i = 0, n = prePath.length; i < n; i++) {
const entity = prePath[i];
if (!idSet.has(entity.instanceId)) {
del.push(entity);
changed = true;
}
}
return changed;
}

private _bubble(path: Entity[], pointer: Pointer, fireEvent: FireEvent): void {
const length = path.length;
if (length <= 0) return;
Expand Down
Loading