Skip to content

Commit 9b1fcaa

Browse files
authored
fix(Touch/QTime): Force no-pointer-events on children in touch - fix NaN in QTime on click after dragging (quasarframework#6597)
1 parent f2c1798 commit 9b1fcaa

File tree

4 files changed

+10
-6
lines changed

4 files changed

+10
-6
lines changed

ui/src/css/core/mouse.sass

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,9 @@
1313
.no-scroll
1414
overflow: hidden !important
1515

16-
.no-pointer-events
16+
.no-pointer-events,
17+
.no-pointer-events--children,
18+
.no-pointer-events--children *
1719
pointer-events: none !important
1820
.all-pointer-events
1921
pointer-events: all !important

ui/src/css/core/mouse.styl

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,9 @@
1313
.no-scroll
1414
overflow: hidden !important
1515

16-
.no-pointer-events
16+
.no-pointer-events,
17+
.no-pointer-events--children,
18+
.no-pointer-events--children *
1719
pointer-events: none !important
1820
.all-pointer-events
1921
pointer-events: all !important

ui/src/directives/TouchPan.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@ export default {
234234
handleEvent(evt, isMouseEvt)
235235

236236
document.documentElement.style.cursor = 'grabbing'
237-
isMouseEvt === true && document.body.classList.add('no-pointer-events')
237+
isMouseEvt === true && document.body.classList.add('no-pointer-events--children')
238238
document.body.classList.add('non-selectable')
239239
clearSelection()
240240

@@ -246,7 +246,7 @@ export default {
246246

247247
if (isMouseEvt === true) {
248248
const remove = () => {
249-
document.body.classList.remove('no-pointer-events')
249+
document.body.classList.remove('no-pointer-events--children')
250250
}
251251

252252
if (withDelay === true) { setTimeout(remove, 50) }

ui/src/directives/TouchSwipe.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ export default {
174174
stopAndPrevent(evt)
175175

176176
if (ctx.event.mouse === true) {
177-
document.body.classList.add('no-pointer-events')
177+
document.body.classList.add('no-pointer-events--children')
178178
document.body.classList.add('non-selectable')
179179
clearSelection()
180180

@@ -184,7 +184,7 @@ export default {
184184
document.body.classList.remove('non-selectable')
185185

186186
const remove = () => {
187-
document.body.classList.remove('no-pointer-events')
187+
document.body.classList.remove('no-pointer-events--children')
188188
}
189189

190190
if (withDelay === true) { setTimeout(remove, 50) }

0 commit comments

Comments
 (0)