react-native-enriched-markdown 0.1.1 → 0.2.0

package/ios/styles/StyleConfig.mm

@@ -1,5 +1,7 @@
 #import "StyleConfig.h"
+#import "FontUtils.h"
 #import <React/RCTFont.h>
+#import <React/RCTUtils.h>
 
 static inline NSString *normalizedFontWeight(NSString *fontWeight)
 {
@@ -12,6 +14,8 @@ static inline NSString *normalizedFontWeight(NSString *fontWeight)
 }
 
 @implementation StyleConfig {
+  BOOL _allowFontScaling;
+  CGFloat _maxFontSizeMultiplier;
   // Primary font properties
   UIColor *_primaryColor;
   NSNumber *_primaryFontSize;
@@ -24,8 +28,10 @@ static inline NSString *normalizedFontWeight(NSString *fontWeight)
   NSString *_paragraphFontFamily;
   NSString *_paragraphFontWeight;
   UIColor *_paragraphColor;
+  CGFloat _paragraphMarginTop;
   CGFloat _paragraphMarginBottom;
   CGFloat _paragraphLineHeight;
+  NSTextAlignment _paragraphTextAlign;
   UIFont *_paragraphFont;
   BOOL _paragraphFontNeedsRecreation;
   // H1 properties
@@ -33,8 +39,10 @@ static inline NSString *normalizedFontWeight(NSString *fontWeight)
   NSString *_h1FontFamily;
   NSString *_h1FontWeight;
   UIColor *_h1Color;
+  CGFloat _h1MarginTop;
   CGFloat _h1MarginBottom;
   CGFloat _h1LineHeight;
+  NSTextAlignment _h1TextAlign;
   UIFont *_h1Font;
   BOOL _h1FontNeedsRecreation;
   // H2 properties
@@ -42,8 +50,10 @@ static inline NSString *normalizedFontWeight(NSString *fontWeight)
   NSString *_h2FontFamily;
   NSString *_h2FontWeight;
   UIColor *_h2Color;
+  CGFloat _h2MarginTop;
   CGFloat _h2MarginBottom;
   CGFloat _h2LineHeight;
+  NSTextAlignment _h2TextAlign;
   UIFont *_h2Font;
   BOOL _h2FontNeedsRecreation;
   // H3 properties
@@ -51,8 +61,10 @@ static inline NSString *normalizedFontWeight(NSString *fontWeight)
   NSString *_h3FontFamily;
   NSString *_h3FontWeight;
   UIColor *_h3Color;
+  CGFloat _h3MarginTop;
   CGFloat _h3MarginBottom;
   CGFloat _h3LineHeight;
+  NSTextAlignment _h3TextAlign;
   UIFont *_h3Font;
   BOOL _h3FontNeedsRecreation;
   // H4 properties
@@ -60,8 +72,10 @@ static inline NSString *normalizedFontWeight(NSString *fontWeight)
   NSString *_h4FontFamily;
   NSString *_h4FontWeight;
   UIColor *_h4Color;
+  CGFloat _h4MarginTop;
   CGFloat _h4MarginBottom;
   CGFloat _h4LineHeight;
+  NSTextAlignment _h4TextAlign;
   UIFont *_h4Font;
   BOOL _h4FontNeedsRecreation;
   // H5 properties
@@ -69,8 +83,10 @@ static inline NSString *normalizedFontWeight(NSString *fontWeight)
   NSString *_h5FontFamily;
   NSString *_h5FontWeight;
   UIColor *_h5Color;
+  CGFloat _h5MarginTop;
   CGFloat _h5MarginBottom;
   CGFloat _h5LineHeight;
+  NSTextAlignment _h5TextAlign;
   UIFont *_h5Font;
   BOOL _h5FontNeedsRecreation;
   // H6 properties
@@ -78,8 +94,10 @@ static inline NSString *normalizedFontWeight(NSString *fontWeight)
   NSString *_h6FontFamily;
   NSString *_h6FontWeight;
   UIColor *_h6Color;
+  CGFloat _h6MarginTop;
   CGFloat _h6MarginBottom;
   CGFloat _h6LineHeight;
+  NSTextAlignment _h6TextAlign;
   UIFont *_h6Font;
   BOOL _h6FontNeedsRecreation;
   // Link properties
@@ -89,6 +107,10 @@ static inline NSString *normalizedFontWeight(NSString *fontWeight)
   UIColor *_strongColor;
   // Emphasis properties
   UIColor *_emphasisColor;
+  // Strikethrough properties
+  UIColor *_strikethroughColor;
+  // Underline properties
+  UIColor *_underlineColor;
   // Code properties
   UIColor *_codeColor;
   UIColor *_codeBackgroundColor;
@@ -96,6 +118,7 @@ static inline NSString *normalizedFontWeight(NSString *fontWeight)
   // Image properties
   CGFloat _imageHeight;
   CGFloat _imageBorderRadius;
+  CGFloat _imageMarginTop;
   CGFloat _imageMarginBottom;
   // Inline image properties
   CGFloat _inlineImageSize;
@@ -104,6 +127,7 @@ static inline NSString *normalizedFontWeight(NSString *fontWeight)
   NSString *_blockquoteFontFamily;
   NSString *_blockquoteFontWeight;
   UIColor *_blockquoteColor;
+  CGFloat _blockquoteMarginTop;
   CGFloat _blockquoteMarginBottom;
   CGFloat _blockquoteLineHeight;
   UIColor *_blockquoteBorderColor;
@@ -115,6 +139,7 @@ static inline NSString *normalizedFontWeight(NSString *fontWeight)
   NSString *_listStyleFontFamily;
   NSString *_listStyleFontWeight;
   UIColor *_listStyleColor;
+  CGFloat _listStyleMarginTop;
   CGFloat _listStyleMarginBottom;
   CGFloat _listStyleLineHeight;
   UIColor *_listStyleBulletColor;
@@ -132,6 +157,7 @@ static inline NSString *normalizedFontWeight(NSString *fontWeight)
   NSString *_codeBlockFontFamily;
   NSString *_codeBlockFontWeight;
   UIColor *_codeBlockColor;
+  CGFloat _codeBlockMarginTop;
   CGFloat _codeBlockMarginBottom;
   CGFloat _codeBlockLineHeight;
   UIColor *_codeBlockBackgroundColor;
@@ -153,6 +179,8 @@ static inline NSString *normalizedFontWeight(NSString *fontWeight)
 - (instancetype)init
 {
   self = [super init];
+  _allowFontScaling = YES;
+  _maxFontSizeMultiplier = 0;
   _primaryFontNeedsRecreation = YES;
   _paragraphFontNeedsRecreation = YES;
   _h1FontNeedsRecreation = YES;
@@ -169,9 +197,70 @@ static inline NSString *normalizedFontWeight(NSString *fontWeight)
   return self;
 }
 
+- (CGFloat)fontScaleMultiplier
+{
+  return _allowFontScaling ? RCTFontSizeMultiplier() : 1.0;
+}
+
+- (void)setFontScaleMultiplier:(CGFloat)newValue
+{
+  BOOL newAllowFontScaling = (newValue != 1.0);
+  if (_allowFontScaling != newAllowFontScaling) {
+    _allowFontScaling = newAllowFontScaling;
+    // Invalidate all cached fonts when scale changes
+    _primaryFontNeedsRecreation = YES;
+    _paragraphFontNeedsRecreation = YES;
+    _h1FontNeedsRecreation = YES;
+    _h2FontNeedsRecreation = YES;
+    _h3FontNeedsRecreation = YES;
+    _h4FontNeedsRecreation = YES;
+    _h5FontNeedsRecreation = YES;
+    _h6FontNeedsRecreation = YES;
+    _listMarkerFontNeedsRecreation = YES;
+    _listStyleFontNeedsRecreation = YES;
+    _codeBlockFontNeedsRecreation = YES;
+    _blockquoteFontNeedsRecreation = YES;
+  }
+}
+
+- (CGFloat)effectiveScaleMultiplierForFontSize:(CGFloat)fontSize
+{
+  if (!_allowFontScaling) {
+    return 1.0;
+  }
+  return RCTFontSizeMultiplierWithMax(_maxFontSizeMultiplier);
+}
+
+- (CGFloat)maxFontSizeMultiplier
+{
+  return _maxFontSizeMultiplier;
+}
+
+- (void)setMaxFontSizeMultiplier:(CGFloat)newValue
+{
+  if (_maxFontSizeMultiplier != newValue) {
+    _maxFontSizeMultiplier = newValue;
+    // Invalidate all cached fonts when max multiplier changes
+    _primaryFontNeedsRecreation = YES;
+    _paragraphFontNeedsRecreation = YES;
+    _h1FontNeedsRecreation = YES;
+    _h2FontNeedsRecreation = YES;
+    _h3FontNeedsRecreation = YES;
+    _h4FontNeedsRecreation = YES;
+    _h5FontNeedsRecreation = YES;
+    _h6FontNeedsRecreation = YES;
+    _listMarkerFontNeedsRecreation = YES;
+    _listStyleFontNeedsRecreation = YES;
+    _codeBlockFontNeedsRecreation = YES;
+    _blockquoteFontNeedsRecreation = YES;
+  }
+}
+
 - (id)copyWithZone:(NSZone *)zone
 {
   StyleConfig *copy = [[[self class] allocWithZone:zone] init];
+  copy->_allowFontScaling = _allowFontScaling;
+  copy->_maxFontSizeMultiplier = _maxFontSizeMultiplier;
   copy->_primaryColor = [_primaryColor copy];
   copy->_primaryFontSize = [_primaryFontSize copy];
   copy->_primaryFontWeight = [_primaryFontWeight copy];
@@ -182,66 +271,84 @@ static inline NSString *normalizedFontWeight(NSString *fontWeight)
   copy->_paragraphFontFamily = [_paragraphFontFamily copy];
   copy->_paragraphFontWeight = [_paragraphFontWeight copy];
   copy->_paragraphColor = [_paragraphColor copy];
+  copy->_paragraphMarginTop = _paragraphMarginTop;
   copy->_paragraphMarginBottom = _paragraphMarginBottom;
   copy->_paragraphLineHeight = _paragraphLineHeight;
+  copy->_paragraphTextAlign = _paragraphTextAlign;
   copy->_paragraphFontNeedsRecreation = YES;
   copy->_h1FontSize = _h1FontSize;
   copy->_h1FontFamily = [_h1FontFamily copy];
   copy->_h1FontWeight = [_h1FontWeight copy];
   copy->_h1Color = [_h1Color copy];
+  copy->_h1MarginTop = _h1MarginTop;
   copy->_h1MarginBottom = _h1MarginBottom;
   copy->_h1LineHeight = _h1LineHeight;
+  copy->_h1TextAlign = _h1TextAlign;
   copy->_h1FontNeedsRecreation = YES;
   copy->_h2FontSize = _h2FontSize;
   copy->_h2FontFamily = [_h2FontFamily copy];
   copy->_h2FontWeight = [_h2FontWeight copy];
   copy->_h2Color = [_h2Color copy];
+  copy->_h2MarginTop = _h2MarginTop;
   copy->_h2MarginBottom = _h2MarginBottom;
   copy->_h2LineHeight = _h2LineHeight;
+  copy->_h2TextAlign = _h2TextAlign;
   copy->_h2FontNeedsRecreation = YES;
   copy->_h3FontSize = _h3FontSize;
   copy->_h3FontFamily = [_h3FontFamily copy];
   copy->_h3FontWeight = [_h3FontWeight copy];
   copy->_h3Color = [_h3Color copy];
+  copy->_h3MarginTop = _h3MarginTop;
   copy->_h3MarginBottom = _h3MarginBottom;
   copy->_h3LineHeight = _h3LineHeight;
+  copy->_h3TextAlign = _h3TextAlign;
   copy->_h3FontNeedsRecreation = YES;
   copy->_h4FontSize = _h4FontSize;
   copy->_h4FontFamily = [_h4FontFamily copy];
   copy->_h4FontWeight = [_h4FontWeight copy];
   copy->_h4Color = [_h4Color copy];
+  copy->_h4MarginTop = _h4MarginTop;
   copy->_h4MarginBottom = _h4MarginBottom;
   copy->_h4LineHeight = _h4LineHeight;
+  copy->_h4TextAlign = _h4TextAlign;
   copy->_h4FontNeedsRecreation = YES;
   copy->_h5FontSize = _h5FontSize;
   copy->_h5FontFamily = [_h5FontFamily copy];
   copy->_h5FontWeight = [_h5FontWeight copy];
   copy->_h5Color = [_h5Color copy];
+  copy->_h5MarginTop = _h5MarginTop;
   copy->_h5MarginBottom = _h5MarginBottom;
   copy->_h5LineHeight = _h5LineHeight;
+  copy->_h5TextAlign = _h5TextAlign;
   copy->_h5FontNeedsRecreation = YES;
   copy->_h6FontSize = _h6FontSize;
   copy->_h6FontFamily = [_h6FontFamily copy];
   copy->_h6FontWeight = [_h6FontWeight copy];
   copy->_h6Color = [_h6Color copy];
+  copy->_h6MarginTop = _h6MarginTop;
   copy->_h6MarginBottom = _h6MarginBottom;
   copy->_h6LineHeight = _h6LineHeight;
+  copy->_h6TextAlign = _h6TextAlign;
   copy->_h6FontNeedsRecreation = YES;
   copy->_linkColor = [_linkColor copy];
   copy->_linkUnderline = _linkUnderline;
   copy->_strongColor = [_strongColor copy];
   copy->_emphasisColor = [_emphasisColor copy];
+  copy->_strikethroughColor = [_strikethroughColor copy];
+  copy->_underlineColor = [_underlineColor copy];
   copy->_codeColor = [_codeColor copy];
   copy->_codeBackgroundColor = [_codeBackgroundColor copy];
   copy->_codeBorderColor = [_codeBorderColor copy];
   copy->_imageHeight = _imageHeight;
   copy->_imageBorderRadius = _imageBorderRadius;
+  copy->_imageMarginTop = _imageMarginTop;
   copy->_imageMarginBottom = _imageMarginBottom;
   copy->_inlineImageSize = _inlineImageSize;
   copy->_blockquoteFontSize = _blockquoteFontSize;
   copy->_blockquoteFontFamily = [_blockquoteFontFamily copy];
   copy->_blockquoteFontWeight = [_blockquoteFontWeight copy];
   copy->_blockquoteColor = [_blockquoteColor copy];
+  copy->_blockquoteMarginTop = _blockquoteMarginTop;
   copy->_blockquoteMarginBottom = _blockquoteMarginBottom;
   copy->_blockquoteLineHeight = _blockquoteLineHeight;
   copy->_blockquoteBorderColor = [_blockquoteBorderColor copy];
@@ -252,6 +359,7 @@ static inline NSString *normalizedFontWeight(NSString *fontWeight)
   copy->_listStyleFontFamily = [_listStyleFontFamily copy];
   copy->_listStyleFontWeight = [_listStyleFontWeight copy];
   copy->_listStyleColor = [_listStyleColor copy];
+  copy->_listStyleMarginTop = _listStyleMarginTop;
   copy->_listStyleMarginBottom = _listStyleMarginBottom;
   copy->_listStyleLineHeight = _listStyleLineHeight;
   copy->_listStyleBulletColor = [_listStyleBulletColor copy];
@@ -265,6 +373,7 @@ static inline NSString *normalizedFontWeight(NSString *fontWeight)
   copy->_codeBlockFontFamily = [_codeBlockFontFamily copy];
   copy->_codeBlockFontWeight = [_codeBlockFontWeight copy];
   copy->_codeBlockColor = [_codeBlockColor copy];
+  copy->_codeBlockMarginTop = _codeBlockMarginTop;
   copy->_codeBlockMarginBottom = _codeBlockMarginBottom;
   copy->_codeBlockLineHeight = _codeBlockLineHeight;
   copy->_codeBlockBackgroundColor = [_codeBlockBackgroundColor copy];
@@ -334,7 +443,7 @@ static inline NSString *normalizedFontWeight(NSString *fontWeight)
                                 weight:normalizedFontWeight(_primaryFontWeight)
                                  style:nil
                                variant:nil
-                       scaleMultiplier:1];
+                       scaleMultiplier:[self effectiveScaleMultiplierForFontSize:[_primaryFontSize floatValue]]];
     _primaryFontNeedsRecreation = NO;
   }
   return _primaryFont;
