diff --git a/ios/events/CameraIdleEvent.h b/ios/events/CameraIdleEvent.h
index b5a1378..11ca6ec 100644
--- a/ios/events/CameraIdleEvent.h
+++ b/ios/events/CameraIdleEvent.h
@@ -11,8 +11,10 @@ struct CameraIdleEvent {
   double zoom;
   bool gesture;
 
-  template <typename Emitter>
-  void emit(const facebook::react::SharedEventEmitter &eventEmitter) const {
+  // Holder type is templated to bridge RN versions: SharedEventEmitter went
+  // from shared_ptr<const EventEmitter> to shared_ptr<EventEmitter> in 0.85.
+  template <typename Emitter, typename EventEmitterPtr>
+  void emit(const EventEmitterPtr &eventEmitter) const {
     if (!eventEmitter)
       return;
     auto emitter = std::static_pointer_cast<Emitter const>(eventEmitter);
diff --git a/ios/events/CameraMoveEvent.h b/ios/events/CameraMoveEvent.h
index 7073bf1..9a2a011 100644
--- a/ios/events/CameraMoveEvent.h
+++ b/ios/events/CameraMoveEvent.h
@@ -11,8 +11,10 @@ struct CameraMoveEvent {
   double zoom;
   bool gesture;
 
-  template <typename Emitter>
-  void emit(const facebook::react::SharedEventEmitter &eventEmitter) const {
+  // Holder type is templated to bridge RN versions: SharedEventEmitter went
+  // from shared_ptr<const EventEmitter> to shared_ptr<EventEmitter> in 0.85.
+  template <typename Emitter, typename EventEmitterPtr>
+  void emit(const EventEmitterPtr &eventEmitter) const {
     if (!eventEmitter)
       return;
     auto emitter = std::static_pointer_cast<Emitter const>(eventEmitter);
diff --git a/ios/events/CirclePressEvent.h b/ios/events/CirclePressEvent.h
index f24d714..8e98368 100644
--- a/ios/events/CirclePressEvent.h
+++ b/ios/events/CirclePressEvent.h
@@ -6,8 +6,10 @@ namespace luggmaps {
 namespace events {
 
 struct CirclePressEvent {
-  template <typename Emitter>
-  static void emit(const facebook::react::SharedEventEmitter &eventEmitter) {
+  // Holder type is templated to bridge RN versions: SharedEventEmitter went
+  // from shared_ptr<const EventEmitter> to shared_ptr<EventEmitter> in 0.85.
+  template <typename Emitter, typename EventEmitterPtr>
+  static void emit(const EventEmitterPtr &eventEmitter) {
     if (!eventEmitter)
       return;
     auto emitter = std::static_pointer_cast<Emitter const>(eventEmitter);
diff --git a/ios/events/GroundOverlayPressEvent.h b/ios/events/GroundOverlayPressEvent.h
index 9f1c36f..43cbd38 100644
--- a/ios/events/GroundOverlayPressEvent.h
+++ b/ios/events/GroundOverlayPressEvent.h
@@ -6,8 +6,10 @@ namespace luggmaps {
 namespace events {
 
 struct GroundOverlayPressEvent {
-  template <typename Emitter>
-  static void emit(const facebook::react::SharedEventEmitter &eventEmitter) {
+  // Holder type is templated to bridge RN versions: SharedEventEmitter went
+  // from shared_ptr<const EventEmitter> to shared_ptr<EventEmitter> in 0.85.
+  template <typename Emitter, typename EventEmitterPtr>
+  static void emit(const EventEmitterPtr &eventEmitter) {
     if (!eventEmitter)
       return;
     auto emitter = std::static_pointer_cast<Emitter const>(eventEmitter);
diff --git a/ios/events/LongPressEvent.h b/ios/events/LongPressEvent.h
index d40b2f3..153f01b 100644
--- a/ios/events/LongPressEvent.h
+++ b/ios/events/LongPressEvent.h
@@ -11,8 +11,10 @@ struct LongPressEvent {
   double x;
   double y;
 
-  template <typename Emitter>
-  void emit(const facebook::react::SharedEventEmitter &eventEmitter) const {
+  // Holder type is templated to bridge RN versions: SharedEventEmitter went
+  // from shared_ptr<const EventEmitter> to shared_ptr<EventEmitter> in 0.85.
+  template <typename Emitter, typename EventEmitterPtr>
+  void emit(const EventEmitterPtr &eventEmitter) const {
     if (!eventEmitter)
       return;
     auto emitter = std::static_pointer_cast<Emitter const>(eventEmitter);
diff --git a/ios/events/MarkerDragEvent.h b/ios/events/MarkerDragEvent.h
index 33f45ed..e033d5c 100644
--- a/ios/events/MarkerDragEvent.h
+++ b/ios/events/MarkerDragEvent.h
@@ -11,8 +11,10 @@ struct MarkerDragStartEvent {
   double x;
   double y;
 
-  template <typename Emitter>
-  void emit(const facebook::react::SharedEventEmitter &eventEmitter) const {
+  // Holder type is templated to bridge RN versions: SharedEventEmitter went
+  // from shared_ptr<const EventEmitter> to shared_ptr<EventEmitter> in 0.85.
+  template <typename Emitter, typename EventEmitterPtr>
+  void emit(const EventEmitterPtr &eventEmitter) const {
     if (!eventEmitter)
       return;
     auto emitter = std::static_pointer_cast<Emitter const>(eventEmitter);
@@ -31,8 +33,10 @@ struct MarkerDragChangeEvent {
   double x;
   double y;
 
-  template <typename Emitter>
-  void emit(const facebook::react::SharedEventEmitter &eventEmitter) const {
+  // Holder type is templated to bridge RN versions: SharedEventEmitter went
+  // from shared_ptr<const EventEmitter> to shared_ptr<EventEmitter> in 0.85.
+  template <typename Emitter, typename EventEmitterPtr>
+  void emit(const EventEmitterPtr &eventEmitter) const {
     if (!eventEmitter)
       return;
     auto emitter = std::static_pointer_cast<Emitter const>(eventEmitter);
@@ -51,8 +55,10 @@ struct MarkerDragEndEvent {
   double x;
   double y;
 
-  template <typename Emitter>
-  void emit(const facebook::react::SharedEventEmitter &eventEmitter) const {
+  // Holder type is templated to bridge RN versions: SharedEventEmitter went
+  // from shared_ptr<const EventEmitter> to shared_ptr<EventEmitter> in 0.85.
+  template <typename Emitter, typename EventEmitterPtr>
+  void emit(const EventEmitterPtr &eventEmitter) const {
     if (!eventEmitter)
       return;
     auto emitter = std::static_pointer_cast<Emitter const>(eventEmitter);
diff --git a/ios/events/MarkerPressEvent.h b/ios/events/MarkerPressEvent.h
index a47d523..e80abe4 100644
--- a/ios/events/MarkerPressEvent.h
+++ b/ios/events/MarkerPressEvent.h
@@ -11,8 +11,10 @@ struct MarkerPressEvent {
   double x;
   double y;
 
-  template <typename Emitter>
-  void emit(const facebook::react::SharedEventEmitter &eventEmitter) const {
+  // Holder type is templated to bridge RN versions: SharedEventEmitter went
+  // from shared_ptr<const EventEmitter> to shared_ptr<EventEmitter> in 0.85.
+  template <typename Emitter, typename EventEmitterPtr>
+  void emit(const EventEmitterPtr &eventEmitter) const {
     if (!eventEmitter)
       return;
     auto emitter = std::static_pointer_cast<Emitter const>(eventEmitter);
diff --git a/ios/events/PolygonPressEvent.h b/ios/events/PolygonPressEvent.h
index ee08cac..f975bfd 100644
--- a/ios/events/PolygonPressEvent.h
+++ b/ios/events/PolygonPressEvent.h
@@ -6,8 +6,10 @@ namespace luggmaps {
 namespace events {
 
 struct PolygonPressEvent {
-  template <typename Emitter>
-  static void emit(const facebook::react::SharedEventEmitter &eventEmitter) {
+  // Holder type is templated to bridge RN versions: SharedEventEmitter went
+  // from shared_ptr<const EventEmitter> to shared_ptr<EventEmitter> in 0.85.
+  template <typename Emitter, typename EventEmitterPtr>
+  static void emit(const EventEmitterPtr &eventEmitter) {
     if (!eventEmitter)
       return;
     auto emitter = std::static_pointer_cast<Emitter const>(eventEmitter);
diff --git a/ios/events/PressEvent.h b/ios/events/PressEvent.h
index 08fe6a7..429a409 100644
--- a/ios/events/PressEvent.h
+++ b/ios/events/PressEvent.h
@@ -11,8 +11,10 @@ struct PressEvent {
   double x;
   double y;
 
-  template <typename Emitter>
-  void emit(const facebook::react::SharedEventEmitter &eventEmitter) const {
+  // Holder type is templated to bridge RN versions: SharedEventEmitter went
+  // from shared_ptr<const EventEmitter> to shared_ptr<EventEmitter> in 0.85.
+  template <typename Emitter, typename EventEmitterPtr>
+  void emit(const EventEmitterPtr &eventEmitter) const {
     if (!eventEmitter)
       return;
     auto emitter = std::static_pointer_cast<Emitter const>(eventEmitter);
diff --git a/ios/events/ReadyEvent.h b/ios/events/ReadyEvent.h
index a994942..ec2f3b7 100644
--- a/ios/events/ReadyEvent.h
+++ b/ios/events/ReadyEvent.h
@@ -6,8 +6,10 @@ namespace luggmaps {
 namespace events {
 
 struct ReadyEvent {
-  template <typename Emitter>
-  static void emit(const facebook::react::SharedEventEmitter &eventEmitter) {
+  // Holder type is templated to bridge RN versions: SharedEventEmitter went
+  // from shared_ptr<const EventEmitter> to shared_ptr<EventEmitter> in 0.85.
+  template <typename Emitter, typename EventEmitterPtr>
+  static void emit(const EventEmitterPtr &eventEmitter) {
     if (!eventEmitter)
       return;
     auto emitter = std::static_pointer_cast<Emitter const>(eventEmitter);
diff --git a/ios/events/TileOverlayPressEvent.h b/ios/events/TileOverlayPressEvent.h
index 87d8490..d668c71 100644
--- a/ios/events/TileOverlayPressEvent.h
+++ b/ios/events/TileOverlayPressEvent.h
@@ -6,8 +6,10 @@ namespace luggmaps {
 namespace events {
 
 struct TileOverlayPressEvent {
-  template <typename Emitter>
-  static void emit(const facebook::react::SharedEventEmitter &eventEmitter) {
+  // Holder type is templated to bridge RN versions: SharedEventEmitter went
+  // from shared_ptr<const EventEmitter> to shared_ptr<EventEmitter> in 0.85.
+  template <typename Emitter, typename EventEmitterPtr>
+  static void emit(const EventEmitterPtr &eventEmitter) {
     if (!eventEmitter)
       return;
     auto emitter = std::static_pointer_cast<Emitter const>(eventEmitter);