Skip to content
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
12 changes: 8 additions & 4 deletions packages/taro-runtime/src/dom/event.ts
Original file line number Diff line number Diff line change
Expand Up @@ -70,9 +70,11 @@ export class TaroEvent {
// Note:优先判断冒泡场景alipay的targetDataset的sid, 不然冒泡场景target属性吐出不对,其余拿取当前绑定id
const element = env.document.getElementById(target.targetDataset?.sid || target.dataset?.sid || target.id || null)

// Keep logical data authoritative, falling back per source when an index is unavailable.
// Preserve Alipay's merge order: the actual target overrides the wrapper's dataset.
target.dataset = {
...(currentEle !== null ? currentEle.dataset : EMPTY_OBJ),
...(element !== null ? element.dataset : EMPTY_OBJ)
...(currentEle !== null ? currentEle.dataset : target.dataset || EMPTY_OBJ),
...(element !== null ? element.dataset : target.targetDataset || EMPTY_OBJ)
}

for (const key in this.mpEvent?.detail) {
Expand All @@ -97,12 +99,14 @@ export class TaroEvent {
const element = doc.getElementById(currentTarget.dataset?.sid || currentTarget.id || null)
const targetElement = doc.getElementById(this.mpEvent?.target?.dataset?.sid as string || this.mpEvent?.target?.id as string || null)

if (element === null || (element && element === targetElement)) {
// Missing indexes do not imply identical targets. Without a logical match,
// only the same native object (or absent targets on a manual event) shares the wrapper.
if (element !== null ? element === targetElement : !this.mpEvent || this.mpEvent.currentTarget === this.mpEvent.target) {
this.cacheCurrentTarget = this.target
return this.target
}

currentTarget.dataset = element.dataset
currentTarget.dataset = element !== null ? element.dataset : currentTarget.dataset || EMPTY_OBJ

for (const key in this.mpEvent?.detail) {
currentTarget[key] = this.mpEvent!.detail[key]
Expand Down
169 changes: 169 additions & 0 deletions packages/taro-runtime/tests/event-target.spec.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,169 @@
import { afterEach, describe, expect, test, vi } from 'vitest'

import { createEvent, document, eventHandler } from '../src/index'

import type { TaroElement } from '../src/dom/element'
import type { TaroEvent } from '../src/dom/event'

function createNode (id: string) {
const node = document.createElement('view')
node.id = id
node.setAttribute('data-role', id)
return node
}

function nativeTarget (node: TaroElement) {
return { id: node.id, dataset: { sid: node.sid } }
}

describe('event target data', () => {
afterEach(() => {
vi.restoreAllMocks()
})

test.each([false, true])('preserves native targets after removal in a handler (remove receiver: %s)', (removeReceiver) => {
const holder = createNode('holder')
const parent = createNode('parent')
const child = createNode('child')
holder.appendChild(parent)
parent.appendChild(child)
const target = nativeTarget(child)
const currentTarget = nativeTarget(parent)
const handler = vi.fn((event: TaroEvent) => {
if (removeReceiver) {
holder.removeChild(parent)
} else {
parent.removeChild(child)
}

expect(document.getElementById(child.sid)).toBeNull()
expect(event.currentTarget.id).toBe(parent.id)
expect(event.target.id).toBe(child.id)
expect(event.target.dataset).toEqual(target.dataset)
expect(event.currentTarget.dataset).toEqual(removeReceiver ? currentTarget.dataset : parent.dataset)
expect(event.currentTarget).not.toBe(event.target)
})
parent.addEventListener('tap', handler, false)

// Both nodes are indexed when the ordinary template dispatch entry resolves its receiver.
eventHandler({ type: 'tap', target, currentTarget, detail: {} })
expect(handler).toHaveBeenCalledOnce()
})

test.each([
['', ''],
['unresolved-id', ''],
['', 'unresolved-sid'],
['unresolved-id', 'unresolved-sid']
])('keeps distinct unresolved targets separate (id: %s, sid: %s)', (id, sid) => {
const target = { id, dataset: { sid, role: 'child' } }
const currentTarget = { id, dataset: { sid, role: 'parent' } }
const event = createEvent({ type: 'tap', target, currentTarget, detail: { value: 7 } })

expect(event.target.dataset).toEqual(target.dataset)
expect(event.currentTarget.dataset).toBe(currentTarget.dataset)
expect(event.currentTarget).not.toBe(event.target)
expect(event.target.value).toBe(7)
expect(event.currentTarget.value).toBe(7)
expect(target).toEqual({ id, dataset: { sid, role: 'child' } })
expect(currentTarget).toEqual({ id, dataset: { sid, role: 'parent' } })
})

test('shares the target wrapper for the same unresolved native object', () => {
const target = { id: '', dataset: { role: 'same' } }
const event = createEvent({ type: 'tap', target, currentTarget: target, detail: {} })

expect(event.currentTarget).toBe(event.target)
expect(event.target.dataset).toEqual(target.dataset)
})

test('supports missing native datasets and manually constructed events', () => {
const target = { id: '', dataset: {} }
const currentTarget = { id: '', dataset: {} }
// Model platform payloads omitting dataset while retaining the public input type.
Reflect.deleteProperty(target, 'dataset')
Reflect.deleteProperty(currentTarget, 'dataset')
const event = createEvent({ type: 'tap', target, currentTarget, detail: {} })
expect(event.target.dataset).toEqual({})
expect(event.currentTarget.dataset).toEqual({})
expect(event.currentTarget).not.toBe(event.target)

const manual = createEvent('tap')
expect(manual.currentTarget).toBe(manual.target)
expect(manual.target.dataset).toEqual({})
})

test('preserves indexed datasets, object values and shared logical identity', () => {
const child = createNode('indexed-child')
const parent = createNode('indexed-parent')
const value = { nested: ['identity'] }
child.setAttribute('data-value', value)
const target = { id: child.id, dataset: { role: 'stale', nativeOnly: true } }
const currentTarget = { id: parent.id, dataset: { role: 'stale' } }
const event = createEvent({ type: 'tap', target, currentTarget, detail: {} })

expect(event.target.dataset).toEqual(child.dataset)
expect(event.target.dataset).not.toBe(child.dataset)
expect(event.target.dataset.value).toBe(value)
expect(event.currentTarget.dataset).toBe(parent.dataset)
expect(event.currentTarget).not.toBe(event.target)

const same = createEvent({
type: 'tap', target, currentTarget: { id: '', dataset: { sid: child.sid } }, detail: {}
})
expect(same.currentTarget).toBe(same.target)

const missingReceiver = createEvent({
type: 'tap', target, currentTarget: { id: '', dataset: { role: 'native-parent' } }, detail: {}
})
expect(missingReceiver.target.dataset).toEqual(child.dataset)
expect(missingReceiver.currentTarget.dataset).toEqual({ role: 'native-parent' })
expect(missingReceiver.currentTarget).not.toBe(missingReceiver.target)
})

test.each([
[true, true],
[true, false],
[false, true],
[false, false]
])('preserves Alipay merge precedence (wrapper indexed: %s, target indexed: %s)', (hasWrapper, hasTarget) => {
const wrapper = createNode('alipay-wrapper')
const child = createNode('alipay-child')
wrapper.setAttribute('data-wrapper', true)
const value = { nested: ['identity'] }
child.setAttribute('data-value', value)
const target = {
id: hasWrapper ? wrapper.id : 'missing-wrapper',
dataset: { sid: hasWrapper ? wrapper.sid : 'missing-wrapper', wrapper: 'native', role: 'native-wrapper' },
targetDataset: { sid: hasTarget ? child.sid : 'missing-child', role: 'native-child' }
}
const event = createEvent({ type: 'tap', target, currentTarget: { id: '', dataset: {} }, detail: {} })

expect(event.target.dataset.wrapper).toBe(hasWrapper ? true : 'native')
expect(event.target.dataset.role).toBe(hasTarget ? 'alipay-child' : 'native-child')
expect(event.target.dataset.value).toBe(hasTarget ? value : undefined)
expect(event.target.dataset.sid).toBe(hasTarget ? (hasWrapper ? undefined : 'missing-wrapper') : 'missing-child')
expect(target.dataset.role).toBe('native-wrapper')
expect(target.targetDataset.role).toBe('native-child')
})

test('retains lazy caches and the existing number of index lookups', () => {
const lookup = vi.spyOn(document, 'getElementById')
const event = createEvent({
type: 'tap',
target: { id: '', dataset: { role: 'child' } },
currentTarget: { id: '', dataset: { role: 'parent' } },
detail: {}
})

const currentTarget = event.currentTarget
expect(lookup).toHaveBeenCalledTimes(2)
expect(event.currentTarget).toBe(currentTarget)
expect(lookup).toHaveBeenCalledTimes(2)

const target = event.target
expect(lookup).toHaveBeenCalledTimes(4)
expect(event.target).toBe(target)
expect(lookup).toHaveBeenCalledTimes(4)
})
})
Loading