Skip to content

refactor: keydown event is refactored for more generic use #63

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 5 commits into from
Mar 21, 2021
Merged

refactor: keydown event is refactored for more generic use #63

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
488b5e4
keydown event is refactored for more generic use
fatihsolhan Mar 18, 2021
738888a
fix test name
fatihsolhan Mar 18, 2021
ef40a5b
used @keydown modifier to process ESC click
fatihsolhan Mar 19, 2021
7f4686a
Merge branch 'master' into refactorKeydown
hunterliu1003 Mar 21, 2021
520d213
Merge branch 'master' into refactorKeydown
hunterliu1003 Mar 21, 2021
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
2 changes: 1 addition & 1 deletion dist/VueFinalModal.esm.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/VueFinalModal.esm.js.map
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/VueFinalModal.umd.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/VueFinalModal.umd.js.map
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions lib/VueFinalModal.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
:style="bindStyle"
class="vfm vfm--inset"
:class="[attach === false ? 'vfm--fixed' : 'vfm--absolute', { 'vfm--prevent-none': preventClick }]"
@keydown="onEsc"
@keydown.esc="onEsc"
>
<transition
:name="overlayTransition"
Expand Down Expand Up @@ -323,8 +323,8 @@ export default {
this.$emit('click-outside', this.createModalEvent({ type: 'click-outside' }))
this.clickToClose && this.$emit('input', false)
},
onEsc(evt) {
if (evt.keyCode === 27 && this.visible && this.escToClose) {
onEsc() {
if (this.visible && this.escToClose) {
this.$emit('input', false)
}
},
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/VueFinalModal.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ describe('VueFinalModal.vue', () => {
done()
})
})
it('escToClose: false', async done => {
it('escToClose: true', async done => {
const { wrapper } = await createOpenedModal({
escToClose: true
})
Expand Down