[Apply ordered and unordered list to all selection, event if selected multiple paragraphos] (Update RichTextState.kt) #257
Conversation
MedvedevaElena
commented
Apr 18, 2024
MedvedevaElena
commented
- made functions toggleUnorderedList and toggleUnorderedList work with multiple paragraphs
- added deprecared annotation to fuctions, that became private, if someone used it (I don't know, if it important)
[Apply ordered and unordered list to all selection, event if selected multiple paragraphos] - made functions toggleUnorderedList and toggleUnorderedList work with multiple paragraphs - added deprecared annotation to fuctions, that became private, if someone used it (I don't know, if it important)
| val paragraph = getRichParagraphByTextIndex(selection.min - 1) ?: return | ||
| if (paragraph.type is OrderedList) removeOrderedList() | ||
| else addOrderedList() | ||
| val firstParagraph = getRichParagraphByTextIndex(selection.min - 1) ?: return |
There was a problem hiding this comment.
Why you are getting the first paragraph here, the paragraph list should be enough.
And if the list if empty, you can return
There was a problem hiding this comment.
Thank you for the tip!
When I tested the new version, I've found out, that when I tap on text only, without any selection, list styles doesn't applied to current paragraph. It occures because getRichParagraphListByTextRange() returns empty list. So, I've edited getRichParagraphListByTextRange() for this case.
If it's not good for the main concept, I can create separate function
There was a problem hiding this comment.
Yes, it's fine now. The getRichParagraphListByTextRange method should return data even if the selection is collapsed.
| val firstParagraph = getRichParagraphByTextIndex(selection.min - 1) ?: return | ||
| val paragraphs = getRichParagraphListByTextRange(selection).toMutableList() | ||
| if (paragraphs.isEmpty()) { | ||
| paragraphs.add(firstParagraph) |
| fun addOrderedList() { | ||
| val paragraph = getRichParagraphByTextIndex(selection.min - 1) ?: return | ||
| addOrderedList(paragraph) |
There was a problem hiding this comment.
Same as above, this shouldn't be deprecated.
| fun removeOrderedList() { | ||
| val paragraph = getRichParagraphByTextIndex(selection.min - 1) ?: return | ||
| removeOrderedList(paragraph) |
There was a problem hiding this comment.
Same as above, this shouldn't be deprecated.
| val paragraph = getRichParagraphByTextIndex(selection.min - 1) ?: return | ||
| if (paragraph.type is UnorderedList) removeUnorderedList() | ||
| else addUnorderedList() | ||
| val firstParagraph = getRichParagraphByTextIndex(selection.min - 1) ?: return |
There was a problem hiding this comment.
Why you are getting the first paragraph here, the paragraph list should be enough.
And if the list if empty, you can return
There was a problem hiding this comment.
As with Ordered List, changed
| val firstParagraph = getRichParagraphByTextIndex(selection.min - 1) ?: return | ||
| val paragraphs = getRichParagraphListByTextRange(selection).toMutableList() | ||
| if (paragraphs.isEmpty()) { | ||
| paragraphs.add(firstParagraph) |
| fun addUnorderedList() { | ||
| val paragraph = getRichParagraphByTextIndex(selection.min - 1) ?: return | ||
| addUnorderedList(paragraph) |
There was a problem hiding this comment.
I think this shouldn't be deprecated, but it can work the same as toggle.
- Get the list of the selected paragraphs.
- call addUnorderedList on each paragraph.
| fun removeUnorderedList() { | ||
| val paragraph = getRichParagraphByTextIndex(selection.min - 1) ?: return | ||
| removeUnorderedList(paragraph) |
There was a problem hiding this comment.
Same as above, this shouldn't be deprecated.
[Apply ordered and unordered list to all selection, event if selected multiple paragraphos] - removed @deprecated attributes - made simplier toggleOrderedList & toggleUnorderedList - made getRichParagraphListByTextRange to return not empty list even when selection collapsed
