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

fix(runtime-core): allow symbol values for slot prop key #12069

Merged
merged 5 commits into from
Oct 11, 2024
Merged

fix(runtime-core): allow symbol values for slot prop key #12069

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
185c251
fix(runtime-core): allow symbol values for slot prop key
jh-leong Sep 28, 2024
de28fda
fix: update
jh-leong Sep 28, 2024
bd6363a
fix: update
jh-leong Sep 29, 2024
d086b40
fix(runtime-core): use slot name for Symbol keys to ensure uniqueness
jh-leong Sep 29, 2024
3cdd1df
Merge branch 'main' into fix/12068
jh-leong Oct 7, 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
6 changes: 6 additions & 0 deletions packages/runtime-core/__tests__/helpers/renderSlot.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,12 @@ describe('renderSlot', () => {
expect(vnode.key).toBe('foo')
})

it('should allow symbol values for slot prop key', () => {
const key = Symbol()
const vnode = renderSlot({ default: () => [h('div')] }, 'default', { key })
expect(vnode.key).toBe(String(key))
})

it('should render slot fallback', () => {
const vnode = renderSlot({}, 'default', { key: 'foo' }, () => ['fallback'])
expect(vnode.children).toEqual(['fallback'])
Expand Down
10 changes: 5 additions & 5 deletions packages/runtime-core/src/helpers/renderSlot.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,11 +76,11 @@ export function renderSlot(
Fragment,
{
key:
(props.key ||
// slot content array of a dynamic conditional slot may have a branch
// key attached in the `createSlots` helper, respect that
(validSlotContent && (validSlotContent as any).key) ||
`_${name}`) +
(props.key == null || props.key === ''
? // slot content array of a dynamic conditional slot may have a branch
// key attached in the `createSlots` helper, respect that
(validSlotContent && (validSlotContent as any).key) || `_${name}`
jh-leong marked this conversation as resolved.
Show resolved Hide resolved
: String(props.key)) +
// #7256 force differentiate fallback content from actual content
(!validSlotContent && fallback ? '_fb' : ''),
},
Expand Down