refactor: extract priorityStyling sorting logic

Author: hejsztynx

ios/inputAttributesManager/InputAttributesManager.mm

@@ -5,6 +5,7 @@
 #import "ParagraphAttributesUtils.h"
 #import "RangeUtils.h"
 #import "StyleHeaders.h"
+#import "StyleUtils.h"
 #import "ZeroWidthSpaceUtils.h"
 
 @implementation InputAttributesManager {
@@ -99,17 +100,11 @@ - (void)handleDirtyRangesStyling {
     // attributes (e.g. foreground color, font) are laid down before inline
     // styles override them on their specific sub-ranges. Inline styles among
     // themselves follow their stylePriority.
-    NSArray *sortedStyleTypes = [presentStyles.allKeys
-        sortedArrayWithOptions:NSSortStable
-               usingComparator:^NSComparisonResult(NSNumber *a, NSNumber *b) {
-                 NSInteger aOrder = [_input->stylesDict[a] stylePriority];
-                 NSInteger bOrder = [_input->stylesDict[b] stylePriority];
-                 if (aOrder == bOrder) {
-                   return [a compare:b];
-                 }
-                 return aOrder < bOrder ? NSOrderedAscending
-                                        : NSOrderedDescending;
-               }];
+    NSArray *sortedStyleTypes =
+        [StyleUtils sortedArray:presentStyles.allKeys
+                      bySortKey:^NSInteger(NSNumber *styleType) {
+                        return [_input->stylesDict[styleType] stylePriority];
+                      }];
 
     // re-apply meta-attributes and apply visual styling following the saved
     // occurences.

ios/textHtmlParser/TextHtmlParser.mm

@@ -154,16 +154,11 @@ - (void)applyProcessedStyles:(NSArray *_Nonnull)processedStyles {
   }
 
   // Respect the styling priority
-  NSArray *sortedInlineApply = [pendingInlineApply
-      sortedArrayWithOptions:NSSortStable
-             usingComparator:^NSComparisonResult(NSArray *a, NSArray *b) {
-               NSInteger aPriority = [((StyleBase *)a[0]) stylePriority];
-               NSInteger bPriority = [((StyleBase *)b[0]) stylePriority];
-               if (aPriority == bPriority)
-                 return NSOrderedSame;
-               return aPriority < bPriority ? NSOrderedAscending
-                                            : NSOrderedDescending;
-             }];
+  NSArray *sortedInlineApply =
+      [StyleUtils sortedArray:pendingInlineApply
+                    bySortKey:^NSInteger(NSArray *entry) {
+                      return [((StyleBase *)entry[0]) stylePriority];
+                    }];
 
   // Apply visual styling for inline styles
   for (NSArray *entry in sortedInlineApply) {

ios/utils/StyleUtils.h

@@ -30,4 +30,7 @@
 + (void)removeStyleConflict:(StyleType)conflicting
                        from:(StyleType)conflicted
                     forHost:(id<EnrichedViewHost>)host;
+
++ (NSArray *)sortedArray:(NSArray *)array
+               bySortKey:(NSInteger (^)(id item))sortKeyForItem;
 @end

ios/utils/StyleUtils.mm

@@ -287,4 +287,18 @@ + (void)removeStyleConflict:(StyleType)conflicting
   }
 }
 
++ (NSArray *)sortedArray:(NSArray *)array
+               bySortKey:(NSInteger (^)(id item))sortKeyForItem {
+  return [array sortedArrayWithOptions:NSSortStable
+                       usingComparator:^NSComparisonResult(id a, id b) {
+                         NSInteger aKey = sortKeyForItem(a);
+                         NSInteger bKey = sortKeyForItem(b);
+                         if (aKey == bKey) {
+                           return NSOrderedSame;
+                         }
+                         return aKey < bKey ? NSOrderedAscending
+                                            : NSOrderedDescending;
+                       }];
+}
+
 @end