Skip to content

refactor(runtime-vapor): pass vapor slot fallback directly to renderSlot #14155

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
edison1105 wants to merge 1 commit into from
+2 −9
Closed

refactor(runtime-vapor): pass vapor slot fallback directly to renderSlot #14155

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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/helpers/renderSlot.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ export function ensureValidVNode(
: null
}

export function ensureVaporSlotFallback(
function ensureVaporSlotFallback(
vnodes: VNodeArrayChildren | null | undefined,
fallback?: () => VNodeArrayChildren,
): void {
Expand Down
4 changes: 0 additions & 4 deletions packages/runtime-core/src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -608,10 +608,6 @@ export { setRef } from './rendererTemplateRef'
* @internal
*/
export { type VNodeNormalizedRef, normalizeRef } from './vnode'
/**
* @internal
*/
export { ensureVaporSlotFallback } from './helpers/renderSlot'
/**
* @internal
*/
Expand Down
5 changes: 1 addition & 4 deletions packages/runtime-vapor/src/vdomInterop.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ import {
currentInstance,
ensureHydrationRenderer,
ensureRenderer,
ensureVaporSlotFallback,
isEmitListener,
isKeepAlive,
isRef,
Expand Down Expand Up @@ -464,12 +463,10 @@ function renderVDOMSlot(
slotsRef.value,
isFunction(name) ? name() : name,
props,
fallback as any,
)

let children = vnode.children as any[]
// handle forwarded vapor slot without its own fallback
// use the fallback provided by the slot outlet
ensureVaporSlotFallback(children, fallback as any)
isValidSlot = children.length > 0
}

Expand Down
Loading