react-native-enriched 0.2.0 → 0.3.0

package/ios/config/InputConfig.h

@@ -1,10 +1,11 @@
 #pragma once
-#import <UIKit/UIKit.h>
-#import "TextDecorationLineEnum.h"
+#import "LinkRegexConfig.h"
 #import "MentionStyleProps.h"
+#import "TextDecorationLineEnum.h"
+#import <UIKit/UIKit.h>
 
-@interface InputConfig: NSObject<NSCopying>
-- (instancetype) init;
+@interface InputConfig : NSObject <NSCopying>
+- (instancetype)init;
 - (UIColor *)primaryColor;
 - (void)setPrimaryColor:(UIColor *)newValue;
 - (NSNumber *)primaryFontSize;
@@ -15,8 +16,8 @@
 - (void)setPrimaryFontFamily:(NSString *)newValue;
 - (UIFont *)primaryFont;
 - (UIFont *)monospacedFont;
-- (NSSet<NSNumber*>*)mentionIndicators;
-- (void)setMentionIndicators:(NSSet<NSNumber*>*)newValue;
+- (NSSet<NSNumber *> *)mentionIndicators;
+- (void)setMentionIndicators:(NSSet<NSNumber *> *)newValue;
 - (CGFloat)h1FontSize;
 - (void)setH1FontSize:(CGFloat)newValue;
 - (BOOL)h1Bold;
@@ -29,6 +30,18 @@
 - (void)setH3FontSize:(CGFloat)newValue;
 - (BOOL)h3Bold;
 - (void)setH3Bold:(BOOL)newValue;
+- (CGFloat)h4FontSize;
+- (void)setH4FontSize:(CGFloat)newValue;
+- (BOOL)h4Bold;
+- (void)setH4Bold:(BOOL)newValue;
+- (CGFloat)h5FontSize;
+- (void)setH5FontSize:(CGFloat)newValue;
+- (BOOL)h5Bold;
+- (void)setH5Bold:(BOOL)newValue;
+- (CGFloat)h6FontSize;
+- (void)setH6FontSize:(CGFloat)newValue;
+- (BOOL)h6Bold;
+- (void)setH6Bold:(BOOL)newValue;
 - (UIColor *)blockquoteBorderColor;
 - (void)setBlockquoteBorderColor:(UIColor *)newValue;
 - (CGFloat)blockquoteBorderWidth;
@@ -70,4 +83,9 @@
 - (void)setCodeBlockBgColor:(UIColor *)newValue;
 - (CGFloat)codeBlockBorderRadius;
 - (void)setCodeBlockBorderRadius:(CGFloat)newValue;
+- (LinkRegexConfig *)linkRegexConfig;
+- (void)setLinkRegexConfig:(LinkRegexConfig *)newValue;
+- (NSRegularExpression *)parsedLinkRegex;
+- (void)invalidateFonts;
+- (NSNumber *)scaledPrimaryFontSize;
 @end

package/ios/config/InputConfig.mm

@@ -10,13 +10,19 @@
   UIFont *_monospacedFont;
   BOOL _primaryFontNeedsRecreation;
   BOOL _monospacedFontNeedsRecreation;
-  NSSet<NSNumber*> *_mentionIndicators;
+  NSSet<NSNumber *> *_mentionIndicators;
   CGFloat _h1FontSize;
   BOOL _h1Bold;
   CGFloat _h2FontSize;
   BOOL _h2Bold;
   CGFloat _h3FontSize;
   BOOL _h3Bold;
+  CGFloat _h4FontSize;
+  BOOL _h4Bold;
+  CGFloat _h5FontSize;
+  BOOL _h5Bold;
+  CGFloat _h6FontSize;
+  BOOL _h6Bold;
   UIColor *_blockquoteBorderColor;
   CGFloat _blockquoteBorderWidth;
   CGFloat _blockquoteGapWidth;
@@ -39,11 +45,11 @@
   UIColor *_codeBlockFgColor;
   CGFloat _codeBlockBorderRadius;
   UIColor *_codeBlockBgColor;
-  CGFloat _imageWidth;
-  CGFloat _imageHeight;
+  LinkRegexConfig *_linkRegexConfig;
+  NSRegularExpression *_parsedLinkRegex;
 }
 
