@@ -26,8 +26,8 @@ @implementation ReactNativeRichTextEditorView {
2626 ReactNativeRichTextEditorViewShadowNode::ConcreteState::Shared _state;
2727 int _componentViewHeightUpdateCounter;
2828 NSMutableSet <NSNumber *> *_activeStyles;
29- NSMutableDictionary <NSNumber *, NSArray <NSNumber *> *> *_conflictingStyles;
30- NSMutableDictionary <NSNumber *, NSArray <NSNumber *> *> *_blockingStyles;
29+ NSDictionary <NSNumber *, NSArray <NSNumber *> *> *_conflictingStyles;
30+ NSDictionary <NSNumber *, NSArray <NSNumber *> *> *_blockingStyles;
3131 LinkData *_recentlyActiveLinkData;
3232 NSRange _recentlyActiveLinkRange;
3333 NSRange _recentlyChangedRange;
@@ -99,7 +99,7 @@ - (void)setDefaults {
9999 @([BlockQuoteStyle getStyleType ]): [[BlockQuoteStyle alloc ] initWithEditor: self ]
100100 };
101101
102- _conflictingStyles = [ @{
102+ _conflictingStyles = @{
103103 @([BoldStyle getStyleType ]) : @[],
104104 @([ItalicStyle getStyleType ]) : @[],
105105 @([UnderlineStyle getStyleType ]) : @[],
@@ -113,9 +113,9 @@ - (void)setDefaults {
113113 @([UnorderedListStyle getStyleType ]): @[@([H1Style getStyleType ]), @([H2Style getStyleType ]), @([H3Style getStyleType ]), @([OrderedListStyle getStyleType ]), @([BlockQuoteStyle getStyleType ])],
114114 @([OrderedListStyle getStyleType ]): @[@([H1Style getStyleType ]), @([H2Style getStyleType ]), @([H3Style getStyleType ]), @([UnorderedListStyle getStyleType ]), @([BlockQuoteStyle getStyleType ])],
115115 @([BlockQuoteStyle getStyleType ]): @[@([H1Style getStyleType ]), @([H2Style getStyleType ]), @([H3Style getStyleType ]), @([UnorderedListStyle getStyleType ]), @([OrderedListStyle getStyleType ])]
116- } mutableCopy] ;
116+ };
117117
118- _blockingStyles = [ @{
118+ _blockingStyles = @{
119119 @([BoldStyle getStyleType ]) : @[],
120120 @([ItalicStyle getStyleType ]) : @[],
121121 @([UnderlineStyle getStyleType ]) : @[],
@@ -129,7 +129,7 @@ - (void)setDefaults {
129129 @([UnorderedListStyle getStyleType ]): @[],
130130 @([OrderedListStyle getStyleType ]): @[],
131131 @([BlockQuoteStyle getStyleType ]): @[],
132- } mutableCopy] ;
132+ };
133133
134134 parser = [[EditorParser alloc ] initWithEditor: self ];
135135}
@@ -305,23 +305,9 @@ - (void)updateProps:(Props::Shared const &)props oldProps:(Props::Shared const &
305305 NSString *objcString = [NSString fromCppString: newViewProps.richTextStyle.a.textDecorationLine];
306306 if ([objcString isEqualToString: DecorationUnderline]) {
307307 [newConfig setLinkDecorationLine: DecorationUnderline];
308-
309- // underline is being blocked by links now
310- NSMutableArray *blocking = [_blockingStyles[@([UnderlineStyle getStyleType ])] mutableCopy ];
311- if (![blocking containsObject: @([LinkStyle getStyleType ])]) {
312- [blocking addObject: @([LinkStyle getStyleType ])];
313- }
314- _blockingStyles[@([UnderlineStyle getStyleType ])] = blocking;
315308 } else {
316309 // both DecorationNone and a different, wrong value gets a DecorationNone here
317310 [newConfig setLinkDecorationLine: DecorationNone];
318-
319- // underline is not being blocked by links anymore
320- NSMutableArray *blocking = [_blockingStyles[@([UnderlineStyle getStyleType ])] mutableCopy ];
321- if ([blocking containsObject: @([LinkStyle getStyleType ])]) {
322- [blocking removeObject: @([LinkStyle getStyleType ])];
323- }
324- _blockingStyles[@([UnderlineStyle getStyleType ])] = blocking;
325311 }
326312 stylePropChanged = YES ;
327313 }
0 commit comments