From b84a56a84a60a62ed0a39f8f852595acc08c35f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= Date: Fri, 23 Apr 2021 23:01:53 +0200 Subject: [PATCH] fix: improve isActive check for floating menu when using custom doc content, fix #1205 --- .../extension-floating-menu/src/floating-menu-plugin.ts | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/packages/extension-floating-menu/src/floating-menu-plugin.ts b/packages/extension-floating-menu/src/floating-menu-plugin.ts index cf5238da..3331b5f6 100644 --- a/packages/extension-floating-menu/src/floating-menu-plugin.ts +++ b/packages/extension-floating-menu/src/floating-menu-plugin.ts @@ -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 { EditorView } from 'prosemirror-view' import tippy, { Instance, Props } from 'tippy.js' @@ -95,9 +95,8 @@ export class FloatingMenuView { to, } = selection const isRootDepth = $anchor.depth === 1 - const isDefaultNodeType = $anchor.parent.type === state.doc.type.contentMatch.defaultType - const isDefaultNodeEmpty = isNodeEmpty(selection.$anchor.parent) - const isActive = isRootDepth && isDefaultNodeType && isDefaultNodeEmpty + const isNodeEmpty = !selection.$anchor.parent.isLeaf && !selection.$anchor.parent.textContent + const isActive = isRootDepth && isNodeEmpty if (!empty || !isActive) { this.hide()