-- (instancetype) init {
+- (instancetype)init {
   self = [super init];
   _primaryFontNeedsRecreation = YES;
   _monospacedFontNeedsRecreation = YES;
@@ -66,6 +72,12 @@
   copy->_h2Bold = _h2Bold;
   copy->_h3FontSize = _h3FontSize;
   copy->_h3Bold = _h3Bold;
+  copy->_h4FontSize = _h4FontSize;
+  copy->_h4Bold = _h4Bold;
+  copy->_h5FontSize = _h5FontSize;
+  copy->_h5Bold = _h5Bold;
+  copy->_h6FontSize = _h6FontSize;
+  copy->_h6Bold = _h6Bold;
   copy->_blockquoteBorderColor = [_blockquoteBorderColor copy];
   copy->_blockquoteBorderWidth = _blockquoteBorderWidth;
   copy->_blockquoteGapWidth = _blockquoteGapWidth;
@@ -87,6 +99,8 @@
   copy->_codeBlockFgColor = [_codeBlockFgColor copy];
   copy->_codeBlockBgColor = [_codeBlockBgColor copy];
   copy->_codeBlockBorderRadius = _codeBlockBorderRadius;
+  copy->_linkRegexConfig = [_linkRegexConfig copy];
+  copy->_parsedLinkRegex = [_parsedLinkRegex copy];
   return copy;
 }
 
@@ -110,7 +124,9 @@
 }
 
 - (NSString *)primaryFontWeight {
-  return _primaryFontWeight != nullptr ? _primaryFontWeight : [NSString stringWithFormat:@"%@", @(UIFontWeightRegular)];
+  return _primaryFontWeight != nullptr
+             ? _primaryFontWeight
+             : [NSString stringWithFormat:@"%@", @(UIFontWeightRegular)];
 }
 
 - (void)setPrimaryFontWeight:(NSString *)newValue {
@@ -130,46 +146,50 @@
 }
 
 - (UIFont *)primaryFont {
-  if(_primaryFontNeedsRecreation) {
+  if (_primaryFontNeedsRecreation) {
     _primaryFontNeedsRecreation = NO;
-    
+
     NSString *newFontWeight = [self primaryFontWeight];
     // fix RCTFontWeight conversion warnings:
     // sometimes changing font family comes with weight '0' if not specified
-    // RCTConvert doesn't recognize this value so we just nullify it and it gets a default value
-    if([newFontWeight isEqualToString:@"0"]) {
+    // RCTConvert doesn't recognize this value so we just nullify it and it gets
+    // a default value
+    if ([newFontWeight isEqualToString:@"0"]) {
       newFontWeight = nullptr;
     }
-    
+
     _primaryFont = [RCTFont updateFont:nullptr
-      withFamily:[self primaryFontFamily]
-      size:[self primaryFontSize]
-      weight:newFontWeight
-      style:nullptr
-      variant:nullptr
-      scaleMultiplier: 1];
+                            withFamily:[self primaryFontFamily]
+                                  size:[self scaledPrimaryFontSize]
+                                weight:newFontWeight
+                                 style:nullptr
+                               variant:nullptr
+                       scaleMultiplier:1];
   }
   return _primaryFont;
 }
 
 - (UIFont *)monospacedFont {
-  if(_monospacedFontNeedsRecreation) {
+  if (_monospacedFontNeedsRecreation) {
     _monospacedFontNeedsRecreation = NO;
-    _monospacedFont = [UIFont monospacedSystemFontOfSize: [[self primaryFontSize] floatValue]  weight: [[self primaryFontWeight] floatValue]];
+    _monospacedFont = [UIFont
+        monospacedSystemFontOfSize:[[self scaledPrimaryFontSize] floatValue]
+                            weight:[[self primaryFontWeight] floatValue]];
   }
   return _monospacedFont;
 }
 
-- (NSSet<NSNumber*>*)mentionIndicators {
-  return _mentionIndicators != nullptr ? _mentionIndicators : [[NSSet alloc] init];
+- (NSSet<NSNumber *> *)mentionIndicators {
+  return _mentionIndicators != nullptr ? _mentionIndicators
+                                       : [[NSSet alloc] init];
 }
 
-- (void)setMentionIndicators:(NSSet<NSNumber*>*)newValue {
+- (void)setMentionIndicators:(NSSet<NSNumber *> *)newValue {
   _mentionIndicators = newValue;
 }
 
 - (CGFloat)h1FontSize {
-  return _h1FontSize;
+  return [[UIFontMetrics defaultMetrics] scaledValueForValue:_h1FontSize];
 }
 
 - (void)setH1FontSize:(CGFloat)newValue {
@@ -185,7 +205,7 @@
 }
 
 - (CGFloat)h2FontSize {
-  return _h2FontSize;
+  return [[UIFontMetrics defaultMetrics] scaledValueForValue:_h2FontSize];
 }
 
 - (void)setH2FontSize:(CGFloat)newValue {
@@ -201,7 +221,7 @@
 }
 
 - (CGFloat)h3FontSize {
-  return _h3FontSize;
+  return [[UIFontMetrics defaultMetrics] scaledValueForValue:_h3FontSize];
 }
 
 - (void)setH3FontSize:(CGFloat)newValue {
@@ -216,6 +236,54 @@
   _h3Bold = newValue;
 }
 
+- (CGFloat)h4FontSize {
+  return [[UIFontMetrics defaultMetrics] scaledValueForValue:_h4FontSize];
+}
+
+- (void)setH4FontSize:(CGFloat)newValue {
+  _h4FontSize = newValue;
+}
+
+- (BOOL)h4Bold {
+  return _h4Bold;
+}
+
+- (void)setH4Bold:(BOOL)newValue {
+  _h4Bold = newValue;
+}
+
+- (CGFloat)h5FontSize {
+  return [[UIFontMetrics defaultMetrics] scaledValueForValue:_h5FontSize];
+}
+
+- (void)setH5FontSize:(CGFloat)newValue {
+  _h5FontSize = newValue;
+}
+
+- (BOOL)h5Bold {
+  return _h5Bold;
+}
+
+- (void)setH5Bold:(BOOL)newValue {
+  _h5Bold = newValue;
+}
+
+- (CGFloat)h6FontSize {
+  return [[UIFontMetrics defaultMetrics] scaledValueForValue:_h6FontSize];
+}
+
+- (void)setH6FontSize:(CGFloat)newValue {
+  _h6FontSize = newValue;
+}
+
+- (BOOL)h6Bold {
+  return _h6Bold;
+}
+
+- (void)setH6Bold:(BOOL)newValue {
+  _h6Bold = newValue;
+}
+
 - (UIColor *)blockquoteBorderColor {
   return _blockquoteBorderColor;
 }
@@ -232,7 +300,6 @@
   _blockquoteBorderWidth = newValue;
 }
 
-
 - (CGFloat)blockquoteGapWidth {
   return _blockquoteGapWidth;
 }
@@ -299,24 +366,25 @@
 }
 
 - (UIFont *)orderedListMarkerFont {
-  if(_olMarkerFontNeedsRecreation) {
+  if (_olMarkerFontNeedsRecreation) {
     _olMarkerFontNeedsRecreation = NO;
-    
+
     NSString *newFontWeight = [self orderedListMarkerFontWeight];
     // fix RCTFontWeight conversion warnings:
     // sometimes changing font family comes with weight '0' if not specified
-    // RCTConvert doesn't recognize this value so we just nullify it and it gets a default value
-    if([newFontWeight isEqualToString:@"0"]) {
+    // RCTConvert doesn't recognize this value so we just nullify it and it gets
+    // a default value
+    if ([newFontWeight isEqualToString:@"0"]) {
       newFontWeight = nullptr;
     }
-    
+
     _orderedListMarkerFont = [RCTFont updateFont:nullptr
-      withFamily:[self primaryFontFamily]
-      size:[self primaryFontSize]
-      weight:newFontWeight
-      style:nullptr
-      variant:nullptr
-      scaleMultiplier: 1];
+                                      withFamily:[self primaryFontFamily]
+                                            size:[self scaledPrimaryFontSize]
+                                          weight:newFontWeight
+                                           style:nullptr
+                                         variant:nullptr
+                                 scaleMultiplier:1];
   }
   return _orderedListMarkerFont;
 }
@@ -374,10 +442,10 @@
 }
 
 - (MentionStyleProps *)mentionStylePropsForIndicator:(NSString *)indicator {
-  if(_mentionProperties.count == 1 && _mentionProperties[@"all"] != nullptr) {
+  if (_mentionProperties.count == 1 && _mentionProperties[@"all"] != nullptr) {
     // single props for all the indicators
     return _mentionProperties[@"all"];
-  } else if(_mentionProperties[indicator] != nullptr) {
+  } else if (_mentionProperties[indicator] != nullptr) {
     return _mentionProperties[indicator];
   }
   MentionStyleProps *fallbackProps = [[MentionStyleProps alloc] init];
@@ -411,4 +479,52 @@
   _codeBlockBorderRadius = newValue;
 }
 
+- (LinkRegexConfig *)linkRegexConfig {
+  return _linkRegexConfig;
+}
+
+- (void)setLinkRegexConfig:(LinkRegexConfig *)newValue {
+  _linkRegexConfig = newValue;
+
+  // try initializing the native regular expression if it applies
+  if (_linkRegexConfig.isDefault || _linkRegexConfig.isDisabled) {
+    return;
+  }
+
+  NSError *regexInitError;
+  NSRegularExpressionOptions options =
+      (_linkRegexConfig.caseInsensitive ? NSRegularExpressionCaseInsensitive
+                                        : 0) |
+      (_linkRegexConfig.dotAll ? NSRegularExpressionDotMatchesLineSeparators
+                               : 0);
+  NSRegularExpression *userRegex =
+      [NSRegularExpression regularExpressionWithPattern:_linkRegexConfig.pattern
+                                                options:options
+                                                  error:&regexInitError];
+
+  if (regexInitError) {
+    RCTLogWarn(@"[EnrichedTextInput]: Couldn't parse the user-defined link "
+               @"regex, falling back to a default regex.");
+    _parsedLinkRegex = nullptr;
+  } else {
+    _parsedLinkRegex = userRegex;
+  }
+}
+
+- (NSRegularExpression *)parsedLinkRegex {
+  return _parsedLinkRegex;
+}
+
+- (void)invalidateFonts {
+  _primaryFontNeedsRecreation = YES;
+  _monospacedFontNeedsRecreation = YES;
+  _olMarkerFontNeedsRecreation = YES;
+}
+
+- (NSNumber *)scaledPrimaryFontSize {
+  CGFloat scaledSize = [[UIFontMetrics defaultMetrics]
+      scaledValueForValue:[[self primaryFontSize] floatValue]];
+  return @(scaledSize);
+}
+
 @end

package/ios/{utils → extensions}/ColorExtension.mm

@@ -4,11 +4,13 @@
 - (BOOL)isEqualToColor:(UIColor *)otherColor {
   CGColorSpaceRef colorSpaceRGB = CGColorSpaceCreateDeviceRGB();
 
-  UIColor *(^convertColorToRGBSpace)(UIColor*) = ^(UIColor *color) {
-    if(CGColorSpaceGetModel(CGColorGetColorSpace(color.CGColor)) == kCGColorSpaceModelMonochrome) {
+  UIColor * (^convertColorToRGBSpace)(UIColor *) = ^(UIColor *color) {
+    if (CGColorSpaceGetModel(CGColorGetColorSpace(color.CGColor)) ==
+        kCGColorSpaceModelMonochrome) {
       const CGFloat *oldComponents = CGColorGetComponents(color.CGColor);
-      CGFloat components[4] = {oldComponents[0], oldComponents[0], oldComponents[0], oldComponents[1]};
-      CGColorRef colorRef = CGColorCreate( colorSpaceRGB, components );
+      CGFloat components[4] = {oldComponents[0], oldComponents[0],
+                               oldComponents[0], oldComponents[1]};
+      CGColorRef colorRef = CGColorCreate(colorSpaceRGB, components);
 
       UIColor *color = [UIColor colorWithCGColor:colorRef];
       CGColorRelease(colorRef);
@@ -29,7 +31,7 @@
   CGFloat alpha = 0.0;
   [self getRed:nil green:nil blue:nil alpha:&alpha];
   if (alpha > 0.0) {
-      return [self colorWithAlphaComponent:newAlpha];
+    return [self colorWithAlphaComponent:newAlpha];
   }
   return self;
 }

package/ios/extensions/FontExtension.mm

@@ -0,0 +1,106 @@
+#import "FontExtension.h"
+#import <React/RCTLog.h>
+
+@implementation UIFont (FontExtension)
+
+- (BOOL)isBold {
+  return (self.fontDescriptor.symbolicTraits & UIFontDescriptorTraitBold) ==
+         UIFontDescriptorTraitBold;
+}
+
+- (UIFont *)setBold {
+  if ([self isBold]) {
+    return self;
+  }
+  UIFontDescriptorSymbolicTraits newTraits =
+      (self.fontDescriptor.symbolicTraits | UIFontDescriptorTraitBold);
+  UIFontDescriptor *fontDescriptor =
+      [self.fontDescriptor fontDescriptorWithSymbolicTraits:newTraits];
+  if (fontDescriptor != nullptr) {
+    return [UIFont fontWithDescriptor:fontDescriptor size:0];
+  } else {
+    RCTLogWarn(@"[EnrichedTextInput]: Couldn't apply bold trait to the font.");
+    return self;
+  }
+}
+
+- (UIFont *)removeBold {
+  if (![self isBold]) {
+    return self;
+  }
+  UIFontDescriptorSymbolicTraits newTraits =
+      (self.fontDescriptor.symbolicTraits ^ UIFontDescriptorTraitBold);
+  UIFontDescriptor *fontDescriptor =
+      [self.fontDescriptor fontDescriptorWithSymbolicTraits:newTraits];
+  if (fontDescriptor != nullptr) {
+    return [UIFont fontWithDescriptor:fontDescriptor size:0];
+  } else {
+    RCTLogWarn(
+        @"[EnrichedTextInput]: Couldn't remove bold trait from the font.");
+    return self;
+  }
+}
+
+- (BOOL)isItalic {
+  return (self.fontDescriptor.symbolicTraits & UIFontDescriptorTraitItalic) ==
+         UIFontDescriptorTraitItalic;
+}
+
+- (UIFont *)setItalic {
+  if ([self isItalic]) {
+    return self;
+  }
+  UIFontDescriptorSymbolicTraits newTraits =
+      (self.fontDescriptor.symbolicTraits | UIFontDescriptorTraitItalic);
+  UIFontDescriptor *fontDescriptor =
+      [self.fontDescriptor fontDescriptorWithSymbolicTraits:newTraits];
+  if (fontDescriptor != nullptr) {
+    return [UIFont fontWithDescriptor:fontDescriptor size:0];
+  } else {
+    RCTLogWarn(
+        @"[EnrichedTextInput]: Couldn't apply italic trait to the font.");
+    return self;
+  }
+}
+
+- (UIFont *)removeItalic {
+  if (![self isItalic]) {
+    return self;
+  }
+  UIFontDescriptorSymbolicTraits newTraits =
+      (self.fontDescriptor.symbolicTraits ^ UIFontDescriptorTraitItalic);
+  UIFontDescriptor *fontDescriptor =
+      [self.fontDescriptor fontDescriptorWithSymbolicTraits:newTraits];
+  if (fontDescriptor != nullptr) {
+    return [UIFont fontWithDescriptor:fontDescriptor size:0];
+  } else {
+    RCTLogWarn(
+        @"[EnrichedTextInput]: Couldn't remove italic trait from the font.");
+    return self;
+  }
+}
+
+- (UIFont *)withFontTraits:(UIFont *)from {
+  UIFont *newFont = self;
+  if ([from isBold]) {
+    newFont = [newFont setBold];
+  }
+  if ([from isItalic]) {
+    newFont = [newFont setItalic];
+  }
+  return newFont;
+}
+
+- (UIFont *)setSize:(CGFloat)size {
+  UIFontDescriptor *newFontDescriptor =
+      [self.fontDescriptor fontDescriptorWithSize:size];
+  if (newFontDescriptor != nullptr) {
+    return [UIFont fontWithDescriptor:newFontDescriptor size:0];
+  } else {
+    RCTLogWarn(
+        @"[EnrichedTextInput]: Couldn't apply heading style to the font.");
+    return self;
+  }
+}
+
+@end

package/ios/{utils → extensions}/LayoutManagerExtension.h

@@ -2,5 +2,5 @@
 #import <UIKit/UIKit.h>
 
 @interface NSLayoutManager (LayoutManagerExtension)
-@property (nonatomic, weak) id input;
+@property(nonatomic, weak) id input;
 @end