react-native-enriched 0.1.6 → 0.2.1

package/ios/attachments/ImageAttachment.h

@@ -0,0 +1,10 @@
+#import "ImageData.h"
+#import "MediaAttachment.h"
+
+@interface ImageAttachment : MediaAttachment
+
+@property(nonatomic, strong) ImageData *imageData;
+
+- (instancetype)initWithImageData:(ImageData *)data;
+
+@end

package/ios/attachments/ImageAttachment.mm

@@ -0,0 +1,34 @@
+#import "ImageAttachment.h"
+
+@implementation ImageAttachment
+
+- (instancetype)initWithImageData:(ImageData *)data {
+  self = [super initWithURI:data.uri width:data.width height:data.height];
+  if (!self)
+    return nil;
+
+  _imageData = data;
+  self.image = [UIImage new];
+
+  [self loadAsync];
+  return self;
+}
+
+- (void)loadAsync {
+  NSURL *url = [NSURL URLWithString:self.uri];
+  if (!url)
+    return;
+
+  dispatch_async(dispatch_get_global_queue(QOS_CLASS_USER_INITIATED, 0), ^{
+    NSData *bytes = [NSData dataWithContentsOfURL:url];
+    UIImage *img = bytes ? [UIImage imageWithData:bytes]
+                         : [UIImage systemImageNamed:@"file"];
+
+    dispatch_async(dispatch_get_main_queue(), ^{
+      self.image = img;
+      [self notifyUpdate];
+    });
+  });
+}
+
+@end

package/ios/attachments/MediaAttachment.h

@@ -0,0 +1,23 @@
+#import <UIKit/UIKit.h>
+
+@class MediaAttachment;
+
+@protocol MediaAttachmentDelegate <NSObject>
+- (void)mediaAttachmentDidUpdate:(MediaAttachment *)attachment;
+@end
+
+@interface MediaAttachment : NSTextAttachment
+
+@property(nonatomic, weak) id<MediaAttachmentDelegate> delegate;
+@property(nonatomic, strong) NSString *uri;
+@property(nonatomic, assign) CGFloat width;
+@property(nonatomic, assign) CGFloat height;
+
+- (instancetype)initWithURI:(NSString *)uri
+                      width:(CGFloat)width
+                     height:(CGFloat)height;
+
+- (void)loadAsync;
+- (void)notifyUpdate;
+
+@end

package/ios/attachments/MediaAttachment.mm

@@ -0,0 +1,31 @@
+#import "MediaAttachment.h"
+
+@implementation MediaAttachment
+
+- (instancetype)initWithURI:(NSString *)uri
+                      width:(CGFloat)width
+                     height:(CGFloat)height {
+  self = [super init];
+  if (!self)
+    return nil;
+
+  _uri = uri;
+  _width = width;
+  _height = height;
+
+  self.bounds = CGRectMake(0, 0, width, height);
+
+  return self;
+}
+
+- (void)loadAsync {
+  // no-op for base
+}
+
+- (void)notifyUpdate {
+  if ([self.delegate respondsToSelector:@selector(mediaAttachmentDidUpdate:)]) {
+    [self.delegate mediaAttachmentDidUpdate:self];
+  }
+}
+
+@end

package/ios/config/InputConfig.h

@@ -1,10 +1,10 @@
 #pragma once
-#import <UIKit/UIKit.h>
-#import "TextDecorationLineEnum.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 +15,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;
@@ -64,4 +64,10 @@
 - (void)setLinkDecorationLine:(TextDecorationLineEnum)newValue;
 - (void)setMentionStyleProps:(NSDictionary *)newValue;
 - (MentionStyleProps *)mentionStylePropsForIndicator:(NSString *)indicator;
+- (UIColor *)codeBlockFgColor;
+- (void)setCodeBlockFgColor:(UIColor *)newValue;
+- (UIColor *)codeBlockBgColor;
+- (void)setCodeBlockBgColor:(UIColor *)newValue;
+- (CGFloat)codeBlockBorderRadius;
+- (void)setCodeBlockBorderRadius:(CGFloat)newValue;
 @end

package/ios/config/InputConfig.mm

@@ -10,7 +10,7 @@
   UIFont *_monospacedFont;
   BOOL _primaryFontNeedsRecreation;
   BOOL _monospacedFontNeedsRecreation;
