perf: improve static content insertion perf
Especially on multiple insertions of the same static node. fix #3090
This commit is contained in:
parent
be1e42eb92
commit
4de5d24aa7
@ -141,7 +141,8 @@ export interface RendererOptions<
|
|||||||
content: string,
|
content: string,
|
||||||
parent: HostElement,
|
parent: HostElement,
|
||||||
anchor: HostNode | null,
|
anchor: HostNode | null,
|
||||||
isSVG: boolean
|
isSVG: boolean,
|
||||||
|
cached?: [HostNode, HostNode | null] | null
|
||||||
): HostElement[]
|
): HostElement[]
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -635,7 +636,11 @@ function baseCreateRenderer(
|
|||||||
n2.children as string,
|
n2.children as string,
|
||||||
container,
|
container,
|
||||||
anchor,
|
anchor,
|
||||||
isSVG
|
isSVG,
|
||||||
|
// pass cached nodes if the static node is being mounted multiple times
|
||||||
|
// so that runtime-dom can simply cloneNode() instead of inserting new
|
||||||
|
// HTML
|
||||||
|
n2.el && [n2.el, n2.anchor]
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
import { nodeOps } from '../src/nodeOps'
|
import { nodeOps, svgNS } from '../src/nodeOps'
|
||||||
|
|
||||||
describe('runtime-dom: node-ops', () => {
|
describe('runtime-dom: node-ops', () => {
|
||||||
test('the _value property should be cloned', () => {
|
test('the _value property should be cloned', () => {
|
||||||
@ -25,4 +25,101 @@ describe('runtime-dom: node-ops', () => {
|
|||||||
expect(option1.selected).toBe(true)
|
expect(option1.selected).toBe(true)
|
||||||
expect(option2.selected).toBe(true)
|
expect(option2.selected).toBe(true)
|
||||||
})
|
})
|
||||||
|
|
||||||
|
describe('insertStaticContent', () => {
|
||||||
|
test('fresh insertion', () => {
|
||||||
|
const content = `<div>one</div><div>two</div>three`
|
||||||
|
const parent = document.createElement('div')
|
||||||
|
const [first, last] = nodeOps.insertStaticContent!(
|
||||||
|
content,
|
||||||
|
parent,
|
||||||
|
null,
|
||||||
|
false
|
||||||
|
)
|
||||||
|
expect(parent.innerHTML).toBe(content)
|
||||||
|
expect(first).toBe(parent.firstChild)
|
||||||
|
expect(last).toBe(parent.lastChild)
|
||||||
|
})
|
||||||
|
|
||||||
|
test('fresh insertion with anchor', () => {
|
||||||
|
const content = `<div>one</div><div>two</div>three`
|
||||||
|
const existing = `<div>existing</div>`
|
||||||
|
const parent = document.createElement('div')
|
||||||
|
parent.innerHTML = existing
|
||||||
|
const anchor = parent.firstChild
|
||||||
|
const [first, last] = nodeOps.insertStaticContent!(
|
||||||
|
content,
|
||||||
|
parent,
|
||||||
|
anchor,
|
||||||
|
false
|
||||||
|
)
|
||||||
|
expect(parent.innerHTML).toBe(content + existing)
|
||||||
|
expect(first).toBe(parent.firstChild)
|
||||||
|
expect(last).toBe(parent.childNodes[parent.childNodes.length - 2])
|
||||||
|
})
|
||||||
|
|
||||||
|
test('fresh insertion as svg', () => {
|
||||||
|
const content = `<text>hello</text><circle cx="100" cy="100" r="80"></circle>`
|
||||||
|
const parent = document.createElementNS(svgNS, 'svg')
|
||||||
|
const [first, last] = nodeOps.insertStaticContent!(
|
||||||
|
content,
|
||||||
|
parent,
|
||||||
|
null,
|
||||||
|
true
|
||||||
|
)
|
||||||
|
expect(parent.innerHTML).toBe(content)
|
||||||
|
expect(first).toBe(parent.firstChild)
|
||||||
|
expect(last).toBe(parent.lastChild)
|
||||||
|
expect(first.namespaceURI).toMatch('svg')
|
||||||
|
expect(last.namespaceURI).toMatch('svg')
|
||||||
|
})
|
||||||
|
|
||||||
|
test('fresh insertion as svg, with anchor', () => {
|
||||||
|
const content = `<text>hello</text><circle cx="100" cy="100" r="80"></circle>`
|
||||||
|
const existing = `<path></path>`
|
||||||
|
const parent = document.createElementNS(svgNS, 'svg')
|
||||||
|
parent.innerHTML = existing
|
||||||
|
const anchor = parent.firstChild
|
||||||
|
const [first, last] = nodeOps.insertStaticContent!(
|
||||||
|
content,
|
||||||
|
parent,
|
||||||
|
anchor,
|
||||||
|
true
|
||||||
|
)
|
||||||
|
expect(parent.innerHTML).toBe(content + existing)
|
||||||
|
expect(first).toBe(parent.firstChild)
|
||||||
|
expect(last).toBe(parent.childNodes[parent.childNodes.length - 2])
|
||||||
|
expect(first.namespaceURI).toMatch('svg')
|
||||||
|
expect(last.namespaceURI).toMatch('svg')
|
||||||
|
})
|
||||||
|
|
||||||
|
test('cached', () => {
|
||||||
|
const content = `<div>one</div><div>two</div>three`
|
||||||
|
|
||||||
|
const cacheParent = document.createElement('div')
|
||||||
|
const [cachedFirst, cachedLast] = nodeOps.insertStaticContent!(
|
||||||
|
content,
|
||||||
|
cacheParent,
|
||||||
|
null,
|
||||||
|
false
|
||||||
|
)
|
||||||
|
|
||||||
|
const parent = document.createElement('div')
|
||||||
|
|
||||||
|
const [first, last] = nodeOps.insertStaticContent!(
|
||||||
|
``,
|
||||||
|
parent,
|
||||||
|
null,
|
||||||
|
false,
|
||||||
|
[cachedFirst, cachedLast]
|
||||||
|
)
|
||||||
|
|
||||||
|
expect(parent.innerHTML).toBe(content)
|
||||||
|
expect(first).toBe(parent.firstChild)
|
||||||
|
expect(last).toBe(parent.lastChild)
|
||||||
|
|
||||||
|
expect(first).not.toBe(cachedFirst)
|
||||||
|
expect(last).not.toBe(cachedLast)
|
||||||
|
})
|
||||||
|
})
|
||||||
})
|
})
|
||||||
|
@ -4,9 +4,6 @@ export const svgNS = 'http://www.w3.org/2000/svg'
|
|||||||
|
|
||||||
const doc = (typeof document !== 'undefined' ? document : null) as Document
|
const doc = (typeof document !== 'undefined' ? document : null) as Document
|
||||||
|
|
||||||
let tempContainer: HTMLElement
|
|
||||||
let tempSVGContainer: SVGElement
|
|
||||||
|
|
||||||
export const nodeOps: Omit<RendererOptions<Node, Element>, 'patchProp'> = {
|
export const nodeOps: Omit<RendererOptions<Node, Element>, 'patchProp'> = {
|
||||||
insert: (child, parent, anchor) => {
|
insert: (child, parent, anchor) => {
|
||||||
parent.insertBefore(child, anchor || null)
|
parent.insertBefore(child, anchor || null)
|
||||||
@ -71,23 +68,54 @@ export const nodeOps: Omit<RendererOptions<Node, Element>, 'patchProp'> = {
|
|||||||
},
|
},
|
||||||
|
|
||||||
// __UNSAFE__
|
// __UNSAFE__
|
||||||
// Reason: innerHTML.
|
// Reason: insertAdjacentHTML.
|
||||||
// Static content here can only come from compiled templates.
|
// Static content here can only come from compiled templates.
|
||||||
// As long as the user only uses trusted templates, this is safe.
|
// As long as the user only uses trusted templates, this is safe.
|
||||||
insertStaticContent(content, parent, anchor, isSVG) {
|
insertStaticContent(content, parent, anchor, isSVG, cached) {
|
||||||
const temp = isSVG
|
if (cached) {
|
||||||
? tempSVGContainer ||
|
let [cachedFirst, cachedLast] = cached
|
||||||
(tempSVGContainer = doc.createElementNS(svgNS, 'svg'))
|
let first, last
|
||||||
: tempContainer || (tempContainer = doc.createElement('div'))
|
while (true) {
|
||||||
temp.innerHTML = content
|
let node = cachedFirst.cloneNode(true)
|
||||||
const first = temp.firstChild as Element
|
if (!first) first = node
|
||||||
let node: Element | null = first
|
parent.insertBefore(node, anchor)
|
||||||
let last: Element = node
|
if (cachedFirst === cachedLast) {
|
||||||
while (node) {
|
last = node
|
||||||
last = node
|
break
|
||||||
nodeOps.insert(node, parent, anchor)
|
}
|
||||||
node = temp.firstChild as Element
|
cachedFirst = cachedFirst.nextSibling!
|
||||||
|
}
|
||||||
|
return [first, last] as any
|
||||||
}
|
}
|
||||||
return [first, last]
|
|
||||||
|
// <parent> before | first ... last | anchor </parent>
|
||||||
|
const before = anchor ? anchor.previousSibling : parent.lastChild
|
||||||
|
if (anchor) {
|
||||||
|
let insertionPoint
|
||||||
|
let usingTempInsertionPoint = false
|
||||||
|
if (anchor instanceof Element) {
|
||||||
|
insertionPoint = anchor
|
||||||
|
} else {
|
||||||
|
// insertAdjacentHTML only works for elements but the anchor is not an
|
||||||
|
// element...
|
||||||
|
usingTempInsertionPoint = true
|
||||||
|
insertionPoint = isSVG
|
||||||
|
? doc.createElementNS(svgNS, 'g')
|
||||||
|
: doc.createElement('div')
|
||||||
|
parent.insertBefore(insertionPoint, anchor)
|
||||||
|
}
|
||||||
|
insertionPoint.insertAdjacentHTML('beforebegin', content)
|
||||||
|
if (usingTempInsertionPoint) {
|
||||||
|
parent.removeChild(insertionPoint)
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
parent.insertAdjacentHTML('beforeend', content)
|
||||||
|
}
|
||||||
|
return [
|
||||||
|
// first
|
||||||
|
before ? before.nextSibling : parent.firstChild,
|
||||||
|
// last
|
||||||
|
anchor ? anchor.previousSibling : parent.lastChild
|
||||||
|
]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user