Merge branch 'master' of git://github.com/scrumpy/tiptap

This commit is contained in:
Billy Lam
2019-10-04 09:58:20 +13:00
9 changed files with 132 additions and 5 deletions

View File

@@ -1,6 +1,6 @@
{
"name": "tiptap",
"version": "1.26.0",
"version": "1.26.1",
"description": "A rich-text editor for Vue.js",
"homepage": "https://tiptap.scrumpy.io",
"license": "MIT",

View File

@@ -91,7 +91,10 @@ class Menu {
}
hide(event) {
if (event && event.relatedTarget) {
if (event
&& event.relatedTarget
&& this.options.element.parentNode.contains(event.relatedTarget)
) {
return
}

View File

@@ -66,6 +66,7 @@ class Menu {
this.isActive = false
this.left = 0
this.bottom = 0
this.top = 0
// the mousedown event is fired before blur so we can prevent it
this.options.element.addEventListener('mousedown', this.handleClick)
@@ -129,6 +130,7 @@ class Menu {
this.left = Math.round(this.options.keepInBounds
? Math.min(box.width - (el.width / 2), Math.max(left, el.width / 2)) : left)
this.bottom = Math.round(box.bottom - start.top)
this.top = Math.round(end.bottom - box.top)
this.isActive = true
this.sendUpdate()
@@ -139,11 +141,15 @@ class Menu {
isActive: this.isActive,
left: this.left,
bottom: this.bottom,
top: this.top,
})
}
hide(event) {
if (event && event.relatedTarget) {
if (event
&& event.relatedTarget
&& this.options.element.parentNode.contains(event.relatedTarget)
) {
return
}