react-native-enriched-markdown-scaffold 0.6.0-scaffold.8 → 0.7.4-scaffold.2

package/ios/generated/ReactCodegen/EnrichedMarkdownTextSpec/RCTComponentViewHelpers.h

@@ -35,6 +35,7 @@ NS_ASSUME_NONNULL_BEGIN
 - (void)insertMath:(NSString *)latex displayMode:(BOOL)displayMode;
 - (void)updateMath:(NSInteger)start latex:(NSString *)latex displayMode:(BOOL)displayMode;
 - (void)removeMath:(NSInteger)start;
+- (void)copyToClipboard;
 - (void)requestMarkdown:(NSInteger)requestId;
 - (void)requestCaretRect:(NSInteger)requestId;
 @end
@@ -384,6 +385,20 @@ if ([commandName isEqualToString:@"removeMath"]) {
   return;
 }
 
+if ([commandName isEqualToString:@"copyToClipboard"]) {
+#if RCT_DEBUG
+  if ([args count] != 0) {
+    RCTLogError(@"%@ command %@ received %d arguments, expected %d.", @"EnrichedMarkdownTextInput", commandName, (int)[args count], 0);
+    return;
+  }
+#endif
+
+  
+
+  [componentView copyToClipboard];
+  return;
+}
+
 if ([commandName isEqualToString:@"requestMarkdown"]) {
 #if RCT_DEBUG
   if ([args count] != 1) {

package/ios/input/ENRMFormattingStore.h

@@ -14,8 +14,13 @@ NS_ASSUME_NONNULL_BEGIN
 - (nullable ENRMFormattingRange *)rangeOfType:(ENRMInputStyleType)type containingPosition:(NSUInteger)position;
 - (BOOL)isStyleActive:(ENRMInputStyleType)type atPosition:(NSUInteger)position;
 - (BOOL)isStyleActive:(ENRMInputStyleType)type inRange:(NSRange)range;
+- (BOOL)isStyleAdjacentBefore:(ENRMInputStyleType)type position:(NSUInteger)position;
 - (NSArray<ENRMFormattingRange *> *)rangesOfType:(ENRMInputStyleType)type;
 
+/// Snaps a selection so it never partially overlaps an atomic link: a partial selection expands to
+/// the whole link, a caret inside a link moves to its end (unchanged when no adjustment is needed).
+- (NSRange)selectionAdjustedForAtomicLinks:(NSRange)selection;
+
 - (void)addRange:(ENRMFormattingRange *)range;
 - (void)removeType:(ENRMInputStyleType)type inRange:(NSRange)range;
 - (void)removeRange:(ENRMFormattingRange *)range;

package/ios/input/ENRMFormattingStore.mm

@@ -99,6 +99,31 @@ static EditOverlap classifyOverlap(NSUInteger rangeStart, NSUInteger rangeEnd, N
   return nil;
 }
 
+- (NSRange)selectionAdjustedForAtomicLinks:(NSRange)selection
+{
+  if (selection.length > 0) {
+    NSUInteger start = selection.location;
+    NSUInteger end = NSMaxRange(selection);
+    ENRMFormattingRange *startLink = [self rangeOfType:ENRMInputStyleTypeLink containingPosition:start];
+    if (startLink != nil) {
+      start = MIN(start, startLink.range.location);
+    }
+    if (end > 0) {
+      ENRMFormattingRange *endLink = [self rangeOfType:ENRMInputStyleTypeLink containingPosition:(end - 1)];
+      if (endLink != nil) {
+        end = MAX(end, NSMaxRange(endLink.range));
+      }
+    }
+    return NSMakeRange(start, end - start);
+  }
+  ENRMFormattingRange *caretLink = [self rangeOfType:ENRMInputStyleTypeLink containingPosition:selection.location];
+  if (caretLink != nil && selection.location > caretLink.range.location &&
+      selection.location < NSMaxRange(caretLink.range)) {
+    return NSMakeRange(NSMaxRange(caretLink.range), 0);
+  }
+  return selection;
+}
+
 - (BOOL)isStyleActive:(ENRMInputStyleType)type atPosition:(NSUInteger)position
 {
   return [self rangeOfType:type containingPosition:position] != nil;
@@ -114,6 +139,15 @@ static EditOverlap classifyOverlap(NSUInteger rangeStart, NSUInteger rangeEnd, N
   return NO;
 }
 
+- (BOOL)isStyleAdjacentBefore:(ENRMInputStyleType)type position:(NSUInteger)position
+{
+  if (position == 0) {
+    return NO;
+  }
+  return [self rangeOfType:type containingPosition:position] != nil || [self rangeOfType:type
+                                                                           containingPosition:position - 1] != nil;
+}
+
 - (void)addRange:(ENRMFormattingRange *)newRange
 {
   NSMutableIndexSet *mergeIndexes = [NSMutableIndexSet indexSet];

package/ios/input/ENRMInputTextView.h

@@ -6,6 +6,8 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
+extern NSString *const kENRMMarkdownPasteboardType;
+
 @interface ENRMInputTextView : ENRMPlatformTextView
 @property (nonatomic, weak, nullable) EnrichedMarkdownTextInput *markdownTextInput;
 @end

package/ios/input/ENRMInputTextView.mm

@@ -1,15 +1,14 @@
 #import "ENRMInputTextView.h"
 #import "EnrichedMarkdownTextInput.h"
+#import "PasteboardUtils.h"
 #if TARGET_OS_OSX
 #import "EnrichedMarkdownTextInput+Internal.h"
 #endif
 
-static NSString *const kENRMMarkdownPasteboardType = @"com.swmansion.enriched-markdown.markdown";
+NSString *const kENRMMarkdownPasteboardType = @"com.swmansion.enriched-markdown.markdown";
 
 #if !TARGET_OS_OSX
 
-#import <UniformTypeIdentifiers/UniformTypeIdentifiers.h>
-
 @implementation ENRMInputTextView
 
 - (void)copy:(id)sender
@@ -21,14 +20,12 @@ static NSString *const kENRMMarkdownPasteboardType = @"com.swmansion.enriched-ma
 
   NSString *plainText = [self.text substringWithRange:selection];
   NSString *markdown = [self.markdownTextInput markdownForSelectedRange];
-
-  UIPasteboard *pasteboard = [UIPasteboard generalPasteboard];
   NSMutableDictionary *items = [NSMutableDictionary dictionary];
-  items[UTTypePlainText.identifier] = plainText;
+  items[kUTIPlainText] = plainText;
   if (markdown.length > 0) {
     items[kENRMMarkdownPasteboardType] = markdown;
   }
-  pasteboard.items = @[ items ];
+  copyItemsToPasteboard(items);
 }
 
 - (void)cut:(id)sender
@@ -94,18 +91,12 @@ static NSString *const kENRMMarkdownPasteboardType = @"com.swmansion.enriched-ma
 
   NSString *plainText = [self.string substringWithRange:selection];
   NSString *markdown = [self.markdownTextInput markdownForSelectedRange];
-
-  NSPasteboard *pasteboard = [NSPasteboard generalPasteboard];
-  [pasteboard clearContents];
-  NSMutableArray *types = [NSMutableArray arrayWithObject:NSPasteboardTypeString];
-  if (markdown.length > 0) {
-    [types addObject:kENRMMarkdownPasteboardType];
-  }
-  [pasteboard declareTypes:types owner:nil];
-  [pasteboard setString:plainText forType:NSPasteboardTypeString];
+  NSMutableDictionary *items = [NSMutableDictionary dictionary];
+  items[kUTIPlainText] = plainText;
   if (markdown.length > 0) {
-    [pasteboard setString:markdown forType:kENRMMarkdownPasteboardType];
+    items[kENRMMarkdownPasteboardType] = markdown;
   }
+  copyItemsToPasteboard(items);
 }
 
 - (void)cut:(id)sender

package/ios/input/ENRMMarkdownSerializer.mm

@@ -100,7 +100,7 @@ static NSCharacterSet *whitespaceSet(void)
 {
   static NSCharacterSet *set;
   static dispatch_once_t onceToken;
-  dispatch_once(&onceToken, ^{ set = [NSCharacterSet whitespaceCharacterSet]; });
+  dispatch_once(&onceToken, ^{ set = [NSCharacterSet whitespaceAndNewlineCharacterSet]; });
   return set;
 }
 

package/ios/input/EnrichedMarkdownTextInput+ContextMenu.mm

@@ -3,8 +3,6 @@
 #import "EnrichedMarkdownTextInput+Internal.h"
 #import "PasteboardUtils.h"
 
-// TODO: Wrap all user-facing strings with NSLocalizedString for localization support.
-
 @implementation EnrichedMarkdownTextInput (ContextMenu)
 
 - (void)copySelectedRangeAsMarkdown
@@ -25,28 +23,33 @@
     return nil;
   }
 
+  ENRMInputSelectionMenuConfig menuConfig = [self inputSelectionMenuConfig];
+  ENRMFormatMenuConfig fmtConfig = [self formatMenuConfig];
   __weak EnrichedMarkdownTextInput *weakSelf = self;
 
-  static const struct {
+  const struct {
     NSString *title;
     NSString *icon;
     ENRMInputStyleType styleType;
-  } kFormatItems[] = {
-      // TODO: Localize titles with NSLocalizedString.
-      {@"Bold", @"bold", ENRMInputStyleTypeStrong},
-      {@"Italic", @"italic", ENRMInputStyleTypeEmphasis},
-      {@"Underline", @"underline", ENRMInputStyleTypeUnderline},
-      {@"Strikethrough", @"strikethrough", ENRMInputStyleTypeStrikethrough},
-      {@"Spoiler", @"eye.slash", ENRMInputStyleTypeSpoiler},
-      {@"Link", @"link", ENRMInputStyleTypeLink},
+    BOOL visible;
+  } formatItems[] = {
+      {fmtConfig.boldLabel, @"bold", ENRMInputStyleTypeStrong, fmtConfig.bold},
+      {fmtConfig.italicLabel, @"italic", ENRMInputStyleTypeEmphasis, fmtConfig.italic},
+      {fmtConfig.underlineLabel, @"underline", ENRMInputStyleTypeUnderline, fmtConfig.underline},
+      {fmtConfig.strikethroughLabel, @"strikethrough", ENRMInputStyleTypeStrikethrough, fmtConfig.strikethrough},
+      {fmtConfig.spoilerLabel, @"eye.slash", ENRMInputStyleTypeSpoiler, fmtConfig.spoiler},
+      {fmtConfig.linkLabel, @"link", ENRMInputStyleTypeLink, fmtConfig.link},
   };
-  static const NSUInteger kFormatItemCount = sizeof(kFormatItems) / sizeof(kFormatItems[0]);
+  const NSUInteger formatItemCount = sizeof(formatItems) / sizeof(formatItems[0]);
 
-  NSMutableArray<UIAction *> *formatActions = [NSMutableArray arrayWithCapacity:kFormatItemCount];
-  for (NSUInteger i = 0; i < kFormatItemCount; i++) {
-    ENRMInputStyleType styleType = kFormatItems[i].styleType;
-    UIAction *action = [UIAction actionWithTitle:kFormatItems[i].title
-                                           image:[UIImage systemImageNamed:kFormatItems[i].icon]
+  NSMutableArray<UIAction *> *formatActions = [NSMutableArray arrayWithCapacity:formatItemCount];
+  for (NSUInteger i = 0; i < formatItemCount; i++) {
+    if (!formatItems[i].visible) {
+      continue;
+    }
+    ENRMInputStyleType styleType = formatItems[i].styleType;
+    UIAction *action = [UIAction actionWithTitle:formatItems[i].title
+                                           image:[UIImage systemImageNamed:formatItems[i].icon]
                                       identifier:nil
                                          handler:^(__kindof UIAction *_) {
                                            if (styleType == ENRMInputStyleTypeLink) {
@@ -57,14 +60,14 @@
                                          }];
     [formatActions addObject:action];
   }
-  UIMenu *formatMenu = [UIMenu menuWithTitle:@"Format"
+  UIMenu *formatMenu = [UIMenu menuWithTitle:menuConfig.formatLabel
                                        image:[UIImage systemImageNamed:@"textformat"]
                                   identifier:@"com.enrichedmarkdown.format"
                                      options:0
                                     children:formatActions];
 
   UIAction *copyMarkdownAction =
-      [UIAction actionWithTitle:@"Copy as Markdown"
+      [UIAction actionWithTitle:menuConfig.copyAsMarkdownLabel
                           image:[UIImage systemImageNamed:@"doc.text"]
                      identifier:@"com.enrichedmarkdown.copyMarkdown"
                         handler:^(__kindof UIAction *action) { [self copySelectedRangeAsMarkdown]; }];
@@ -91,8 +94,13 @@
       break;
     }
   }
-  [systemActions insertObject:formatMenu atIndex:insertIndex];
-  [systemActions insertObject:copyMarkdownAction atIndex:insertIndex + 1];
+  if (menuConfig.format) {
+    [systemActions insertObject:formatMenu atIndex:insertIndex];
+    insertIndex++;
+  }
+  if (menuConfig.copyAsMarkdown) {
+    [systemActions insertObject:copyMarkdownAction atIndex:insertIndex];
+  }
   [allActions addObjectsFromArray:systemActions];
 
   return [UIMenu menuWithChildren:allActions];
@@ -104,6 +112,8 @@
     return menu;
   }
 
+  ENRMInputSelectionMenuConfig menuConfig = [self inputSelectionMenuConfig];
+  ENRMFormatMenuConfig fmtConfig = [self formatMenuConfig];
   __weak EnrichedMarkdownTextInput *weakSelf = self;
   NSArray<NSMenuItem *> *customItems =
       ENRMBuildContextMenuItems([self contextMenuItemTexts], [self contextMenuItemIcons], textView,
@@ -114,41 +124,49 @@
 
   [menu addItem:[NSMenuItem separatorItem]];
 
-  NSMenuItem *copyMarkdownItem = [[NSMenuItem alloc] initWithTitle:@"Copy as Markdown"
-                                                            action:@selector(copySelectedRangeAsMarkdown)
-                                                     keyEquivalent:@""];
-  copyMarkdownItem.target = self;
-  [menu addItem:copyMarkdownItem];
-
-  NSMenu *formatSubmenu = [[NSMenu alloc] initWithTitle:@"Format"];
-  struct {
-    NSString *title;
-    SEL action;
-    NSString *key;
-    NSEventModifierFlags modifiers;
-  } const items[] = {
-      {@"Bold", @selector(toggleBold), @"b", NSEventModifierFlagCommand},
-      {@"Italic", @selector(toggleItalic), @"i", NSEventModifierFlagCommand},
-      {@"Underline", @selector(toggleUnderline), @"u", NSEventModifierFlagCommand},
-      {@"Strikethrough", @selector(toggleStrikethrough), @"", 0},
-      {@"Spoiler", @selector(toggleSpoiler), @"", 0},
-      {@"Link", @selector(showLinkPrompt), @"", 0},
-  };
+  if (menuConfig.copyAsMarkdown) {
+    NSMenuItem *copyMarkdownItem = [[NSMenuItem alloc] initWithTitle:menuConfig.copyAsMarkdownLabel
+                                                              action:@selector(copySelectedRangeAsMarkdown)
+                                                       keyEquivalent:@""];
+    copyMarkdownItem.target = self;
+    [menu addItem:copyMarkdownItem];
+  }
 
-  for (NSUInteger i = 0; i < sizeof(items) / sizeof(items[0]); i++) {
-    NSMenuItem *item = [[NSMenuItem alloc] initWithTitle:items[i].title
-                                                  action:items[i].action
-                                           keyEquivalent:items[i].key];
-    if (items[i].modifiers) {
-      item.keyEquivalentModifierMask = items[i].modifiers;
+  if (menuConfig.format) {
+    NSMenu *formatSubmenu = [[NSMenu alloc] initWithTitle:menuConfig.formatLabel];
+    const struct {
+      NSString *title;
+      SEL action;
+      NSString *key;
+      NSEventModifierFlags modifiers;
+      BOOL visible;
+    } items[] = {
+        {fmtConfig.boldLabel, @selector(toggleBold), @"b", NSEventModifierFlagCommand, fmtConfig.bold},
+        {fmtConfig.italicLabel, @selector(toggleItalic), @"i", NSEventModifierFlagCommand, fmtConfig.italic},
+        {fmtConfig.underlineLabel, @selector(toggleUnderline), @"u", NSEventModifierFlagCommand, fmtConfig.underline},
+        {fmtConfig.strikethroughLabel, @selector(toggleStrikethrough), @"", 0, fmtConfig.strikethrough},
+        {fmtConfig.spoilerLabel, @selector(toggleSpoiler), @"", 0, fmtConfig.spoiler},
+        {fmtConfig.linkLabel, @selector(showLinkPrompt), @"", 0, fmtConfig.link},
+    };
+
+    for (NSUInteger i = 0; i < sizeof(items) / sizeof(items[0]); i++) {
+      if (!items[i].visible) {
+        continue;
+      }
+      NSMenuItem *item = [[NSMenuItem alloc] initWithTitle:items[i].title
+                                                    action:items[i].action
+                                             keyEquivalent:items[i].key];
+      if (items[i].modifiers) {
+        item.keyEquivalentModifierMask = items[i].modifiers;
+      }
+      item.target = self;
+      [formatSubmenu addItem:item];
     }
-    item.target = self;
-    [formatSubmenu addItem:item];
-  }
 
-  NSMenuItem *formatItem = [[NSMenuItem alloc] initWithTitle:@"Format" action:nil keyEquivalent:@""];
-  formatItem.submenu = formatSubmenu;
-  [menu addItem:formatItem];
+    NSMenuItem *formatItem = [[NSMenuItem alloc] initWithTitle:menuConfig.formatLabel action:nil keyEquivalent:@""];
+    formatItem.submenu = formatSubmenu;
+    [menu addItem:formatItem];
+  }
 
   return menu;
 }

package/ios/input/EnrichedMarkdownTextInput+Internal.h

@@ -5,6 +5,30 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
+// The owner must keep these strings alive for the duration of the call (the
+// view holds them in strong ivars).
+typedef struct {
+  BOOL format;
+  __unsafe_unretained NSString *_Nullable formatLabel;
+  BOOL copyAsMarkdown;
+  __unsafe_unretained NSString *_Nullable copyAsMarkdownLabel;
+} ENRMInputSelectionMenuConfig;
+
+typedef struct {
+  BOOL bold;
+  __unsafe_unretained NSString *_Nullable boldLabel;
+  BOOL italic;
+  __unsafe_unretained NSString *_Nullable italicLabel;
+  BOOL underline;
+  __unsafe_unretained NSString *_Nullable underlineLabel;
+  BOOL strikethrough;
+  __unsafe_unretained NSString *_Nullable strikethroughLabel;
+  BOOL spoiler;
+  __unsafe_unretained NSString *_Nullable spoilerLabel;
+  BOOL link;
+  __unsafe_unretained NSString *_Nullable linkLabel;
+} ENRMFormatMenuConfig;
+
 @interface EnrichedMarkdownTextInput (Internal)
 
 - (void)toggleBold;
@@ -20,6 +44,8 @@ NS_ASSUME_NONNULL_BEGIN
 - (void)emitContextMenuItemPress:(NSString *)itemText;
 - (NSArray<NSString *> *)contextMenuItemTexts;
 - (NSArray<NSString *> *)contextMenuItemIcons;
+- (ENRMInputSelectionMenuConfig)inputSelectionMenuConfig;
+- (ENRMFormatMenuConfig)formatMenuConfig;
 
 #if TARGET_OS_OSX
 - (NSMenu *)enrichedMenuForEvent:(NSEvent *)event defaultMenu:(NSMenu *)menu textView:(NSTextView *)textView;

package/ios/input/EnrichedMarkdownTextInput.h

@@ -10,6 +10,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, assign) BOOL blockEmitting;
 - (CGSize)measureSize:(CGFloat)maxWidth;
 - (nullable NSString *)markdownForSelectedRange;
+- (void)copyToClipboard;
 - (void)pasteMarkdown:(NSString *)markdown;
 - (void)replaceSelectedTextWith:(NSString *)text formattingRanges:(NSArray *)ranges;
 - (void)scheduleRelayoutIfNeeded;