Merge branch 'main' into @ksienkiewicz/fix-ios-cjk-italics

Author: hejsztynx

.maestro/enrichedInput/flows/preserve_typing_attributes_on_selection_change.yaml

@@ -0,0 +1,34 @@
+appId: swmansion.enriched.example
+---
+# Verifies that typing attributes are properly preserved on selection changes
+- launchApp
+
+- tapOn:
+    id: 'toggle-screen-button'
+
+- tapOn:
+    id: "editor-input"
+
+- tapOn:
+    id: "toolbar-bold"
+
+- inputText: 'bold text'
+- pressKey: Enter
+- pressKey: Enter
+- pressKey: Enter
+- inputText: 'another line'
+
+- doubleTapOn:
+    id: 'editor-input'
+    point: '20%, 75%'
+
+- tapOn:
+    id: 'editor-input'
+    point: '50%, 15%'
+
+- inputText: 'new'
+
+- runFlow:
+    file: '../subflows/capture_or_assert_screenshot.yaml'
+    env:
+      SCREENSHOT_NAME: 'preserve_typing_attributes_on_selection_changes'

.maestro/enrichedInput/screenshots/android/preserve_typing_attributes_on_selection_changes.png

@@ -2000,6 +2000,14 @@ - (bool)textView:(UITextView *)textView
     return NO;
   }
 
+  // To be sure, we re-run typingAttributes management right before the
+  // character actually lands. Sometimes, between a selection change and the
+  // next keystroke, typing attributes might get removed - this seems like a
+  // native TextKit issue.
+  if (textView.markedTextRange == nil && text.length > 0) {
+    [attributesManager repeatRecentTypingAttributesManagement];
+  }
+
   return YES;
 }
 

.maestro/enrichedInput/screenshots/ios/preserve_typing_attributes_on_selection_changes.png

@@ -13,6 +13,7 @@
 - (void)didRemoveTypingAttribute:(NSString *)key;
 - (void)clearRemovedTypingAttributes;
 - (void)manageTypingAttributesWithOnlySelection:(BOOL)onlySelectionChanged;
+- (void)repeatRecentTypingAttributesManagement;
 - (void)handleDirtyRangesStyling;
 - (NSSet<NSString *> *)customAttributesKeys;
 @end

ios/EnrichedTextInputView.mm

@@ -13,13 +13,15 @@ @implementation InputAttributesManager {
   NSMutableArray<NSValue *> *_dirtyRanges;
   NSSet *_customAttributesKeys;
   NSMutableSet *_removedTypingAttributes;
+  BOOL _recentOnlySelectionStatus;
 }
 
 - (instancetype)initWithInput:(EnrichedTextInputView *)input {
   self = [super init];
   _input = input;
   _dirtyRanges = [[NSMutableArray alloc] init];
   _removedTypingAttributes = [[NSMutableSet alloc] init];
+  _recentOnlySelectionStatus = NO;
 
   // setup customAttributes
   NSMutableSet *_customAttrsSet = [[NSMutableSet alloc] init];
@@ -127,6 +129,7 @@ - (void)handleDirtyRangesStyling {
 }
 
 - (void)manageTypingAttributesWithOnlySelection:(BOOL)onlySelectionChanged {
+  _recentOnlySelectionStatus = onlySelectionChanged;
   EnrichedInputTextView *textView = _input->textView;
   NSRange selectedRange = textView.selectedRange;
 
@@ -217,4 +220,8 @@ - (void)manageTypingAttributesWithOnlySelection:(BOOL)onlySelectionChanged {
   textView.typingAttributes = newAttrs;
 }
 
+- (void)repeatRecentTypingAttributesManagement {
+  [self manageTypingAttributesWithOnlySelection:_recentOnlySelectionStatus];
+}
+
 @end

ios/inputAttributesManager/InputAttributesManager.h

@@ -229,19 +229,28 @@ + (NSArray *)getPresentStyleTypesFrom:(NSArray *)types
                               forHost:(id<EnrichedViewHost>)host {
   NSMutableArray<NSNumber *> *resultArray =
       [[NSMutableArray<NSNumber *> alloc] init];
+
+  // There might be a case where the given `range` doesn't have a conflicting
+  // style, but it is present in typing attributes. In that case, run `detect:`
+  // for good measure, since it considers typing attributes (unlike `any:`).
+  NSRange selectedRange = host.textView.selectedRange;
+  BOOL caretWithinRange = range.length >= 1 && selectedRange.length == 0 &&
+                          selectedRange.location >= range.location &&
+                          selectedRange.location <= NSMaxRange(range);
+
   for (NSNumber *type in types) {
     StyleBase *style = host.stylesDict[type];
 
-    if (range.length >= 1) {
-      if ([style any:range]) {
-        [resultArray addObject:type];
-      }
-    } else {
-      if ([style detect:range]) {
-        [resultArray addObject:type];
-      }
+    BOOL present = range.length >= 1 ? [style any:range] : [style detect:range];
+    if (!present && caretWithinRange) {
+      present = [style detect:selectedRange];
+    }
+
+    if (present) {
+      [resultArray addObject:type];
     }
   }
+
   return resultArray;
 }