@@ -384,6 +493,16 @@ static inline NSString *normalizedFontWeight(NSString *fontWeight)
   _paragraphColor = newValue;
 }
 
+- (CGFloat)paragraphMarginTop
+{
+  return _paragraphMarginTop;
+}
+
+- (void)setParagraphMarginTop:(CGFloat)newValue
+{
+  _paragraphMarginTop = newValue;
+}
+
 - (CGFloat)paragraphMarginBottom
 {
   return _paragraphMarginBottom;
@@ -396,6 +515,9 @@ static inline NSString *normalizedFontWeight(NSString *fontWeight)
 
 - (CGFloat)paragraphLineHeight
 {
+  if (_allowFontScaling && _paragraphLineHeight > 0) {
+    return _paragraphLineHeight * RCTFontSizeMultiplierWithMax(_maxFontSizeMultiplier);
+  }
   return _paragraphLineHeight;
 }
 
@@ -404,6 +526,16 @@ static inline NSString *normalizedFontWeight(NSString *fontWeight)
   _paragraphLineHeight = newValue;
 }
 
+- (NSTextAlignment)paragraphTextAlign
+{
+  return _paragraphTextAlign;
+}
+
+- (void)setParagraphTextAlign:(NSTextAlignment)newValue
+{
+  _paragraphTextAlign = newValue;
+}
+
 - (UIFont *)paragraphFont
 {
   if (_paragraphFontNeedsRecreation || !_paragraphFont) {
@@ -413,7 +545,7 @@ static inline NSString *normalizedFontWeight(NSString *fontWeight)
                                   weight:normalizedFontWeight(_paragraphFontWeight)
                                    style:nil
                                  variant:nil
-                         scaleMultiplier:1];
+                         scaleMultiplier:[self effectiveScaleMultiplierForFontSize:_paragraphFontSize]];
     _paragraphFontNeedsRecreation = NO;
   }
   return _paragraphFont;
