root
/
vue3-core
mirror of https://github.com/vuejs/core.git
1
0
Fork 0
Code Issues Actions 4 Packages Projects Releases Wiki Activity

fix(compat): include legacy scoped slots (#10868) 

close #8869
This commit is contained in:
Stanislav Lashmanov 2024-05-07 03:05:55 +04:00 committed by GitHub
parent f2c1412e46
commit 83661264a4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
packages/runtime-core/src/compat/instance.ts
View File

@ -36,8 +36,7 @@ import {
legacyresolveScopedSlots, legacyresolveScopedSlots,
} from './renderHelpers' } from './renderHelpers'
import { resolveFilter } from '../helpers/resolveAssets' import { resolveFilter } from '../helpers/resolveAssets'
import type { InternalSlots, Slots } from '../componentSlots' import type { Slots } from '../componentSlots'
import type { ContextualRenderFn } from '../componentRenderContext'
import { resolveMergedOptions } from '../componentOptions' import { resolveMergedOptions } from '../componentOptions'
export type LegacyPublicInstance = ComponentPublicInstance & export type LegacyPublicInstance = ComponentPublicInstance &
@ -106,14 +105,7 @@ export function installCompatInstanceProperties(map: PublicPropertiesMap) {
$scopedSlots: i => { $scopedSlots: i => {
assertCompatEnabled(DeprecationTypes.INSTANCE_SCOPED_SLOTS, i) assertCompatEnabled(DeprecationTypes.INSTANCE_SCOPED_SLOTS, i)
const res: InternalSlots = {} return __DEV__ ? shallowReadonly(i.slots) : i.slots
for (const key in i.slots) {
const fn = i.slots[key]!
if (!(fn as ContextualRenderFn)._ns /* non-scoped slot */) {
res[key] = fn
}
}
return res
}, },
$on: i => on.bind(null, i), $on: i => on.bind(null, i),

4
packages/vue-compat/__tests__/instance.spec.ts
View File

@ -284,7 +284,7 @@ describe('INSTANCE_SCOPED_SLOTS', () => {
).toHaveBeenWarned() ).toHaveBeenWarned()
}) })
test('should not include legacy slot usage in $scopedSlots', () => { test('should include legacy slot usage in $scopedSlots', () => {
let normalSlots: Slots let normalSlots: Slots
let scopedSlots: Slots let scopedSlots: Slots
new Vue({ new Vue({
@ -301,7 +301,7 @@ describe('INSTANCE_SCOPED_SLOTS', () => {
}).$mount() }).$mount()
expect('default' in normalSlots!).toBe(true) expect('default' in normalSlots!).toBe(true)
expect('default' in scopedSlots!).toBe(false) expect('default' in scopedSlots!).toBe(true)
expect( expect(
deprecationData[DeprecationTypes.INSTANCE_SCOPED_SLOTS].message, deprecationData[DeprecationTypes.INSTANCE_SCOPED_SLOTS].message,