Skip to content

fix(compiler): prevent syntax error when using exact with all system modifiers #13325

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

Open
wdskuki wants to merge 1 commit into
base: main
Choose a base branch
from
+12 −6
Open

fix(compiler): prevent syntax error when using exact with all system modifiers #13325

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
13 changes: 7 additions & 6 deletions src/compiler/codegen/events.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,12 +114,13 @@ function genHandler(
}
} else if (key === 'exact') {
const modifiers = handler.modifiers
genModifierCode += genGuard(
['ctrl', 'shift', 'alt', 'meta']
.filter(keyModifier => !modifiers[keyModifier])
.map(keyModifier => `$event.${keyModifier}Key`)
.join('||')
)
const exactModifiers = ['ctrl', 'shift', 'alt', 'meta']
.filter(keyModifier => !modifiers[keyModifier])
.map(keyModifier => `$event.${keyModifier}Key`)
.join('||')
if (exactModifiers) {
genModifierCode += genGuard(exactModifiers)
}
} else {
keys.push(key)
}
Expand Down
5 changes: 5 additions & 0 deletions test/unit/modules/compiler/codegen.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -455,6 +455,11 @@ describe('codegen', () => {
'<input @click.ctrl.exact="onClick">',
`with(this){return _c('input',{on:{"click":function($event){if(!$event.ctrlKey)return null;if($event.shiftKey||$event.altKey||$event.metaKey)return null;return onClick.apply(null, arguments)}}})}`
)
// #12319: all system modifiers with .exact should not generate syntax error
assertCodegen(
'<input @keydown.ctrl.shift.alt.meta.exact="onKeydown">',
`with(this){return _c('input',{on:{"keydown":function($event){if(!$event.ctrlKey)return null;if(!$event.shiftKey)return null;if(!$event.altKey)return null;if(!$event.metaKey)return null;return onKeydown.apply(null, arguments)}}})}`
)
})

it('generate events with multiple modifiers', () => {
Expand Down