Skip to content

Commit d832c3d

Browse files
committed
fix: refactor swift events
1 parent a3a4a09 commit d832c3d

File tree

4 files changed

+28
-48
lines changed

4 files changed

+28
-48
lines changed

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

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,25 @@
11
import React
22

3-
@objc public class OnNativeLayoutEvent: NSObject, RCTEvent {
3+
@objcMembers
4+
public class OnNativeLayoutEvent: NSObject, RCTEvent {
45
private var size: CGSize
5-
@objc public var viewTag: NSNumber
6-
@objc public var coalescingKey: UInt16
6+
public var viewTag: NSNumber
77

8-
@objc public var eventName: String {
8+
public var eventName: String {
99
return "onNativeLayout"
1010
}
1111

12-
@objc public init(reactTag: NSNumber, size: CGSize, coalescingKey: UInt16) {
12+
public init(reactTag: NSNumber, size: CGSize) {
1313
self.viewTag = reactTag
1414
self.size = size
15-
self.coalescingKey = coalescingKey
1615
super.init()
1716
}
1817

19-
@objc public func canCoalesce() -> Bool {
20-
return false
21-
}
22-
23-
@objc public class func moduleDotMethod() -> String {
18+
public class func moduleDotMethod() -> String {
2419
return "RCTEventEmitter.receiveEvent"
2520
}
2621

27-
@objc public func arguments() -> [Any] {
22+
public func arguments() -> [Any] {
2823
return [
2924
viewTag,
3025
RCTNormalizeInputEventName(eventName) ?? eventName,

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

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,25 @@
11
import React
22

3-
@objc public class PageSelectedEvent: NSObject, RCTEvent {
3+
@objcMembers
4+
public class PageSelectedEvent: NSObject, RCTEvent {
45
private var key: NSString
5-
@objc public var viewTag: NSNumber
6-
@objc public var coalescingKey: UInt16
6+
public var viewTag: NSNumber
77

8-
@objc public var eventName: String {
8+
public var eventName: String {
99
return "onPageSelected"
1010
}
1111

12-
@objc public init(reactTag: NSNumber, key: NSString, coalescingKey: UInt16) {
12+
public init(reactTag: NSNumber, key: NSString) {
1313
self.viewTag = reactTag
1414
self.key = key
15-
self.coalescingKey = coalescingKey
1615
super.init()
1716
}
1817

19-
@objc public func canCoalesce() -> Bool {
20-
return false
21-
}
22-
23-
@objc public class func moduleDotMethod() -> String {
18+
public class func moduleDotMethod() -> String {
2419
return "RCTEventEmitter.receiveEvent"
2520
}
2621

27-
@objc public func arguments() -> [Any] {
22+
public func arguments() -> [Any] {
2823
return [
2924
viewTag,
3025
RCTNormalizeInputEventName(eventName) ?? eventName,

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

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,25 @@
11
import React
22

3-
@objc public class TabBarMeasuredEvent: NSObject, RCTEvent {
3+
@objcMembers
4+
public class TabBarMeasuredEvent: NSObject, RCTEvent {
45
private var height: NSInteger
5-
@objc public var viewTag: NSNumber
6-
@objc public var coalescingKey: UInt16
6+
public var viewTag: NSNumber
77

8-
@objc public var eventName: String {
8+
public var eventName: String {
99
return "onTabBarMeasured"
1010
}
1111

12-
@objc public init(reactTag: NSNumber, height: NSInteger, coalescingKey: UInt16) {
12+
public init(reactTag: NSNumber, height: NSInteger) {
1313
self.viewTag = reactTag
1414
self.height = height
15-
self.coalescingKey = coalescingKey
1615
super.init()
1716
}
1817

19-
@objc public func canCoalesce() -> Bool {
20-
return false
21-
}
22-
23-
@objc public class func moduleDotMethod() -> String {
18+
public class func moduleDotMethod() -> String {
2419
return "RCTEventEmitter.receiveEvent"
2520
}
2621

27-
@objc public func arguments() -> [Any] {
22+
public func arguments() -> [Any] {
2823
return [
2924
viewTag,
3025
RCTNormalizeInputEventName(eventName) ?? eventName,

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

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,31 +4,26 @@ import React
44
// RCTEvent is not defined for new arch.
55
protocol RCTEvent {}
66

7-
@objc public class TabLongPressEvent: NSObject, RCTEvent {
7+
@objcMembers
8+
public class TabLongPressEvent: NSObject, RCTEvent {
89
private var key: NSString
9-
@objc public var viewTag: NSNumber
10-
@objc public var coalescingKey: UInt16
10+
public var viewTag: NSNumber
1111

12-
@objc public var eventName: String {
12+
public var eventName: String {
1313
return "onTabLongPress"
1414
}
1515

16-
@objc public init(reactTag: NSNumber, key: NSString, coalescingKey: UInt16) {
16+
public init(reactTag: NSNumber, key: NSString) {
1717
self.viewTag = reactTag
1818
self.key = key
19-
self.coalescingKey = coalescingKey
2019
super.init()
2120
}
2221

23-
@objc public func canCoalesce() -> Bool {
24-
return false
25-
}
26-
27-
@objc public class func moduleDotMethod() -> String {
22+
public class func moduleDotMethod() -> String {
2823
return "RCTEventEmitter.receiveEvent"
2924
}
3025

31-
@objc public func arguments() -> [Any] {
26+
public func arguments() -> [Any] {
3227
return [
3328
viewTag,
3429
RCTNormalizeInputEventName(eventName) ?? eventName,

0 commit comments

Comments
 (0)