7Mountains
diff --git a/‎ios/EnrichedTextInputView.mm‎
Lines changed: 6 additions & 0 deletions b/‎ios/EnrichedTextInputView.mm‎
Lines changed: 6 additions & 0 deletions
diff --git a/‎ios/attachments/ImageAttachment.mm‎
Lines changed: 3 additions & 1 deletion b/‎ios/attachments/ImageAttachment.mm‎
Lines changed: 3 additions & 1 deletion
@@ -851,6 +851,9 @@ - (void)updateProps:(Props::Shared const &)props
       newViewProps.defaultValue != oldViewProps.defaultValue;
 
   if (stylePropChanged) {
+    // we want to preserve the selection between props changes
+    NSRange prevSelectedRange = textView.selectedRange;
+
     // now set the new config
     config = newConfig;
 
@@ -887,6 +890,7 @@ - (void)updateProps:(Props::Shared const &)props
     defaultTypingAttributes[NSParagraphStyleAttributeName] =
         [[NSParagraphStyle alloc] init];
     textView.typingAttributes = defaultTypingAttributes;
+    textView.selectedRange = prevSelectedRange;
 
     // update the placeholder as well
     [self refreshPlaceholderLabelStyles];
@@ -911,6 +915,7 @@ - (void)updateProps:(Props::Shared const &)props
       [parser replaceWholeFromHtml:newDefaultValue
           notifyAnyTextMayHaveBeenModified:!isFirstMount];
     }
+    textView.selectedRange = NSRange(textView.textStorage.string.length, 0);
   }
 
   // placeholderTextColor
@@ -1332,6 +1337,7 @@ - (void)setValue:(NSString *)value {
 
   // set recentlyChangedRange and check for changes
   recentlyChangedRange = NSMakeRange(0, textView.textStorage.string.length);
+  textView.selectedRange = NSRange(textView.textStorage.string.length, 0);
   [self anyTextMayHaveBeenModified];
 }
 
 
@@ -16,8 +16,10 @@ - (instancetype)initWithImageData:(ImageData *)data {
 
 - (void)loadAsync {
   NSURL *url = [NSURL URLWithString:self.uri];
-  if (!url)
+  if (!url) {
+    self.image = [UIImage systemImageNamed:@"file"];
     return;
+  }
 
   dispatch_async(dispatch_get_global_queue(QOS_CLASS_USER_INITIATED, 0), ^{
     NSData *bytes = [NSData dataWithContentsOfURL:url];