-
-
Notifications
You must be signed in to change notification settings - Fork 33.7k
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.
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
fix(types): allow scoped slots to return a single VNode #9563
Conversation
types/vnode.d.ts
Outdated
@@ -1,7 +1,8 @@ | |||
import { Vue } from "./vue"; | |||
|
|||
export type ScopedSlot = (props: any) => VNode | VNode[] | string | undefined; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I guess the return type should have similar type with VNodeChildren
as it is normalized as same as vnode children.
vue/src/core/vdom/helpers/normalize-scoped-slots.js
Lines 42 to 51 in 8a80086
function normalizeScopedSlot(normalSlots, key, fn) { | |
const normalized = scope => { | |
let res = fn(scope || {}) | |
res = res && typeof res === 'object' && !Array.isArray(res) | |
? [res] // single vnode | |
: normalizeChildren(res) | |
return res && res.length === 0 | |
? undefined | |
: res | |
} |
Maybe it will be:
type ScopedSlot = (props: any) => ScopedSlotReturn;
type ScopedSlotReturn = VNode | string | boolean | null | undefined | ScopedSlotReturnArray;
interface ScopedSlotReturnArray extends Array<ScopedSlotReturn> {}
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@KaelWD are you planning to update the PR according to the suggestion?
What kind of change does this PR introduce? (check at least one)
Does this PR introduce a breaking change? (check one)
If yes, please describe the impact and migration path for existing applications:
The PR fulfills these requirements:
dev
branch for v2.x (or to a previous version branch), not themaster
branchfix #xxx[,#xxx]
, where "xxx" is the issue number)If adding a new feature, the PR's description includes:
Other information:
Scoped slots are normalised to
VNode[]
, but they should still be able to return a bare string or VNode when used in a render function.https://codepen.io/anon/pen/BMXvme?editors=1010