Fix const-correctness for EventEmitter (facebook#55714)

sammy-SC · meta-codesync[bot] · commit d1b2ddc9cb4f · 2026-02-26T03:59:50.000-08:00
Summary: Pull Request resolved: facebook#55714 Changelog: [Internal] Remove incorrect const qualifier from EventEmitter setter methods (setEnabled, setShadowNodeFamily). This is part of a larger effort to fix const-correctness throughout the React Native Fabric codebase. Reviewed By: NickGerleman Differential Revision: D90765891 fbshipit-source-id: f36e3ec0f934ddacd76a203d1d8265481db9e6e0
diff --git a/packages/react-native/ReactCommon/react/renderer/core/ConcreteComponentDescriptor.h b/packages/react-native/ReactCommon/react/renderer/core/ConcreteComponentDescriptor.h
@@ -179,7 +179,7 @@ class ConcreteComponentDescriptor : public ComponentDescriptor {
 
   ShadowNodeFamily::Shared createFamily(const ShadowNodeFamilyFragment &fragment) const override
   {
-    auto eventEmitter = std::make_shared<const ConcreteEventEmitter>(
+    auto eventEmitter = std::make_shared<ConcreteEventEmitter>(
         std::make_shared<EventTarget>(fragment.instanceHandle, fragment.surfaceId), eventDispatcher_);
     auto family = std::make_shared<ShadowNodeFamily>(fragment, eventEmitter, eventDispatcher_, *this);
     eventEmitter->setShadowNodeFamily(family);
diff --git a/packages/react-native/ReactCommon/react/renderer/core/EventEmitter.cpp b/packages/react-native/ReactCommon/react/renderer/core/EventEmitter.cpp
@@ -125,7 +125,7 @@ void EventEmitter::dispatchUniqueEvent(
       RawEvent::Category::Continuous));
 }
 
-void EventEmitter::setEnabled(bool enabled) const {
+void EventEmitter::setEnabled(bool enabled) {
   enableCounter_ += enabled ? 1 : -1;
 
   bool shouldBeEnabled = enableCounter_ > 0;
@@ -149,7 +149,7 @@ void EventEmitter::setEnabled(bool enabled) const {
 }
 
 void EventEmitter::setShadowNodeFamily(
-    std::weak_ptr<const ShadowNodeFamily> shadowNodeFamily) const {
+    std::weak_ptr<const ShadowNodeFamily> shadowNodeFamily) {
   shadowNodeFamily_ = std::move(shadowNodeFamily);
 }
 
diff --git a/packages/react-native/ReactCommon/react/renderer/core/EventEmitter.h b/packages/react-native/ReactCommon/react/renderer/core/EventEmitter.h
@@ -21,7 +21,7 @@ namespace facebook::react {
 
 class EventEmitter;
 
-using SharedEventEmitter = std::shared_ptr<const EventEmitter>;
+using SharedEventEmitter = std::shared_ptr<EventEmitter>;
 
 /*
  * Base class for all particular typed event handlers.
@@ -31,7 +31,7 @@ using SharedEventEmitter = std::shared_ptr<const EventEmitter>;
  */
 class EventEmitter {
  public:
-  using Shared = std::shared_ptr<const EventEmitter>;
+  using Shared = std::shared_ptr<EventEmitter>;
 
   static std::string normalizeEventType(std::string type);
 
@@ -53,12 +53,12 @@ class EventEmitter {
    * a number of `disable` calls to release the event target.
    * `DispatchMutex` must be acquired before calling.
    */
-  void setEnabled(bool enabled) const;
+  void setEnabled(bool enabled);
 
   /*
    * Sets a weak reference to the cooresponding ShadowNodeFamily
    */
-  void setShadowNodeFamily(std::weak_ptr<const ShadowNodeFamily> shadowNodeFamily) const;
+  void setShadowNodeFamily(std::weak_ptr<const ShadowNodeFamily> shadowNodeFamily);
 
   const SharedEventTarget &getEventTarget() const;
 
@@ -106,12 +106,12 @@ class EventEmitter {
  private:
   friend class UIManagerBinding;
 
-  mutable SharedEventTarget eventTarget_;
-  mutable std::weak_ptr<const ShadowNodeFamily> shadowNodeFamily_;
+  SharedEventTarget eventTarget_;
+  std::weak_ptr<const ShadowNodeFamily> shadowNodeFamily_;
 
   EventDispatcher::Weak eventDispatcher_;
-  mutable int enableCounter_{0};
-  mutable bool isEnabled_{false};
+  int enableCounter_{0};
+  bool isEnabled_{false};
 };
 
 } // namespace facebook::react
diff --git a/packages/react-native/ReactCommon/react/renderer/textlayoutmanager/platform/ios/react/renderer/textlayoutmanager/RCTAttributedTextUtils.h b/packages/react-native/ReactCommon/react/renderer/textlayoutmanager/platform/ios/react/renderer/textlayoutmanager/RCTAttributedTextUtils.h
@@ -52,17 +52,17 @@ BOOL RCTIsAttributedStringEffectivelySame(
     NSDictionary<NSAttributedStringKey, id> *insensitiveAttributes,
     const facebook::react::TextAttributes &baseTextAttributes);
 
-static inline NSData *RCTWrapEventEmitter(const facebook::react::SharedEventEmitter &eventEmitter)
+static inline NSData *RCTWrapEventEmitter(const std::shared_ptr<const facebook::react::EventEmitter> &eventEmitter)
 {
   auto eventEmitterPtr = new std::weak_ptr<const facebook::react::EventEmitter>(eventEmitter);
   return [[NSData alloc] initWithBytesNoCopy:eventEmitterPtr
                                       length:sizeof(eventEmitterPtr)
                                  deallocator:^(void *ptrToDelete, NSUInteger) {
-                                   delete (std::weak_ptr<facebook::react::EventEmitter> *)ptrToDelete;
+                                   delete (std::weak_ptr<const facebook::react::EventEmitter> *)ptrToDelete;
                                  }];
 }
 
-static inline facebook::react::SharedEventEmitter RCTUnwrapEventEmitter(NSData *data)
+static inline std::shared_ptr<const facebook::react::EventEmitter> RCTUnwrapEventEmitter(NSData *data)
 {
   if (data.length == 0) {
     return nullptr;
diff --git a/packages/react-native/ReactCommon/react/renderer/textlayoutmanager/platform/ios/react/renderer/textlayoutmanager/RCTTextLayoutManager.h b/packages/react-native/ReactCommon/react/renderer/textlayoutmanager/platform/ios/react/renderer/textlayoutmanager/RCTTextLayoutManager.h
@@ -47,7 +47,7 @@ using RCTTextLayoutFragmentEnumerationBlock =
                                                   (facebook::react::ParagraphAttributes)paragraphAttributes
                                                              size:(CGSize)size;
 
-- (facebook::react::SharedEventEmitter)
+- (std::shared_ptr<const facebook::react::EventEmitter>)
     getEventEmitterWithAttributeString:(facebook::react::AttributedString)attributedString
                    paragraphAttributes:(facebook::react::ParagraphAttributes)paragraphAttributes
                                  frame:(CGRect)frame
diff --git a/packages/react-native/ReactCommon/react/renderer/textlayoutmanager/platform/ios/react/renderer/textlayoutmanager/RCTTextLayoutManager.mm b/packages/react-native/ReactCommon/react/renderer/textlayoutmanager/platform/ios/react/renderer/textlayoutmanager/RCTTextLayoutManager.mm
@@ -251,10 +251,10 @@ - (NSTextStorage *)_textStorageAndLayoutManagerWithAttributesString:(NSAttribute
   return textStorage;
 }
 
-- (SharedEventEmitter)getEventEmitterWithAttributeString:(AttributedString)attributedString
-                                     paragraphAttributes:(ParagraphAttributes)paragraphAttributes
-                                                   frame:(CGRect)frame
-                                                 atPoint:(CGPoint)point
+- (std::shared_ptr<const EventEmitter>)getEventEmitterWithAttributeString:(AttributedString)attributedString
+                                                      paragraphAttributes:(ParagraphAttributes)paragraphAttributes
+                                                                    frame:(CGRect)frame
+                                                                  atPoint:(CGPoint)point
 {
   NSTextStorage *textStorage = [self
       _textStorageAndLayoutManagerWithAttributesString:[self _nsAttributedStringFromAttributedString:attributedString]

Original file line number	Diff line number	Diff line change
`@@ -179,7 +179,7 @@ class ConcreteComponentDescriptor : public ComponentDescriptor {`
`179`	`179`
`180`	`180`	`ShadowNodeFamily::Shared createFamily(const ShadowNodeFamilyFragment &fragment) const override`
`181`	`181`	`{`
`182`		`- auto eventEmitter = std::make_shared<const ConcreteEventEmitter>(`
	`182`	`+ auto eventEmitter = std::make_shared<ConcreteEventEmitter>(`
`183`	`183`	`std::make_shared<EventTarget>(fragment.instanceHandle, fragment.surfaceId), eventDispatcher_);`
`184`	`184`	`auto family = std::make_shared<ShadowNodeFamily>(fragment, eventEmitter, eventDispatcher_, *this);`
`185`	`185`	`eventEmitter->setShadowNodeFamily(family);`
Original file line number	Diff line number	Diff line change
`@@ -125,7 +125,7 @@ void EventEmitter::dispatchUniqueEvent(`
`125`	`125`	`RawEvent::Category::Continuous));`
`126`	`126`	`}`
`127`	`127`
`128`		`-void EventEmitter::setEnabled(bool enabled) const {`
	`128`	`+void EventEmitter::setEnabled(bool enabled) {`
`129`	`129`	`enableCounter_ += enabled ? 1 : -1;`
`130`	`130`
`131`	`131`	`bool shouldBeEnabled = enableCounter_ > 0;`
`@@ -149,7 +149,7 @@ void EventEmitter::setEnabled(bool enabled) const {`
`149`	`149`	`}`
`150`	`150`
`151`	`151`	`void EventEmitter::setShadowNodeFamily(`
`152`		`- std::weak_ptr<const ShadowNodeFamily> shadowNodeFamily) const {`
	`152`	`+ std::weak_ptr<const ShadowNodeFamily> shadowNodeFamily) {`
`153`	`153`	`shadowNodeFamily_ = std::move(shadowNodeFamily);`
`154`	`154`	`}`
`155`	`155`
Original file line number	Diff line number	Diff line change
`@@ -52,17 +52,17 @@ BOOL RCTIsAttributedStringEffectivelySame(`
`52`	`52`	`NSDictionary<NSAttributedStringKey, id> *insensitiveAttributes,`
`53`	`53`	`const facebook::react::TextAttributes &baseTextAttributes);`
`54`	`54`
`55`		`-static inline NSData *RCTWrapEventEmitter(const facebook::react::SharedEventEmitter &eventEmitter)`
	`55`	`+static inline NSData *RCTWrapEventEmitter(const std::shared_ptr<const facebook::react::EventEmitter> &eventEmitter)`
`56`	`56`	`{`
`57`	`57`	`auto eventEmitterPtr = new std::weak_ptr<const facebook::react::EventEmitter>(eventEmitter);`
`58`	`58`	`return [[NSData alloc] initWithBytesNoCopy:eventEmitterPtr`
`59`	`59`	`length:sizeof(eventEmitterPtr)`
`60`	`60`	`deallocator:^(void *ptrToDelete, NSUInteger) {`
`61`		`- delete (std::weak_ptr<facebook::react::EventEmitter> *)ptrToDelete;`
	`61`	`+ delete (std::weak_ptr<const facebook::react::EventEmitter> *)ptrToDelete;`
`62`	`62`	`}];`
`63`	`63`	`}`
`64`	`64`
`65`		`-static inline facebook::react::SharedEventEmitter RCTUnwrapEventEmitter(NSData *data)`
	`65`	`+static inline std::shared_ptr<const facebook::react::EventEmitter> RCTUnwrapEventEmitter(NSData *data)`
`66`	`66`	`{`
`67`	`67`	`if (data.length == 0) {`
`68`	`68`	`return nullptr;`
Original file line number	Diff line number	Diff line change
`@@ -251,10 +251,10 @@ - (NSTextStorage *)_textStorageAndLayoutManagerWithAttributesString:(NSAttribute`
`251`	`251`	`return textStorage;`
`252`	`252`	`}`
`253`	`253`
`254`		`-- (SharedEventEmitter)getEventEmitterWithAttributeString:(AttributedString)attributedString`
`255`		`- paragraphAttributes:(ParagraphAttributes)paragraphAttributes`
`256`		`- frame:(CGRect)frame`
`257`		`- atPoint:(CGPoint)point`
	`254`	`+- (std::shared_ptr<const EventEmitter>)getEventEmitterWithAttributeString:(AttributedString)attributedString`
	`255`	`+ paragraphAttributes:(ParagraphAttributes)paragraphAttributes`
	`256`	`+ frame:(CGRect)frame`
	`257`	`+ atPoint:(CGPoint)point`
`258`	`258`	`{`
`259`	`259`	`NSTextStorage *textStorage = [self`
`260`	`260`	`_textStorageAndLayoutManagerWithAttributesString:[self _nsAttributedStringFromAttributedString:attributedString]`