Skip to content
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

Jump to bottom

runfix: Handle mention deletion edge cases #16167

Merged
merged 2 commits into from
Nov 8, 2023
Merged

runfix: Handle mention deletion edge cases #16167

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d2eb5c6
runfix: Handle mention deletion edge cases
atomrc Nov 8, 2023
da75514
add docs
atomrc Nov 8, 2023
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
31 changes: 24 additions & 7 deletions src/script/components/RichTextEditor/nodes/Mention.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ import {
NodeSelection,
RangeSelection,
$isRangeSelection,
$createRangeSelection,
} from 'lexical';

import {KEY} from 'Util/KeyboardUtil';
Expand Down Expand Up @@ -81,12 +82,21 @@ export const Mention = (props: MentionComponentProps) => {
const rangeSelection = $isRangeSelection(currentSelection) ? currentSelection : null;

let shouldSelectNode = false;
if (event.key === 'Backspace') {
shouldSelectNode = nodeKey === rangeSelection?.getNodes()[0]?.getKey();
} else if (event.key === 'Delete') {
const currentNode = rangeSelection?.getNodes()[0];
const isOnTheEdgeOfNode = currentNode?.getTextContent().length === rangeSelection?.focus.offset;
shouldSelectNode = currentNode?.getNextSibling()?.getKey() === nodeKey && isOnTheEdgeOfNode;
const selectedNode = rangeSelection?.getNodes().length === 1 && rangeSelection?.getNodes()[0];
if (selectedNode) {
const isCurrentNode = nodeKey === selectedNode?.getKey();
if (event.key === 'Backspace') {
// When backspace is hit, we want to select the mention if the cursor is right after it
const isNextNode =
selectedNode?.getPreviousSibling()?.getKey() === nodeKey && rangeSelection?.focus.offset === 0;
shouldSelectNode = isCurrentNode || isNextNode;
} else if (event.key === 'Delete') {
// When backspace is hit, we want to select the mention if the cursor is right before it
const isNextNode =
selectedNode?.getNextSibling()?.getKey() === nodeKey &&
rangeSelection?.focus.offset === selectedNode?.getTextContent().length;
shouldSelectNode = isCurrentNode || isNextNode;
}
}
// If the cursor is right before the mention, we first select the mention before deleting it
if (shouldSelectNode) {
Expand All @@ -101,9 +111,16 @@ export const Mention = (props: MentionComponentProps) => {
const node = $getNodeByKey(nodeKey);

if ($isMentionNode(node)) {
const previousNode = node.getPreviousSibling();
if ($isTextNode(previousNode)) {
const newSelection = $createRangeSelection();
const contentLength = previousNode.getTextContent().length;
newSelection.setTextNodeRange(previousNode, contentLength, previousNode, contentLength);
$setSelection(newSelection);
}
node.remove();
return true;
}

setSelected(false);
}
return false;
Expand Down
Loading