ianhitchman/tiptap
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix: improve isActive check for floating menu when using custom doc content, fix #1205

Browse Source
This commit is contained in:
Philipp Kühn
2021-04-23 23:01:53 +02:00
parent cd595b8ece
commit b84a56a84a
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
packages/extension-floating-menu/src/floating-menu-plugin.ts
View File

@@ -1,4 +1,4 @@
import { Editor, isNodeEmpty, posToDOMRect } from '@tiptap/core' import { Editor, posToDOMRect } 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'
import tippy, { Instance, Props } from 'tippy.js' import tippy, { Instance, Props } from 'tippy.js'
@@ -95,9 +95,8 @@ export class FloatingMenuView {
to, to,
} = selection } = selection
const isRootDepth = $anchor.depth === 1 const isRootDepth = $anchor.depth === 1
const isDefaultNodeType = $anchor.parent.type === state.doc.type.contentMatch.defaultType const isNodeEmpty = !selection.$anchor.parent.isLeaf && !selection.$anchor.parent.textContent
const isDefaultNodeEmpty = isNodeEmpty(selection.$anchor.parent) const isActive = isRootDepth && isNodeEmpty
const isActive = isRootDepth && isDefaultNodeType && isDefaultNodeEmpty
if (!empty || !isActive) { if (!empty || !isActive) {
this.hide() this.hide()