Skip to content

fix: allow opening another suggestion menu if another is triggered #1473 #1591

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nperez0111 merged 3 commits into from
Apr 10, 2025
Merged

fix: allow opening another suggestion menu if another is triggered #1473 #1591

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0a4607a
fix: allow opening another suggestion menu if another is triggered #1473
nperez0111 Apr 7, 2025
ca6dbd5
fix: moving selection to new block should hide the menu
nperez0111 Apr 9, 2025
47d451c
fix: close the menu if it already exists
nperez0111 Apr 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 17 additions & 13 deletions packages/core/src/extensions/SuggestionMenu/SuggestionPlugin.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,12 @@ export class SuggestionMenuProseMirrorPlugin<
},

// Apply changes to the plugin state from an editor transaction.
apply(transaction, prev, _oldState, newState): SuggestionPluginState {
apply: (
transaction,
prev,
_oldState,
newState
): SuggestionPluginState => {
// TODO: More clearly define which transactions should be ignored.
if (transaction.getMeta("orderedListIndexing") !== undefined) {
return prev;
Expand All @@ -215,12 +220,14 @@ export class SuggestionMenuProseMirrorPlugin<
ignoreQueryLength?: boolean;
} | null = transaction.getMeta(suggestionMenuPluginKey);

// Only opens a menu of no menu is already open
if (
typeof suggestionPluginTransactionMeta === "object" &&
suggestionPluginTransactionMeta !== null &&
prev === undefined
suggestionPluginTransactionMeta !== null
) {
if (prev) {
// Close the previous menu if it exists
this.closeMenu();
}
const trackedPosition = trackPosition(
editor,
newState.selection.from -
Expand Down Expand Up @@ -262,7 +269,11 @@ export class SuggestionMenuProseMirrorPlugin<
transaction.getMeta("pointer") ||
// Moving the caret before the character which triggered the menu should hide it.
(prev.triggerCharacter !== undefined &&
newState.selection.from < prev.queryStartPos())
newState.selection.from < prev.queryStartPos()) ||
// Moving the caret to a new block should hide the menu.
!newState.selection.$from.sameParent(
newState.doc.resolve(prev.queryStartPos())
)
) {
return undefined;
}
Expand All @@ -281,14 +292,7 @@ export class SuggestionMenuProseMirrorPlugin<

props: {
handleTextInput(view, _from, _to, text) {
const suggestionPluginState: SuggestionPluginState = (
this as Plugin
).getState(view.state);

if (
triggerCharacters.includes(text) &&
suggestionPluginState === undefined
) {
if (triggerCharacters.includes(text)) {
view.dispatch(
view.state.tr
.insertText(text)
Expand Down
Loading