Skip to content
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

Jump to bottom

fix: handle async placeholders in normalizeScopedSlot #11963

Merged
merged 3 commits into from Apr 16, 2021
+4 −2
Merged

fix: handle async placeholders in normalizeScopedSlot #11963

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e8c0248
fix: handle async placeholders in normalizeScopedSlot
pi0 Mar 16, 2021
d0cf075
ensure res.length is 1
pi0 Mar 24, 2021
3451090
Update src/core/vdom/helpers/normalize-scoped-slots.js
posva Mar 24, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 4 additions & 2 deletions src/core/vdom/helpers/normalize-scoped-slots.js
View file
Open in desktop
Expand Up @@ -3,6 +3,7 @@
import { def } from 'core/util/lang'
import { normalizeChildren } from 'core/vdom/helpers/normalize-children'
import { emptyObject } from 'shared/util'
import { isAsyncPlaceholder } from './is-async-placeholder'

export function normalizeScopedSlots (
slots: { [key: string]: Function } | void,
Expand Down Expand Up @@ -60,9 +61,10 @@ function normalizeScopedSlot(normalSlots, key, fn) {
res = res && typeof res === 'object' && !Array.isArray(res)
? [res] // single vnode
: normalizeChildren(res)
let vnode: VNode = res && res[0]
pi0 marked this conversation as resolved.
Show resolved Hide resolved
return res && (
res.length === 0 ||
(res.length === 1 && res[0].isComment) // #9658
!vnode ||
(vnode.isComment && !isAsyncPlaceholder(vnode)) // #9658, #10391
) ? undefined
: res
}
Expand Down