-  NSSet<NSNumber*> *_mentionIndicators;
+  NSSet<NSNumber *> *_mentionIndicators;
   CGFloat _h1FontSize;
   BOOL _h1Bold;
   CGFloat _h2FontSize;
@@ -36,9 +36,14 @@
   UIColor *_linkColor;
   TextDecorationLineEnum _linkDecorationLine;
   NSDictionary *_mentionProperties;
+  UIColor *_codeBlockFgColor;
+  CGFloat _codeBlockBorderRadius;
+  UIColor *_codeBlockBgColor;
+  CGFloat _imageWidth;
+  CGFloat _imageHeight;
 }
 
-- (instancetype) init {
+- (instancetype)init {
   self = [super init];
   _primaryFontNeedsRecreation = YES;
   _monospacedFontNeedsRecreation = YES;
@@ -79,6 +84,9 @@
   copy->_linkColor = [_linkColor copy];
   copy->_linkDecorationLine = [_linkDecorationLine copy];
   copy->_mentionProperties = [_mentionProperties mutableCopy];
+  copy->_codeBlockFgColor = [_codeBlockFgColor copy];
+  copy->_codeBlockBgColor = [_codeBlockBgColor copy];
+  copy->_codeBlockBorderRadius = _codeBlockBorderRadius;
   return copy;
 }
 
@@ -102,7 +110,9 @@
 }
 
 - (NSString *)primaryFontWeight {
-  return _primaryFontWeight != nullptr ? _primaryFontWeight : [NSString stringWithFormat:@"%@", @(UIFontWeightRegular)];
+  return _primaryFontWeight != nullptr
+             ? _primaryFontWeight
+             : [NSString stringWithFormat:@"%@", @(UIFontWeightRegular)];
 }
 
 - (void)setPrimaryFontWeight:(NSString *)newValue {
@@ -122,41 +132,45 @@
 }
 
 - (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 primaryFontSize]
+                                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 primaryFontSize] 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;
 }
 
@@ -224,7 +238,6 @@
   _blockquoteBorderWidth = newValue;
 }
 
-
 - (CGFloat)blockquoteGapWidth {
   return _blockquoteGapWidth;
 }
@@ -291,24 +304,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 primaryFontSize]
+                                          weight:newFontWeight
+                                           style:nullptr
+                                         variant:nullptr
+                                 scaleMultiplier:1];
   }
   return _orderedListMarkerFont;
 }
@@ -366,10 +380,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];
@@ -379,4 +393,28 @@
   return fallbackProps;
 }
 
+- (UIColor *)codeBlockFgColor {
+  return _codeBlockFgColor;
+}
+
+- (void)setCodeBlockFgColor:(UIColor *)newValue {
+  _codeBlockFgColor = newValue;
+}
+
+- (UIColor *)codeBlockBgColor {
+  return _codeBlockBgColor;
+}
+
+- (void)setCodeBlockBgColor:(UIColor *)newValue {
+  _codeBlockBgColor = newValue;
+}
+
+- (CGFloat)codeBlockBorderRadius {
+  return _codeBlockBorderRadius;
+}
+
+- (void)setCodeBlockBorderRadius:(CGFloat)newValue {
+  _codeBlockBorderRadius = newValue;
+}
+
 @end

package/ios/generated/RNEnrichedTextInputViewSpec/EventEmitters.cpp

@@ -115,4 +115,14 @@ payload.setProperty(runtime, "text", event.text);
   });
 }
 
+
+void EnrichedTextInputViewEventEmitter::onRequestHtmlResult(OnRequestHtmlResult event) const {
+  dispatchEvent("requestHtmlResult", [event=std::move(event)](jsi::Runtime &runtime) {
+    auto payload = jsi::Object(runtime);
+    payload.setProperty(runtime, "requestId", event.requestId);
+payload.setProperty(runtime, "html", jsi::valueFromDynamic(runtime, event.html));
+    return payload;
+  });
+}
+
 } // namespace facebook::react

package/ios/generated/RNEnrichedTextInputViewSpec/EventEmitters.h

@@ -74,6 +74,11 @@ class EnrichedTextInputViewEventEmitter : public ViewEventEmitter {
     int end;
     std::string text;
     };
