* add key option to bubble menu * ignore react for now * add shouldShow option to bubble menu extension * improve types * remove BubbleMenuPluginKey * add key and shouldShow option to floating menu extension * fix: don’t show floating menu within code block * docs: add new menu options
This commit is contained in:
@@ -9,9 +9,18 @@ import { EditorView } from 'prosemirror-view'
|
||||
import tippy, { Instance, Props } from 'tippy.js'
|
||||
|
||||
export interface BubbleMenuPluginProps {
|
||||
key: PluginKey | string,
|
||||
editor: Editor,
|
||||
element: HTMLElement,
|
||||
tippyOptions?: Partial<Props>,
|
||||
shouldShow: ((props: {
|
||||
editor: Editor,
|
||||
view: EditorView,
|
||||
state: EditorState,
|
||||
oldState?: EditorState,
|
||||
from: number,
|
||||
to: number,
|
||||
}) => boolean) | null,
|
||||
}
|
||||
|
||||
export type BubbleMenuViewProps = BubbleMenuPluginProps & {
|
||||
@@ -29,15 +38,38 @@ export class BubbleMenuView {
|
||||
|
||||
public tippy!: Instance
|
||||
|
||||
public shouldShow: Exclude<BubbleMenuPluginProps['shouldShow'], null> = ({ state, from, to }) => {
|
||||
const { doc, selection } = state
|
||||
const { empty } = selection
|
||||
|
||||
// Sometime check for `empty` is not enough.
|
||||
// Doubleclick an empty paragraph returns a node size of 2.
|
||||
// So we check also for an empty text size.
|
||||
const isEmptyTextBlock = !doc.textBetween(from, to).length
|
||||
&& isTextSelection(state.selection)
|
||||
|
||||
if (empty || isEmptyTextBlock) {
|
||||
return false
|
||||
}
|
||||
|
||||
return true
|
||||
}
|
||||
|
||||
constructor({
|
||||
editor,
|
||||
element,
|
||||
view,
|
||||
tippyOptions,
|
||||
shouldShow,
|
||||
}: BubbleMenuViewProps) {
|
||||
this.editor = editor
|
||||
this.element = element
|
||||
this.view = view
|
||||
|
||||
if (shouldShow) {
|
||||
this.shouldShow = shouldShow
|
||||
}
|
||||
|
||||
this.element.addEventListener('mousedown', this.mousedownHandler, { capture: true })
|
||||
this.view.dom.addEventListener('dragstart', this.dragstartHandler)
|
||||
this.editor.on('focus', this.focusHandler)
|
||||
@@ -98,19 +130,21 @@ export class BubbleMenuView {
|
||||
return
|
||||
}
|
||||
|
||||
const { empty, ranges } = selection
|
||||
|
||||
// support for CellSelections
|
||||
const { ranges } = selection
|
||||
const from = Math.min(...ranges.map(range => range.$from.pos))
|
||||
const to = Math.max(...ranges.map(range => range.$to.pos))
|
||||
|
||||
// Sometime check for `empty` is not enough.
|
||||
// Doubleclick an empty paragraph returns a node size of 2.
|
||||
// So we check also for an empty text size.
|
||||
const isEmptyTextBlock = !doc.textBetween(from, to).length
|
||||
&& isTextSelection(view.state.selection)
|
||||
const shouldShow = this.shouldShow({
|
||||
editor: this.editor,
|
||||
view,
|
||||
state,
|
||||
oldState,
|
||||
from,
|
||||
to,
|
||||
})
|
||||
|
||||
if (empty || isEmptyTextBlock) {
|
||||
if (!shouldShow) {
|
||||
this.hide()
|
||||
|
||||
return
|
||||
@@ -118,7 +152,7 @@ export class BubbleMenuView {
|
||||
|
||||
this.tippy.setProps({
|
||||
getReferenceClientRect: () => {
|
||||
if (isNodeSelection(view.state.selection)) {
|
||||
if (isNodeSelection(state.selection)) {
|
||||
const node = view.nodeDOM(from) as HTMLElement
|
||||
|
||||
if (node) {
|
||||
@@ -150,11 +184,11 @@ export class BubbleMenuView {
|
||||
}
|
||||
}
|
||||
|
||||
export const BubbleMenuPluginKey = new PluginKey('menuBubble')
|
||||
|
||||
export const BubbleMenuPlugin = (options: BubbleMenuPluginProps) => {
|
||||
return new Plugin({
|
||||
key: BubbleMenuPluginKey,
|
||||
key: typeof options.key === 'string'
|
||||
? new PluginKey(options.key)
|
||||
: options.key,
|
||||
view: view => new BubbleMenuView({ view, ...options }),
|
||||
})
|
||||
}
|
||||
|
||||
@@ -11,6 +11,8 @@ export const BubbleMenu = Extension.create<BubbleMenuOptions>({
|
||||
defaultOptions: {
|
||||
element: null,
|
||||
tippyOptions: {},
|
||||
key: 'bubbleMenu',
|
||||
shouldShow: null,
|
||||
},
|
||||
|
||||
addProseMirrorPlugins() {
|
||||
@@ -20,9 +22,11 @@ export const BubbleMenu = Extension.create<BubbleMenuOptions>({
|
||||
|
||||
return [
|
||||
BubbleMenuPlugin({
|
||||
key: this.options.key,
|
||||
editor: this.editor,
|
||||
element: this.options.element,
|
||||
tippyOptions: this.options.tippyOptions,
|
||||
shouldShow: this.options.shouldShow,
|
||||
}),
|
||||
]
|
||||
},
|
||||
|
||||
@@ -4,9 +4,16 @@ import { EditorView } from 'prosemirror-view'
|
||||
import tippy, { Instance, Props } from 'tippy.js'
|
||||
|
||||
export interface FloatingMenuPluginProps {
|
||||
key: PluginKey | string,
|
||||
editor: Editor,
|
||||
element: HTMLElement,
|
||||
tippyOptions?: Partial<Props>,
|
||||
shouldShow: ((props: {
|
||||
editor: Editor,
|
||||
view: EditorView,
|
||||
state: EditorState,
|
||||
oldState?: EditorState,
|
||||
}) => boolean) | null,
|
||||
}
|
||||
|
||||
export type FloatingMenuViewProps = FloatingMenuPluginProps & {
|
||||
@@ -24,15 +31,36 @@ export class FloatingMenuView {
|
||||
|
||||
public tippy!: Instance
|
||||
|
||||
public shouldShow: Exclude<FloatingMenuPluginProps['shouldShow'], null> = ({ state }) => {
|
||||
const { selection } = state
|
||||
const { $anchor, empty } = selection
|
||||
const isRootDepth = $anchor.depth === 1
|
||||
const isEmptyTextBlock = $anchor.parent.isTextblock
|
||||
&& !$anchor.parent.type.spec.code
|
||||
&& !$anchor.parent.textContent
|
||||
|
||||
if (!empty || !isRootDepth || !isEmptyTextBlock) {
|
||||
return false
|
||||
}
|
||||
|
||||
return true
|
||||
}
|
||||
|
||||
constructor({
|
||||
editor,
|
||||
element,
|
||||
view,
|
||||
tippyOptions,
|
||||
shouldShow,
|
||||
}: FloatingMenuViewProps) {
|
||||
this.editor = editor
|
||||
this.element = element
|
||||
this.view = view
|
||||
|
||||
if (shouldShow) {
|
||||
this.shouldShow = shouldShow
|
||||
}
|
||||
|
||||
this.element.addEventListener('mousedown', this.mousedownHandler, { capture: true })
|
||||
this.editor.on('focus', this.focusHandler)
|
||||
this.editor.on('blur', this.blurHandler)
|
||||
@@ -82,23 +110,21 @@ export class FloatingMenuView {
|
||||
update(view: EditorView, oldState?: EditorState) {
|
||||
const { state, composing } = view
|
||||
const { doc, selection } = state
|
||||
const { from, to } = selection
|
||||
const isSame = oldState && oldState.doc.eq(doc) && oldState.selection.eq(selection)
|
||||
|
||||
if (composing || isSame) {
|
||||
return
|
||||
}
|
||||
|
||||
const {
|
||||
$anchor,
|
||||
empty,
|
||||
from,
|
||||
to,
|
||||
} = selection
|
||||
const isRootDepth = $anchor.depth === 1
|
||||
const isNodeEmpty = !selection.$anchor.parent.isLeaf && !selection.$anchor.parent.textContent
|
||||
const isActive = isRootDepth && isNodeEmpty
|
||||
const shouldShow = this.shouldShow({
|
||||
editor: this.editor,
|
||||
view,
|
||||
state,
|
||||
oldState,
|
||||
})
|
||||
|
||||
if (!empty || !isActive) {
|
||||
if (!shouldShow) {
|
||||
this.hide()
|
||||
|
||||
return
|
||||
@@ -127,11 +153,11 @@ export class FloatingMenuView {
|
||||
}
|
||||
}
|
||||
|
||||
export const FloatingMenuPluginKey = new PluginKey('menuFloating')
|
||||
|
||||
export const FloatingMenuPlugin = (options: FloatingMenuPluginProps) => {
|
||||
return new Plugin({
|
||||
key: FloatingMenuPluginKey,
|
||||
key: typeof options.key === 'string'
|
||||
? new PluginKey(options.key)
|
||||
: options.key,
|
||||
view: view => new FloatingMenuView({ view, ...options }),
|
||||
})
|
||||
}
|
||||
|
||||
@@ -11,6 +11,8 @@ export const FloatingMenu = Extension.create<FloatingMenuOptions>({
|
||||
defaultOptions: {
|
||||
element: null,
|
||||
tippyOptions: {},
|
||||
key: 'floatingMenu',
|
||||
shouldShow: null,
|
||||
},
|
||||
|
||||
addProseMirrorPlugins() {
|
||||
@@ -20,9 +22,11 @@ export const FloatingMenu = Extension.create<FloatingMenuOptions>({
|
||||
|
||||
return [
|
||||
FloatingMenuPlugin({
|
||||
key: this.options.key,
|
||||
editor: this.editor,
|
||||
element: this.options.element,
|
||||
tippyOptions: this.options.tippyOptions,
|
||||
shouldShow: this.options.shouldShow,
|
||||
}),
|
||||
]
|
||||
},
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import React, { useEffect, useRef } from 'react'
|
||||
import { BubbleMenuPlugin, BubbleMenuPluginKey, BubbleMenuPluginProps } from '@tiptap/extension-bubble-menu'
|
||||
import { BubbleMenuPlugin, BubbleMenuPluginProps } from '@tiptap/extension-bubble-menu'
|
||||
|
||||
export type BubbleMenuProps = Omit<BubbleMenuPluginProps, 'element'> & {
|
||||
className?: string,
|
||||
@@ -9,16 +9,23 @@ export const BubbleMenu: React.FC<BubbleMenuProps> = props => {
|
||||
const element = useRef<HTMLDivElement>(null)
|
||||
|
||||
useEffect(() => {
|
||||
const { editor, tippyOptions } = props
|
||||
const {
|
||||
key,
|
||||
editor,
|
||||
tippyOptions,
|
||||
shouldShow,
|
||||
} = props
|
||||
|
||||
editor.registerPlugin(BubbleMenuPlugin({
|
||||
key,
|
||||
editor,
|
||||
element: element.current as HTMLElement,
|
||||
tippyOptions,
|
||||
shouldShow,
|
||||
}))
|
||||
|
||||
return () => {
|
||||
editor.unregisterPlugin(BubbleMenuPluginKey)
|
||||
editor.unregisterPlugin(key)
|
||||
}
|
||||
}, [])
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import React, { useEffect, useRef } from 'react'
|
||||
import { FloatingMenuPlugin, FloatingMenuPluginKey, FloatingMenuPluginProps } from '@tiptap/extension-floating-menu'
|
||||
import { FloatingMenuPlugin, FloatingMenuPluginProps } from '@tiptap/extension-floating-menu'
|
||||
|
||||
export type FloatingMenuProps = Omit<FloatingMenuPluginProps, 'element'> & {
|
||||
className?: string,
|
||||
@@ -9,16 +9,23 @@ export const FloatingMenu: React.FC<FloatingMenuProps> = props => {
|
||||
const element = useRef<HTMLDivElement>(null)
|
||||
|
||||
useEffect(() => {
|
||||
const { editor, tippyOptions } = props
|
||||
const {
|
||||
key,
|
||||
editor,
|
||||
tippyOptions,
|
||||
shouldShow,
|
||||
} = props
|
||||
|
||||
editor.registerPlugin(FloatingMenuPlugin({
|
||||
key,
|
||||
editor,
|
||||
element: element.current as HTMLElement,
|
||||
tippyOptions,
|
||||
shouldShow,
|
||||
}))
|
||||
|
||||
return () => {
|
||||
editor.unregisterPlugin(FloatingMenuPluginKey)
|
||||
editor.unregisterPlugin(key)
|
||||
}
|
||||
}, [])
|
||||
|
||||
|
||||
@@ -1,15 +1,22 @@
|
||||
import Vue, { Component, PropType } from 'vue'
|
||||
import { BubbleMenuPlugin, BubbleMenuPluginKey, BubbleMenuPluginProps } from '@tiptap/extension-bubble-menu'
|
||||
import { BubbleMenuPlugin, BubbleMenuPluginProps } from '@tiptap/extension-bubble-menu'
|
||||
|
||||
export interface BubbleMenuInterface extends Vue {
|
||||
tippyOptions: BubbleMenuPluginProps['tippyOptions'],
|
||||
pluginKey: BubbleMenuPluginProps['key'],
|
||||
editor: BubbleMenuPluginProps['editor'],
|
||||
tippyOptions: BubbleMenuPluginProps['tippyOptions'],
|
||||
shouldShow: BubbleMenuPluginProps['shouldShow'],
|
||||
}
|
||||
|
||||
export const BubbleMenu: Component = {
|
||||
name: 'BubbleMenu',
|
||||
|
||||
props: {
|
||||
pluginKey: {
|
||||
type: [String, Object as PropType<Exclude<BubbleMenuPluginProps['key'], string>>],
|
||||
default: 'bubbleMenu',
|
||||
},
|
||||
|
||||
editor: {
|
||||
type: Object as PropType<BubbleMenuPluginProps['editor']>,
|
||||
required: true,
|
||||
@@ -19,6 +26,11 @@ export const BubbleMenu: Component = {
|
||||
type: Object as PropType<BubbleMenuPluginProps['tippyOptions']>,
|
||||
default: () => ({}),
|
||||
},
|
||||
|
||||
shouldShow: {
|
||||
type: Function as PropType<Exclude<BubbleMenuPluginProps['shouldShow'], null>>,
|
||||
default: null,
|
||||
},
|
||||
},
|
||||
|
||||
watch: {
|
||||
@@ -31,9 +43,11 @@ export const BubbleMenu: Component = {
|
||||
|
||||
this.$nextTick(() => {
|
||||
editor.registerPlugin(BubbleMenuPlugin({
|
||||
key: this.pluginKey,
|
||||
editor,
|
||||
element: this.$el as HTMLElement,
|
||||
tippyOptions: this.tippyOptions,
|
||||
shouldShow: this.shouldShow,
|
||||
}))
|
||||
})
|
||||
},
|
||||
@@ -45,6 +59,6 @@ export const BubbleMenu: Component = {
|
||||
},
|
||||
|
||||
beforeDestroy(this: BubbleMenuInterface) {
|
||||
this.editor.unregisterPlugin(BubbleMenuPluginKey)
|
||||
this.editor.unregisterPlugin(this.pluginKey)
|
||||
},
|
||||
}
|
||||
|
||||
@@ -1,15 +1,22 @@
|
||||
import Vue, { Component, PropType } from 'vue'
|
||||
import { FloatingMenuPlugin, FloatingMenuPluginKey, FloatingMenuPluginProps } from '@tiptap/extension-floating-menu'
|
||||
import { FloatingMenuPlugin, FloatingMenuPluginProps } from '@tiptap/extension-floating-menu'
|
||||
|
||||
export interface FloatingMenuInterface extends Vue {
|
||||
pluginKey: FloatingMenuPluginProps['key'],
|
||||
tippyOptions: FloatingMenuPluginProps['tippyOptions'],
|
||||
editor: FloatingMenuPluginProps['editor'],
|
||||
shouldShow: FloatingMenuPluginProps['shouldShow'],
|
||||
}
|
||||
|
||||
export const FloatingMenu: Component = {
|
||||
name: 'FloatingMenu',
|
||||
|
||||
props: {
|
||||
pluginKey: {
|
||||
type: [String, Object as PropType<Exclude<FloatingMenuPluginProps['key'], string>>],
|
||||
default: 'floatingMenu',
|
||||
},
|
||||
|
||||
editor: {
|
||||
type: Object as PropType<FloatingMenuPluginProps['editor']>,
|
||||
required: true,
|
||||
@@ -19,6 +26,11 @@ export const FloatingMenu: Component = {
|
||||
type: Object as PropType<FloatingMenuPluginProps['tippyOptions']>,
|
||||
default: () => ({}),
|
||||
},
|
||||
|
||||
shouldShow: {
|
||||
type: Function as PropType<Exclude<FloatingMenuPluginProps['shouldShow'], null>>,
|
||||
default: null,
|
||||
},
|
||||
},
|
||||
|
||||
watch: {
|
||||
@@ -31,9 +43,11 @@ export const FloatingMenu: Component = {
|
||||
|
||||
this.$nextTick(() => {
|
||||
editor.registerPlugin(FloatingMenuPlugin({
|
||||
key: this.pluginKey,
|
||||
editor,
|
||||
element: this.$el as HTMLElement,
|
||||
tippyOptions: this.tippyOptions,
|
||||
shouldShow: this.shouldShow,
|
||||
}))
|
||||
})
|
||||
},
|
||||
@@ -45,6 +59,6 @@ export const FloatingMenu: Component = {
|
||||
},
|
||||
|
||||
beforeDestroy(this: FloatingMenuInterface) {
|
||||
this.editor.unregisterPlugin(FloatingMenuPluginKey)
|
||||
this.editor.unregisterPlugin(this.pluginKey)
|
||||
},
|
||||
}
|
||||
|
||||
@@ -6,16 +6,19 @@ import {
|
||||
onBeforeUnmount,
|
||||
defineComponent,
|
||||
} from 'vue'
|
||||
import {
|
||||
BubbleMenuPlugin,
|
||||
BubbleMenuPluginKey,
|
||||
BubbleMenuPluginProps,
|
||||
} from '@tiptap/extension-bubble-menu'
|
||||
import { BubbleMenuPlugin, BubbleMenuPluginProps } from '@tiptap/extension-bubble-menu'
|
||||
|
||||
export const BubbleMenu = defineComponent({
|
||||
name: 'BubbleMenu',
|
||||
|
||||
props: {
|
||||
pluginKey: {
|
||||
// TODO: TypeScript breaks :(
|
||||
// type: [String, Object as PropType<Exclude<BubbleMenuPluginProps['key'], string>>],
|
||||
type: [String, Object],
|
||||
default: 'bubbleMenu',
|
||||
},
|
||||
|
||||
editor: {
|
||||
type: Object as PropType<BubbleMenuPluginProps['editor']>,
|
||||
required: true,
|
||||
@@ -25,25 +28,37 @@ export const BubbleMenu = defineComponent({
|
||||
type: Object as PropType<BubbleMenuPluginProps['tippyOptions']>,
|
||||
default: () => ({}),
|
||||
},
|
||||
|
||||
shouldShow: {
|
||||
type: Function as PropType<Exclude<BubbleMenuPluginProps['shouldShow'], null>>,
|
||||
default: null,
|
||||
},
|
||||
},
|
||||
|
||||
setup(props, { slots }) {
|
||||
const root = ref<HTMLElement | null>(null)
|
||||
|
||||
onMounted(() => {
|
||||
const { editor, tippyOptions } = props
|
||||
const {
|
||||
pluginKey,
|
||||
editor,
|
||||
tippyOptions,
|
||||
shouldShow,
|
||||
} = props
|
||||
|
||||
editor.registerPlugin(BubbleMenuPlugin({
|
||||
key: pluginKey,
|
||||
editor,
|
||||
element: root.value as HTMLElement,
|
||||
tippyOptions,
|
||||
shouldShow,
|
||||
}))
|
||||
})
|
||||
|
||||
onBeforeUnmount(() => {
|
||||
const { editor } = props
|
||||
const { pluginKey, editor } = props
|
||||
|
||||
editor.unregisterPlugin(BubbleMenuPluginKey)
|
||||
editor.unregisterPlugin(pluginKey)
|
||||
})
|
||||
|
||||
return () => h('div', { ref: root }, slots.default?.())
|
||||
|
||||
@@ -6,16 +6,19 @@ import {
|
||||
onBeforeUnmount,
|
||||
defineComponent,
|
||||
} from 'vue'
|
||||
import {
|
||||
FloatingMenuPlugin,
|
||||
FloatingMenuPluginKey,
|
||||
FloatingMenuPluginProps,
|
||||
} from '@tiptap/extension-floating-menu'
|
||||
import { FloatingMenuPlugin, FloatingMenuPluginProps } from '@tiptap/extension-floating-menu'
|
||||
|
||||
export const FloatingMenu = defineComponent({
|
||||
name: 'FloatingMenu',
|
||||
|
||||
props: {
|
||||
pluginKey: {
|
||||
// TODO: TypeScript breaks :(
|
||||
// type: [String, Object as PropType<Exclude<FloatingMenuPluginProps['key'], string>>],
|
||||
type: [String, Object],
|
||||
default: 'floatingMenu',
|
||||
},
|
||||
|
||||
editor: {
|
||||
type: Object as PropType<FloatingMenuPluginProps['editor']>,
|
||||
required: true,
|
||||
@@ -25,25 +28,37 @@ export const FloatingMenu = defineComponent({
|
||||
type: Object as PropType<FloatingMenuPluginProps['tippyOptions']>,
|
||||
default: () => ({}),
|
||||
},
|
||||
|
||||
shouldShow: {
|
||||
type: Function as PropType<Exclude<FloatingMenuPluginProps['shouldShow'], null>>,
|
||||
default: null,
|
||||
},
|
||||
},
|
||||
|
||||
setup(props, { slots }) {
|
||||
const root = ref<HTMLElement | null>(null)
|
||||
|
||||
onMounted(() => {
|
||||
const { editor, tippyOptions } = props
|
||||
const {
|
||||
pluginKey,
|
||||
editor,
|
||||
tippyOptions,
|
||||
shouldShow,
|
||||
} = props
|
||||
|
||||
editor.registerPlugin(FloatingMenuPlugin({
|
||||
key: pluginKey,
|
||||
editor,
|
||||
element: root.value as HTMLElement,
|
||||
tippyOptions,
|
||||
shouldShow,
|
||||
}))
|
||||
})
|
||||
|
||||
onBeforeUnmount(() => {
|
||||
const { editor } = props
|
||||
const { pluginKey, editor } = props
|
||||
|
||||
editor.unregisterPlugin(FloatingMenuPluginKey)
|
||||
editor.unregisterPlugin(pluginKey)
|
||||
})
|
||||
|
||||
return () => h('div', { ref: root }, slots.default?.())
|
||||
|
||||
Reference in New Issue
Block a user