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

package/ios/EnrichedMarkdown.mm

@@ -1,5 +1,6 @@
 #import "EnrichedMarkdown.h"
 #import "ContextMenuUtils.h"
+#import "ENRMAccessibilityLabels.h"
 #import "ENRMAsyncRenderCoordinator.h"
 #import "ENRMImageAttachment.h"
 #import "ENRMMarkdownParser.h"
@@ -106,6 +107,8 @@ static char kENRMSegmentFadeAnimatorKey;
   NSArray<NSString *> *_contextMenuItemTexts;
   NSArray<NSString *> *_contextMenuItemIcons;
   ENRMSelectionMenuConfig _selectionMenuConfig;
+  ENRMAccessibilityLabels *_accessibilityLabels;
+  ENRMSelectionMenuLabels _selectionMenuLabels;
 
   ENRMSpoilerOverlay _spoilerOverlay;
 
@@ -388,6 +391,43 @@ static char kENRMSegmentFadeAnimatorKey;
   }
 }
 
+- (void)pushAccessibilityLabelsToSegments
+{
+  for (RCTUIView *segment in _segmentViews) {
+    if ([segment isKindOfClass:[EnrichedMarkdownInternalText class]]) {
+      ((EnrichedMarkdownInternalText *)segment).accessibilityLabels = _accessibilityLabels;
+    } else if ([segment isKindOfClass:[TableContainerView class]]) {
+      ((TableContainerView *)segment).accessibilityLabels = _accessibilityLabels;
+    }
+#if ENRICHED_MARKDOWN_MATH
+    else if ([segment isKindOfClass:[ENRMMathContainerView class]]) {
+      ((ENRMMathContainerView *)segment).accessibilityLabels = _accessibilityLabels;
+    }
+#endif
+  }
+}
+
+// Table and math views cache the copy labels at creation time, so re-push them
+// on prop updates (e.g. a language change without a remount) to avoid stale
+// labels. Only the copy/copy-as-markdown labels apply to these block menus.
+- (void)pushSelectionMenuLabelsToSegments
+{
+  for (RCTUIView *segment in _segmentViews) {
+    if ([segment isKindOfClass:[TableContainerView class]]) {
+      TableContainerView *tableView = (TableContainerView *)segment;
+      tableView.copyLabel = _selectionMenuLabels.copyLabel;
+      tableView.copyAsMarkdownLabel = _selectionMenuLabels.copyAsMarkdownLabel;
+    }
+#if ENRICHED_MARKDOWN_MATH
+    else if ([segment isKindOfClass:[ENRMMathContainerView class]]) {
+      ENRMMathContainerView *mathView = (ENRMMathContainerView *)segment;
+      mathView.copyLabel = _selectionMenuLabels.copyLabel;
+      mathView.copyAsMarkdownLabel = _selectionMenuLabels.copyAsMarkdownLabel;
+    }
+#endif
+  }
+}
+
 - (void)requestHeightUpdate
 {
   ENRMRequestHeightUpdate<EnrichedMarkdownState>(_state, _heightUpdateCounter, self);
@@ -549,6 +589,7 @@ static char kENRMSegmentFadeAnimatorKey;
   view.allowTrailingMargin = _allowTrailingMargin;
   view.lastElementMarginBottom = segment.lastElementMarginBottom;
   view.accessibilityInfo = segment.accessibilityInfo;
+  view.accessibilityLabels = _accessibilityLabels;
   view.textView.selectable = _selectable;
   [view applyAttributedText:segment.attributedText context:segment.context];
 
@@ -599,6 +640,9 @@ static char kENRMSegmentFadeAnimatorKey;
   tableView.enableLinkPreview = _enableLinkPreview;
   tableView.writingDirectionMode = _writingDirectionMode;
   tableView.resolvedLayoutDirection = _resolvedLayoutDirection;
+  tableView.accessibilityLabels = _accessibilityLabels;
+  tableView.copyLabel = _selectionMenuLabels.copyLabel;
+  tableView.copyAsMarkdownLabel = _selectionMenuLabels.copyAsMarkdownLabel;
 
   __weak EnrichedMarkdown *weakSelf = self;
 
@@ -635,6 +679,9 @@ static char kENRMSegmentFadeAnimatorKey;
 - (ENRMMathContainerView *)createMathViewForSegment:(ENRMMathSegment *)mathSegment
 {
   ENRMMathContainerView *mathView = [[ENRMMathContainerView alloc] initWithConfig:_config];
+  mathView.accessibilityLabels = _accessibilityLabels;
+  mathView.copyLabel = _selectionMenuLabels.copyLabel;
+  mathView.copyAsMarkdownLabel = _selectionMenuLabels.copyAsMarkdownLabel;
   [mathView applyLatex:mathSegment.latex];
   return mathView;
 }
@@ -787,10 +834,38 @@ static char kENRMSegmentFadeAnimatorKey;
     _contextMenuItemIcons = ENRMContextMenuIconsFromItems(newViewProps.contextMenuItems);
   }
 
