fix(teleport): should only force remove teleport when not disabled

fix #2323
vuejs · Oct 9, 2020 · b0931dc · b0931dc
1 parent 54ed759
commit b0931dc
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/packages/runtime-core/src/components/Teleport.ts b/packages/runtime-core/src/components/Teleport.ts
@@ -20,7 +20,7 @@ export interface TeleportProps {
 
 export const isTeleport = (type: any): boolean => type.__isTeleport
 
-const isTeleportDisabled = (props: VNode['props']): boolean =>
+export const isTeleportDisabled = (props: VNode['props']): boolean =>
  props && (props.disabled || props.disabled === '')
 
 const resolveTarget = <T = RendererElement>(

diff --git a/packages/runtime-core/src/renderer.ts b/packages/runtime-core/src/renderer.ts
@@ -56,7 +56,11 @@ import {
  queueEffectWithSuspense,
  SuspenseImpl
 } from './components/Suspense'
-import { TeleportImpl, TeleportVNode } from './components/Teleport'
+import {
+ isTeleportDisabled,
+ TeleportImpl,
+ TeleportVNode
+} from './components/Teleport'
 import { isKeepAlive, KeepAliveContext } from './components/KeepAlive'
 import { registerHMR, unregisterHMR, isHmrUpdating } from './hmr'
 import {
@@ -2037,8 +2041,11 @@ function baseCreateRenderer(
  unmountChildren(children as VNode[], parentComponent, parentSuspense)
  }
 
- // an unmounted teleport should always remove its children
- if (shapeFlag & ShapeFlags.TELEPORT) {
+ // an unmounted teleport should always remove its children if not disabled
+ if (
+ shapeFlag & ShapeFlags.TELEPORT &&
+ (doRemove || !isTeleportDisabled(vnode.props))
+ ) {
  ;(vnode.type as typeof TeleportImpl).remove(vnode, internals)
  }