fix: refactor swift events

Author: okwasniewski

packages/react-native-bottom-tabs/ios/Events/OnNativeLayoutEvent.swift

@@ -1,30 +1,25 @@
 import React
 
-@objc public class OnNativeLayoutEvent: NSObject, RCTEvent {
+@objcMembers
+public class OnNativeLayoutEvent: NSObject, RCTEvent {
   private var size: CGSize
-  @objc public var viewTag: NSNumber
-  @objc public var coalescingKey: UInt16
+  public var viewTag: NSNumber
 
-  @objc public var eventName: String {
+  public var eventName: String {
     return "onNativeLayout"
   }
 
-  @objc public init(reactTag: NSNumber, size: CGSize, coalescingKey: UInt16) {
+  public init(reactTag: NSNumber, size: CGSize) {
     self.viewTag = reactTag
     self.size = size
-    self.coalescingKey = coalescingKey
     super.init()
   }
 
-  @objc public func canCoalesce() -> Bool {
-    return false
-  }
-
-  @objc public class func moduleDotMethod() -> String {
+  public class func moduleDotMethod() -> String {
     return "RCTEventEmitter.receiveEvent"
   }
 
-  @objc public func arguments() -> [Any] {
+  public func arguments() -> [Any] {
     return [
       viewTag,
       RCTNormalizeInputEventName(eventName) ?? eventName,

packages/react-native-bottom-tabs/ios/Events/PageSelectedEvent.swift

@@ -1,30 +1,25 @@
 import React
 
-@objc public class PageSelectedEvent: NSObject, RCTEvent {
+@objcMembers
+public class PageSelectedEvent: NSObject, RCTEvent {
   private var key: NSString
-  @objc public var viewTag: NSNumber
-  @objc public var coalescingKey: UInt16
+  public var viewTag: NSNumber
 
-  @objc public var eventName: String {
+  public var eventName: String {
     return "onPageSelected"
   }
 
-  @objc public init(reactTag: NSNumber, key: NSString, coalescingKey: UInt16) {
+  public init(reactTag: NSNumber, key: NSString) {
     self.viewTag = reactTag
     self.key = key
-    self.coalescingKey = coalescingKey
     super.init()
   }
 
-  @objc public func canCoalesce() -> Bool {
-    return false
-  }
-  
-  @objc public class func moduleDotMethod() -> String {
+  public class func moduleDotMethod() -> String {
     return "RCTEventEmitter.receiveEvent"
   }
 
-  @objc public func arguments() -> [Any] {
+  public func arguments() -> [Any] {
     return [
       viewTag,
       RCTNormalizeInputEventName(eventName) ?? eventName,

packages/react-native-bottom-tabs/ios/Events/TabBarMeasuredEvent.swift

@@ -1,30 +1,25 @@
 import React
 
-@objc public class TabBarMeasuredEvent: NSObject, RCTEvent {
+@objcMembers
+public class TabBarMeasuredEvent: NSObject, RCTEvent {
   private var height: NSInteger
-  @objc public var viewTag: NSNumber
-  @objc public var coalescingKey: UInt16
+  public var viewTag: NSNumber
 
-  @objc public var eventName: String {
+  public var eventName: String {
     return "onTabBarMeasured"
   }
 
-  @objc public init(reactTag: NSNumber, height: NSInteger, coalescingKey: UInt16) {
+  public init(reactTag: NSNumber, height: NSInteger) {
     self.viewTag = reactTag
     self.height = height
-    self.coalescingKey = coalescingKey
     super.init()
   }
 
-  @objc public func canCoalesce() -> Bool {
-    return false
-  }
-  
-  @objc public class func moduleDotMethod() -> String {
+  public class func moduleDotMethod() -> String {
     return "RCTEventEmitter.receiveEvent"
   }
 
-  @objc public func arguments() -> [Any] {
+  public func arguments() -> [Any] {
     return [
       viewTag,
       RCTNormalizeInputEventName(eventName) ?? eventName,

packages/react-native-bottom-tabs/ios/Events/TabLongPressedEvent.swift

@@ -4,31 +4,26 @@ import React
 // RCTEvent is not defined for new arch.
 protocol RCTEvent {}
 
-@objc public class TabLongPressEvent: NSObject, RCTEvent {
+@objcMembers
+public class TabLongPressEvent: NSObject, RCTEvent {
   private var key: NSString
-  @objc public var viewTag: NSNumber
-  @objc public var coalescingKey: UInt16
+  public var viewTag: NSNumber
 
-  @objc public var eventName: String {
+  public var eventName: String {
     return "onTabLongPress"
   }
 
-  @objc public init(reactTag: NSNumber, key: NSString, coalescingKey: UInt16) {
+  public init(reactTag: NSNumber, key: NSString) {
     self.viewTag = reactTag
     self.key = key
-    self.coalescingKey = coalescingKey
     super.init()
   }
 
-  @objc public func canCoalesce() -> Bool {
-    return false
-  }
-  
-  @objc public class func moduleDotMethod() -> String {
+  public class func moduleDotMethod() -> String {
     return "RCTEventEmitter.receiveEvent"
   }
 
-  @objc public func arguments() -> [Any] {
+  public func arguments() -> [Any] {
     return [
       viewTag,
       RCTNormalizeInputEventName(eventName) ?? eventName,

packages/react-native-bottom-tabs/ios/RCTTabViewViewManager.mm

@@ -12,21 +12,10 @@
 @interface RCTTabView : RCTViewManager <TabViewProviderDelegate>
 @end
 
-@implementation RCTTabView {
-  uint16_t _coalescingKey;
-}
+@implementation RCTTabView
 
 RCT_EXPORT_MODULE(RNCTabView)
 
-- (instancetype)init
-{
-  self = [super init];
-  if (self) {
-    _coalescingKey = 0;
-  }
-  return self;
-}
-
 RCT_EXPORT_VIEW_PROPERTY(items, NSArray)
 RCT_EXPORT_VIEW_PROPERTY(onPageSelected, RCTDirectEventBlock)
 RCT_EXPORT_VIEW_PROPERTY(onTabLongPress, RCTDirectEventBlock)
@@ -51,22 +40,22 @@ - (instancetype)init
 //  MARK: TabViewProviderDelegate
 
 - (void)onLongPressWithKey:(NSString *)key reactTag:(NSNumber *)reactTag {
-  auto event = [[TabLongPressEvent alloc] initWithReactTag:reactTag key:key coalescingKey:_coalescingKey++];
+  auto event = [[TabLongPressEvent alloc] initWithReactTag:reactTag key:key];
   [self.bridge.eventDispatcher sendEvent:event];
 }
 
 - (void)onPageSelectedWithKey:(NSString *)key reactTag:(NSNumber *)reactTag {
-  auto event = [[PageSelectedEvent alloc] initWithReactTag:reactTag key:key coalescingKey:_coalescingKey++];
+  auto event = [[PageSelectedEvent alloc] initWithReactTag:reactTag key:key];
   [self.bridge.eventDispatcher sendEvent:event];
 }
 
 - (void)onTabBarMeasuredWithHeight:(NSInteger)height reactTag:(NSNumber *)reactTag {
-  auto event = [[TabBarMeasuredEvent alloc] initWithReactTag:reactTag height:height coalescingKey:_coalescingKey++];
+  auto event = [[TabBarMeasuredEvent alloc] initWithReactTag:reactTag height:height];
   [self.bridge.eventDispatcher sendEvent:event];
 }
 
 - (void)onLayoutWithSize:(CGSize)size reactTag:(NSNumber *)reactTag {
-  auto event = [[OnNativeLayoutEvent alloc] initWithReactTag:reactTag size:size coalescingKey:_coalescingKey++];
+  auto event = [[OnNativeLayoutEvent alloc] initWithReactTag:reactTag size:size];
   [self.bridge.eventDispatcher sendEvent:event];
 }