opensourcemirror
/
CodeMirror
mirror of https://github.com/codemirror/CodeMirror.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Delay blur events during dragging 

Issue #6427
This commit is contained in:
Marijn Haverbeke 2020-10-26 09:08:36 +01:00
parent 23b7a9924b
commit d50797179b
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/display/focus.js
View File

@ -16,7 +16,7 @@ export function delayBlurEvent(cm) {
}
export function onFocus(cm, e) {
if (cm.state.delayingBlurEvent) cm.state.delayingBlurEvent = false
if (cm.state.delayingBlurEvent && !cm.state.draggingText) cm.state.delayingBlurEvent = false
if (cm.options.readOnly == "nocursor") return
if (!cm.state.focused) {

9
src/edit/mouse_events.js
View File

@ -1,4 +1,4 @@
import { delayBlurEvent, ensureFocus } from "../display/focus.js"
import { delayBlurEvent, ensureFocus, onBlur } from "../display/focus.js"
import { operation } from "../display/operations.js"
import { visibleLines } from "../display/update_lines.js"
import { clipPos, cmp, maxPos, minPos, Pos } from "../line/pos.js"
@ -149,6 +149,10 @@ function leftButtonStartDrag(cm, event, pos, behavior) {
let dragEnd = operation(cm, e => {
if (webkit) display.scroller.draggable = false
cm.state.draggingText = false
if (cm.state.delayingBlurEvent) {
cm.state.delayingBlurEvent = false
if (!cm.state.focused) onBlur(cm)
}
off(display.wrapper.ownerDocument, "mouseup", dragEnd)
off(display.wrapper.ownerDocument, "mousemove", mouseMove)
off(display.scroller, "dragstart", dragStart)
@ -179,7 +183,7 @@ function leftButtonStartDrag(cm, event, pos, behavior) {
on(display.scroller, "dragstart", dragStart)
on(display.scroller, "drop", dragEnd)
delayBlurEvent(cm)
cm.state.delayingBlurEvent = true
setTimeout(() => display.input.focus(), 20)
}
@ -193,6 +197,7 @@ function rangeForUnit(cm, pos, unit) {
// Normal selection, as opposed to text dragging.
function leftButtonSelect(cm, event, start, behavior) {
if (ie) delayBlurEvent(cm)
let display = cm.display, doc = cm.doc
e_preventDefault(event)