@@ -462,6 +594,16 @@ static inline NSString *normalizedFontWeight(NSString *fontWeight)
   _h1Color = newValue;
 }
 
+- (CGFloat)h1MarginTop
+{
+  return _h1MarginTop;
+}
+
+- (void)setH1MarginTop:(CGFloat)newValue
+{
+  _h1MarginTop = newValue;
+}
+
 - (CGFloat)h1MarginBottom
 {
   return _h1MarginBottom;
@@ -474,6 +616,9 @@ static inline NSString *normalizedFontWeight(NSString *fontWeight)
 
 - (CGFloat)h1LineHeight
 {
+  if (_allowFontScaling && _h1LineHeight > 0) {
+    return _h1LineHeight * RCTFontSizeMultiplierWithMax(_maxFontSizeMultiplier);
+  }
   return _h1LineHeight;
 }
 
@@ -482,6 +627,16 @@ static inline NSString *normalizedFontWeight(NSString *fontWeight)
   _h1LineHeight = newValue;
 }
 
+- (NSTextAlignment)h1TextAlign
+{
+  return _h1TextAlign;
+}
+
+- (void)setH1TextAlign:(NSTextAlignment)newValue
+{
+  _h1TextAlign = newValue;
+}
+
 - (UIFont *)h1Font
 {
   if (_h1FontNeedsRecreation || !_h1Font) {
@@ -491,7 +646,7 @@ static inline NSString *normalizedFontWeight(NSString *fontWeight)
                            weight:normalizedFontWeight(_h1FontWeight)
                             style:nil
                           variant:nil
-                  scaleMultiplier:1];
+                  scaleMultiplier:[self effectiveScaleMultiplierForFontSize:_h1FontSize]];
     _h1FontNeedsRecreation = NO;
   }
   return _h1Font;
