Skip to content
Open
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,10 @@ fun Spannable.mergeSpannables(
val isNewLineStart = startBlockSpans.isNotEmpty() || startParagraphSpans.isNotEmpty()
val isNewLineEnd = endBlockSpans.isNotEmpty() || endParagraphSpans.isNotEmpty()

val pastedHasOwnStyles =
spannable.getSpans(0, spannable.length, EnrichedBlockSpan::class.java).isNotEmpty() ||
spannable.getSpans(0, spannable.length, EnrichedParagraphSpan::class.java).isNotEmpty()

if (isNewLineStart && start != paragraphStart) {
builder.insert(start, "\n")
finalStart = start + 1
Expand All @@ -78,5 +82,25 @@ fun Spannable.mergeSpannables(

builder.replace(finalStart, finalEnd, spannable)

// Manually extend existing paragraph/block spans to cover the pasted text.
if (!pastedHasOwnStyles) {
val pasteEnd = finalStart + spannable.length

val affectedParagraphSpans = builder.getSpans(finalStart, finalStart, EnrichedParagraphSpan::class.java)
val affectedBlockSpans = builder.getSpans(finalStart, finalStart, EnrichedBlockSpan::class.java)
val affectedSpans = affectedBlockSpans.toList() + affectedParagraphSpans.toList()

for (span in affectedSpans) {
val spanStart = builder.getSpanStart(span)
val spanEnd = builder.getSpanEnd(span)
if (spanStart == -1 || spanEnd >= pasteEnd) continue

val (_, newParagraphEnd) = builder.getParagraphBounds(spanStart, pasteEnd)
val flags = builder.getSpanFlags(span)
builder.removeSpan(span)
builder.setSpan(span, spanStart, newParagraphEnd, flags)
}
}

return builder
}