huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Implement actual "stop bubbling"

This commit is contained in:
Steve Sanderson 2019-09-26 13:40:17 +01:00 committed by Artak
parent 31ee4a8daf
commit e7e2dedf5d
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/Components/Web.JS/src/Rendering/EventDelegator.ts
View File

@ -92,6 +92,7 @@ export class EventDelegator {
let candidateElement = evt.target as Element | null; let candidateElement = evt.target as Element | null;
let eventArgs: EventForDotNet<UIEventArgs> | null = null; // Populate lazily let eventArgs: EventForDotNet<UIEventArgs> | null = null; // Populate lazily
const eventIsNonBubbling = nonBubblingEvents.hasOwnProperty(evt.type); const eventIsNonBubbling = nonBubblingEvents.hasOwnProperty(evt.type);
let stopBubblingWasRequested = false;
while (candidateElement) { while (candidateElement) {
const handlerInfos = this.getEventHandlerInfosForElement(candidateElement, false); const handlerInfos = this.getEventHandlerInfosForElement(candidateElement, false);
if (handlerInfos) { if (handlerInfos) {
@ -105,9 +106,13 @@ export class EventDelegator {
const eventFieldInfo = EventFieldInfo.fromEvent(handlerInfo.renderingComponentId, evt); const eventFieldInfo = EventFieldInfo.fromEvent(handlerInfo.renderingComponentId, evt);
this.onEvent(evt, handlerInfo.eventHandlerId, eventArgs, eventFieldInfo); this.onEvent(evt, handlerInfo.eventHandlerId, eventArgs, eventFieldInfo);
} }
if (handlerInfos.stopBubbling(evt.type)) {
stopBubblingWasRequested = true;
}
} }
candidateElement = eventIsNonBubbling ? null : candidateElement.parentElement; candidateElement = (eventIsNonBubbling || stopBubblingWasRequested) ? null : candidateElement.parentElement;
} }
} }
@ -205,8 +210,8 @@ class EventHandlerInfosForElement {
delete this.handlers[eventName]; delete this.handlers[eventName];
} }
public preventDefault(eventName: string, setValue: boolean | null): boolean { public preventDefault(eventName: string, setValue?: boolean): boolean {
if (setValue !== null) { if (setValue !== undefined) {
this.preventDefaultFlags = this.preventDefaultFlags || {}; this.preventDefaultFlags = this.preventDefaultFlags || {};
this.preventDefaultFlags[eventName] = setValue; this.preventDefaultFlags[eventName] = setValue;
} }
@ -214,8 +219,8 @@ class EventHandlerInfosForElement {
return this.preventDefaultFlags ? this.preventDefaultFlags[eventName] : false; return this.preventDefaultFlags ? this.preventDefaultFlags[eventName] : false;
} }
public stopBubbling(eventName: string, setValue: boolean | null): boolean { public stopBubbling(eventName: string, setValue?: boolean): boolean {
if (setValue !== null) { if (setValue !== undefined) {
this.stopBubblingFlags = this.stopBubblingFlags || {}; this.stopBubblingFlags = this.stopBubblingFlags || {};
this.stopBubblingFlags[eventName] = setValue; this.stopBubblingFlags[eventName] = setValue;
} }