pepepper/fluxer
1
0 Fork 0
mirror of https://github.com/fluxerapp/fluxer synced 2026-10-19 05:55:34 +09:00
Code Issues Packages Projects Releases Wiki Activity

fix(app): keep blockquotes open across pasted lines (#2771)

Browse Source
This commit is contained in:
Hampus authored and GitHub committed 2026-09-14 18:54:04 +02:00
1 parent a3d6cf37cb
commit 04481d7235
24 files changed
+3174 -229
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

fluxer_app/src/features/lexical/composer/ComposerMarkdownHighlight.ts
+18 -7
View File
@@ -1,9 +1,9 @@
// SPDX-License-Identifier: AGPL-3.0-or-later
import {findBlockquoteMarkerEnds} from '@app/features/lexical/composer/blockquoteLines';
import {findBlockquoteMarkers} from '@app/features/lexical/composer/blockquoteLines';
import {
$rewriteMultilineBlockquoteMarker,
$snapCaretOutOfBlockquoteMarker,
$snapSelectionOutOfBlockquoteMarker,
$splitComposerLines,
$syncComposerBlockquoteLines,
} from '@app/features/lexical/composer/ComposerBlockquote';
@@ -93,6 +93,7 @@ export function registerComposerMarkdownHighlight(
editor: LexicalEditor,
parserFlags?: number,
silentMessagePrefix = false,
maxWireLength?: number,
): () => void {
return editor.registerNodeTransform(RootNode, (root) => {
if (editor.isComposing()) {
@@ -100,7 +101,7 @@ export function registerComposerMarkdownHighlight(
}
for (const child of root.getChildren()) {
if (child instanceof ParagraphNode) {
$reconcileParagraph(child, parserFlags, silentMessagePrefix && child.is(root.getFirstChild()));
$reconcileParagraph(child, parserFlags, silentMessagePrefix && child.is(root.getFirstChild()), maxWireLength);
}
}
});
@@ -123,13 +124,23 @@ export function $reconcileLineOf(node: TextNode, parserFlags?: number): void {
$reconcileParagraph(block as ParagraphNode, parserFlags);
}
function $reconcileParagraph(paragraph: ParagraphNode, parserFlags?: number, silentMessagePrefix = false): void {
function $reconcileParagraph(
paragraph: ParagraphNode,
parserFlags?: number,
silentMessagePrefix = false,
maxWireLength?: number,
): void {
const lines = $splitComposerLines(paragraph);
const lineSources = lines.map((line) => line.nodes.map($nodeWireText).join(''));
const source = lineSources.join('\n');
const markdownSpans = computeMarkdownHighlightSpans(source, parserFlags);
const quoteMarkerEnds = findBlockquoteMarkerEnds(source, markdownSpans);
if ($rewriteMultilineBlockquoteMarker(lines, lineSources, quoteMarkerEnds)) {
const {markerEnds: quoteMarkerEnds, multiline} = findBlockquoteMarkers(
source,
markdownSpans,
parserFlags,
maxWireLength,
);
if ($rewriteMultilineBlockquoteMarker(lines, multiline)) {
return;
}
const spans = silentMessagePrefix ? markSilentMessagePrefix(markdownSpans, source) : markdownSpans;
@@ -155,7 +166,7 @@ function $reconcileParagraph(paragraph: ParagraphNode, parserFlags?: number, sil
quoteMarkerEnds.map((end) => end > 0),
);
if (quoteMarkerEnds.some((end) => end > 0)) {
$snapCaretOutOfBlockquoteMarker();
$snapSelectionOutOfBlockquoteMarker();
}
}