@@ -540,6 +695,16 @@ static inline NSString *normalizedFontWeight(NSString *fontWeight)
   _h2Color = newValue;
 }
 
+- (CGFloat)h2MarginTop
+{
+  return _h2MarginTop;
+}
+
+- (void)setH2MarginTop:(CGFloat)newValue
+{
+  _h2MarginTop = newValue;
+}
+
 - (CGFloat)h2MarginBottom
 {
   return _h2MarginBottom;
@@ -552,6 +717,9 @@ static inline NSString *normalizedFontWeight(NSString *fontWeight)
 
 - (CGFloat)h2LineHeight
 {
+  if (_allowFontScaling && _h2LineHeight > 0) {
+    return _h2LineHeight * RCTFontSizeMultiplierWithMax(_maxFontSizeMultiplier);
+  }
   return _h2LineHeight;
 }
 
@@ -560,6 +728,16 @@ static inline NSString *normalizedFontWeight(NSString *fontWeight)
   _h2LineHeight = newValue;
 }
 
+- (NSTextAlignment)h2TextAlign
+{
+  return _h2TextAlign;
+}
+
+- (void)setH2TextAlign:(NSTextAlignment)newValue
+{
+  _h2TextAlign = newValue;
+}
+
 - (UIFont *)h2Font
 {
   if (_h2FontNeedsRecreation || !_h2Font) {
@@ -569,7 +747,7 @@ static inline NSString *normalizedFontWeight(NSString *fontWeight)
                            weight:normalizedFontWeight(_h2FontWeight)
                             style:nil
                           variant:nil
-                  scaleMultiplier:1];
+                  scaleMultiplier:[self effectiveScaleMultiplierForFontSize:_h2FontSize]];
     _h2FontNeedsRecreation = NO;
   }
   return _h2Font;
