Merge pull request #263 from wechat-miniprogram/feat-revert-listener-event-replacer

Tidyzq · web-flow · commit c13fcd6f844f · 2025-11-07T15:37:20.000+08:00
Revert listenerEventReplacer &amp; call setEventListenerWrapper as default
diff --git a/glass-easel-template-compiler/src/proc_gen/tag.rs b/glass-easel-template-compiler/src/proc_gen/tag.rs
@@ -67,11 +67,11 @@ impl Template {
                                         write!(w, "R.setFnFilter(Q.A,Q.B)")?;
                                         Ok(())
                                     })?;
-                                    w.expr_stmt(|w| {
-                                        write!(w, "if(typeof R.setEventListenerWrapper==='function')R.setEventListenerWrapper(Q.C)")?;
-                                        Ok(())
-                                    })?;
                                 }
+                                w.expr_stmt(|w| {
+                                    write!(w, "if(typeof R.setEventListenerWrapper==='function')R.setEventListenerWrapper(Q.C)")?;
+                                    Ok(())
+                                })?;
                                 let mut writer = JsTopScopeWriter::new(String::new());
                                 writer.align(w);
                                 let define_root_ident = writer.function_scope(|w| {
diff --git a/glass-easel/src/behavior.ts b/glass-easel/src/behavior.ts
@@ -189,11 +189,6 @@ export class BehaviorBuilder<
   _$init: { func: (this: any, ctx: any) => any; once: boolean }[] = []
   /** @internal */
   _$methodCallerInit?: (this: ComponentInstance<TData, TProperty, TMethod, TExtraThisFields>) => any
-  /** @internal */
-  _$listenerEventReplacer?: (
-    this: ComponentInstance<TData, TProperty, TMethod, TExtraThisFields>,
-    event: ShadowedEvent<unknown>,
-  ) => ShadowedEvent<unknown>
 
   /** @internal */
   constructor(is: string | undefined, ownerSpace: ComponentSpace) {
@@ -214,21 +209,6 @@ export class BehaviorBuilder<
     return this as any
   }
 
-  /**
-   * Set a listener wrapper function
-   *
-   * It should return the wrapped listener.
-   */
-  listenerEventReplacer(
-    func: (
-      this: ComponentInstance<TData, TProperty, TMethod, TExtraThisFields>,
-      event: ShadowedEvent<unknown>,
-    ) => ShadowedEvent<unknown>,
-  ): ResolveBehaviorBuilder<this, TChainingFilter> {
-    this._$listenerEventReplacer = func
-    return this as any
-  }
-
   /**
    * Add a behavior
    *
@@ -870,11 +850,6 @@ export class Behavior<
   _$methodCallerInit?: (
     this: ComponentInstance<TData, TProperty, TMethod, TExtraThisFields>,
   ) => ComponentInstance<TData, TProperty, TMethod, TExtraThisFields>
-  /** @internal */
-  _$listenerEventReplacer?: (
-    this: ComponentInstance<TData, TProperty, TMethod, TExtraThisFields>,
-    event: ShadowedEvent<unknown>,
-  ) => ShadowedEvent<unknown>
 
   /**
    * Create a behavior with classic-style definition
@@ -925,7 +900,6 @@ export class Behavior<
     this._$relationMap = undefined
     this._$init = []
     this._$methodCallerInit = builder._$methodCallerInit
-    this._$listenerEventReplacer = builder._$listenerEventReplacer
   }
 
   general(): GeneralBehavior {
diff --git a/glass-easel/src/component.ts b/glass-easel/src/component.ts
@@ -1233,13 +1233,6 @@ export class Component<
     return this._$methodCaller
   }
 
-  /**
-   * Get the final event object
-   */
-  getEventObject(e: ShadowedEvent<unknown>): ShadowedEvent<any> {
-    return this._$behavior._$listenerEventReplacer?.(e) || e
-  }
-
   /**
    * Add a lifetime event listener on the component
    */
diff --git a/glass-easel/src/event.ts b/glass-easel/src/event.ts
@@ -272,13 +272,12 @@ export class Event<TDetail> {
     targetCaller: Element,
     mark: { [name: string]: unknown } | null,
     currentTargetCaller: Element,
-    ownerHost: GeneralComponent | undefined,
   ): ShadowedEvent<TDetail> {
     const ret = Object.create(this) as ShadowedEvent<TDetail>
     ret.target = targetCaller
     ret.mark = mark
     ret.currentTarget = currentTargetCaller
-    return ownerHost?.getEventObject(ret) || ret
+    return ret
   }
 
   getEventName(): string {
@@ -347,12 +346,7 @@ export class Event<TDetail> {
       ? currentTarget.getMethodCaller() || currentTarget
       : currentTarget
     this._$hasListener ||= efa.funcArr.hasFunc()
-    const ev = this.wrapShadowedEvent(
-      targetCaller,
-      mark,
-      currentTargetCaller,
-      target.ownerShadowRoot?.getHostNode(),
-    )
+    const ev = this.wrapShadowedEvent(targetCaller, mark, currentTargetCaller)
     const ret = efa.funcArr.call(
       currentTargetCaller,
       [ev],
diff --git a/glass-easel/src/tmpl/native_rendering.ts b/glass-easel/src/tmpl/native_rendering.ts
@@ -137,7 +137,7 @@ export class GlassEaselTemplateDOMInstance implements TemplateInstance, External
     const evName = event.getEventName()
     const bubbles = event.bubbles
     for (;;) {
-      const shadowedEvent = event.wrapShadowedEvent(target as any, null, cur as any, this.comp)
+      const shadowedEvent = event.wrapShadowedEvent(target as any, null, cur as any)
       const f = (cur as unknown as ElementWithEvent)._$wxTmplEv?.[evName]
       if (f) {
         const r = f.call(cur, shadowedEvent)
diff --git a/glass-easel/tests/core/behavior.test.ts b/glass-easel/tests/core/behavior.test.ts
@@ -512,117 +512,6 @@ describe('chaining-form interface', () => {
     expect(callOrder).toStrictEqual([3, 1, 2])
   })
 
-  test('chaining listener event replacer', () => {
-    const callOrder: [number, number | undefined][] = []
-    const beh = componentSpace
-      .define()
-      .init(({ self, lifetime }) => {
-        lifetime('created', () => {
-          self.addListener('customEv', (e) => {
-            callOrder.push([
-              1,
-              (e as glassEasel.ShadowedEvent<{ eventOrder?: number }>).detail.eventOrder,
-            ])
-          })
-        })
-      })
-      .registerBehavior()
-
-    let eventOrder = 0
-    const compDef = componentSpace
-      .define()
-      .behavior(beh)
-      .template(tmpl(`<div id="wrapper" bind:customEv="onCustomEv"></div>`))
-      .listenerEventReplacer((e) => {
-        eventOrder += 1
-        e.detail = { eventOrder }
-        return e
-      })
-      .init(({ self, lifetime, listener }) => {
-        lifetime('created', () => {
-          ;(self.shadowRoot as glassEasel.ShadowRoot).addListener('customEv', (e) => {
-            callOrder.push([
-              3,
-              (e as glassEasel.ShadowedEvent<{ eventOrder: number }>).detail.eventOrder,
-            ])
-          })
-        })
-        return {
-          onCustomEv: listener((e) => {
-            callOrder.push([
-              2,
-              (e as glassEasel.ShadowedEvent<{ eventOrder: number }>).detail.eventOrder,
-            ])
-          }),
-        }
-      })
-      .registerComponent()
-    const root = glassEasel.Component.createWithContext('root', compDef, domBackend)
-    ;(root.$.wrapper as glassEasel.Element).triggerEvent(
-      'customEv',
-      {},
-      { bubbles: true, composed: true },
-    )
-    expect(callOrder).toStrictEqual([
-      [2, 1],
-      [3, 2],
-      [1, undefined],
-    ])
-  })
-
-  test('chaining listener event replacer on native rendering', () => {
-    const callOrder: [number, number | undefined][] = []
-    const beh = componentSpace
-      .define()
-      .init(({ self, lifetime }) => {
-        lifetime('created', () => {
-          self.addListener('customEv', (e) => {
-            callOrder.push([
-              1,
-              (e as glassEasel.ShadowedEvent<{ eventOrder?: number }>).detail.eventOrder,
-            ])
-          })
-        })
-      })
-      .registerBehavior()
-
-    let eventOrder = 0
-    const compDef = componentSpace
-      .define()
-      .behavior(beh)
-      .options({ externalComponent: true })
-      .template(tmpl(`<div id="wrapper" bind:customEv="onCustomEv"></div>`))
-      .listenerEventReplacer((e) => {
-        eventOrder += 1
-        e.detail = { eventOrder }
-        return e
-      })
-      // eslint-disable-next-line arrow-body-style
-      .init(({ listener }) => {
-        return {
-          onCustomEv: listener((e) => {
-            callOrder.push([
-              2,
-              (e as glassEasel.ShadowedEvent<{ eventOrder: number }>).detail.eventOrder,
-            ])
-          }),
-        }
-      })
-      .registerComponent()
-    const root = glassEasel.Component.createWithContext('root', compDef, domBackend)
-    glassEasel.triggerExternalEvent(
-      root,
-      root.$.wrapper as glassEasel.GeneralBackendElement,
-      'customEv',
-      {},
-      { bubbles: true, composed: true },
-    )
-    expect(callOrder).toStrictEqual([
-      [2, 1],
-      [1, undefined],
-    ])
-  })
-
   test('chaining relations', () => {
     const eventArr: number[] = []
     const parentDef = componentSpace
