From 5eb8b20643168ebac45c8f20ca156c6f6ab2ca32 Mon Sep 17 00:00:00 2001 From: cp-megh Date: Wed, 14 Feb 2024 12:51:01 +0530 Subject: [PATCH] Fix bullet item selection crash --- .../com/canopas/editor/ui/data/QuillTextManager.kt | 14 +++----------- .../canopas/editor/ui/utils/ElementsSpanStyle.kt | 2 +- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/editor/src/main/java/com/canopas/editor/ui/data/QuillTextManager.kt b/editor/src/main/java/com/canopas/editor/ui/data/QuillTextManager.kt index b013faa..941df6c 100644 --- a/editor/src/main/java/com/canopas/editor/ui/data/QuillTextManager.kt +++ b/editor/src/main/java/com/canopas/editor/ui/data/QuillTextManager.kt @@ -178,18 +178,10 @@ class QuillTextManager(quillSpan: QuillSpan) { ) } - if (currentSpan != null) { - if ( - currentSpan.style.contains(TextSpanStyle.BulletStyle) && - editable[selection.min - 1] == '\n' && - editable[selection.min - 2] != '\n' - ) { + if (currentSpan != null && this.selection.collapsed) { + if (editable[selection.min - 1] == '\n' && editable[selection.min - 2] != '\n') { addStyle(TextSpanStyle.BulletStyle) - } else if ( - currentSpan.style.contains(TextSpanStyle.BulletStyle) && - editable[selection.min - 1] == '\n' && - editable[selection.min - 2] == '\n' - ) { + } else if (editable[selection.min - 1] == '\n' && editable[selection.min - 2] == '\n') { removeStyle(TextSpanStyle.BulletStyle) } else { this.currentStyles.addAll(currentStyles) diff --git a/editor/src/main/java/com/canopas/editor/ui/utils/ElementsSpanStyle.kt b/editor/src/main/java/com/canopas/editor/ui/utils/ElementsSpanStyle.kt index f262599..3517f31 100644 --- a/editor/src/main/java/com/canopas/editor/ui/utils/ElementsSpanStyle.kt +++ b/editor/src/main/java/com/canopas/editor/ui/utils/ElementsSpanStyle.kt @@ -99,7 +99,7 @@ sealed interface TextSpanStyle { object H2Style : TextSpanStyle { override val key: String - get() = "h3" + get() = "h2" override val style: Any get() = RelativeSizeSpan(1.4f)