fix(runtime-dom): support mounting app to svg container (#2929)

fix #2926
This commit is contained in:
HcySunYang 2021-03-02 00:51:32 +08:00 committed by GitHub
parent 1a955e2278
commit 8ffcde2836
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 44 additions and 9 deletions

View File

@ -617,6 +617,20 @@ describe('SSR hydration', () => {
expect(spy).toHaveBeenCalled()
})
test('SVG as a mount container', () => {
const svgContainer = document.createElement('svg')
svgContainer.innerHTML = '<g></g>'
const app = createSSRApp({
render: () => h('g')
})
expect(
(app.mount(svgContainer).$.subTree as VNode<Node, Element> & {
el: Element
}).el instanceof SVGElement
)
})
describe('mismatch handling', () => {
test('text node', () => {
const { container } = mountWithHydration(`foo`, () => 'bar')

View File

@ -27,7 +27,8 @@ export interface App<HostElement = any> {
directive(name: string, directive: Directive): this
mount(
rootContainer: HostElement | string,
isHydrate?: boolean
isHydrate?: boolean,
isSVG?: boolean
): ComponentPublicInstance
unmount(): void
provide<T>(key: InjectionKey<T> | string, value: T): this
@ -224,7 +225,11 @@ export function createAppAPI<HostElement>(
return app
},
mount(rootContainer: HostElement, isHydrate?: boolean): any {
mount(
rootContainer: HostElement,
isHydrate?: boolean,
isSVG?: boolean
): any {
if (!isMounted) {
const vnode = createVNode(
rootComponent as ConcreteComponent,
@ -237,14 +242,14 @@ export function createAppAPI<HostElement>(
// HMR root reload
if (__DEV__) {
context.reload = () => {
render(cloneVNode(vnode), rootContainer)
render(cloneVNode(vnode), rootContainer, isSVG)
}
}
if (isHydrate && hydrate) {
hydrate(vnode as VNode<Node, Element>, rootContainer as any)
} else {
render(vnode, rootContainer)
render(vnode, rootContainer, isSVG)
}
isMounted = true
app._container = rootContainer

View File

@ -93,7 +93,8 @@ export interface HydrationRenderer extends Renderer<Element> {
export type RootRenderFunction<HostElement = RendererElement> = (
vnode: VNode | null,
container: HostElement
container: HostElement,
isSVG?: boolean
) => void
export interface RendererOptions<
@ -2202,13 +2203,13 @@ function baseCreateRenderer(
return hostNextSibling((vnode.anchor || vnode.el)!)
}
const render: RootRenderFunction = (vnode, container) => {
const render: RootRenderFunction = (vnode, container, isSVG) => {
if (vnode == null) {
if (container._vnode) {
unmount(container._vnode, null, null, true)
}
} else {
patch(container._vnode || null, vnode, container)
patch(container._vnode || null, vnode, container, null, null, null, isSVG)
}
flushPostFlushCbs()
container._vnode = vnode

View File

@ -0,0 +1,15 @@
import { createApp, h } from '../src'
describe('createApp for dom', () => {
// #2926
test('mount to SVG container', () => {
const root = document.createElementNS('http://www.w3.org/2000/svg', 'svg')
createApp({
render() {
return h('g')
}
}).mount(root)
expect(root.children.length).toBe(1)
expect(root.children[0] instanceof SVGElement).toBe(true)
})
})

View File

@ -69,7 +69,7 @@ export const createApp = ((...args) => {
}
// clear content before mounting
container.innerHTML = ''
const proxy = mount(container)
const proxy = mount(container, false, container instanceof SVGElement)
if (container instanceof Element) {
container.removeAttribute('v-cloak')
container.setAttribute('data-v-app', '')
@ -92,7 +92,7 @@ export const createSSRApp = ((...args) => {
app.mount = (containerOrSelector: Element | ShadowRoot | string): any => {
const container = normalizeContainer(containerOrSelector)
if (container) {
return mount(container, true)
return mount(container, true, container instanceof SVGElement)
}
}