Skip to content

Commit

Permalink
Merge pull request #229 from MohamedRejeb/1.x
Browse files Browse the repository at this point in the history 
Support editing existing Link and deleting Link
  • Loading branch information
@MohamedRejeb
MohamedRejeb committed Mar 31, 2024
2 parents 2ef0305 + ad9e862 commit e226fc1
Show file tree
Hide file tree
Showing 3 changed files with 160 additions and 58 deletions.
129 changes: 99 additions & 30 deletions richeditor-compose/src/commonMain/kotlin/com/mohamedrejeb/richeditor/model/RichTextState.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,22 +83,42 @@ class RichTextState internal constructor(
?: RichSpanStyle.Default
)

/**
* Returns whether the current selected text is a link.
*/
val isLink: Boolean get() = currentRichSpanStyle::class == RichSpanStyle.Link::class

/**
* Returns the selected link text.
*/
val selectedLinkText: String? get() =
if (isLink)
getRichSpanByTextIndex(textIndex = selection.min - 1)?.text
else
null

/**
* Returns the selected link URL.
*/
val selectedLinkUrl: String? get() = (currentRichSpanStyle as? RichSpanStyle.Link)?.url

@Deprecated(
message = "Use isCodeSpan instead",
replaceWith = ReplaceWith("isCodeSpan"),
level = DeprecationLevel.ERROR,
)
val isCode: Boolean get() = isCodeSpan

/**
* Returns whether the current selected text is a code span.
*/
val isCodeSpan: Boolean get() = isRichSpan<RichSpanStyle.Code>()

private var toAddSpanStyle: SpanStyle by mutableStateOf(SpanStyle())
private var toRemoveSpanStyle: SpanStyle by mutableStateOf(SpanStyle())

private var toAddRichSpanStyle: RichSpanStyle by mutableStateOf(RichSpanStyle.Default)
private var toRemoveRichSpanStyle: RichSpanStyle by mutableStateOf(RichSpanStyle.Default)
private var toAddRichSpanStyle: RichSpanStyle = RichSpanStyle.Default
private var toRemoveRichSpanStyle: KClass<out RichSpanStyle> = RichSpanStyle.Default::class