@@ -618,6 +796,16 @@ static inline NSString *normalizedFontWeight(NSString *fontWeight)
   _h3Color = newValue;
 }
 
+- (CGFloat)h3MarginTop
+{
+  return _h3MarginTop;
+}
+
+- (void)setH3MarginTop:(CGFloat)newValue
+{
+  _h3MarginTop = newValue;
+}
+
 - (CGFloat)h3MarginBottom
 {
   return _h3MarginBottom;
@@ -630,6 +818,9 @@ static inline NSString *normalizedFontWeight(NSString *fontWeight)
 
 - (CGFloat)h3LineHeight
 {
+  if (_allowFontScaling && _h3LineHeight > 0) {
+    return _h3LineHeight * RCTFontSizeMultiplierWithMax(_maxFontSizeMultiplier);
+  }
   return _h3LineHeight;
 }
 
@@ -638,6 +829,16 @@ static inline NSString *normalizedFontWeight(NSString *fontWeight)
   _h3LineHeight = newValue;
 }
 
+- (NSTextAlignment)h3TextAlign
+{
+  return _h3TextAlign;
+}
+
+- (void)setH3TextAlign:(NSTextAlignment)newValue
+{
+  _h3TextAlign = newValue;
+}
+
 - (UIFont *)h3Font
 {
   if (_h3FontNeedsRecreation || !_h3Font) {
@@ -647,7 +848,7 @@ static inline NSString *normalizedFontWeight(NSString *fontWeight)
                            weight:normalizedFontWeight(_h3FontWeight)
                             style:nil
                           variant:nil
-                  scaleMultiplier:1];
+                  scaleMultiplier:[self effectiveScaleMultiplierForFontSize:_h3FontSize]];
     _h3FontNeedsRecreation = NO;
   }
   return _h3Font;
