Skip to content

fix(runtime-core): improve isSVG check #2928

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 6 commits into from
Closed

fix(runtime-core): improve isSVG check #2928

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8aaa77c
fix(runtime-core): improve isSVG check
edison1105 Jan 3, 2021
52be907
fix(runtime-core): improve isSVG check
edison1105 Jan 3, 2021
2f8a4be
fix(runtime-core): clean
edison1105 Jan 3, 2021
7558767
fix(runtime-core): improve isSVG check
edison1105 Jan 3, 2021
06ed0f9
fix(runtime-core): improve isSVG check
edison1105 Jan 3, 2021
4671bf4
fix(runtime-core): improve isSVG check
edison1105 Jan 3, 2021
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
2 changes: 1 addition & 1 deletion packages/runtime-core/src/hydration.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ const enum DOMNodeTypes {

let hasMismatch = false

const isSVGContainer = (container: Element) =>
export const isSVGContainer = (container: Element) =>
/svg/.test(container.namespaceURI!) && container.tagName !== 'foreignObject'

const isComment = (node: Node): node is Comment =>
Expand Down
11 changes: 9 additions & 2 deletions packages/runtime-core/src/renderer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,11 @@ import {
callWithErrorHandling,
callWithAsyncErrorHandling
} from './errorHandling'
import { createHydrationFunctions, RootHydrateFunction } from './hydration'
import {
createHydrationFunctions,
RootHydrateFunction,
isSVGContainer
} from './hydration'
import { invokeDirectiveHook } from './directives'
import { startMeasure, endMeasure } from './profiling'
import { ComponentPublicInstance } from './componentPublicInstance'
Expand Down Expand Up @@ -662,7 +666,10 @@ function baseCreateRenderer(
isSVG: boolean,
optimized: boolean
) => {
isSVG = isSVG || (n2.type as string) === 'svg'
isSVG =
isSVG ||
(n2.type as string) === 'svg' ||
isSVGContainer(container as Element)
if (n1 == null) {
mountElement(
n2,
Expand Down