GitHub/outline
1
0
Fork 0
mirror of https://github.com/outline/outline.git synced 2026-06-13 11:25:03 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix: Prevent block menu trigger when marked (#12515)

Browse Source 
* Prevent block menu trigger when marked

* PR feedback
This commit is contained in:
Tom Moor
2026-05-28 21:30:53 -04:00
committed by GitHub
parent 3f92e96006
commit 1eba87020c
3 changed files with 89 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
shared/editor/plugins/SuggestionsMenuPlugin.ts
+43 -6
View File
@@ -2,6 +2,7 @@ import { action } from "mobx";
import type { EditorState } from "prosemirror-state";
import { Plugin } from "prosemirror-state";
import type { EditorView } from "prosemirror-view";
import { getMarksBetween } from "@shared/editor/queries/getMarksBetween";
const MAX_MATCH = 500;
@@ -10,8 +11,35 @@ type ExtensionState = {
query: string;
};
/**
* Determine whether the trigger character of a suggestion match carries any
* marks (e.g. bold, code, link).
*
* @param state The editor state.
* @param cursorPos The document position of the cursor (end of the match).
* @param match The regex match where group 1 is the search term.
* @returns True if the trigger character has one or more marks applied.
*/
export function isTriggerMarked(
state: EditorState,
cursorPos: number,
match: RegExpMatchArray
): boolean {
const queryLength = match[1]?.length ?? 0;
const triggerEnd = cursorPos - queryLength;
const triggerStart = triggerEnd - 1;
if (triggerStart < 0) {
return false;
}
return getMarksBetween(triggerStart, triggerEnd, state).length > 0;
}
export class SuggestionsMenuPlugin extends Plugin {
constructor(extensionState: ExtensionState, openRegex: RegExp) {
constructor(
extensionState: ExtensionState,
openRegex: RegExp,
enabledInMarks: boolean
) {
super({
props: {
handleDOMEvents: {
@@ -34,7 +62,10 @@ export class SuggestionsMenuPlugin extends Plugin {
);
const match = openRegex.exec(textBefore);
action(() => {
if (match) {
if (
match &&
(enabledInMarks || !isTriggerMarked(state, fromPos, match))
) {
if (match[0].length <= 2) {
extensionState.open = true;
}
@@ -59,8 +90,11 @@ export class SuggestionsMenuPlugin extends Plugin {
fromPos,
fromPos,
openRegex,
action((_, match) => {
if (match) {
action((state, match) => {
if (
match &&
(enabledInMarks || !isTriggerMarked(state, fromPos, match))
) {
extensionState.query = match[1];
} else {
extensionState.open = false;
@@ -89,8 +123,11 @@ export class SuggestionsMenuPlugin extends Plugin {
fromPos,
fromPos,
openRegex,
action((_, match) => {
if (match) {
action((state, match) => {
if (
match &&
(enabledInMarks || !isTriggerMarked(state, fromPos, match))
) {
if (match[0].length <= 2) {
extensionState.open = true;
}