+
+  struct OnRequestHtmlResult {
+      int requestId;
+    folly::dynamic html;
+    };
   void onInputFocus(OnInputFocus value) const;
 
   void onInputBlur(OnInputBlur value) const;
@@ -91,5 +96,7 @@ class EnrichedTextInputViewEventEmitter : public ViewEventEmitter {
   void onMention(OnMention value) const;
 
   void onChangeSelection(OnChangeSelection value) const;
+
+  void onRequestHtmlResult(OnRequestHtmlResult value) const;
 };
 } // namespace facebook::react

package/ios/generated/RNEnrichedTextInputViewSpec/Props.h

@@ -309,45 +309,6 @@ static inline folly::dynamic toDynamic(const EnrichedTextInputViewHtmlStyleAStru
 }
 #endif
 
-struct EnrichedTextInputViewHtmlStyleImgStruct {
-  Float width{0.0};
-  Float height{0.0};
-
-#ifdef RN_SERIALIZABLE_STATE
-  bool operator==(const EnrichedTextInputViewHtmlStyleImgStruct&) const = default;
-
-  folly::dynamic toDynamic() const {
-    folly::dynamic result = folly::dynamic::object();
-    result["width"] = width;
-    result["height"] = height;
-    return result;
-  }
-#endif
-};
-
-static inline void fromRawValue(const PropsParserContext& context, const RawValue &value, EnrichedTextInputViewHtmlStyleImgStruct &result) {
-  auto map = (std::unordered_map<std::string, RawValue>)value;
-
-  auto tmp_width = map.find("width");
-  if (tmp_width != map.end()) {
-    fromRawValue(context, tmp_width->second, result.width);
-  }
-  auto tmp_height = map.find("height");
-  if (tmp_height != map.end()) {
-    fromRawValue(context, tmp_height->second, result.height);
-  }
-}
-
-static inline std::string toString(const EnrichedTextInputViewHtmlStyleImgStruct &value) {
-  return "[Object EnrichedTextInputViewHtmlStyleImgStruct]";
-}
-
-#ifdef RN_SERIALIZABLE_STATE
-static inline folly::dynamic toDynamic(const EnrichedTextInputViewHtmlStyleImgStruct &value) {
-  return value.toDynamic();
-}
-#endif
-
 struct EnrichedTextInputViewHtmlStyleOlStruct {
   Float gapWidth{0.0};
   Float marginLeft{0.0};
@@ -459,7 +420,6 @@ struct EnrichedTextInputViewHtmlStyleStruct {
   EnrichedTextInputViewHtmlStyleCodeStruct code{};
   EnrichedTextInputViewHtmlStyleAStruct a{};
   folly::dynamic mention{};
-  EnrichedTextInputViewHtmlStyleImgStruct img{};
   EnrichedTextInputViewHtmlStyleOlStruct ol{};
   EnrichedTextInputViewHtmlStyleUlStruct ul{};
 
@@ -476,7 +436,6 @@ struct EnrichedTextInputViewHtmlStyleStruct {
     result["code"] = ::facebook::react::toDynamic(code);
     result["a"] = ::facebook::react::toDynamic(a);
     result["mention"] = mention;
-    result["img"] = ::facebook::react::toDynamic(img);
     result["ol"] = ::facebook::react::toDynamic(ol);
     result["ul"] = ::facebook::react::toDynamic(ul);
     return result;
@@ -519,10 +478,6 @@ static inline void fromRawValue(const PropsParserContext& context, const RawValu
   if (tmp_mention != map.end()) {
     fromRawValue(context, tmp_mention->second, result.mention);
   }
-  auto tmp_img = map.find("img");
-  if (tmp_img != map.end()) {
-    fromRawValue(context, tmp_img->second, result.img);
-  }
   auto tmp_ol = map.find("ol");
   if (tmp_ol != map.end()) {
     fromRawValue(context, tmp_ol->second, result.ol);

package/ios/generated/RNEnrichedTextInputViewSpec/RCTComponentViewHelpers.h

@@ -30,9 +30,10 @@ NS_ASSUME_NONNULL_BEGIN
 - (void)toggleOrderedList;
 - (void)toggleUnorderedList;
 - (void)addLink:(NSInteger)start end:(NSInteger)end text:(NSString *)text url:(NSString *)url;
-- (void)addImage:(NSString *)uri;
+- (void)addImage:(NSString *)uri width:(float)width height:(float)height;
 - (void)startMention:(NSString *)indicator;
 - (void)addMention:(NSString *)indicator text:(NSString *)text payload:(NSString *)payload;
+- (void)requestHTML:(NSInteger)requestId;
 @end
 
 RCT_EXTERN inline void RCTEnrichedTextInputViewHandleCommand(
@@ -302,8 +303,8 @@ NSObject *arg3 = args[3];
 
 if ([commandName isEqualToString:@"addImage"]) {
 #if RCT_DEBUG
-  if ([args count] != 1) {
-    RCTLogError(@"%@ command %@ received %d arguments, expected %d.", @"EnrichedTextInputView", commandName, (int)[args count], 1);
+  if ([args count] != 3) {
+    RCTLogError(@"%@ command %@ received %d arguments, expected %d.", @"EnrichedTextInputView", commandName, (int)[args count], 3);
     return;
   }
 #endif
@@ -316,7 +317,23 @@ if ([commandName isEqualToString:@"addImage"]) {
 #endif
   NSString * uri = (NSString *)arg0;
 
-  [componentView addImage:uri];
+NSObject *arg1 = args[1];
+#if RCT_DEBUG
+  if (!RCTValidateTypeOfViewCommandArgument(arg1, [NSNumber class], @"float", @"EnrichedTextInputView", commandName, @"2nd")) {
+    return;
+  }
+#endif
+  float width = [(NSNumber *)arg1 floatValue];
+
+NSObject *arg2 = args[2];
+#if RCT_DEBUG
+  if (!RCTValidateTypeOfViewCommandArgument(arg2, [NSNumber class], @"float", @"EnrichedTextInputView", commandName, @"3rd")) {
+    return;
+  }
+#endif
+  float height = [(NSNumber *)arg2 floatValue];
+
+  [componentView addImage:uri width:width height:height];
   return;
 }
 
@@ -376,6 +393,26 @@ NSObject *arg2 = args[2];
   return;
 }
 
+if ([commandName isEqualToString:@"requestHTML"]) {
+#if RCT_DEBUG
+  if ([args count] != 1) {
+    RCTLogError(@"%@ command %@ received %d arguments, expected %d.", @"EnrichedTextInputView", commandName, (int)[args count], 1);
+    return;
+  }
+#endif
+
+  NSObject *arg0 = args[0];
+#if RCT_DEBUG
+  if (!RCTValidateTypeOfViewCommandArgument(arg0, [NSNumber class], @"number", @"EnrichedTextInputView", commandName, @"1st")) {
+    return;
+  }
+#endif
+  NSInteger requestId = [(NSNumber *)arg0 intValue];
+
+  [componentView requestHTML:requestId];
+  return;
+}
+
 #if RCT_DEBUG
   RCTLogError(@"%@ received command %@, which is not a supported command.", @"EnrichedTextInputView", commandName);
 #endif

package/ios/inputParser/InputParser.h

@@ -3,9 +3,9 @@
 
 @interface InputParser : NSObject
 - (instancetype _Nonnull)initWithInput:(id _Nonnull)input;
-- (NSString * _Nonnull)parseToHtmlFromRange:(NSRange)range;
-- (void)replaceWholeFromHtml:(NSString * _Nonnull)html;
-- (void)replaceFromHtml:(NSString * _Nonnull)html range:(NSRange)range;
-- (void)insertFromHtml:(NSString * _Nonnull)html location:(NSInteger)location;
-- (NSString * _Nullable)initiallyProcessHtml:(NSString * _Nonnull)html;
+- (NSString *_Nonnull)parseToHtmlFromRange:(NSRange)range;
+- (void)replaceWholeFromHtml:(NSString *_Nonnull)html;
+- (void)replaceFromHtml:(NSString *_Nonnull)html range:(NSRange)range;
+- (void)insertFromHtml:(NSString *_Nonnull)html location:(NSInteger)location;
+- (NSString *_Nullable)initiallyProcessHtml:(NSString *_Nonnull)html;
 @end