Skip to content

feat: Add ability to clear color span range #487

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

Open
Sermilion wants to merge 2 commits into
base: main
Choose a base branch
from
Open

feat: Add ability to clear color span range #487

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3de3300
Add ability to set Unspecified color span over existing
Sermilion Jan 6, 2025
d3710ed
Added ability to clear color spans for specified range
Sermilion Jan 6, 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
34 changes: 30 additions & 4 deletions richeditor-compose/src/commonMain/kotlin/com/mohamedrejeb/richeditor/model/RichTextState.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -446,10 +446,32 @@ public class RichTextState internal constructor(
* @see [removeSpanStyle]
*/
public fun toggleSpanStyle(spanStyle: SpanStyle) {
if (currentSpanStyle.isSpecifiedFieldsEquals(spanStyle))
removeSpanStyle(spanStyle)
else
addSpanStyle(spanStyle)
if (spanStyle.isUnspecifiedColorSpan()) {
val modifiedSpan = currentSpanStyle.copy(color = Color.Unspecified)
removeSpanStyle(currentSpanStyle)
addSpanStyle(modifiedSpan)
} else {
if (currentSpanStyle.isSpecifiedFieldsEquals(spanStyle))
removeSpanStyle(spanStyle)
else
addSpanStyle(spanStyle)
}
}

/**
* Clear color [SpanStyle]s for current selection.
*/
public fun clearSelectionColorSpans() {
annotatedString
.subSequence(selection)
.spanStyles
.filter { it.item.color.isSpecified }
.forEach {
val spanStyle = SpanStyle(color = it.item.color)
toRemoveSpanStyle = toRemoveSpanStyle.customMerge(spanStyle)
toAddSpanStyle = toAddSpanStyle.unmerge(spanStyle)
if (!selection.collapsed) applyRichSpanStyleToSelectedText()
}
}

/**
Expand Down Expand Up @@ -3277,3 +3299,7 @@ public class RichTextState internal constructor(
)
}
}

private fun SpanStyle.isUnspecifiedColorSpan(): Boolean {
return this == SpanStyle(color = Color.Unspecified)
}