Skip to content

Commit e3ba4fc

Browse files
authored
android - adjust combining styles logic (#111)
1 parent 30de5e8 commit e3ba4fc

1 file changed

Lines changed: 5 additions & 5 deletions

File tree

  • android/src/main/java/com/swmansion/reactnativerichtexteditor/spans

android/src/main/java/com/swmansion/reactnativerichtexteditor/spans/EditorSpans.kt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -76,20 +76,20 @@ object EditorSpans {
7676
blockingStyles = arrayOf(CODE_BLOCK)
7777
),
7878
INLINE_CODE to StylesMergingConfig(
79-
conflictingStyles = arrayOf(H1, H2, H3, MENTION, LINK),
79+
conflictingStyles = arrayOf(MENTION, LINK),
8080
blockingStyles = arrayOf(CODE_BLOCK)
8181
),
8282
H1 to StylesMergingConfig(
83-
conflictingStyles = arrayOf(H2, H3, INLINE_CODE, ORDERED_LIST, UNORDERED_LIST, BLOCK_QUOTE, CODE_BLOCK),
83+
conflictingStyles = arrayOf(H2, H3, ORDERED_LIST, UNORDERED_LIST, BLOCK_QUOTE, CODE_BLOCK),
8484
),
8585
H2 to StylesMergingConfig(
86-
conflictingStyles = arrayOf(H1, H3, INLINE_CODE, ORDERED_LIST, UNORDERED_LIST, BLOCK_QUOTE, CODE_BLOCK),
86+
conflictingStyles = arrayOf(H1, H3, ORDERED_LIST, UNORDERED_LIST, BLOCK_QUOTE, CODE_BLOCK),
8787
),
8888
H3 to StylesMergingConfig(
89-
conflictingStyles = arrayOf(H1, H2, INLINE_CODE, ORDERED_LIST, UNORDERED_LIST, BLOCK_QUOTE, CODE_BLOCK),
89+
conflictingStyles = arrayOf(H1, H2, ORDERED_LIST, UNORDERED_LIST, BLOCK_QUOTE, CODE_BLOCK),
9090
),
9191
BLOCK_QUOTE to StylesMergingConfig(
92-
conflictingStyles = arrayOf(H1, H2, H3, CODE_BLOCK),
92+
conflictingStyles = arrayOf(H1, H2, H3, CODE_BLOCK, ORDERED_LIST, UNORDERED_LIST),
9393
),
9494
CODE_BLOCK to StylesMergingConfig(
9595
conflictingStyles = arrayOf(H1, H2, H3, BOLD, ITALIC, UNDERLINE, STRIKETHROUGH, UNORDERED_LIST, ORDERED_LIST, BLOCK_QUOTE, INLINE_CODE),

0 commit comments

Comments
 (0)