@Deprecated(
message = "Use isRichSpan with T or KClass instead",
Expand All @@ -114,7 +134,7 @@ class RichTextState internal constructor(
fun isRichSpan(kClass: KClass<out RichSpanStyle>): Boolean {
return (currentRichSpanStyle::class == kClass ||
toAddRichSpanStyle::class == kClass) &&
toRemoveRichSpanStyle::class != kClass
toRemoveRichSpanStyle != kClass
}

/**
Expand Down Expand Up @@ -249,6 +269,10 @@ class RichTextState internal constructor(
applyRichSpanStyleToSelectedText()
}

/**
* Add a link to the text field.
* The link is going to be added after the current selection.
*/
fun addLink(
text: String,
url: String,
Expand Down Expand Up @@ -281,6 +305,9 @@ class RichTextState internal constructor(
)
}

/**
* Add a link to the selected text.
*/
fun addLinkToSelection(
url: String,
) {
Expand All @@ -291,13 +318,51 @@ class RichTextState internal constructor(
)

toAddRichSpanStyle = linkStyle
toRemoveRichSpanStyle = RichSpanStyle.Default
toRemoveRichSpanStyle = RichSpanStyle.Default::class

addRichSpan(
spanStyle = linkStyle
)
}

/**
* Update the link of the selected text.
*/
fun updateLink(
url: String,
) {
if (!isLink) return

val linkStyle = RichSpanStyle.Link(
url = url,
)

val richSpan = getSelectedLinkRichSpan() ?: return

richSpan.style = linkStyle

updateTextFieldValue(textFieldValue)
}

/**
* Remove the link from the selected text.
*/
fun removeLink() {
if (!isLink) return

val richSpan = getSelectedLinkRichSpan() ?: return

richSpan.style = RichSpanStyle.Default

updateTextFieldValue(textFieldValue)
}

private fun getSelectedLinkRichSpan(): RichSpan? {
val richSpan = getRichSpanByTextIndex(selection.min - 1)

return getLinkRichSpan(richSpan)
}

@Deprecated(
message = "Use toggleCodeSpan instead",
replaceWith = ReplaceWith("toggleCodeSpan()"),
Expand Down Expand Up @@ -336,7 +401,7 @@ class RichTextState internal constructor(

fun addRichSpan(spanStyle: RichSpanStyle) {
if (toRemoveRichSpanStyle::class == spanStyle)
toRemoveRichSpanStyle = RichSpanStyle.Default
toRemoveRichSpanStyle = RichSpanStyle.Default::class
toAddRichSpanStyle = spanStyle

if (!selection.collapsed)
Expand All @@ -346,7 +411,7 @@ class RichTextState internal constructor(
fun removeRichSpan(spanStyle: RichSpanStyle) {
if (toAddRichSpanStyle::class == spanStyle::class)
toAddRichSpanStyle = RichSpanStyle.Default
toRemoveRichSpanStyle = spanStyle
toRemoveRichSpanStyle = spanStyle::class

if (!selection.collapsed)
applyRichSpanStyleToSelectedText()
Expand Down Expand Up @@ -640,7 +705,7 @@ class RichTextState internal constructor(
toAddSpanStyle = SpanStyle()
toRemoveSpanStyle = SpanStyle()
toAddRichSpanStyle = RichSpanStyle.Default
toRemoveRichSpanStyle = RichSpanStyle.Default
toRemoveRichSpanStyle = RichSpanStyle.Default::class

// Update current span style
updateCurrentSpanStyle()
Expand Down Expand Up @@ -1170,11 +1235,22 @@ class RichTextState internal constructor(
* Handles adding or removing the style in [toAddSpanStyle] and [toRemoveSpanStyle] from the selected text.
*/
private fun applyRichSpanStyleToSelectedText() {
applyRichSpanStyleToTextRange(selection)
}

/**
* Handles adding or removing the style in [toAddSpanStyle] and [toRemoveSpanStyle] from a given [TextRange].
*
* @param textRange The [TextRange] to apply the styles to.
*/
private fun applyRichSpanStyleToTextRange(
textRange: TextRange
) {
// Get the rich span list of the selected text
val selectedRichSpanList = getRichSpanListByTextRange(selection)
val selectedRichSpanList = getRichSpanListByTextRange(textRange)

val startSelectionIndex = selection.min
val endSelectionIndex = selection.max
val startSelectionIndex = textRange.min
val endSelectionIndex = textRange.max

// Loop through the rich span list
for (i in selectedRichSpanList.lastIndex downTo 0) {
Expand Down Expand Up @@ -1252,7 +1328,7 @@ class RichTextState internal constructor(

if (
(toRemoveSpanStyle == SpanStyle() || !richSpanFullSpanStyle.isSpecifiedFieldsEquals(toRemoveSpanStyle)) &&
(toRemoveRichSpanStyle is RichSpanStyle.Default || newRichSpanStyle::class == richSpan.style::class)
(toRemoveRichSpanStyle == RichSpanStyle.Default::class || newRichSpanStyle::class == richSpan.style::class)
) {
applyStyleToRichSpan(
richSpan = richSpan,
Expand Down Expand Up @@ -1933,34 +2009,27 @@ class RichTextState internal constructor(
}

internal fun getLinkByOffset(offset: Offset): String? {
var richSpan = getRichSpanByOffset(offset)
var url: String? = null
val richSpan = getRichSpanByOffset(offset)
val linkRichSpan = getLinkRichSpan(richSpan)

while (richSpan != null) {
val style = richSpan.style
if (style is RichSpanStyle.Link) {
url = style.url
break
}

richSpan = richSpan.parent
}

return url
return (linkRichSpan?.style as? RichSpanStyle.Link)?.url
}

internal fun isLink(offset: Offset): Boolean {
var richSpan = getRichSpanByOffset(offset)
val richSpan = getRichSpanByOffset(offset)
val linkRichSpan = getLinkRichSpan(richSpan)

return linkRichSpan != null
}

while (richSpan != null) {
val style = richSpan.style
if (style is RichSpanStyle.Link)
return true
private fun getLinkRichSpan(initialRichSpan: RichSpan?): RichSpan? {
var richSpan = initialRichSpan

while (richSpan != null && richSpan.style !is RichSpanStyle.Link) {
richSpan = richSpan.parent
}

return false
return richSpan
}

private fun getRichSpanByOffset(offset: Offset): RichSpan? {
Expand Down
4 changes: 0 additions & 4 deletions ...src/commonMain/kotlin/com/mohamedrejeb/richeditor/sample/common/slack/SlackDemoContent.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,6 @@ fun SlackDemoContent() {
}

val openLinkDialog = remember { mutableStateOf(false) }
val text = remember { mutableStateOf("") }
val link = remember { mutableStateOf("") }

LaunchedEffect(Unit) {
richTextState.setConfig(
Expand Down Expand Up @@ -229,8 +227,6 @@ fun SlackDemoContent() {
) {
SlackDemoLinkDialog(
state = richTextState,
text = text,
link = link,
openLinkDialog = openLinkDialog
)
}
Expand Down

0 comments on commit e226fc1

Please sign in to comment.