Skip to content

fix: #111 #126

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

Closed
wants to merge 3 commits into from
Closed

fix: #111 #126

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1d47ff6
fix: #111
mesqueeb Jun 11, 2021
f15022a
fix: #111 proper working fix
mesqueeb Jun 11, 2021
090d854
fix: #111
mesqueeb Jun 12, 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.

17 changes: 14 additions & 3 deletions lib/VueFinalModal.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,13 +40,18 @@
role="dialog"
aria-modal="true"
tabindex="-1"
@click.self="onClickContainer"
@mouseup.self.stop="onMouseupContainer"
@touchend.self.stop="onMouseupContainer"
@mousedown.self.stop="onMousedown"
@touchstart.self.stop="onMousedown"
>
<div
ref="vfmContent"
class="vfm__content"
:class="[contentClass, { 'vfm--prevent-auto': preventClick }]"
:style="bindContentStyle"
@mousedown.self.stop="onMousedown"
@touchstart.self.stop="onMousedown"
>
<slot :params="params" :close="() => $emit('input', false)" />
<div
Expand Down Expand Up @@ -178,7 +183,8 @@ export default {
dragResizeStyle: {},
resolveToggle: noop,
rejectToggle: noop,
state: null
state: null,
lastMousedownEl: null
}),
computed: {
api() {
Expand Down Expand Up @@ -430,7 +436,12 @@ export default {
if (stopEvent) return
this.params = {}
},
onClickContainer() {
onMousedown(e) {
this.lastMousedownEl = e.target
},
onMouseupContainer(e) {
// skip when the mousedown didn't start on the container el
if (this.lastMousedownEl !== e.target) return
// skip when state equal 'resize:move'
if (this.state === 'resize:move') return
this.$emit('click-outside', this.createModalEvent({ type: 'click-outside' }))
Expand Down