yuuza/outline
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allow using / anywhere on a line or table (#7026)

Browse Source
This commit is contained in:
Tom Moor
2024-06-12 08:50:54 -04:00
committed by GitHub
parent df3cd22aee
commit 8a4555f565
5 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/editor/extensions/BlockMenu.tsx
View File

@@ -12,8 +12,9 @@ import BlockMenu from "../components/BlockMenu";
export default class BlockMenuExtension extends Suggestion { export default class BlockMenuExtension extends Suggestion {
get defaultOptions() { get defaultOptions() {
return { return {
openRegex: /^\/(\w+)?$/, // ported from https://github.com/tc39/proposal-regexp-unicode-property-escapes#unicode-aware-version-of-w
closeRegex: /(^(?!\/(\w+)?)(.*)$|^\/(([\w\W]+)\s.*|\s)$|^\/((\W)+)$)/, openRegex: /(?:^|\s|\()\/([\p{L}\p{M}\d]+)?$/u,
closeRegex: /(?:^|\s|\()\/(([\p{L}\p{M}\d]*\s+)|(\s+[\p{L}\p{M}\d]+))$/u,
}; };
} }

1
app/editor/extensions/EmojiMenu.tsx
View File

@@ -24,7 +24,6 @@ export default class EmojiMenuExtension extends Suggestion {
), ),
closeRegex: closeRegex:
/(?:^|\s|\():(([0-9a-zA-Z_+-]*\s+)|(\s+[0-9a-zA-Z_+-]+)|[^0-9a-zA-Z_+-]+)$/, /(?:^|\s|\():(([0-9a-zA-Z_+-]*\s+)|(\s+[0-9a-zA-Z_+-]+)|[^0-9a-zA-Z_+-]+)$/,
enabledInTable: true,
}; };
} }

1
app/editor/extensions/MentionMenu.tsx
View File

@@ -10,7 +10,6 @@ export default class MentionMenuExtension extends Suggestion {
// ported from https://github.com/tc39/proposal-regexp-unicode-property-escapes#unicode-aware-version-of-w // ported from https://github.com/tc39/proposal-regexp-unicode-property-escapes#unicode-aware-version-of-w
openRegex: /(?:^|\s|\()@([\p{L}\p{M}\d]+)?$/u, openRegex: /(?:^|\s|\()@([\p{L}\p{M}\d]+)?$/u,
closeRegex: /(?:^|\s|\()@(([\p{L}\p{M}\d]*\s+)|(\s+[\p{L}\p{M}\d]+))$/u, closeRegex: /(?:^|\s|\()@(([\p{L}\p{M}\d]*\s+)|(\s+[\p{L}\p{M}\d]+))$/u,
enabledInTable: true,
}; };
} }

4
app/editor/extensions/Suggestion.ts
View File

@@ -2,7 +2,6 @@ import { action, observable } from "mobx";
import { InputRule } from "prosemirror-inputrules"; import { InputRule } from "prosemirror-inputrules";
import { NodeType, Schema } from "prosemirror-model"; import { NodeType, Schema } from "prosemirror-model";
import { EditorState, Plugin } from "prosemirror-state"; import { EditorState, Plugin } from "prosemirror-state";
import { isInTable } from "prosemirror-tables";
import Extension from "@shared/editor/lib/Extension"; import Extension from "@shared/editor/lib/Extension";
import { SuggestionsMenuPlugin } from "@shared/editor/plugins/Suggestions"; import { SuggestionsMenuPlugin } from "@shared/editor/plugins/Suggestions";
import { isInCode } from "@shared/editor/queries/isInCode"; import { isInCode } from "@shared/editor/queries/isInCode";
@@ -50,8 +49,7 @@ export default class Suggestion extends Extension {
match && match &&
(parent.type.name === "paragraph" || (parent.type.name === "paragraph" ||
parent.type.name === "heading") && parent.type.name === "heading") &&
(!isInCode(state) || this.options.enabledInCode) && (!isInCode(state) || this.options.enabledInCode)
(!isInTable(state) || this.options.enabledInTable)
) { ) {
this.state.open = true; this.state.open = true;
this.state.query = match[1]; this.state.query = match[1];

1
shared/editor/plugins/Suggestions.ts
View File

@@ -8,7 +8,6 @@ type Options = {
openRegex: RegExp; openRegex: RegExp;
closeRegex: RegExp; closeRegex: RegExp;
enabledInCode: true; enabledInCode: true;
enabledInTable: true;
}; };
type ExtensionState = { type ExtensionState = {