@@ -696,6 +897,16 @@ static inline NSString *normalizedFontWeight(NSString *fontWeight)
   _h4Color = newValue;
 }
 
+- (CGFloat)h4MarginTop
+{
+  return _h4MarginTop;
+}
+
+- (void)setH4MarginTop:(CGFloat)newValue
+{
+  _h4MarginTop = newValue;
+}
+
 - (CGFloat)h4MarginBottom
 {
   return _h4MarginBottom;
@@ -708,6 +919,9 @@ static inline NSString *normalizedFontWeight(NSString *fontWeight)
 
 - (CGFloat)h4LineHeight
 {
+  if (_allowFontScaling && _h4LineHeight > 0) {
+    return _h4LineHeight * RCTFontSizeMultiplierWithMax(_maxFontSizeMultiplier);
+  }
   return _h4LineHeight;
 }
 
@@ -716,6 +930,16 @@ static inline NSString *normalizedFontWeight(NSString *fontWeight)
   _h4LineHeight = newValue;
 }
 
+- (NSTextAlignment)h4TextAlign
+{
+  return _h4TextAlign;
+}
+
+- (void)setH4TextAlign:(NSTextAlignment)newValue
+{
+  _h4TextAlign = newValue;
+}
+
 - (UIFont *)h4Font
 {
   if (_h4FontNeedsRecreation || !_h4Font) {
@@ -725,7 +949,7 @@ static inline NSString *normalizedFontWeight(NSString *fontWeight)
                            weight:normalizedFontWeight(_h4FontWeight)
                             style:nil
                           variant:nil
-                  scaleMultiplier:1];
+                  scaleMultiplier:[self effectiveScaleMultiplierForFontSize:_h4FontSize]];
     _h4FontNeedsRecreation = NO;
   }
   return _h4Font;
@@ -774,6 +998,16 @@ static inline NSString *normalizedFontWeight(NSString *fontWeight)
   _h5Color = newValue;
 }
 
