refactor: rename internal C++/ObjC symbols from MarkdownInput to MarkdownTextInput

hryhoriiK97 · hryhoriiK97 · commit 09c5b5e8cc83 · 2026-04-22T09:29:24.000+02:00
diff --git a/android/src/main/jni/react/renderer/components/EnrichedMarkdownTextSpec/ComponentDescriptors.h b/android/src/main/jni/react/renderer/components/EnrichedMarkdownTextSpec/ComponentDescriptors.h
@@ -2,8 +2,8 @@
 
 #include "MarkdownContainerMeasurementManager.h"
 #include "MarkdownContainerShadowNode.h"
-#include "MarkdownInputMeasurementManager.h"
-#include "MarkdownInputShadowNode.h"
+#include "MarkdownTextInputMeasurementManager.h"
+#include "MarkdownTextInputShadowNode.h"
 #include "MarkdownTextMeasurementManager.h"
 #include "MarkdownTextShadowNode.h"
 
@@ -44,20 +44,21 @@ class EnrichedMarkdownTextComponentDescriptor final : public ConcreteComponentDe
   const std::shared_ptr<MarkdownTextMeasurementManager> measurementsManager_;
 };
 
-class EnrichedMarkdownTextInputComponentDescriptor final : public ConcreteComponentDescriptor<MarkdownInputShadowNode> {
+class EnrichedMarkdownTextInputComponentDescriptor final
+    : public ConcreteComponentDescriptor<MarkdownTextInputShadowNode> {
 public:
   EnrichedMarkdownTextInputComponentDescriptor(const ComponentDescriptorParameters &parameters)
       : ConcreteComponentDescriptor(parameters),
-        measurementsManager_(std::make_shared<MarkdownInputMeasurementManager>(contextContainer_)) {}
+        measurementsManager_(std::make_shared<MarkdownTextInputMeasurementManager>(contextContainer_)) {}
 
   void adopt(ShadowNode &shadowNode) const override {
     ConcreteComponentDescriptor::adopt(shadowNode);
-    auto &inputShadowNode = static_cast<MarkdownInputShadowNode &>(shadowNode);
+    auto &inputShadowNode = static_cast<MarkdownTextInputShadowNode &>(shadowNode);
     inputShadowNode.setMeasurementsManager(measurementsManager_);
   }
 
 private:
-  const std::shared_ptr<MarkdownInputMeasurementManager> measurementsManager_;
+  const std::shared_ptr<MarkdownTextInputMeasurementManager> measurementsManager_;
 };
 
 void EnrichedMarkdownTextSpec_registerComponentDescriptorsFromCodegen(
diff --git a/android/src/main/jni/react/renderer/components/EnrichedMarkdownTextSpec/MarkdownInputState.cpp b/android/src/main/jni/react/renderer/components/EnrichedMarkdownTextSpec/MarkdownInputState.cpp
diff --git a/android/src/main/jni/react/renderer/components/EnrichedMarkdownTextSpec/MarkdownTextInputMeasurementManager.cpp b/android/src/main/jni/react/renderer/components/EnrichedMarkdownTextSpec/MarkdownTextInputMeasurementManager.cpp
@@ -1,4 +1,4 @@
-#include "MarkdownInputMeasurementManager.h"
+#include "MarkdownTextInputMeasurementManager.h"
 #include "conversions.h"
 
 #include <fbjni/fbjni.h>
@@ -9,9 +9,9 @@ using namespace facebook::jni;
 
 namespace facebook::react {
 
-Size MarkdownInputMeasurementManager::measure(SurfaceId surfaceId, int viewTag,
-                                              const EnrichedMarkdownTextInputProps &props,
-                                              LayoutConstraints layoutConstraints) const {
+Size MarkdownTextInputMeasurementManager::measure(SurfaceId surfaceId, int viewTag,
+                                                  const EnrichedMarkdownTextInputProps &props,
+                                                  LayoutConstraints layoutConstraints) const {
   const jni::global_ref<jobject> &fabricUIManager = contextContainer_->at<jni::global_ref<jobject>>("FabricUIManager");
 
   static const auto measure =
diff --git a/android/src/main/jni/react/renderer/components/EnrichedMarkdownTextSpec/MarkdownTextInputMeasurementManager.h b/android/src/main/jni/react/renderer/components/EnrichedMarkdownTextSpec/MarkdownTextInputMeasurementManager.h
@@ -6,9 +6,9 @@
 
 namespace facebook::react {
 
-class MarkdownInputMeasurementManager {
+class MarkdownTextInputMeasurementManager {
 public:
-  MarkdownInputMeasurementManager(const std::shared_ptr<const ContextContainer> &contextContainer)
+  MarkdownTextInputMeasurementManager(const std::shared_ptr<const ContextContainer> &contextContainer)
       : contextContainer_(contextContainer) {}
 
   Size measure(SurfaceId surfaceId, int viewTag, const EnrichedMarkdownTextInputProps &props,
diff --git a/android/src/main/jni/react/renderer/components/EnrichedMarkdownTextSpec/MarkdownTextInputShadowNode.cpp b/android/src/main/jni/react/renderer/components/EnrichedMarkdownTextSpec/MarkdownTextInputShadowNode.cpp
@@ -1,18 +1,18 @@
-#include "MarkdownInputShadowNode.h"
+#include "MarkdownTextInputShadowNode.h"
 
 #include <react/renderer/core/LayoutContext.h>
 
 namespace facebook::react {
 
-extern const char MarkdownInputComponentName[] = "EnrichedMarkdownTextInput";
+extern const char MarkdownTextInputComponentName[] = "EnrichedMarkdownTextInput";
 
-void MarkdownInputShadowNode::setMeasurementsManager(
-    const std::shared_ptr<MarkdownInputMeasurementManager> &measurementsManager) {
+void MarkdownTextInputShadowNode::setMeasurementsManager(
+    const std::shared_ptr<MarkdownTextInputMeasurementManager> &measurementsManager) {
   ensureUnsealed();
   measurementsManager_ = measurementsManager;
 }
 
-void MarkdownInputShadowNode::dirtyLayoutIfNeeded() {
+void MarkdownTextInputShadowNode::dirtyLayoutIfNeeded() {
   const auto state = this->getStateData();
   const auto counter = state.getForceHeightRecalculationCounter();
 
@@ -22,8 +22,8 @@ void MarkdownInputShadowNode::dirtyLayoutIfNeeded() {
   }
 }
 
-Size MarkdownInputShadowNode::measureContent(const LayoutContext &layoutContext,
-                                             const LayoutConstraints &layoutConstraints) const {
+Size MarkdownTextInputShadowNode::measureContent(const LayoutContext &layoutContext,
+                                                 const LayoutConstraints &layoutConstraints) const {
   return measurementsManager_->measure(getSurfaceId(), getTag(), getConcreteProps(), layoutConstraints);
 }
 
diff --git a/android/src/main/jni/react/renderer/components/EnrichedMarkdownTextSpec/MarkdownTextInputShadowNode.h b/android/src/main/jni/react/renderer/components/EnrichedMarkdownTextSpec/MarkdownTextInputShadowNode.h
@@ -1,23 +1,23 @@
 #pragma once
 
-#include "MarkdownInputMeasurementManager.h"
-#include "MarkdownInputState.h"
+#include "MarkdownTextInputMeasurementManager.h"
+#include "MarkdownTextInputState.h"
 
 #include <react/renderer/components/EnrichedMarkdownTextSpec/EventEmitters.h>
 #include <react/renderer/components/EnrichedMarkdownTextSpec/Props.h>
 #include <react/renderer/components/view/ConcreteViewShadowNode.h>
 
 namespace facebook::react {
 
-JSI_EXPORT extern const char MarkdownInputComponentName[];
+JSI_EXPORT extern const char MarkdownTextInputComponentName[];
 
-class MarkdownInputShadowNode final
-    : public ConcreteViewShadowNode<MarkdownInputComponentName, EnrichedMarkdownTextInputProps,
-                                    EnrichedMarkdownTextInputEventEmitter, MarkdownInputState> {
+class MarkdownTextInputShadowNode final
+    : public ConcreteViewShadowNode<MarkdownTextInputComponentName, EnrichedMarkdownTextInputProps,
+                                    EnrichedMarkdownTextInputEventEmitter, MarkdownTextInputState> {
 public:
   using ConcreteViewShadowNode::ConcreteViewShadowNode;
 
-  MarkdownInputShadowNode(ShadowNode const &sourceShadowNode, ShadowNodeFragment const &fragment)
+  MarkdownTextInputShadowNode(ShadowNode const &sourceShadowNode, ShadowNodeFragment const &fragment)
       : ConcreteViewShadowNode(sourceShadowNode, fragment) {
     dirtyLayoutIfNeeded();
   }
@@ -29,15 +29,15 @@ class MarkdownInputShadowNode final
     return traits;
   }
 
-  void setMeasurementsManager(const std::shared_ptr<MarkdownInputMeasurementManager> &measurementsManager);
+  void setMeasurementsManager(const std::shared_ptr<MarkdownTextInputMeasurementManager> &measurementsManager);
 
   void dirtyLayoutIfNeeded();
 
   Size measureContent(const LayoutContext &layoutContext, const LayoutConstraints &layoutConstraints) const override;
 
 private:
   int forceHeightRecalculationCounter_{0};
-  std::shared_ptr<MarkdownInputMeasurementManager> measurementsManager_;
+  std::shared_ptr<MarkdownTextInputMeasurementManager> measurementsManager_;
 };
 
 } // namespace facebook::react
diff --git a/android/src/main/jni/react/renderer/components/EnrichedMarkdownTextSpec/MarkdownTextInputState.cpp b/android/src/main/jni/react/renderer/components/EnrichedMarkdownTextSpec/MarkdownTextInputState.cpp
@@ -0,0 +1,9 @@
+#include "MarkdownTextInputState.h"
+
+namespace facebook::react {
+
+int MarkdownTextInputState::getForceHeightRecalculationCounter() const {
+  return forceHeightRecalculationCounter_;
+}
+
+} // namespace facebook::react
diff --git a/android/src/main/jni/react/renderer/components/EnrichedMarkdownTextSpec/MarkdownTextInputState.h b/android/src/main/jni/react/renderer/components/EnrichedMarkdownTextSpec/MarkdownTextInputState.h
@@ -4,11 +4,11 @@
 
 namespace facebook::react {
 
-class MarkdownInputState {
+class MarkdownTextInputState {
 public:
-  MarkdownInputState() : forceHeightRecalculationCounter_(0) {}
+  MarkdownTextInputState() : forceHeightRecalculationCounter_(0) {}
 
-  MarkdownInputState(MarkdownInputState const &previousState, folly::dynamic data)
+  MarkdownTextInputState(MarkdownTextInputState const &previousState, folly::dynamic data)
       : forceHeightRecalculationCounter_((int)data["forceHeightRecalculationCounter"].getInt()) {}
 
   folly::dynamic getDynamic() const {
diff --git a/ios/input/ENRMInputTextView.h b/ios/input/ENRMInputTextView.h
@@ -7,7 +7,7 @@
 NS_ASSUME_NONNULL_BEGIN
 
 @interface ENRMInputTextView : ENRMPlatformTextView
-@property (nonatomic, weak, nullable) EnrichedMarkdownTextInput *markdownInput;
+@property (nonatomic, weak, nullable) EnrichedMarkdownTextInput *markdownTextInput;
 @end
 
 NS_ASSUME_NONNULL_END
diff --git a/ios/input/ENRMInputTextView.mm b/ios/input/ENRMInputTextView.mm
@@ -20,7 +20,7 @@ - (void)copy:(id)sender
   }
 
   NSString *plainText = [self.text substringWithRange:selection];
-  NSString *markdown = [self.markdownInput markdownForSelectedRange];
+  NSString *markdown = [self.markdownTextInput markdownForSelectedRange];
 
   UIPasteboard *pasteboard = [UIPasteboard generalPasteboard];
   NSMutableDictionary *items = [NSMutableDictionary dictionary];
@@ -49,8 +49,8 @@ - (void)paste:(id)sender
     markdown = [[NSString alloc] initWithData:markdownValue encoding:NSUTF8StringEncoding];
   }
 
-  if (markdown.length > 0 && self.markdownInput != nil) {
-    [self.markdownInput pasteMarkdown:markdown];
+  if (markdown.length > 0 && self.markdownTextInput != nil) {
+    [self.markdownTextInput pasteMarkdown:markdown];
     return;
   }
 
@@ -74,8 +74,8 @@ - (BOOL)canPerformAction:(SEL)action withSender:(id)sender
 - (void)layoutSubviews
 {
   [super layoutSubviews];
-  if (self.markdownInput != nil) {
-    [self.markdownInput scheduleRelayoutIfNeeded];
+  if (self.markdownTextInput != nil) {
+    [self.markdownTextInput scheduleRelayoutIfNeeded];
   }
 }
 
@@ -93,7 +93,7 @@ - (void)copy:(id)sender
   }
 
   NSString *plainText = [self.string substringWithRange:selection];
-  NSString *markdown = [self.markdownInput markdownForSelectedRange];
+  NSString *markdown = [self.markdownTextInput markdownForSelectedRange];
 
   NSPasteboard *pasteboard = [NSPasteboard generalPasteboard];
   [pasteboard clearContents];
@@ -121,8 +121,8 @@ - (void)paste:(id)sender
   NSPasteboard *pasteboard = [NSPasteboard generalPasteboard];
 
   NSString *markdown = [pasteboard stringForType:kENRMMarkdownPasteboardType];
-  if (markdown.length > 0 && self.markdownInput != nil) {
-    [self.markdownInput pasteMarkdown:markdown];
+  if (markdown.length > 0 && self.markdownTextInput != nil) {
+    [self.markdownTextInput pasteMarkdown:markdown];
     return;
   }
 
@@ -158,17 +158,17 @@ - (void)mouseDown:(NSEvent *)event
 - (NSMenu *)menuForEvent:(NSEvent *)event
 {
   NSMenu *menu = [super menuForEvent:event];
-  if (self.markdownInput != nil) {
-    return [self.markdownInput enrichedMenuForEvent:event defaultMenu:menu textView:self];
+  if (self.markdownTextInput != nil) {
+    return [self.markdownTextInput enrichedMenuForEvent:event defaultMenu:menu textView:self];
   }
   return menu;
 }
 
 - (void)layout
 {
   [super layout];
-  if (self.markdownInput != nil) {
-    [self.markdownInput scheduleRelayoutIfNeeded];
+  if (self.markdownTextInput != nil) {
+    [self.markdownTextInput scheduleRelayoutIfNeeded];
   }
 }
 
diff --git a/ios/input/EnrichedMarkdownTextInput.mm b/ios/input/EnrichedMarkdownTextInput.mm
@@ -146,9 +146,9 @@ - (void)setupTextView
 #else
   ENRMInputTextView *inputTextView = [[ENRMInputTextView alloc] initWithFrame:CGRectZero];
 #endif
-  inputTextView.markdownInput = self;
+  inputTextView.markdownTextInput = self;
   _textView = inputTextView;
-  ENRMConfigureMarkdownInputTextView(_textView);
+  ENRMConfigureMarkdownTextInputTextView(_textView);
 #if !TARGET_OS_OSX
   _textView.adjustsFontForContentSizeCategory = YES;
   _textView.delegate = self;
diff --git a/ios/utils/ENRMUIKit.h b/ios/utils/ENRMUIKit.h
@@ -176,7 +176,7 @@ static inline void ENRMSetDefaultTypingAttributes(ENRMPlatformTextView *textView
 /// Applies shared configuration to a text view used for markdown input editing.
 /// Handles platform differences: scroll indicators, text container insets,
 /// drawsBackground (macOS). Sets editable=YES, scrollEnabled=YES.
-static inline void ENRMConfigureMarkdownInputTextView(ENRMPlatformTextView *textView)
+static inline void ENRMConfigureMarkdownTextInputTextView(ENRMPlatformTextView *textView)
 {
   textView.font = [UIFont systemFontOfSize:16.0];
   textView.backgroundColor = [RCTUIColor clearColor];

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ - (void)copy:(id)sender`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`NSString *plainText = [self.text substringWithRange:selection];`
`23`		`- NSString *markdown = [self.markdownInput markdownForSelectedRange];`
	`23`	`+ NSString *markdown = [self.markdownTextInput markdownForSelectedRange];`
`24`	`24`
`25`	`25`	`UIPasteboard *pasteboard = [UIPasteboard generalPasteboard];`
`26`	`26`	`NSMutableDictionary *items = [NSMutableDictionary dictionary];`
`@@ -49,8 +49,8 @@ - (void)paste:(id)sender`
`49`	`49`	`markdown = [[NSString alloc] initWithData:markdownValue encoding:NSUTF8StringEncoding];`
`50`	`50`	`}`
`51`	`51`
`52`		`- if (markdown.length > 0 && self.markdownInput != nil) {`
`53`		`- [self.markdownInput pasteMarkdown:markdown];`
	`52`	`+ if (markdown.length > 0 && self.markdownTextInput != nil) {`
	`53`	`+ [self.markdownTextInput pasteMarkdown:markdown];`
`54`	`54`	`return;`
`55`	`55`	`}`
`56`	`56`
`@@ -74,8 +74,8 @@ - (BOOL)canPerformAction:(SEL)action withSender:(id)sender`
`74`	`74`	`- (void)layoutSubviews`
`75`	`75`	`{`
`76`	`76`	`[super layoutSubviews];`
`77`		`- if (self.markdownInput != nil) {`
`78`		`- [self.markdownInput scheduleRelayoutIfNeeded];`
	`77`	`+ if (self.markdownTextInput != nil) {`
	`78`	`+ [self.markdownTextInput scheduleRelayoutIfNeeded];`
`79`	`79`	`}`
`80`	`80`	`}`
`81`	`81`
`@@ -93,7 +93,7 @@ - (void)copy:(id)sender`
`93`	`93`	`}`
`94`	`94`
`95`	`95`	`NSString *plainText = [self.string substringWithRange:selection];`
`96`		`- NSString *markdown = [self.markdownInput markdownForSelectedRange];`
	`96`	`+ NSString *markdown = [self.markdownTextInput markdownForSelectedRange];`
`97`	`97`
`98`	`98`	`NSPasteboard *pasteboard = [NSPasteboard generalPasteboard];`
`99`	`99`	`[pasteboard clearContents];`
`@@ -121,8 +121,8 @@ - (void)paste:(id)sender`
`121`	`121`	`NSPasteboard *pasteboard = [NSPasteboard generalPasteboard];`
`122`	`122`
`123`	`123`	`NSString *markdown = [pasteboard stringForType:kENRMMarkdownPasteboardType];`
`124`		`- if (markdown.length > 0 && self.markdownInput != nil) {`
`125`		`- [self.markdownInput pasteMarkdown:markdown];`
	`124`	`+ if (markdown.length > 0 && self.markdownTextInput != nil) {`
	`125`	`+ [self.markdownTextInput pasteMarkdown:markdown];`
`126`	`126`	`return;`
`127`	`127`	`}`
`128`	`128`
`@@ -158,17 +158,17 @@ - (void)mouseDown:(NSEvent *)event`
`158`	`158`	`- (NSMenu )menuForEvent:(NSEvent )event`
`159`	`159`	`{`
`160`	`160`	`NSMenu *menu = [super menuForEvent:event];`
`161`		`- if (self.markdownInput != nil) {`
`162`		`- return [self.markdownInput enrichedMenuForEvent:event defaultMenu:menu textView:self];`
	`161`	`+ if (self.markdownTextInput != nil) {`
	`162`	`+ return [self.markdownTextInput enrichedMenuForEvent:event defaultMenu:menu textView:self];`
`163`	`163`	`}`
`164`	`164`	`return menu;`
`165`	`165`	`}`
`166`	`166`
`167`	`167`	`- (void)layout`
`168`	`168`	`{`
`169`	`169`	`[super layout];`
`170`		`- if (self.markdownInput != nil) {`
`171`		`- [self.markdownInput scheduleRelayoutIfNeeded];`
	`170`	`+ if (self.markdownTextInput != nil) {`
	`171`	`+ [self.markdownTextInput scheduleRelayoutIfNeeded];`
`172`	`172`	`}`
`173`	`173`	`}`
`174`	`174`