Skip to content

Commit 9889bc0

Browse files
committed
fix(expo): spell dismissible prop correctly
1 parent 4641816 commit 9889bc0

16 files changed

Lines changed: 45 additions & 45 deletions

packages/expo/android/src/main/java/expo/modules/clerk/ClerkAuthExpoView.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ private fun debugLog(tag: String, message: String) {
3939

4040
class ClerkAuthNativeView(context: Context) : FrameLayout(context) {
4141
var mode: String = "signInOrUp"
42-
var isDismissable: Boolean = true
42+
var isDismissible: Boolean = true
4343

4444
private val activity: ComponentActivity? = findActivity(context).also {
4545
// At cold start, ClerkExpoModule.configure() may run before React's
@@ -101,7 +101,7 @@ class ClerkAuthNativeView(context: Context) : FrameLayout(context) {
101101
private var authCompletedSent: Boolean = false
102102

103103
fun setupView() {
104-
debugLog(TAG, "setupView - mode: $mode, isDismissable: $isDismissable, activity: $activity")
104+
debugLog(TAG, "setupView - mode: $mode, isDismissible: $isDismissible, activity: $activity")
105105

106106
composeView.setContent {
107107
val session by Clerk.sessionFlow.collectAsStateWithLifecycle()

packages/expo/android/src/main/java/expo/modules/clerk/ClerkAuthViewManager.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ class ClerkAuthViewManager : SimpleViewManager<ClerkAuthNativeView>(),
2121
view.setupView()
2222
}
2323

24-
@ReactProp(name = "isDismissable")
25-
override fun setIsDismissable(view: ClerkAuthNativeView, isDismissable: Boolean) {
26-
view.isDismissable = isDismissable
24+
@ReactProp(name = "isDismissible")
25+
override fun setIsDismissible(view: ClerkAuthNativeView, isDismissible: Boolean) {
26+
view.isDismissible = isDismissible
2727
view.setupView()
2828
}
2929

packages/expo/android/src/main/java/expo/modules/clerk/ClerkUserProfileExpoView.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ import kotlinx.coroutines.launch
3535
private const val TAG = "ClerkUserProfileExpoView"
3636

3737
class ClerkUserProfileNativeView(context: Context) : FrameLayout(context) {
38-
var isDismissable: Boolean = true
38+
var isDismissible: Boolean = true
3939

4040
private val activity = ClerkAuthNativeView.findActivity(context)
4141

@@ -68,7 +68,7 @@ class ClerkUserProfileNativeView(context: Context) : FrameLayout(context) {
6868
}
6969

7070
fun setupView() {
71-
Log.d(TAG, "setupView - isDismissable: $isDismissable")
71+
Log.d(TAG, "setupView - isDismissible: $isDismissible")
7272

7373
composeView.setContent {
7474
val session by Clerk.sessionFlow.collectAsStateWithLifecycle()

packages/expo/android/src/main/java/expo/modules/clerk/ClerkUserProfileViewManager.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ class ClerkUserProfileViewManager : SimpleViewManager<ClerkUserProfileNativeView
1515
return ClerkUserProfileNativeView(reactContext)
1616
}
1717

18-
@ReactProp(name = "isDismissable")
19-
override fun setIsDismissable(view: ClerkUserProfileNativeView, isDismissable: Boolean) {
20-
view.isDismissable = isDismissable
18+
@ReactProp(name = "isDismissible")
19+
override fun setIsDismissible(view: ClerkUserProfileNativeView, isDismissible: Boolean) {
20+
view.isDismissible = isDismissible
2121
view.setupView()
2222
}
2323

packages/expo/ios/ClerkAuthNativeView.swift

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import UIKit
44
public class ClerkAuthNativeView: UIView {
55
private lazy var hostingCoordinator = ClerkNativeHostingCoordinator(containerView: self)
66
private var currentMode: String = "signInOrUp"
7-
private var currentDismissable: Bool = false
7+
private var currentDismissible: Bool = false
88
private var hasInitialized: Bool = false
99
private var didCompleteAuthentication: Bool = false
1010
private var dismissalEventSent: Bool = false
@@ -20,11 +20,11 @@ public class ClerkAuthNativeView: UIView {
2020
}
2121
}
2222

23-
@objc var isDismissable: NSNumber? {
23+
@objc var isDismissible: NSNumber? {
2424
didSet {
25-
let newDismissable = isDismissable?.boolValue ?? false
26-
guard newDismissable != currentDismissable else { return }
27-
currentDismissable = newDismissable
25+
let newDismissible = isDismissible?.boolValue ?? false
26+
guard newDismissible != currentDismissible else { return }
27+
currentDismissible = newDismissible
2828
if hasInitialized { updateView() }
2929
}
3030
}
@@ -42,7 +42,7 @@ public class ClerkAuthNativeView: UIView {
4242
if window != nil && !hasInitialized {
4343
hasInitialized = true
4444
updateView()
45-
} else if window == nil && hasInitialized && currentDismissable && !didCompleteAuthentication && !dismissalEventSent {
45+
} else if window == nil && hasInitialized && currentDismissible && !didCompleteAuthentication && !dismissalEventSent {
4646
dismissalEventSent = true
4747
sendAuthEvent(type: .dismissed)
4848
}
@@ -57,7 +57,7 @@ public class ClerkAuthNativeView: UIView {
5757

5858
guard let returnedController = factory.createAuthView(
5959
mode: currentMode,
60-
dismissable: currentDismissable,
60+
dismissible: currentDismissible,
6161
onEvent: { [weak self] event, data in
6262
if event.isAuthCompletion {
6363
self?.didCompleteAuthentication = true

packages/expo/ios/ClerkAuthViewManager.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
@interface RCT_EXTERN_MODULE(ClerkAuthViewManager, RCTViewManager)
44

55
RCT_EXPORT_VIEW_PROPERTY(mode, NSString)
6-
RCT_EXPORT_VIEW_PROPERTY(isDismissable, NSNumber)
6+
RCT_EXPORT_VIEW_PROPERTY(isDismissible, NSNumber)
77
RCT_EXPORT_VIEW_PROPERTY(onAuthEvent, RCTBubblingEventBlock)
88

99
@end

packages/expo/ios/ClerkExpoModule.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ public var clerkViewFactory: ClerkViewFactoryProtocol?
1212
// Protocol that the app target implements to provide Clerk views
1313
public protocol ClerkViewFactoryProtocol {
1414
// Inline rendering — returns UIViewController to preserve SwiftUI lifecycle
15-
func createAuthView(mode: String, dismissable: Bool, onEvent: @escaping (ClerkNativeViewEvent, [String: Any]) -> Void) -> UIViewController?
16-
func createUserProfileView(dismissable: Bool, onEvent: @escaping (ClerkNativeViewEvent, [String: Any]) -> Void) -> UIViewController?
15+
func createAuthView(mode: String, dismissible: Bool, onEvent: @escaping (ClerkNativeViewEvent, [String: Any]) -> Void) -> UIViewController?
16+
func createUserProfileView(dismissible: Bool, onEvent: @escaping (ClerkNativeViewEvent, [String: Any]) -> Void) -> UIViewController?
1717
func createUserButton(onEvent: @escaping (ClerkNativeViewEvent, [String: Any]) -> Void) -> UIViewController?
1818

1919
// SDK operations

packages/expo/ios/ClerkNativeEvent.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/// Events emitted by the native view wrappers to their React Native host views.
22
public enum ClerkNativeViewEvent: String {
3-
/// Emitted by the Expo host view when app-owned dismissable content leaves the window.
3+
/// Emitted by the Expo host view when app-owned dismissible content leaves the window.
44
case dismissed
55
case signedOut
66
case signInCompleted

packages/expo/ios/ClerkUserProfileNativeView.swift

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,18 @@ import UIKit
33

44
public class ClerkUserProfileNativeView: UIView {
55
private lazy var hostingCoordinator = ClerkNativeHostingCoordinator(containerView: self)
6-
private var currentDismissable: Bool = false
6+
private var currentDismissible: Bool = false
77
private var hasInitialized: Bool = false
88
private var didSignOut = false
99
private var dismissalEventSent = false
1010

1111
@objc var onProfileEvent: RCTBubblingEventBlock?
1212

13-
@objc var isDismissable: NSNumber? {
13+
@objc var isDismissible: NSNumber? {
1414
didSet {
15-
let newDismissable = isDismissable?.boolValue ?? false
16-
guard newDismissable != currentDismissable else { return }
17-
currentDismissable = newDismissable
15+
let newDismissible = isDismissible?.boolValue ?? false
16+
guard newDismissible != currentDismissible else { return }
17+
currentDismissible = newDismissible
1818
if hasInitialized { updateView() }
1919
}
2020
}
@@ -32,7 +32,7 @@ public class ClerkUserProfileNativeView: UIView {
3232
if window != nil && !hasInitialized {
3333
hasInitialized = true
3434
updateView()
35-
} else if window == nil && hasInitialized && currentDismissable && !didSignOut && !dismissalEventSent {
35+
} else if window == nil && hasInitialized && currentDismissible && !didSignOut && !dismissalEventSent {
3636
dismissalEventSent = true
3737
sendProfileEvent(type: .dismissed)
3838
}
@@ -46,7 +46,7 @@ public class ClerkUserProfileNativeView: UIView {
4646
guard let factory = clerkViewFactory else { return }
4747

4848
guard let returnedController = factory.createUserProfileView(
49-
dismissable: currentDismissable,
49+
dismissible: currentDismissible,
5050
onEvent: { [weak self] event, data in
5151
if event == .signedOut {
5252
self?.didSignOut = true

packages/expo/ios/ClerkUserProfileViewManager.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
@interface RCT_EXTERN_MODULE(ClerkUserProfileViewManager, RCTViewManager)
44

5-
RCT_EXPORT_VIEW_PROPERTY(isDismissable, NSNumber)
5+
RCT_EXPORT_VIEW_PROPERTY(isDismissible, NSNumber)
66
RCT_EXPORT_VIEW_PROPERTY(onProfileEvent, RCTBubblingEventBlock)
77

88
@end

0 commit comments

Comments
 (0)