+- (CGFloat)h5MarginTop
+{
+  return _h5MarginTop;
+}
+
+- (void)setH5MarginTop:(CGFloat)newValue
+{
+  _h5MarginTop = newValue;
+}
+
 - (CGFloat)h5MarginBottom
 {
   return _h5MarginBottom;
@@ -786,6 +1020,9 @@ static inline NSString *normalizedFontWeight(NSString *fontWeight)
 
 - (CGFloat)h5LineHeight
 {
+  if (_allowFontScaling && _h5LineHeight > 0) {
+    return _h5LineHeight * RCTFontSizeMultiplierWithMax(_maxFontSizeMultiplier);
+  }
   return _h5LineHeight;
 }
 
@@ -794,6 +1031,16 @@ static inline NSString *normalizedFontWeight(NSString *fontWeight)
   _h5LineHeight = newValue;
 }
 
+- (NSTextAlignment)h5TextAlign
+{
+  return _h5TextAlign;
+}
+
+- (void)setH5TextAlign:(NSTextAlignment)newValue
+{
+  _h5TextAlign = newValue;
+}
+
 - (UIFont *)h5Font
 {
   if (_h5FontNeedsRecreation || !_h5Font) {
@@ -803,7 +1050,7 @@ static inline NSString *normalizedFontWeight(NSString *fontWeight)
                            weight:normalizedFontWeight(_h5FontWeight)
                             style:nil
                           variant:nil
-                  scaleMultiplier:1];
+                  scaleMultiplier:[self effectiveScaleMultiplierForFontSize:_h5FontSize]];
     _h5FontNeedsRecreation = NO;
   }
   return _h5Font;
@@ -852,6 +1099,16 @@ static inline NSString *normalizedFontWeight(NSString *fontWeight)
   _h6Color = newValue;
 }
 
+- (CGFloat)h6MarginTop
+{
+  return _h6MarginTop;
+}
+
+- (void)setH6MarginTop:(CGFloat)newValue
+{
+  _h6MarginTop = newValue;
+}
+
 - (CGFloat)h6MarginBottom
 {
   return _h6MarginBottom;
@@ -864,6 +1121,9 @@ static inline NSString *normalizedFontWeight(NSString *fontWeight)
 
 - (CGFloat)h6LineHeight
 {
+  if (_allowFontScaling && _h6LineHeight > 0) {
+    return _h6LineHeight * RCTFontSizeMultiplierWithMax(_maxFontSizeMultiplier);
+  }
   return _h6LineHeight;
 }
 
@@ -872,6 +1132,16 @@ static inline NSString *normalizedFontWeight(NSString *fontWeight)
   _h6LineHeight = newValue;
 }
 
+- (NSTextAlignment)h6TextAlign
+{
+  return _h6TextAlign;
+}
+
+- (void)setH6TextAlign:(NSTextAlignment)newValue
+{
+  _h6TextAlign = newValue;
+}
+
 - (UIFont *)h6Font
 {
   if (_h6FontNeedsRecreation || !_h6Font) {
@@ -881,7 +1151,7 @@ static inline NSString *normalizedFontWeight(NSString *fontWeight)
                            weight:normalizedFontWeight(_h6FontWeight)
                             style:nil
                           variant:nil
-                  scaleMultiplier:1];
+                  scaleMultiplier:[self effectiveScaleMultiplierForFontSize:_h6FontSize]];
     _h6FontNeedsRecreation = NO;
   }
   return _h6Font;
@@ -927,6 +1197,26 @@ static inline NSString *normalizedFontWeight(NSString *fontWeight)
   _emphasisColor = newValue;
 }
 
+- (UIColor *)strikethroughColor
+{
+  return _strikethroughColor;
+}
+
+- (void)setStrikethroughColor:(UIColor *)newValue
+{
+  _strikethroughColor = newValue;
+}
+
+- (UIColor *)underlineColor
+{
+  return _underlineColor;
+}
+
+- (void)setUnderlineColor:(UIColor *)newValue
+{
+  _underlineColor = newValue;
+}
+
 - (UIColor *)codeColor
 {
   return _codeColor;
@@ -977,6 +1267,16 @@ static inline NSString *normalizedFontWeight(NSString *fontWeight)
   _imageBorderRadius = newValue;
 }
 
+- (CGFloat)imageMarginTop
+{
+  return _imageMarginTop;
+}
+
+- (void)setImageMarginTop:(CGFloat)newValue
+{
+  _imageMarginTop = newValue;
+}
+
 - (CGFloat)imageMarginBottom
 {
   return _imageMarginBottom;
@@ -1041,6 +1341,16 @@ static inline NSString *normalizedFontWeight(NSString *fontWeight)
   _blockquoteColor = newValue;
 }
 
