improve default node detection for floating menu
This commit is contained in:
@@ -1,4 +1,4 @@
|
|||||||
import { Editor } from '@tiptap/core'
|
import { Editor, isNodeEmpty } from '@tiptap/core'
|
||||||
import { EditorState, Plugin, PluginKey } from 'prosemirror-state'
|
import { EditorState, Plugin, PluginKey } from 'prosemirror-state'
|
||||||
import { EditorView } from 'prosemirror-view'
|
import { EditorView } from 'prosemirror-view'
|
||||||
|
|
||||||
@@ -22,6 +22,8 @@ export class FloatingMenuView {
|
|||||||
|
|
||||||
public top = 0
|
public top = 0
|
||||||
|
|
||||||
|
public left = 0
|
||||||
|
|
||||||
public preventHide = false
|
public preventHide = false
|
||||||
|
|
||||||
constructor({
|
constructor({
|
||||||
@@ -73,13 +75,12 @@ export class FloatingMenuView {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
const { anchor, empty } = selection
|
const { $anchor, anchor, empty } = selection
|
||||||
const parent = this.element.offsetParent
|
const parent = this.element.offsetParent
|
||||||
const currentDom = view.domAtPos(anchor)
|
const isRootDepth = $anchor.depth === 1
|
||||||
const currentElement = currentDom.node as Element
|
const isDefaultNodeType = $anchor.parent.type === state.doc.type.contentMatch.defaultType
|
||||||
const isActive = currentElement.innerHTML === '<br>'
|
const isDefaultNodeEmpty = isNodeEmpty(selection.$anchor.parent)
|
||||||
&& currentElement.tagName === 'P'
|
const isActive = isRootDepth && isDefaultNodeType && isDefaultNodeEmpty
|
||||||
&& currentElement.parentNode === view.dom
|
|
||||||
|
|
||||||
if (!empty || !parent || !isActive) {
|
if (!empty || !parent || !isActive) {
|
||||||
this.hide()
|
this.hide()
|
||||||
@@ -90,9 +91,11 @@ export class FloatingMenuView {
|
|||||||
const parentBox = parent.getBoundingClientRect()
|
const parentBox = parent.getBoundingClientRect()
|
||||||
const cursorCoords = view.coordsAtPos(anchor)
|
const cursorCoords = view.coordsAtPos(anchor)
|
||||||
const top = cursorCoords.top - parentBox.top
|
const top = cursorCoords.top - parentBox.top
|
||||||
|
const left = cursorCoords.left - parentBox.left
|
||||||
|
|
||||||
this.isActive = true
|
this.isActive = true
|
||||||
this.top = top
|
this.top = top
|
||||||
|
this.left = left
|
||||||
|
|
||||||
this.render()
|
this.render()
|
||||||
}
|
}
|
||||||
@@ -103,9 +106,8 @@ export class FloatingMenuView {
|
|||||||
zIndex: 1,
|
zIndex: 1,
|
||||||
visibility: this.isActive ? 'visible' : 'hidden',
|
visibility: this.isActive ? 'visible' : 'hidden',
|
||||||
opacity: this.isActive ? 1 : 0,
|
opacity: this.isActive ? 1 : 0,
|
||||||
// left: `${this.left}px`,
|
left: `${this.left}px`,
|
||||||
top: `${this.top}px`,
|
top: `${this.top}px`,
|
||||||
// bottom: `${this.bottom}px`,
|
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user