Skip to content
This repository was archived by the owner on Jul 19, 2025. It is now read-only.

fix(runtime-vapor): fix slots render level mess up #241

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open

fix(runtime-vapor): fix slots render level mess up #241

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c749af6
test(runtime-vapor): add test case
Doctor-wu Jun 19, 2024
f17a0ce
feat(runtime-vapor): fix slots level
Doctor-wu Jun 23, 2024
9a2e583
feat(runtime-vapor): simplify code
Doctor-wu Jun 23, 2024
8a55a0d
refactor
sxzz Jun 23, 2024
ec13986
fix(runtime-vapor): fix loop slots cleanup and add some annotate
Doctor-wu Jun 23, 2024
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
Prev Previous commit
Next Next commit
refactor
  • Loading branch information
@sxzz
sxzz committed Nov 13, 2024
commit 8a55a0d73302116bfab177a595ada984fa126594
22 changes: 10 additions & 12 deletions packages/runtime-vapor/src/componentSlots.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,22 +45,20 @@ export function initSlots(
// with ctx
const slots = rawSlots[0] as StaticSlots
for (const name in slots) {
resolveSlot(name, slots[name])
addSlot(name, slots[name])
}
return
}

instance.slots = shallowReactive({})
const renderedSlotKeys: Set<string>[] = []
const slotsQueue: Record<string, [number, Slot][]> = {}
const slotsQueue: Record<string, [level: number, slot: Slot][]> = {}
rawSlots.forEach((slots, index) => {
const isDynamicSlot = isDynamicSlotFn(slots)
if (isDynamicSlot) {
firstEffect(instance, () => {
const renderedKeys =
renderedSlotKeys[index] || (renderedSlotKeys[index] = new Set())
let dynamicSlot: ReturnType<DynamicSlotFn>
dynamicSlot = slots()
const renderedKeys = (renderedSlotKeys[index] ||= new Set())
let dynamicSlot = slots()
const restoreSlotNames = cleanupSlot(index)
if (isArray(dynamicSlot)) {
for (const slot of dynamicSlot) {
Expand All @@ -74,7 +72,7 @@ export function initSlots(
const [restoreLevel, restoreFn] = slotsQueue[key][0]
renderedSlotKeys[restoreLevel] &&
renderedSlotKeys[restoreLevel].add(key)
resolveSlot(key, restoreFn)
addSlot(key, restoreFn)
}
}
for (const name of renderedKeys) {
Expand Down Expand Up @@ -116,12 +114,12 @@ export function initSlots(

function registerSlot(
name: string,
fn: Slot,
slot: Slot,
level: number,
renderedKeys?: Set<string>,
) {
slotsQueue[name] = slotsQueue[name] || []
slotsQueue[name].push([level, fn])
slotsQueue[name] ||= []
slotsQueue[name].push([level, slot])
slotsQueue[name].sort((a, b) => b[0] - a[0])
if (slotsQueue[name][1]) {
const hidenLevel = slotsQueue[name][1][0]
Expand All @@ -130,10 +128,10 @@ export function initSlots(
if (slotsQueue[name][0][0] === level) {
renderedKeys && renderedKeys.add(name)
}
resolveSlot(name, slotsQueue[name][0][1])
addSlot(name, slotsQueue[name][0][1])
}

function resolveSlot(name: string, fn: Slot) {
function addSlot(name: string, fn: Slot) {
instance.slots[name] = withCtx(fn)
}

Expand Down