+- (CGFloat)blockquoteMarginTop
+{
+  return _blockquoteMarginTop;
+}
+
+- (void)setBlockquoteMarginTop:(CGFloat)newValue
+{
+  _blockquoteMarginTop = newValue;
+}
+
 - (CGFloat)blockquoteMarginBottom
 {
   return _blockquoteMarginBottom;
@@ -1053,6 +1363,9 @@ static inline NSString *normalizedFontWeight(NSString *fontWeight)
 
 - (CGFloat)blockquoteLineHeight
 {
+  if (_allowFontScaling && _blockquoteLineHeight > 0) {
+    return _blockquoteLineHeight * RCTFontSizeMultiplierWithMax(_maxFontSizeMultiplier);
+  }
   return _blockquoteLineHeight;
 }
 
@@ -1070,7 +1383,7 @@ static inline NSString *normalizedFontWeight(NSString *fontWeight)
                                    weight:normalizedFontWeight(_blockquoteFontWeight)
                                     style:nil
                                   variant:nil
-                          scaleMultiplier:1];
+                          scaleMultiplier:[self effectiveScaleMultiplierForFontSize:_blockquoteFontSize]];
     _blockquoteFontNeedsRecreation = NO;
   }
   return _blockquoteFont;
@@ -1162,6 +1475,16 @@ static inline NSString *normalizedFontWeight(NSString *fontWeight)
   _listStyleColor = newValue;
 }
 
+- (CGFloat)listStyleMarginTop
+{
+  return _listStyleMarginTop;
+}
+
+- (void)setListStyleMarginTop:(CGFloat)newValue
+{
+  _listStyleMarginTop = newValue;
+}
+
 - (CGFloat)listStyleMarginBottom
 {
   return _listStyleMarginBottom;
@@ -1174,6 +1497,9 @@ static inline NSString *normalizedFontWeight(NSString *fontWeight)
 
 - (CGFloat)listStyleLineHeight
 {
+  if (_allowFontScaling && _listStyleLineHeight > 0) {
+    return _listStyleLineHeight * RCTFontSizeMultiplierWithMax(_maxFontSizeMultiplier);
+  }
   return _listStyleLineHeight;
 }
 
@@ -1252,7 +1578,7 @@ static inline NSString *normalizedFontWeight(NSString *fontWeight)
                                    weight:normalizedFontWeight(_listStyleMarkerFontWeight)
                                     style:nil
                                   variant:nil
-                          scaleMultiplier:1];
+                          scaleMultiplier:[self effectiveScaleMultiplierForFontSize:_listStyleFontSize]];
     _listMarkerFontNeedsRecreation = NO;
   }
   return _listMarkerFont;
@@ -1267,7 +1593,7 @@ static inline NSString *normalizedFontWeight(NSString *fontWeight)
                                   weight:normalizedFontWeight(_listStyleFontWeight)
                                    style:nil
                                  variant:nil
-                         scaleMultiplier:1];
+                         scaleMultiplier:[self effectiveScaleMultiplierForFontSize:_listStyleFontSize]];
     _listStyleFontNeedsRecreation = NO;
   }
   return _listStyleFont;
@@ -1338,6 +1664,16 @@ static const CGFloat kDefaultMinGap = 4.0;
   _codeBlockColor = newValue;
 }
 
+- (CGFloat)codeBlockMarginTop
+{
+  return _codeBlockMarginTop;
+}
+
+- (void)setCodeBlockMarginTop:(CGFloat)newValue
+{
+  _codeBlockMarginTop = newValue;
+}
+
 - (CGFloat)codeBlockMarginBottom
 {
   return _codeBlockMarginBottom;
@@ -1350,6 +1686,9 @@ static const CGFloat kDefaultMinGap = 4.0;
 
 - (CGFloat)codeBlockLineHeight
 {
+  if (_allowFontScaling && _codeBlockLineHeight > 0) {
+    return _codeBlockLineHeight * RCTFontSizeMultiplierWithMax(_maxFontSizeMultiplier);
+  }
   return _codeBlockLineHeight;
 }
 
@@ -1417,7 +1756,7 @@ static const CGFloat kDefaultMinGap = 4.0;
                                   weight:normalizedFontWeight(_codeBlockFontWeight)
                                    style:nil
                                  variant:nil
-                         scaleMultiplier:1];
+                         scaleMultiplier:[self effectiveScaleMultiplierForFontSize:_codeBlockFontSize]];
     _codeBlockFontNeedsRecreation = NO;
   }
   return _codeBlockFont;