react-native-enriched 0.1.6 → 0.2.1

package/ios/inputTextView/InputTextView.h

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

package/ios/inputTextView/InputTextView.mm

@@ -1,114 +1,155 @@
 #import "InputTextView.h"
 #import "EnrichedTextInputView.h"
 #import "StringExtension.h"
-#import <UniformTypeIdentifiers/UniformTypeIdentifiers.h>
 #import "TextInsertionUtils.h"
+#import <UniformTypeIdentifiers/UniformTypeIdentifiers.h>
 
 @implementation InputTextView
 
 - (void)copy:(id)sender {
   EnrichedTextInputView *typedInput = (EnrichedTextInputView *)_input;
-  if(typedInput == nullptr) { return; }
-  
+  if (typedInput == nullptr) {
+    return;
+  }
+
   // remove zero width spaces before copying the text
-  NSString *plainText = [typedInput->textView.textStorage.string substringWithRange:typedInput->textView.selectedRange];
-  NSString *fixedPlainText = [plainText stringByReplacingOccurrencesOfString:@"\u200B" withString:@""];
-  
-  NSString *parsedHtml = [typedInput->parser parseToHtmlFromRange:typedInput->textView.selectedRange];
-  
-  NSMutableAttributedString *attrStr = [[typedInput->textView.textStorage attributedSubstringFromRange:typedInput->textView.selectedRange] mutableCopy];
+  NSString *plainText = [typedInput->textView.textStorage.string
+      substringWithRange:typedInput->textView.selectedRange];
+  NSString *fixedPlainText =
+      [plainText stringByReplacingOccurrencesOfString:@"\u200B" withString:@""];
+
+  NSString *parsedHtml = [typedInput->parser
+      parseToHtmlFromRange:typedInput->textView.selectedRange];
+
+  NSMutableAttributedString *attrStr = [[typedInput->textView.textStorage
+      attributedSubstringFromRange:typedInput->textView.selectedRange]
+      mutableCopy];
   NSRange fullAttrStrRange = NSMakeRange(0, attrStr.length);
-  [attrStr.mutableString replaceOccurrencesOfString:@"\u200B" withString:@"" options:0 range:fullAttrStrRange];
-  
-  NSData *rtfData = [attrStr dataFromRange:NSMakeRange(0, attrStr.length)
-    documentAttributes:@{NSDocumentTypeDocumentAttribute:NSRTFTextDocumentType}
-    error:nullptr
-  ];
-  
+  [attrStr.mutableString replaceOccurrencesOfString:@"\u200B"
+                                         withString:@""
+                                            options:0
+                                              range:fullAttrStrRange];
+
+  NSData *rtfData =
+      [attrStr dataFromRange:NSMakeRange(0, attrStr.length)
+          documentAttributes:@{
+            NSDocumentTypeDocumentAttribute : NSRTFTextDocumentType
+          }
+                       error:nullptr];
+
   UIPasteboard *pasteboard = [UIPasteboard generalPasteboard];
-  [pasteboard setItems:@[@{
-    UTTypeUTF8PlainText.identifier : fixedPlainText,
-    UTTypeHTML.identifier : parsedHtml,
-    UTTypeRTF.identifier : rtfData
-  }]];
+  [pasteboard setItems:@[ @{
+                UTTypeUTF8PlainText.identifier : fixedPlainText,
+                UTTypeHTML.identifier : parsedHtml,
+                UTTypeRTF.identifier : rtfData
+              } ]];
 }
 
 - (void)paste:(id)sender {
   EnrichedTextInputView *typedInput = (EnrichedTextInputView *)_input;
-  if(typedInput == nullptr) { return; }
+  if (typedInput == nullptr) {
+    return;
+  }
 
   UIPasteboard *pasteboard = [UIPasteboard generalPasteboard];
   NSArray<NSString *> *pasteboardTypes = pasteboard.pasteboardTypes;
   NSRange currentRange = typedInput->textView.selectedRange;
-  
-  if([pasteboardTypes containsObject:UTTypeHTML.identifier]) {
+
+  if ([pasteboardTypes containsObject:UTTypeHTML.identifier]) {
     // we try processing the html contents
-    
+
     NSString *htmlString;
     id htmlValue = [pasteboard valueForPasteboardType:UTTypeHTML.identifier];
-    
-    if([htmlValue isKindOfClass:[NSData class]]) {
-      htmlString = [[NSString alloc]initWithData:htmlValue encoding:NSUTF8StringEncoding];
-    } else if([htmlValue isKindOfClass:[NSString class]]) {
+
+    if ([htmlValue isKindOfClass:[NSData class]]) {
+      htmlString = [[NSString alloc] initWithData:htmlValue
+                                         encoding:NSUTF8StringEncoding];
+    } else if ([htmlValue isKindOfClass:[NSString class]]) {
       htmlString = htmlValue;
     }
-    
+
     // validate the html
-    NSString *initiallyProcessedHtml = [typedInput->parser initiallyProcessHtml:htmlString];
-    
-    if(initiallyProcessedHtml != nullptr) {
+    NSString *initiallyProcessedHtml =
+        [typedInput->parser initiallyProcessHtml:htmlString];
+
+    if (initiallyProcessedHtml != nullptr) {
       // valid html, let's apply it
       currentRange.length > 0
-        ? [typedInput->parser replaceFromHtml:initiallyProcessedHtml range:currentRange]
-        : [typedInput->parser insertFromHtml:initiallyProcessedHtml location:currentRange.location];
+          ? [typedInput->parser replaceFromHtml:initiallyProcessedHtml
+                                          range:currentRange]
+          : [typedInput->parser insertFromHtml:initiallyProcessedHtml
+                                      location:currentRange.location];
     } else {
       // fall back to plain text, otherwise do nothing
-      [self tryHandlingPlainTextItemsIn:pasteboard range:currentRange input:typedInput];
+      [self tryHandlingPlainTextItemsIn:pasteboard
+                                  range:currentRange
+                                  input:typedInput];
     }
   } else {
-    [self tryHandlingPlainTextItemsIn:pasteboard range:currentRange input:typedInput];
+    [self tryHandlingPlainTextItemsIn:pasteboard
+                                range:currentRange
+                                input:typedInput];
   }
-  
+
   [typedInput anyTextMayHaveBeenModified];
 }
 
-- (void)tryHandlingPlainTextItemsIn:(UIPasteboard *)pasteboard range:(NSRange)range input:(EnrichedTextInputView *)input {
+- (void)tryHandlingPlainTextItemsIn:(UIPasteboard *)pasteboard
+                              range:(NSRange)range
+                              input:(EnrichedTextInputView *)input {
   NSArray *existingTypes = pasteboard.pasteboardTypes;
-  NSArray *handledTypes = @[UTTypeUTF8PlainText.identifier, UTTypePlainText.identifier, UTTypeURL.identifier];
+  NSArray *handledTypes = @[
+    UTTypeUTF8PlainText.identifier, UTTypePlainText.identifier,
+    UTTypeURL.identifier
+  ];
   NSString *plainText;
-  
-  for(NSString *type in handledTypes) {
-    if(![existingTypes containsObject:type]) {
+
+  for (NSString *type in handledTypes) {
+    if (![existingTypes containsObject:type]) {
       continue;
     }
-    
+
     id value = [pasteboard valueForPasteboardType:type];
-    
-    if([value isKindOfClass:[NSData class]]) {
-      plainText = [[NSString alloc]initWithData:value encoding:NSUTF8StringEncoding];
-    } else if([value isKindOfClass:[NSString class]]) {
+
+    if ([value isKindOfClass:[NSData class]]) {
+      plainText = [[NSString alloc] initWithData:value
+                                        encoding:NSUTF8StringEncoding];
+    } else if ([value isKindOfClass:[NSString class]]) {
       plainText = (NSString *)value;
-    } else if([value isKindOfClass:[NSURL class]]) {
+    } else if ([value isKindOfClass:[NSURL class]]) {
       plainText = [(NSURL *)value absoluteString];
     }
   }
-  
-  if(!plainText) {
+
+  if (!plainText) {
     return;
   }
-  
-  range.length > 0
-    ? [TextInsertionUtils replaceText:plainText at:range additionalAttributes:nullptr input:input withSelection:YES]
-    : [TextInsertionUtils insertText:plainText at:range.location additionalAttributes:nullptr input:input withSelection:YES];
+
+  range.length > 0 ? [TextInsertionUtils replaceText:plainText
+                                                  at:range
+                                additionalAttributes:nullptr
+                                               input:input
+                                       withSelection:YES]
+                   : [TextInsertionUtils insertText:plainText
+                                                 at:range.location
+                               additionalAttributes:nullptr
+                                              input:input
+                                      withSelection:YES];
 }
 
 - (void)cut:(id)sender {
   EnrichedTextInputView *typedInput = (EnrichedTextInputView *)_input;
-  if(typedInput == nullptr) { return; }
-  
+  if (typedInput == nullptr) {
+    return;
+  }
+
   [self copy:sender];
-  [TextInsertionUtils replaceText:@"" at:typedInput->textView.selectedRange additionalAttributes:nullptr input:typedInput  withSelection:YES];
-  
+  [TextInsertionUtils replaceText:@""
+                               at:typedInput->textView.selectedRange
+             additionalAttributes:nullptr
+                            input:typedInput
+                    withSelection:YES];
+
   [typedInput anyTextMayHaveBeenModified];
 }
 

package/ios/internals/EnrichedTextInputViewComponentDescriptor.h

@@ -1,17 +1,19 @@
 #pragma once
-#include <react/debug/react_native_assert.h>
+#include <ReactNativeEnriched/EnrichedTextInputViewShadowNode.h>
 #include <ReactNativeEnriched/Props.h>
+#include <react/debug/react_native_assert.h>
 #include <react/renderer/core/ConcreteComponentDescriptor.h>
-#include <ReactNativeEnriched/EnrichedTextInputViewShadowNode.h>
 
 namespace facebook::react {
-class EnrichedTextInputViewComponentDescriptor final : public ConcreteComponentDescriptor<EnrichedTextInputViewShadowNode> {
-  public:
-    using ConcreteComponentDescriptor::ConcreteComponentDescriptor;
-    void adopt(ShadowNode &shadowNode) const override {
-      react_native_assert(dynamic_cast<EnrichedTextInputViewShadowNode *>(&shadowNode));
-      ConcreteComponentDescriptor::adopt(shadowNode);
-    }
+class EnrichedTextInputViewComponentDescriptor final
+    : public ConcreteComponentDescriptor<EnrichedTextInputViewShadowNode> {
+public:
+  using ConcreteComponentDescriptor::ConcreteComponentDescriptor;
+  void adopt(ShadowNode &shadowNode) const override {
+    react_native_assert(
+        dynamic_cast<EnrichedTextInputViewShadowNode *>(&shadowNode));
+    ConcreteComponentDescriptor::adopt(shadowNode);
+  }
 };
 
 } // namespace facebook::react

package/ios/internals/EnrichedTextInputViewShadowNode.h

@@ -1,10 +1,10 @@
 #pragma once
+#include <ReactNativeEnriched/EnrichedTextInputViewState.h>
 #include <ReactNativeEnriched/EventEmitters.h>
 #include <ReactNativeEnriched/Props.h>
-#include <ReactNativeEnriched/EnrichedTextInputViewState.h>
+#include <jsi/jsi.h>
 #include <react/renderer/components/view/ConcreteViewShadowNode.h>
 #include <react/renderer/core/LayoutConstraints.h>
-#include <jsi/jsi.h>
 
 namespace facebook::react {
 
@@ -13,28 +13,32 @@ JSI_EXPORT extern const char EnrichedTextInputViewComponentName[];
 /*
  * `ShadowNode` for <EnrichedTextInputView> component.
  */
-class EnrichedTextInputViewShadowNode : public ConcreteViewShadowNode<
-        EnrichedTextInputViewComponentName,
-        EnrichedTextInputViewProps,
-        EnrichedTextInputViewEventEmitter,
-        EnrichedTextInputViewState> {
-    public:
-    using ConcreteViewShadowNode::ConcreteViewShadowNode;
-    EnrichedTextInputViewShadowNode(const ShadowNodeFragment& fragment, const ShadowNodeFamily::Shared& family, ShadowNodeTraits traits);
-    EnrichedTextInputViewShadowNode(const ShadowNode& sourceShadowNode, const ShadowNodeFragment& fragment);
-    void dirtyLayoutIfNeeded();
-    Size measureContent(const LayoutContext& layoutContext, const LayoutConstraints& layoutConstraints) const override;
-    
-    
-    static ShadowNodeTraits BaseTraits() {
-      auto traits = ConcreteViewShadowNode::BaseTraits();
-      traits.set(ShadowNodeTraits::Trait::LeafYogaNode);
-      traits.set(ShadowNodeTraits::Trait::MeasurableYogaNode);
-      return traits;
-    }
-    
-    private:
-    int localForceHeightRecalculationCounter_;
+class EnrichedTextInputViewShadowNode
+    : public ConcreteViewShadowNode<
+          EnrichedTextInputViewComponentName, EnrichedTextInputViewProps,
+          EnrichedTextInputViewEventEmitter, EnrichedTextInputViewState> {
+public:
+  using ConcreteViewShadowNode::ConcreteViewShadowNode;
+  EnrichedTextInputViewShadowNode(const ShadowNodeFragment &fragment,
+                                  const ShadowNodeFamily::Shared &family,
+                                  ShadowNodeTraits traits);
+  EnrichedTextInputViewShadowNode(const ShadowNode &sourceShadowNode,
+                                  const ShadowNodeFragment &fragment);
+  void dirtyLayoutIfNeeded();
+  Size
+  measureContent(const LayoutContext &layoutContext,
+                 const LayoutConstraints &layoutConstraints) const override;
+
+  static ShadowNodeTraits BaseTraits() {
+    auto traits = ConcreteViewShadowNode::BaseTraits();
+    traits.set(ShadowNodeTraits::Trait::LeafYogaNode);
+    traits.set(ShadowNodeTraits::Trait::MeasurableYogaNode);
+    return traits;
+  }
+
+private:
+  int localForceHeightRecalculationCounter_;
+  id setupMockTextInputView_() const;
 };
 
 } // namespace facebook::react

package/ios/internals/EnrichedTextInputViewShadowNode.mm

@@ -1,86 +1,103 @@
 #import "EnrichedTextInputViewShadowNode.h"
+#import "CoreText/CoreText.h"
 #import <EnrichedTextInputView.h>
+#import <React/RCTShadowView+Layout.h>
 #import <react/utils/ManagedObjectWrapper.h>
 #import <yoga/Yoga.h>
-#import <React/RCTShadowView+Layout.h>
-#import "CoreText/CoreText.h"
 
 namespace facebook::react {
 
-extern const char EnrichedTextInputViewComponentName[] = "EnrichedTextInputView";
+extern const char EnrichedTextInputViewComponentName[] =
+    "EnrichedTextInputView";
 
 EnrichedTextInputViewShadowNode::EnrichedTextInputViewShadowNode(
-  const ShadowNodeFragment& fragment,
-  const ShadowNodeFamily::Shared& family,
-  ShadowNodeTraits traits
-): ConcreteViewShadowNode(fragment, family, traits) {
+    const ShadowNodeFragment &fragment, const ShadowNodeFamily::Shared &family,
+    ShadowNodeTraits traits)
+    : ConcreteViewShadowNode(fragment, family, traits) {
   localForceHeightRecalculationCounter_ = 0;
 }
 
+// mock input is used for the first measure calls that need to be done when the
+// real input isn't defined yet
+id EnrichedTextInputViewShadowNode::setupMockTextInputView_() const {
+  // it's rendered far away from the viewport
+  const int veryFarAway = 20000;
+  const int mockSize = 1000;
+  EnrichedTextInputView *mockTextInputView_ = [[EnrichedTextInputView alloc]
+      initWithFrame:(CGRectMake(veryFarAway, veryFarAway, mockSize, mockSize))];
+  const auto props = this->getProps();
+  mockTextInputView_->blockEmitting = YES;
+  [mockTextInputView_ updateProps:props oldProps:nullptr];
+  return mockTextInputView_;
+}
+
 EnrichedTextInputViewShadowNode::EnrichedTextInputViewShadowNode(
-  const ShadowNode& sourceShadowNode,
-  const ShadowNodeFragment& fragment
-): ConcreteViewShadowNode(sourceShadowNode, fragment) {
+    const ShadowNode &sourceShadowNode, const ShadowNodeFragment &fragment)
+    : ConcreteViewShadowNode(sourceShadowNode, fragment) {
   dirtyLayoutIfNeeded();
 }
 
 void EnrichedTextInputViewShadowNode::dirtyLayoutIfNeeded() {
   const auto state = this->getStateData();
   const int receivedCounter = state.getForceHeightRecalculationCounter();
-  
-  if(receivedCounter > localForceHeightRecalculationCounter_) {
+
+  if (receivedCounter > localForceHeightRecalculationCounter_) {
     localForceHeightRecalculationCounter_ = receivedCounter;
     YGNodeMarkDirty(&yogaNode_);
   }
 }
 
-Size EnrichedTextInputViewShadowNode::measureContent(const LayoutContext& layoutContext, const LayoutConstraints& layoutConstraints) const {
+Size EnrichedTextInputViewShadowNode::measureContent(
+    const LayoutContext &layoutContext,
+    const LayoutConstraints &layoutConstraints) const {
   const auto state = this->getStateData();
   const auto componentRef = state.getComponentViewRef();
-  RCTInternalGenericWeakWrapper *weakWrapper = (RCTInternalGenericWeakWrapper *)unwrapManagedObject(componentRef);
-  
-  if(weakWrapper != nullptr) {
+  RCTInternalGenericWeakWrapper *weakWrapper =
+      (RCTInternalGenericWeakWrapper *)unwrapManagedObject(componentRef);
+
+  if (weakWrapper != nullptr) {
     id componentObject = weakWrapper.object;
-    EnrichedTextInputView *typedComponentObject = (EnrichedTextInputView *) componentObject;
-    
-    if(typedComponentObject != nullptr) {
+    EnrichedTextInputView *typedComponentObject =
+        (EnrichedTextInputView *)componentObject;
+
+    if (typedComponentObject != nullptr) {
       __block CGSize estimatedSize;
-      
+
       // synchronously dispatch to main thread if needed
-      if([NSThread isMainThread]) {
-        estimatedSize = [typedComponentObject measureSize:layoutConstraints.maximumSize.width];
+      if ([NSThread isMainThread]) {
+        estimatedSize = [typedComponentObject
+            measureSize:layoutConstraints.maximumSize.width];
       } else {
         dispatch_sync(dispatch_get_main_queue(), ^{
-          estimatedSize = [typedComponentObject measureSize:layoutConstraints.maximumSize.width];
+          estimatedSize = [typedComponentObject
+              measureSize:layoutConstraints.maximumSize.width];
         });
       }
-      
-      return {
-        estimatedSize.width,
-        MIN(estimatedSize.height, layoutConstraints.maximumSize.height)
-      };
+
+      return {estimatedSize.width,
+              MIN(estimatedSize.height, layoutConstraints.maximumSize.height)};
     }
   } else {
-    // on the very first call there is no componentView that we can query for the component height
-    // thus, a little heuristic: just put a height that is exactly height of letter "I" with default apple font and size from props
-    // in a lot of cases it will be the desired height
-    // in others, the jump on the second call will at least be smaller
-    const auto props = this->getProps();
-    const auto &typedProps = *std::static_pointer_cast<EnrichedTextInputViewProps const>(props);
-    NSAttributedString *attrStr = [[NSAttributedString alloc] initWithString:@"I" attributes:@{NSFontAttributeName: [UIFont systemFontOfSize:typedProps.fontSize]}];
-    CTFramesetterRef framesetter = CTFramesetterCreateWithAttributedString((CFAttributedStringRef)attrStr);
-    const CGSize &suggestedSize = CTFramesetterSuggestFrameSizeWithConstraints(
-      framesetter,
-      CFRangeMake(0, 1),
-      nullptr,
-      CGSizeMake(layoutConstraints.maximumSize.width, DBL_MAX),
-      nullptr
-    );
-    
-    return {suggestedSize.width, suggestedSize.height};
+    __block CGSize estimatedSize;
+
+    // synchronously dispatch to main thread if needed
+    if ([NSThread isMainThread]) {
+      EnrichedTextInputView *mockTextInputView = setupMockTextInputView_();
+      estimatedSize =
+          [mockTextInputView measureSize:layoutConstraints.maximumSize.width];
+    } else {
+      dispatch_sync(dispatch_get_main_queue(), ^{
+        EnrichedTextInputView *mockTextInputView = setupMockTextInputView_();
+        estimatedSize =
+            [mockTextInputView measureSize:layoutConstraints.maximumSize.width];
+      });
+    }
+
+    return {estimatedSize.width,
+            MIN(estimatedSize.height, layoutConstraints.maximumSize.height)};
   }
-  
+
   return Size();
 }
- 
+
 } // namespace facebook::react

package/ios/internals/EnrichedTextInputViewState.h

@@ -5,13 +5,15 @@ namespace facebook::react {
 
 class EnrichedTextInputViewState {
 public:
-  EnrichedTextInputViewState(): forceHeightRecalculationCounter_(0), componentViewRef_(nullptr) {}
+  EnrichedTextInputViewState()
+      : forceHeightRecalculationCounter_(0), componentViewRef_(nullptr) {}
   EnrichedTextInputViewState(int counter, std::shared_ptr<void> ref) {
     forceHeightRecalculationCounter_ = counter;
     componentViewRef_ = ref;
   }
   int getForceHeightRecalculationCounter() const;
   std::shared_ptr<void> getComponentViewRef() const;
+
 private:
   int forceHeightRecalculationCounter_{};
   std::shared_ptr<void> componentViewRef_{};