feat(compiler/slot): bail out of optimization mode for non-compiled slots

This commit is contained in:
Evan You
2019-10-03 15:09:09 -04:00
parent 05db2a9c6c
commit 227ad034f0
4 changed files with 23 additions and 10 deletions

View File

@@ -58,7 +58,7 @@ export function shouldUpdateComponent(
): boolean {
const { props: prevProps, children: prevChildren } = prevVNode
const { props: nextProps, children: nextChildren, patchFlag } = nextVNode
if (patchFlag) {
if (patchFlag > 0) {
if (patchFlag & PatchFlags.DYNAMIC_SLOTS) {
// slot content that references values that might have changed,
// e.g. in a v-for

View File

@@ -409,7 +409,7 @@ export function createRenderer<
invokeDirectiveHook(newProps.vnodeBeforeUpdate, parentComponent, n2, n1)
}
if (patchFlag) {
if (patchFlag > 0) {
// the presence of a patchFlag means this element's render code was
// generated by the compiler and can take the fast path.
// in this path old node and new node are guaranteed to have the same shape
@@ -1227,9 +1227,12 @@ export function createRenderer<
const prevShapeFlag = n1 ? n1.shapeFlag : 0
const c2 = n2.children
// fast path
const { patchFlag, shapeFlag } = n2
if (patchFlag) {
if (patchFlag === PatchFlags.BAIL) {
optimized = false
}
// fast path
if (patchFlag > 0) {
if (patchFlag & PatchFlags.KEYED_FRAGMENT) {
// this could be either fully-keyed or mixed (some keyed some not)
// presence of patchFlag means children are guaranteed to be arrays

View File

@@ -6,22 +6,24 @@ import {
Fragment,
VNode
} from '../vnode'
import { PatchFlags } from '@vue/shared'
export function renderSlot(
slots: Record<string, Slot>,
key: string,
name: string,
props: any = {},
// this is not a user-facing function, so the fallback is always generated by
// the compiler and gurunteed to be an array
fallback?: VNodeChildren
): VNode {
const slot = slots[key]
const slot = slots[name]
return (
openBlock(),
createBlock(
Fragment,
{ key: props.key },
slot ? slot(props) : fallback || []
slot ? slot(props) : fallback || [],
slots._compiled ? 0 : PatchFlags.BAIL
)
)
}