Skip to content
Open
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
25 changes: 25 additions & 0 deletions packages/runtime-dom/__tests__/customElement.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -223,6 +223,31 @@ describe('defineCustomElement', () => {
expect(e.getAttribute('baz-qux')).toBe('four')
})

test('props via attributes and properties changed together', async () => {
const e = new E()
e.foo = 'foo1'
e.bar = { x: 'bar1' }
container.appendChild(e)
await nextTick()
expect(e.shadowRoot!.innerHTML).toBe('<div>foo1</div><div>bar1</div>')

// change attr then property
e.setAttribute('foo', 'foo2')
e.bar = { x: 'bar2' }
await nextTick()
expect(e.shadowRoot!.innerHTML).toBe('<div>foo2</div><div>bar2</div>')
expect(e.getAttribute('foo')).toBe('foo2')
expect(e.hasAttribute('bar')).toBe(false)

// change prop then attr
e.bar = { x: 'bar3' }
e.setAttribute('foo', 'foo3')
await nextTick()
expect(e.shadowRoot!.innerHTML).toBe('<div>foo3</div><div>bar3</div>')
expect(e.getAttribute('foo')).toBe('foo3')
expect(e.hasAttribute('bar')).toBe(false)
})

test('props via hyphen property', async () => {
const Comp = defineCustomElement({
props: {
Expand Down
17 changes: 11 additions & 6 deletions packages/runtime-dom/src/apiCustomElement.ts
Original file line number Diff line number Diff line change
Expand Up @@ -342,6 +342,12 @@ export class VueElement
})
}

private _processMutations(mutations: MutationRecord[]) {
for (const m of mutations) {
this._setAttr(m.attributeName!)
}
}

/**
* resolve inner component definition (handle possible async component)
*/
Expand All @@ -356,11 +362,7 @@ export class VueElement
}

// watch future attr changes
this._ob = new MutationObserver(mutations => {
for (const m of mutations) {
this._setAttr(m.attributeName!)
}
})
this._ob = new MutationObserver(this._processMutations.bind(this))

this._ob.observe(this, { attributes: true })

Expand Down Expand Up @@ -510,7 +512,10 @@ export class VueElement
// reflect
if (shouldReflect) {
const ob = this._ob
ob && ob.disconnect()
if (ob) {
this._processMutations(ob.takeRecords())
ob.disconnect()
}
if (val === true) {
this.setAttribute(hyphenate(key), '')
} else if (typeof val === 'string' || typeof val === 'number') {
Expand Down
Loading