8000 feat: add `defineSlots` macro and `slots` option by sxzz · Pull Request #7982 · vuejs/core · GitHub
[go: up one dir, main page]
Skip to content

feat: add defineSlots macro and slots option #7982

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

Merged
merged 14 commits into from
Apr 3, 2023
Merged

feat: add defineSlots macro and slots option #7982

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
9fa6fc3
feat: add defineSlots macro
sxzz Mar 29, 2023
8310e56
fix: types
sxzz Mar 29, 2023
477dd22
feat: disallow runtime
sxzz Mar 30, 2023
05c4dca
feat: slot type for defineComponent
sxzz Mar 30, 2023
fe5bae9
refactor: skip repeat checking
sxzz Mar 30, 2023
370b835
fix: functional component & public instance
sxzz Mar 30, 2023
90814c8
fix: types
sxzz Mar 30, 2023
f908ae2
refactor: style
sxzz Mar 30, 2023
99d48bd
fix: sfc test
sxzz Mar 30, 2023
8140bd6
feat: optional slots
sxzz Mar 30, 2023
e8a821e
feat: undefined slot scope
sxzz Mar 30, 2023
e7742da
test: improve
sxzz Mar 30, 2023
b6d421c
test: improve functional slots test case
yyx990803 Apr 3, 2023
31fa036
feat: support using full function types in defineSlots
yyx990803 Apr 3, 2023
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: skip repeat checking
  • Loading branch information
@sxzz
sxzz committed Mar 31, 2023
commit fe5bae9df1638eabedfca162961432cf4e2ee327
5 changes: 3 additions & 2 deletions packages/compiler-sfc/src/compileScript.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1347,8 +1347,9 @@ export function compileScript(
const isDefineProps =
processDefineProps(init, decl.id) ||
processWithDefaults(init, decl.id)
const isDefineEmits = processDefineEmits(init, decl.id)
processDefineSlots(init, decl.id)
const isDefineEmits =
!isDefineProps && processDefineEmits(init, decl.id)
!isDefineEmits && processDefineSlots(init, decl.id)

if (isDefineProps || isDefineEmits) {
if (left === 1) {
Expand Down
1 change: 0 additions & 1 deletion packages/dts-test/defineComponent.test-d.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import {
SetupContext,
h,
SlotsType,
useSlots,
Slots
} from 'vue'
import { describe, expectType, IsUnion } from './utils'
Expand Down
0