Skip to content

A free and open source instant messaging and VoIP chat app built for friends, groups, and communities.

TypeScript fluxerfluxerapp

fix(app): preserve node selection when reconciling composer markdown (#1626)

Hampusd0f56c3afd4b
diff --git a/fluxer_app/src/features/lexical/composer/ComposerMarkdownHighlight.ts b/fluxer_app/src/features/lexical/composer/ComposerMarkdownHighlight.ts
index 17570af90..d8d78f762 100644
--- a/fluxer_app/src/features/lexical/composer/ComposerMarkdownHighlight.ts
+++ b/fluxer_app/src/features/lexical/composer/ComposerMarkdownHighlight.ts
@@ -19,11 +19,14 @@ import {$isComposerStandardEmojiNode} from '@app/features/lexical/composer/nodes
import {$isSlashSlotNode} from '@app/features/lexical/composer/nodes/SlashSlotNode';
import {$createSyntaxMarkerNode, $isSyntaxMarkerNode} from '@app/features/lexical/composer/nodes/SyntaxMarkerNode';
import {
+ $createNodeSelection,
$createTextNode,
$getNodeByKey,
$getSelection,
$isLineBreakNode,
+ $isNodeSelection,
$isRangeSelection,
+ $setSelection,
type LexicalEditor,
type LexicalNode,
ParagraphNode,
@@ -205,8 +208,21 @@ function $reconcileLine(
const selectionKeys = $isRangeSelection(currentSelection)
? {anchor: currentSelection.anchor.key, focus: currentSelection.focus.key}
: null;
+ const nodeSelectionKeys = $isNodeSelection(currentSelection)
+ ? currentSelection.getNodes().map((node) => node.getKey())
+ : null;
const selection = $captureSelectionOffsets();
$applyDescriptors(line, desired);
+ if (nodeSelectionKeys != null) {
+ if (nodeSelectionKeys.every((key) => $getNodeByKey(key)?.isAttached() === true)) {
+ const restored = $createNodeSelection();
+ for (const key of nodeSelectionKeys) {
+ restored.add(key);
+ }
+ $setSelection(restored);
+ }
+ return;
+ }
const anchorNode = selectionKeys == null ? null : $getNodeByKey(selectionKeys.anchor);
const focusNode = selectionKeys == null ? null : $getNodeByKey(selectionKeys.focus);
const selectionNodesSurvived =