-  _selectionMenuConfig = (ENRMSelectionMenuConfig){
-      .copyAsMarkdown = newViewProps.selectionMenuConfig.copyAsMarkdown,
-      .copyImageURL = newViewProps.selectionMenuConfig.copyImageUrl,
-  };
+  _selectionMenuLabels = ENRMParseSelectionMenuLabels(newViewProps.selectionMenuConfig);
+  _selectionMenuConfig =
+      ENRMBuildSelectionMenuConfig(_selectionMenuLabels, newViewProps.selectionMenuConfig.copyAsMarkdown,
+                                   newViewProps.selectionMenuConfig.copyImageUrl);
+  [self pushSelectionMenuLabelsToSegments];
+
+  if (ENRMAccessibilityLabelsChanged(oldViewProps.accessibilityLabels, newViewProps.accessibilityLabels)) {
+    _accessibilityLabels = [[ENRMAccessibilityLabels alloc] init];
+    _accessibilityLabels.bulletPoint =
+        [[NSString alloc] initWithUTF8String:newViewProps.accessibilityLabels.list.bulletPoint.c_str()];
+    _accessibilityLabels.nestedBulletPoint =
+        [[NSString alloc] initWithUTF8String:newViewProps.accessibilityLabels.list.nestedBulletPoint.c_str()];
+    _accessibilityLabels.orderedItem =
+        [[NSString alloc] initWithUTF8String:newViewProps.accessibilityLabels.list.orderedItem.c_str()];
+    _accessibilityLabels.nestedOrderedItem =
+        [[NSString alloc] initWithUTF8String:newViewProps.accessibilityLabels.list.nestedOrderedItem.c_str()];
+    _accessibilityLabels.blockquote =
+        [[NSString alloc] initWithUTF8String:newViewProps.accessibilityLabels.blockquote.quote.c_str()];
+    _accessibilityLabels.nestedBlockquote =
+        [[NSString alloc] initWithUTF8String:newViewProps.accessibilityLabels.blockquote.nestedQuote.c_str()];
+    _accessibilityLabels.tableRow =
+        [[NSString alloc] initWithUTF8String:newViewProps.accessibilityLabels.table.row.c_str()];
+    _accessibilityLabels.mathEquation =
+        [[NSString alloc] initWithUTF8String:newViewProps.accessibilityLabels.math.equation.c_str()];
+    _accessibilityLabels.rotorHeadings =
+        [[NSString alloc] initWithUTF8String:newViewProps.accessibilityLabels.rotor.headings.c_str()];
+    _accessibilityLabels.rotorLinks =
+        [[NSString alloc] initWithUTF8String:newViewProps.accessibilityLabels.rotor.links.c_str()];
+    _accessibilityLabels.rotorImages =
+        [[NSString alloc] initWithUTF8String:newViewProps.accessibilityLabels.rotor.images.c_str()];
+    [self pushAccessibilityLabelsToSegments];
+  }
 
   if (newViewProps.spoilerOverlay != oldViewProps.spoilerOverlay) {
     NSString *modeStr = [[NSString alloc] initWithUTF8String:newViewProps.spoilerOverlay.c_str()];
@@ -1070,26 +1145,7 @@ Class<RCTComponentViewProtocol> EnrichedMarkdownCls(void)
 
 - (NSArray *)accessibilityElements
 {
-  NSMutableArray *allElements = [NSMutableArray array];
-  for (RCTUIView *segment in _segmentViews) {
-    if ([segment isKindOfClass:[EnrichedMarkdownInternalText class]]) {
-      NSArray *elements = [(EnrichedMarkdownInternalText *)segment accessibilityElements];
-      if (elements) {
-        [allElements addObjectsFromArray:elements];
-      }
-    } else if ([segment isKindOfClass:[TableContainerView class]]) {
-      NSArray *elements = [(TableContainerView *)segment accessibilityElements];
-      if (elements) {
-        [allElements addObjectsFromArray:elements];
-      }
-    }
-#if ENRICHED_MARKDOWN_MATH
-    else if ([segment isKindOfClass:[ENRMMathContainerView class]]) {
-      [allElements addObject:segment];
-    }
-#endif
-  }
-  return allElements;
+  return _segmentViews;
 }
 
 - (NSInteger)accessibilityElementCount
@@ -1114,7 +1170,8 @@ Class<RCTComponentViewProtocol> EnrichedMarkdownCls(void)
 #if !TARGET_OS_OSX
 - (NSArray<UIAccessibilityCustomRotor *> *)accessibilityCustomRotors
 {
-  return [MarkdownAccessibilityElementBuilder buildRotorsFromElements:[self accessibilityElements]];
+  return [MarkdownAccessibilityElementBuilder buildRotorsFromElements:[self accessibilityElements]
+                                                               labels:_accessibilityLabels];
 }
 #endif
 

package/ios/EnrichedMarkdownText.mm

@@ -1,6 +1,7 @@
 #import "EnrichedMarkdownText.h"
 #import "CodeBlockBackground.h"
 #import "ContextMenuUtils.h"
+#import "ENRMAccessibilityLabels.h"
 #import "ENRMAsyncRenderCoordinator.h"
 #import "ENRMContextMenuTextView+macOS.h"
 #import "ENRMImageAttachment.h"
@@ -88,6 +89,7 @@ typedef NS_OPTIONS(NSUInteger, ENRMDirtyFlags) {
   ENRMTailFadeInAnimator *_fadeAnimator;
 
   AccessibilityInfo *_accessibilityInfo;
+  ENRMAccessibilityLabels *_accessibilityLabels;
 #if !TARGET_OS_OSX
   NSMutableArray<UIAccessibilityElement *> *_accessibilityElements;
 #else
@@ -98,6 +100,7 @@ typedef NS_OPTIONS(NSUInteger, ENRMDirtyFlags) {
   NSArray<NSString *> *_contextMenuItemTexts;
   NSArray<NSString *> *_contextMenuItemIcons;
   ENRMSelectionMenuConfig _selectionMenuConfig;
+  ENRMSelectionMenuLabels _selectionMenuLabels;
 
   ENRMSpoilerOverlayManager *_spoilerManager;
 
@@ -534,10 +537,37 @@ typedef NS_OPTIONS(NSUInteger, ENRMDirtyFlags) {
     _contextMenuItemIcons = ENRMContextMenuIconsFromItems(newViewProps.contextMenuItems);
   }
 
-  _selectionMenuConfig = (ENRMSelectionMenuConfig){
-      .copyAsMarkdown = newViewProps.selectionMenuConfig.copyAsMarkdown,
-      .copyImageURL = newViewProps.selectionMenuConfig.copyImageUrl,
-  };
+  _selectionMenuLabels = ENRMParseSelectionMenuLabels(newViewProps.selectionMenuConfig);
+  _selectionMenuConfig =
+      ENRMBuildSelectionMenuConfig(_selectionMenuLabels, newViewProps.selectionMenuConfig.copyAsMarkdown,
+                                   newViewProps.selectionMenuConfig.copyImageUrl);
+
+  if (ENRMAccessibilityLabelsChanged(oldViewProps.accessibilityLabels, newViewProps.accessibilityLabels)) {
+    _accessibilityLabels = [[ENRMAccessibilityLabels alloc] init];
+    _accessibilityLabels.bulletPoint =
+        [[NSString alloc] initWithUTF8String:newViewProps.accessibilityLabels.list.bulletPoint.c_str()];
+    _accessibilityLabels.nestedBulletPoint =
+        [[NSString alloc] initWithUTF8String:newViewProps.accessibilityLabels.list.nestedBulletPoint.c_str()];
+    _accessibilityLabels.orderedItem =
+        [[NSString alloc] initWithUTF8String:newViewProps.accessibilityLabels.list.orderedItem.c_str()];
+    _accessibilityLabels.nestedOrderedItem =
+        [[NSString alloc] initWithUTF8String:newViewProps.accessibilityLabels.list.nestedOrderedItem.c_str()];
+    _accessibilityLabels.blockquote =
+        [[NSString alloc] initWithUTF8String:newViewProps.accessibilityLabels.blockquote.quote.c_str()];
+    _accessibilityLabels.nestedBlockquote =
+        [[NSString alloc] initWithUTF8String:newViewProps.accessibilityLabels.blockquote.nestedQuote.c_str()];
+    _accessibilityLabels.tableRow =
+        [[NSString alloc] initWithUTF8String:newViewProps.accessibilityLabels.table.row.c_str()];
+    _accessibilityLabels.mathEquation =
+        [[NSString alloc] initWithUTF8String:newViewProps.accessibilityLabels.math.equation.c_str()];
+    _accessibilityLabels.rotorHeadings =
+        [[NSString alloc] initWithUTF8String:newViewProps.accessibilityLabels.rotor.headings.c_str()];
+    _accessibilityLabels.rotorLinks =
+        [[NSString alloc] initWithUTF8String:newViewProps.accessibilityLabels.rotor.links.c_str()];
+    _accessibilityLabels.rotorImages =
+        [[NSString alloc] initWithUTF8String:newViewProps.accessibilityLabels.rotor.images.c_str()];
+    _accessibilityNeedsRebuild = YES;
+  }
 
   if (newViewProps.streamingAnimation != oldViewProps.streamingAnimation) {
     _streamingAnimation = newViewProps.streamingAnimation;
@@ -753,6 +783,7 @@ Class<RCTComponentViewProtocol> EnrichedMarkdownTextCls(void)
 #if !TARGET_OS_OSX
   _accessibilityElements = [MarkdownAccessibilityElementBuilder buildElementsForTextView:_textView
                                                                                     info:_accessibilityInfo
+                                                                                  labels:_accessibilityLabels
                                                                                container:self];
 #else
   _accessibilityElements = [NSMutableArray array];
@@ -795,7 +826,8 @@ Class<RCTComponentViewProtocol> EnrichedMarkdownTextCls(void)
 - (NSArray<UIAccessibilityCustomRotor *> *)accessibilityCustomRotors
 {
   [self rebuildAccessibilityElementsIfNeeded];
-  return [MarkdownAccessibilityElementBuilder buildRotorsFromElements:_accessibilityElements];
+  return [MarkdownAccessibilityElementBuilder buildRotorsFromElements:_accessibilityElements
+                                                               labels:_accessibilityLabels];
 }
 #endif
 

package/ios/generated/ReactCodegen/EnrichedMarkdownTextSpec/Props.cpp

@@ -34,6 +34,7 @@ EnrichedMarkdownProps::EnrichedMarkdownProps(
     spoilerOverlay(convertRawProp(context, rawProps, "spoilerOverlay", sourceProps.spoilerOverlay, {std::string{"particles"}})),
     contextMenuItems(convertRawProp(context, rawProps, "contextMenuItems", sourceProps.contextMenuItems, {})),
     selectionMenuConfig(convertRawProp(context, rawProps, "selectionMenuConfig", sourceProps.selectionMenuConfig, {})),
+    accessibilityLabels(convertRawProp(context, rawProps, "accessibilityLabels", sourceProps.accessibilityLabels, {})),
     textBreakStrategy(convertRawProp(context, rawProps, "textBreakStrategy", sourceProps.textBreakStrategy, {std::string{"highQuality"}})),
     lineBreakStrategyIOS(convertRawProp(context, rawProps, "lineBreakStrategyIOS", sourceProps.lineBreakStrategyIOS, {std::string{"none"}})),
     writingDirection(convertRawProp(context, rawProps, "writingDirection", sourceProps.writingDirection, {std::string{"first-strong"}})) {}
@@ -114,6 +115,10 @@ folly::dynamic EnrichedMarkdownProps::getDiffProps(
     result["selectionMenuConfig"] = toDynamic(selectionMenuConfig);
   }
     
+  if (accessibilityLabels != oldProps->accessibilityLabels) {
+    result["accessibilityLabels"] = toDynamic(accessibilityLabels);
+  }
+    
   if (textBreakStrategy != oldProps->textBreakStrategy) {
     result["textBreakStrategy"] = textBreakStrategy;
   }
@@ -151,6 +156,8 @@ EnrichedMarkdownTextInputProps::EnrichedMarkdownTextInputProps(
     fontWeight(convertRawProp(context, rawProps, "fontWeight", sourceProps.fontWeight, {})),
     isOnChangeMarkdownSet(convertRawProp(context, rawProps, "isOnChangeMarkdownSet", sourceProps.isOnChangeMarkdownSet, {false})),
     contextMenuItems(convertRawProp(context, rawProps, "contextMenuItems", sourceProps.contextMenuItems, {})),
+    selectionMenuConfig(convertRawProp(context, rawProps, "selectionMenuConfig", sourceProps.selectionMenuConfig, {})),
+    formatMenuConfig(convertRawProp(context, rawProps, "formatMenuConfig", sourceProps.formatMenuConfig, {})),
     linkRegex(convertRawProp(context, rawProps, "linkRegex", sourceProps.linkRegex, {})),
     mentionIndicators(convertRawProp(context, rawProps, "mentionIndicators", sourceProps.mentionIndicators, {})),
     writingDirection(convertRawProp(context, rawProps, "writingDirection", sourceProps.writingDirection, {std::string{"first-strong"}})) {}
@@ -243,6 +250,14 @@ folly::dynamic EnrichedMarkdownTextInputProps::getDiffProps(
     result["contextMenuItems"] = toDynamic(contextMenuItems);
   }
     
+  if (selectionMenuConfig != oldProps->selectionMenuConfig) {
+    result["selectionMenuConfig"] = toDynamic(selectionMenuConfig);
+  }
+    
+  if (formatMenuConfig != oldProps->formatMenuConfig) {
+    result["formatMenuConfig"] = toDynamic(formatMenuConfig);
+  }
+    
   if (linkRegex != oldProps->linkRegex) {
     result["linkRegex"] = toDynamic(linkRegex);
   }
@@ -277,6 +292,7 @@ EnrichedMarkdownTextProps::EnrichedMarkdownTextProps(
     spoilerOverlay(convertRawProp(context, rawProps, "spoilerOverlay", sourceProps.spoilerOverlay, {std::string{"particles"}})),
     contextMenuItems(convertRawProp(context, rawProps, "contextMenuItems", sourceProps.contextMenuItems, {})),
     selectionMenuConfig(convertRawProp(context, rawProps, "selectionMenuConfig", sourceProps.selectionMenuConfig, {})),
+    accessibilityLabels(convertRawProp(context, rawProps, "accessibilityLabels", sourceProps.accessibilityLabels, {})),
     textBreakStrategy(convertRawProp(context, rawProps, "textBreakStrategy", sourceProps.textBreakStrategy, {std::string{"highQuality"}})),
     lineBreakStrategyIOS(convertRawProp(context, rawProps, "lineBreakStrategyIOS", sourceProps.lineBreakStrategyIOS, {std::string{"none"}})),
     writingDirection(convertRawProp(context, rawProps, "writingDirection", sourceProps.writingDirection, {std::string{"first-strong"}})) {}
@@ -357,6 +373,10 @@ folly::dynamic EnrichedMarkdownTextProps::getDiffProps(
     result["selectionMenuConfig"] = toDynamic(selectionMenuConfig);
   }
     
+  if (accessibilityLabels != oldProps->accessibilityLabels) {
+    result["accessibilityLabels"] = toDynamic(accessibilityLabels);
+  }
+    
   if (textBreakStrategy != oldProps->textBreakStrategy) {
     result["textBreakStrategy"] = textBreakStrategy;
   }