Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/quiet-buttons-align.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
"@clerk/expo": minor
---

Align the iOS native Clerk module and native views with Android by registering them through Expo Modules.
6 changes: 2 additions & 4 deletions packages/expo/app.plugin.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,8 +6,7 @@
* 1. iOS is configured with the required deployment target and metadata
* 2. Android is configured with packaging exclusions for dependencies
*
* Native modules are registered via Expo Modules autolinking on Android and
* React Native autolinking on iOS (RCTViewManager).
* Native modules and views are registered via Expo Modules autolinking.
*/
const {
withXcodeProject,
Expand DownExpand Up@@ -187,8 +186,7 @@ const withClerkGoogleSignIn = config => {
* 2. Android gets packaging exclusions for dependency conflicts
* 3. Google Sign-In URL scheme is configured (if env var is set)
*
* Native modules are registered via Expo Modules autolinking on Android and
* React Native autolinking on iOS (RCTViewManager).
* Native modules and views are registered via Expo Modules autolinking.
*/
/**
* Write ClerkKeychainService to Info.plist when keychainService is provided.
Expand Down
8 changes: 7 additions & 1 deletion packages/expo/expo-module.config.json
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,13 @@
{
"platforms": ["apple", "android"],
"apple": {
"modules": ["ClerkGoogleSignInModule"]
"modules": [
"ClerkExpoModule",
"ClerkAuthViewModule",
"ClerkUserProfileViewModule",
"ClerkUserButtonViewModule",
"ClerkGoogleSignInModule"
]
},
"android": {
"modules": [
Expand Down
50 changes: 26 additions & 24 deletions packages/expo/ios/ClerkAuthNativeView.swift
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,29 @@
import React
import ExpoModulesCore
import UIKit

public class ClerkAuthNativeView: ClerkNativeViewHost {
private var currentMode: String = "signInOrUp"
private var currentDismissible: Bool = true
private var didSendDismiss = false

@objc var onAuthEvent: RCTBubblingEventBlock?
let onAuthEvent = EventDispatcher()

@objc var mode: NSString? {
didSet {
let newMode = (mode as String?) ?? "signInOrUp"
guard newMode != currentMode else { return }
currentMode = newMode
setNeedsHostedViewUpdate()
}
func setMode(_ mode: String?) {
let newMode = mode ?? "signInOrUp"
guard newMode != currentMode else { return }
currentMode = newMode
setNeedsHostedViewUpdate()
}

@objc var isDismissible: NSNumber? {
didSet {
let newDismissible = isDismissible?.boolValue ?? true
guard newDismissible != currentDismissible else { return }
currentDismissible = newDismissible
setNeedsHostedViewUpdate()
}
func setDismissible(_ isDismissible: Bool?) {
let newDismissible = isDismissible ?? true
guard newDismissible != currentDismissible else { return }
currentDismissible = newDismissible
setNeedsHostedViewUpdate()
}

private func sendAuthEvent(type: ClerkNativeViewEvent) {
onAuthEvent?(["type": type.rawValue])
onAuthEvent(["type": type.rawValue])
}

private func sendDismissIfNeeded() {
Expand DownExpand Up@@ -58,14 +54,20 @@ public class ClerkAuthNativeView: ClerkNativeViewHost {
}
}

@objc(ClerkAuthViewManager)
class ClerkAuthViewManager: RCTViewManager {
public class ClerkAuthViewModule: Module {
public func definition() -> ModuleDefinition {
Name("ClerkAuthView")

override static func requiresMainQueueSetup() -> Bool {
return true
}
View(ClerkAuthNativeView.self) {
Events("onAuthEvent")

override func view() -> UIView! {
return ClerkAuthNativeView()
Prop("mode") { (view: ClerkAuthNativeView, mode: String?) in
view.setMode(mode)
}

Prop("isDismissible") { (view: ClerkAuthNativeView, isDismissible: Bool?) in
view.setDismissible(isDismissible)
}
}
}
}
9 changes: 0 additions & 9 deletions packages/expo/ios/ClerkAuthViewManager.m

This file was deleted.

9 changes: 4 additions & 5 deletions packages/expo/ios/ClerkExpo.podspec
Original file line numberDiff line numberDiff line change
Expand Up@@ -33,6 +33,8 @@ Pod::Spec.new do |s|
s.source = { git: 'https://github.com/clerk/javascript' }
s.static_framework = true

s.dependency 'ExpoModulesCore'

s.pod_target_xcconfig = {
'DEFINES_MODULE' => 'YES',
'SWIFT_COMPILATION_MODE' => 'wholemodule'
Expand All@@ -50,14 +52,11 @@ Pod::Spec.new do |s|
end

s.source_files = "ClerkNativeBridge.swift",
"ClerkExpoModule.swift", "ClerkExpoModule.m",
"ClerkExpoModule.swift",
"ClerkNativeViewHost.swift",
"ClerkAuthNativeView.swift",
"ClerkAuthViewManager.m",
"ClerkUserProfileNativeView.swift",
"ClerkUserProfileViewManager.m",
"ClerkUserButtonNativeView.swift",
"ClerkUserButtonViewManager.m"
"ClerkUserButtonNativeView.swift"
Comment thread
coderabbitai[bot] marked this conversation as resolved.

install_modules_dependencies(s)
end
21 changes: 0 additions & 21 deletions packages/expo/ios/ClerkExpoModule.m

This file was deleted.

125 changes: 63 additions & 62 deletions packages/expo/ios/ClerkExpoModule.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,113 +2,114 @@
// This module provides the configure function, client sync, and native view bridges.
// SwiftUI Clerk views are created by ClerkNativeBridge through the Clerk iOS SPM dependency.

import UIKit
import React
import ExpoModulesCore
import Foundation

// MARK: - Module

@objc(ClerkExpo)
class ClerkExpoModule: RCTEventEmitter {

private static var _hasListeners = false
private static weak var sharedInstance: ClerkExpoModule?

override init() {
super.init()
ClerkExpoModule.sharedInstance = self
ClerkNativeBridge.setClientChangedEmitter { body in
Self.emitClientChanged(body)
}
}

@objc override static func requiresMainQueueSetup() -> Bool {
return false
}

public class ClerkExpoModule: Module {
private static let nativeClientChangedEvent = "clerkNativeClientChanged"

override func supportedEvents() -> [String]! {
return [Self.nativeClientChangedEvent]
}
private static weak var sharedInstance: ClerkExpoModule?

override func startObserving() {
ClerkExpoModule._hasListeners = true
}
public func definition() -> ModuleDefinition {
Name("ClerkExpo")

override func stopObserving() {
ClerkExpoModule._hasListeners = false
}
Events(Self.nativeClientChangedEvent)

/// Emits a native client change event to JS from anywhere in the native layer.
/// Used by native views to ask ClerkProvider to reload JS client state.
static func emitClientChanged(_ body: [String: Any]? = nil) {
let eventBody = body ?? [:]
OnCreate {
Self.sharedInstance = self
ClerkNativeBridge.setClientChangedEmitter { body in
Self.emitClientChanged(body)
}
}

guard let instance = sharedInstance else {
return
OnDestroy {
if Self.sharedInstance === self {
Self.sharedInstance = nil
ClerkNativeBridge.setClientChangedEmitter(nil)
}
}

if let bridge = instance.bridge {
bridge.enqueueJSCall("RCTDeviceEventEmitter", method: "emit", args: [nativeClientChangedEvent, eventBody], completion: nil)
return
AsyncFunction("configure") { (publishableKey: String, bearerToken: String?, promise: Promise) in
self.configure(publishableKey, bearerToken: bearerToken, promise: promise)
}

guard _hasListeners else {
return
AsyncFunction("getClientToken") { (promise: Promise) in
self.getClientToken(promise: promise)
}

instance.sendEvent(withName: nativeClientChangedEvent, body: eventBody)
AsyncFunction("syncClientStateFromJs") {
(deviceToken: String?,
sourceId: String?,
didChangeClient: Bool,
didChangeDeviceToken: Bool,
promise: Promise) in
self.syncClientStateFromJs(
deviceToken,
sourceId: sourceId,
didChangeClient: didChangeClient,
didChangeDeviceToken: didChangeDeviceToken,
promise: promise
)
}
}

// MARK: - configure

@objc func configure(_ publishableKey: String,
bearerToken: String?,
resolve: @escaping RCTPromiseResolveBlock,
reject: @escaping RCTPromiseRejectBlock) {
private func configure(_ publishableKey: String, bearerToken: String?, promise: Promise) {
Task {
do {
try await ClerkNativeBridge.shared.configure(publishableKey: publishableKey, bearerToken: bearerToken)
resolve(nil)
promise.resolve()
} catch {
reject("E_CONFIGURE_FAILED", error.localizedDescription, error)
promise.reject("E_CONFIGURE_FAILED", error.localizedDescription)
}
}
}

// MARK: - getClientToken

@objc func getClientToken(_ resolve: @escaping RCTPromiseResolveBlock,
reject: @escaping RCTPromiseRejectBlock) {
private func getClientToken(promise: Promise) {
Task {
let token = await ClerkNativeBridge.shared.getClientToken()
resolve(token)
promise.resolve(token)
}
}

// MARK: - syncClientStateFromJs

@objc func syncClientStateFromJs(_ deviceToken: Any?,
sourceId: Any?,
didChangeClient: Bool,
didChangeDeviceToken: Bool,
resolve: @escaping RCTPromiseResolveBlock,
reject: @escaping RCTPromiseRejectBlock) {
let normalizedDeviceToken = deviceToken as? String
let normalizedSourceId = sourceId as? String
private func syncClientStateFromJs(_ deviceToken: String?,
sourceId: String?,
didChangeClient: Bool,
didChangeDeviceToken: Bool,
promise: Promise) {
Task {
do {
try await ClerkNativeBridge.shared.syncClientStateFromJs(
deviceToken: normalizedDeviceToken,
sourceId: normalizedSourceId,
deviceToken: deviceToken,
sourceId: sourceId,
didChangeClient: didChangeClient,
didChangeDeviceToken: didChangeDeviceToken
)
resolve(nil)
promise.resolve()
} catch {
reject("E_SYNC_FROM_JS_FAILED", error.localizedDescription, error)
promise.reject("E_SYNC_FROM_JS_FAILED", error.localizedDescription)
}
}
}

/// Emits a native client change event to JS from anywhere in the native layer.
/// Used by native views to ask ClerkProvider to reload JS client state.
static func emitClientChanged(_ body: [String: Any]? = nil) {
let eventBody = body ?? [:]

guard let instance = sharedInstance else {
return
}

DispatchQueue.main.async { [weak instance] in
instance?.sendEvent(Self.nativeClientChangedEvent, eventBody)
}
}
}
8 changes: 5 additions & 3 deletions packages/expo/ios/ClerkNativeViewHost.swift
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
import ExpoModulesCore
import UIKit

public class ClerkNativeViewHost: UIView {
public class ClerkNativeViewHost: ExpoView {
private lazy var hostingCoordinator = ClerkNativeHostingCoordinator(containerView: self)
private var hasInitialized: Bool = false
private var configuredObserver: NSObjectProtocol?

override public init(frame: CGRect) {
super.init(frame: frame)
public required init(appContext: AppContext? = nil) {
super.init(appContext: appContext)
}

@available(*, unavailable)
public required init?(coder: NSCoder) {
fatalError("init(coder:) has not been implemented")
}
Expand Down
14 changes: 5 additions & 9 deletions packages/expo/ios/ClerkUserButtonNativeView.swift
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import React
import ExpoModulesCore
import UIKit

public class ClerkUserButtonNativeView: ClerkNativeViewHost {
Expand All@@ -7,14 +7,10 @@ public class ClerkUserButtonNativeView: ClerkNativeViewHost {
}
}

@objc(ClerkUserButtonViewManager)
class ClerkUserButtonViewManager: RCTViewManager {
public class ClerkUserButtonViewModule: Module {
public func definition() -> ModuleDefinition {
Name("ClerkUserButtonView")

override static func requiresMainQueueSetup() -> Bool {
return true
}

override func view() -> UIView! {
return ClerkUserButtonNativeView()
View(ClerkUserButtonNativeView.self) {}
}
}
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
refactor(expo): align iOS native components with Expo Modules by mikepitre · Pull Request #8976 · clerk/javascript · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/quiet-buttons-align.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
"@clerk/expo": minor
---

Align the iOS native Clerk module and native views with Android by registering them through Expo Modules.
6 changes: 2 additions & 4 deletions packages/expo/app.plugin.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,8 +6,7 @@
* 1. iOS is configured with the required deployment target and metadata
* 2. Android is configured with packaging exclusions for dependencies
*
* Native modules are registered via Expo Modules autolinking on Android and
* React Native autolinking on iOS (RCTViewManager).
* Native modules and views are registered via Expo Modules autolinking.
*/
const {
withXcodeProject,
Expand DownExpand Up@@ -187,8 +186,7 @@ const withClerkGoogleSignIn = config => {
* 2. Android gets packaging exclusions for dependency conflicts
* 3. Google Sign-In URL scheme is configured (if env var is set)
*
* Native modules are registered via Expo Modules autolinking on Android and
* React Native autolinking on iOS (RCTViewManager).
* Native modules and views are registered via Expo Modules autolinking.
*/
/**
* Write ClerkKeychainService to Info.plist when keychainService is provided.
Expand Down
8 changes: 7 additions & 1 deletion packages/expo/expo-module.config.json
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,13 @@
{
"platforms": ["apple", "android"],
"apple": {
"modules": ["ClerkGoogleSignInModule"]
"modules": [
"ClerkExpoModule",
"ClerkAuthViewModule",
"ClerkUserProfileViewModule",
"ClerkUserButtonViewModule",
"ClerkGoogleSignInModule"
]
},
"android": {
"modules": [
Expand Down
50 changes: 26 additions & 24 deletions packages/expo/ios/ClerkAuthNativeView.swift
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,29 @@
import React
import ExpoModulesCore
import UIKit

public class ClerkAuthNativeView: ClerkNativeViewHost {
private var currentMode: String = "signInOrUp"
private var currentDismissible: Bool = true
private var didSendDismiss = false

@objc var onAuthEvent: RCTBubblingEventBlock?
let onAuthEvent = EventDispatcher()

@objc var mode: NSString? {
didSet {
let newMode = (mode as String?) ?? "signInOrUp"
guard newMode != currentMode else { return }
currentMode = newMode
setNeedsHostedViewUpdate()
}
func setMode(_ mode: String?) {
let newMode = mode ?? "signInOrUp"
guard newMode != currentMode else { return }
currentMode = newMode
setNeedsHostedViewUpdate()
}

@objc var isDismissible: NSNumber? {
didSet {
let newDismissible = isDismissible?.boolValue ?? true
guard newDismissible != currentDismissible else { return }
currentDismissible = newDismissible
setNeedsHostedViewUpdate()
}
func setDismissible(_ isDismissible: Bool?) {
let newDismissible = isDismissible ?? true
guard newDismissible != currentDismissible else { return }
currentDismissible = newDismissible
setNeedsHostedViewUpdate()
}

private func sendAuthEvent(type: ClerkNativeViewEvent) {
onAuthEvent?(["type": type.rawValue])
onAuthEvent(["type": type.rawValue])
}

private func sendDismissIfNeeded() {
Expand DownExpand Up@@ -58,14 +54,20 @@ public class ClerkAuthNativeView: ClerkNativeViewHost {
}
}

@objc(ClerkAuthViewManager)
class ClerkAuthViewManager: RCTViewManager {
public class ClerkAuthViewModule: Module {
public func definition() -> ModuleDefinition {
Name("ClerkAuthView")

override static func requiresMainQueueSetup() -> Bool {
return true
}
View(ClerkAuthNativeView.self) {
Events("onAuthEvent")

override func view() -> UIView! {
return ClerkAuthNativeView()
Prop("mode") { (view: ClerkAuthNativeView, mode: String?) in
view.setMode(mode)
}

Prop("isDismissible") { (view: ClerkAuthNativeView, isDismissible: Bool?) in
view.setDismissible(isDismissible)
}
}
}
}
9 changes: 0 additions & 9 deletions packages/expo/ios/ClerkAuthViewManager.m

This file was deleted.

9 changes: 4 additions & 5 deletions packages/expo/ios/ClerkExpo.podspec
Original file line numberDiff line numberDiff line change
Expand Up@@ -33,6 +33,8 @@ Pod::Spec.new do |s|
s.source = { git: 'https://github.com/clerk/javascript' }
s.static_framework = true

s.dependency 'ExpoModulesCore'

s.pod_target_xcconfig = {
'DEFINES_MODULE' => 'YES',
'SWIFT_COMPILATION_MODE' => 'wholemodule'
Expand All@@ -50,14 +52,11 @@ Pod::Spec.new do |s|
end

s.source_files = "ClerkNativeBridge.swift",
"ClerkExpoModule.swift", "ClerkExpoModule.m",
"ClerkExpoModule.swift",
"ClerkNativeViewHost.swift",
"ClerkAuthNativeView.swift",
"ClerkAuthViewManager.m",
"ClerkUserProfileNativeView.swift",
"ClerkUserProfileViewManager.m",
"ClerkUserButtonNativeView.swift",
"ClerkUserButtonViewManager.m"
"ClerkUserButtonNativeView.swift"
Comment thread
coderabbitai[bot] marked this conversation as resolved.

install_modules_dependencies(s)
end
21 changes: 0 additions & 21 deletions packages/expo/ios/ClerkExpoModule.m

This file was deleted.

125 changes: 63 additions & 62 deletions packages/expo/ios/ClerkExpoModule.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,113 +2,114 @@
// This module provides the configure function, client sync, and native view bridges.
// SwiftUI Clerk views are created by ClerkNativeBridge through the Clerk iOS SPM dependency.

import UIKit
import React
import ExpoModulesCore
import Foundation

// MARK: - Module

@objc(ClerkExpo)
class ClerkExpoModule: RCTEventEmitter {

private static var _hasListeners = false
private static weak var sharedInstance: ClerkExpoModule?

override init() {
super.init()
ClerkExpoModule.sharedInstance = self
ClerkNativeBridge.setClientChangedEmitter { body in
Self.emitClientChanged(body)
}
}

@objc override static func requiresMainQueueSetup() -> Bool {
return false
}

public class ClerkExpoModule: Module {
private static let nativeClientChangedEvent = "clerkNativeClientChanged"

override func supportedEvents() -> [String]! {
return [Self.nativeClientChangedEvent]
}
private static weak var sharedInstance: ClerkExpoModule?

override func startObserving() {
ClerkExpoModule._hasListeners = true
}
public func definition() -> ModuleDefinition {
Name("ClerkExpo")

override func stopObserving() {
ClerkExpoModule._hasListeners = false
}
Events(Self.nativeClientChangedEvent)

/// Emits a native client change event to JS from anywhere in the native layer.
/// Used by native views to ask ClerkProvider to reload JS client state.
static func emitClientChanged(_ body: [String: Any]? = nil) {
let eventBody = body ?? [:]
OnCreate {
Self.sharedInstance = self
ClerkNativeBridge.setClientChangedEmitter { body in
Self.emitClientChanged(body)
}
}

guard let instance = sharedInstance else {
return
OnDestroy {
if Self.sharedInstance === self {
Self.sharedInstance = nil
ClerkNativeBridge.setClientChangedEmitter(nil)
}
}

if let bridge = instance.bridge {
bridge.enqueueJSCall("RCTDeviceEventEmitter", method: "emit", args: [nativeClientChangedEvent, eventBody], completion: nil)
return
AsyncFunction("configure") { (publishableKey: String, bearerToken: String?, promise: Promise) in
self.configure(publishableKey, bearerToken: bearerToken, promise: promise)
}

guard _hasListeners else {
return
AsyncFunction("getClientToken") { (promise: Promise) in
self.getClientToken(promise: promise)
}

instance.sendEvent(withName: nativeClientChangedEvent, body: eventBody)
AsyncFunction("syncClientStateFromJs") {
(deviceToken: String?,
sourceId: String?,
didChangeClient: Bool,
didChangeDeviceToken: Bool,
promise: Promise) in
self.syncClientStateFromJs(
deviceToken,
sourceId: sourceId,
didChangeClient: didChangeClient,
didChangeDeviceToken: didChangeDeviceToken,
promise: promise
)
}
}

// MARK: - configure

@objc func configure(_ publishableKey: String,
bearerToken: String?,
resolve: @escaping RCTPromiseResolveBlock,
reject: @escaping RCTPromiseRejectBlock) {
private func configure(_ publishableKey: String, bearerToken: String?, promise: Promise) {
Task {
do {
try await ClerkNativeBridge.shared.configure(publishableKey: publishableKey, bearerToken: bearerToken)
resolve(nil)
promise.resolve()
} catch {
reject("E_CONFIGURE_FAILED", error.localizedDescription, error)
promise.reject("E_CONFIGURE_FAILED", error.localizedDescription)
}
}
}

// MARK: - getClientToken

@objc func getClientToken(_ resolve: @escaping RCTPromiseResolveBlock,
reject: @escaping RCTPromiseRejectBlock) {
private func getClientToken(promise: Promise) {
Task {
let token = await ClerkNativeBridge.shared.getClientToken()
resolve(token)
promise.resolve(token)
}
}

// MARK: - syncClientStateFromJs

@objc func syncClientStateFromJs(_ deviceToken: Any?,
sourceId: Any?,
didChangeClient: Bool,
didChangeDeviceToken: Bool,
resolve: @escaping RCTPromiseResolveBlock,
reject: @escaping RCTPromiseRejectBlock) {
let normalizedDeviceToken = deviceToken as? String
let normalizedSourceId = sourceId as? String
private func syncClientStateFromJs(_ deviceToken: String?,
sourceId: String?,
didChangeClient: Bool,
didChangeDeviceToken: Bool,
promise: Promise) {
Task {
do {
try await ClerkNativeBridge.shared.syncClientStateFromJs(
deviceToken: normalizedDeviceToken,
sourceId: normalizedSourceId,
deviceToken: deviceToken,
sourceId: sourceId,
didChangeClient: didChangeClient,
didChangeDeviceToken: didChangeDeviceToken
)
resolve(nil)
promise.resolve()
} catch {
reject("E_SYNC_FROM_JS_FAILED", error.localizedDescription, error)
promise.reject("E_SYNC_FROM_JS_FAILED", error.localizedDescription)
}
}
}

/// Emits a native client change event to JS from anywhere in the native layer.
/// Used by native views to ask ClerkProvider to reload JS client state.
static func emitClientChanged(_ body: [String: Any]? = nil) {
let eventBody = body ?? [:]

guard let instance = sharedInstance else {
return
}

DispatchQueue.main.async { [weak instance] in
instance?.sendEvent(Self.nativeClientChangedEvent, eventBody)
}
}
}
8 changes: 5 additions & 3 deletions packages/expo/ios/ClerkNativeViewHost.swift
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
import ExpoModulesCore
import UIKit

public class ClerkNativeViewHost: UIView {
public class ClerkNativeViewHost: ExpoView {
private lazy var hostingCoordinator = ClerkNativeHostingCoordinator(containerView: self)
private var hasInitialized: Bool = false
private var configuredObserver: NSObjectProtocol?

override public init(frame: CGRect) {
super.init(frame: frame)
public required init(appContext: AppContext? = nil) {
super.init(appContext: appContext)
}

@available(*, unavailable)
public required init?(coder: NSCoder) {
fatalError("init(coder:) has not been implemented")
}
Expand Down
14 changes: 5 additions & 9 deletions packages/expo/ios/ClerkUserButtonNativeView.swift
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import React
import ExpoModulesCore
import UIKit

public class ClerkUserButtonNativeView: ClerkNativeViewHost {
Expand All@@ -7,14 +7,10 @@ public class ClerkUserButtonNativeView: ClerkNativeViewHost {
}
}

@objc(ClerkUserButtonViewManager)
class ClerkUserButtonViewManager: RCTViewManager {
public class ClerkUserButtonViewModule: Module {
public func definition() -> ModuleDefinition {
Name("ClerkUserButtonView")

override static func requiresMainQueueSetup() -> Bool {
return true
}

override func view() -> UIView! {
return ClerkUserButtonNativeView()
View(ClerkUserButtonNativeView.self) {}
}
}
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Force GitHub README to respect dark mode (function() { var style = document.createElement('style'); style.textContent = ' .markdown-body { color-scheme: dark light; } .markdown-body pre { background: #161b22 !important; } .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; } .markdown-body table th, .markdown-body table td { border-color: #30363d !important; } .markdown-body img { background: #0d1117; } .markdown-body blockquote { border-left-color: #8b949e; } .markdown-body hr { border-color: #30363d; } '; document.head.appendChild(style); })(); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' refactor(expo): align iOS native components with Expo Modules by mikepitre · Pull Request #8976 · clerk/javascript · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/quiet-buttons-align.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
"@clerk/expo": minor
---

Align the iOS native Clerk module and native views with Android by registering them through Expo Modules.
6 changes: 2 additions & 4 deletions packages/expo/app.plugin.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,8 +6,7 @@
* 1. iOS is configured with the required deployment target and metadata
* 2. Android is configured with packaging exclusions for dependencies
*
* Native modules are registered via Expo Modules autolinking on Android and
* React Native autolinking on iOS (RCTViewManager).
* Native modules and views are registered via Expo Modules autolinking.
*/
const {
withXcodeProject,
Expand DownExpand Up@@ -187,8 +186,7 @@ const withClerkGoogleSignIn = config => {
* 2. Android gets packaging exclusions for dependency conflicts
* 3. Google Sign-In URL scheme is configured (if env var is set)
*
* Native modules are registered via Expo Modules autolinking on Android and
* React Native autolinking on iOS (RCTViewManager).
* Native modules and views are registered via Expo Modules autolinking.
*/
/**
* Write ClerkKeychainService to Info.plist when keychainService is provided.
Expand Down
8 changes: 7 additions & 1 deletion packages/expo/expo-module.config.json
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,13 @@
{
"platforms": ["apple", "android"],
"apple": {
"modules": ["ClerkGoogleSignInModule"]
"modules": [
"ClerkExpoModule",
"ClerkAuthViewModule",
"ClerkUserProfileViewModule",
"ClerkUserButtonViewModule",
"ClerkGoogleSignInModule"
]
},
"android": {
"modules": [
Expand Down
50 changes: 26 additions & 24 deletions packages/expo/ios/ClerkAuthNativeView.swift
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,29 @@
import React
import ExpoModulesCore
import UIKit

public class ClerkAuthNativeView: ClerkNativeViewHost {
private var currentMode: String = "signInOrUp"
private var currentDismissible: Bool = true
private var didSendDismiss = false

@objc var onAuthEvent: RCTBubblingEventBlock?
let onAuthEvent = EventDispatcher()

@objc var mode: NSString? {
didSet {
let newMode = (mode as String?) ?? "signInOrUp"
guard newMode != currentMode else { return }
currentMode = newMode
setNeedsHostedViewUpdate()
}
func setMode(_ mode: String?) {
let newMode = mode ?? "signInOrUp"
guard newMode != currentMode else { return }
currentMode = newMode
setNeedsHostedViewUpdate()
}

@objc var isDismissible: NSNumber? {
didSet {
let newDismissible = isDismissible?.boolValue ?? true
guard newDismissible != currentDismissible else { return }
currentDismissible = newDismissible
setNeedsHostedViewUpdate()
}
func setDismissible(_ isDismissible: Bool?) {
let newDismissible = isDismissible ?? true
guard newDismissible != currentDismissible else { return }
currentDismissible = newDismissible
setNeedsHostedViewUpdate()
}

private func sendAuthEvent(type: ClerkNativeViewEvent) {
onAuthEvent?(["type": type.rawValue])
onAuthEvent(["type": type.rawValue])
}

private func sendDismissIfNeeded() {
Expand DownExpand Up@@ -58,14 +54,20 @@ public class ClerkAuthNativeView: ClerkNativeViewHost {
}
}

@objc(ClerkAuthViewManager)
class ClerkAuthViewManager: RCTViewManager {
public class ClerkAuthViewModule: Module {
public func definition() -> ModuleDefinition {
Name("ClerkAuthView")

override static func requiresMainQueueSetup() -> Bool {
return true
}
View(ClerkAuthNativeView.self) {
Events("onAuthEvent")

override func view() -> UIView! {
return ClerkAuthNativeView()
Prop("mode") { (view: ClerkAuthNativeView, mode: String?) in
view.setMode(mode)
}

Prop("isDismissible") { (view: ClerkAuthNativeView, isDismissible: Bool?) in
view.setDismissible(isDismissible)
}
}
}
}
9 changes: 0 additions & 9 deletions packages/expo/ios/ClerkAuthViewManager.m

This file was deleted.

9 changes: 4 additions & 5 deletions packages/expo/ios/ClerkExpo.podspec
Original file line numberDiff line numberDiff line change
Expand Up@@ -33,6 +33,8 @@ Pod::Spec.new do |s|
s.source = { git: 'https://github.com/clerk/javascript' }
s.static_framework = true

s.dependency 'ExpoModulesCore'

s.pod_target_xcconfig = {
'DEFINES_MODULE' => 'YES',
'SWIFT_COMPILATION_MODE' => 'wholemodule'
Expand All@@ -50,14 +52,11 @@ Pod::Spec.new do |s|
end

s.source_files = "ClerkNativeBridge.swift",
"ClerkExpoModule.swift", "ClerkExpoModule.m",
"ClerkExpoModule.swift",
"ClerkNativeViewHost.swift",
"ClerkAuthNativeView.swift",
"ClerkAuthViewManager.m",
"ClerkUserProfileNativeView.swift",
"ClerkUserProfileViewManager.m",
"ClerkUserButtonNativeView.swift",
"ClerkUserButtonViewManager.m"
"ClerkUserButtonNativeView.swift"
Comment thread
coderabbitai[bot] marked this conversation as resolved.

install_modules_dependencies(s)
end
21 changes: 0 additions & 21 deletions packages/expo/ios/ClerkExpoModule.m

This file was deleted.

125 changes: 63 additions & 62 deletions packages/expo/ios/ClerkExpoModule.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,113 +2,114 @@
// This module provides the configure function, client sync, and native view bridges.
// SwiftUI Clerk views are created by ClerkNativeBridge through the Clerk iOS SPM dependency.

import UIKit
import React
import ExpoModulesCore
import Foundation

// MARK: - Module

@objc(ClerkExpo)
class ClerkExpoModule: RCTEventEmitter {

private static var _hasListeners = false
private static weak var sharedInstance: ClerkExpoModule?

override init() {
super.init()
ClerkExpoModule.sharedInstance = self
ClerkNativeBridge.setClientChangedEmitter { body in
Self.emitClientChanged(body)
}
}

@objc override static func requiresMainQueueSetup() -> Bool {
return false
}

public class ClerkExpoModule: Module {
private static let nativeClientChangedEvent = "clerkNativeClientChanged"

override func supportedEvents() -> [String]! {
return [Self.nativeClientChangedEvent]
}
private static weak var sharedInstance: ClerkExpoModule?

override func startObserving() {
ClerkExpoModule._hasListeners = true
}
public func definition() -> ModuleDefinition {
Name("ClerkExpo")

override func stopObserving() {
ClerkExpoModule._hasListeners = false
}
Events(Self.nativeClientChangedEvent)

/// Emits a native client change event to JS from anywhere in the native layer.
/// Used by native views to ask ClerkProvider to reload JS client state.
static func emitClientChanged(_ body: [String: Any]? = nil) {
let eventBody = body ?? [:]
OnCreate {
Self.sharedInstance = self
ClerkNativeBridge.setClientChangedEmitter { body in
Self.emitClientChanged(body)
}
}

guard let instance = sharedInstance else {
return
OnDestroy {
if Self.sharedInstance === self {
Self.sharedInstance = nil
ClerkNativeBridge.setClientChangedEmitter(nil)
}
}

if let bridge = instance.bridge {
bridge.enqueueJSCall("RCTDeviceEventEmitter", method: "emit", args: [nativeClientChangedEvent, eventBody], completion: nil)
return
AsyncFunction("configure") { (publishableKey: String, bearerToken: String?, promise: Promise) in
self.configure(publishableKey, bearerToken: bearerToken, promise: promise)
}

guard _hasListeners else {
return
AsyncFunction("getClientToken") { (promise: Promise) in
self.getClientToken(promise: promise)
}

instance.sendEvent(withName: nativeClientChangedEvent, body: eventBody)
AsyncFunction("syncClientStateFromJs") {
(deviceToken: String?,
sourceId: String?,
didChangeClient: Bool,
didChangeDeviceToken: Bool,
promise: Promise) in
self.syncClientStateFromJs(
deviceToken,
sourceId: sourceId,
didChangeClient: didChangeClient,
didChangeDeviceToken: didChangeDeviceToken,
promise: promise
)
}
}

// MARK: - configure

@objc func configure(_ publishableKey: String,
bearerToken: String?,
resolve: @escaping RCTPromiseResolveBlock,
reject: @escaping RCTPromiseRejectBlock) {
private func configure(_ publishableKey: String, bearerToken: String?, promise: Promise) {
Task {
do {
try await ClerkNativeBridge.shared.configure(publishableKey: publishableKey, bearerToken: bearerToken)
resolve(nil)
promise.resolve()
} catch {
reject("E_CONFIGURE_FAILED", error.localizedDescription, error)
promise.reject("E_CONFIGURE_FAILED", error.localizedDescription)
}
}
}

// MARK: - getClientToken

@objc func getClientToken(_ resolve: @escaping RCTPromiseResolveBlock,
reject: @escaping RCTPromiseRejectBlock) {
private func getClientToken(promise: Promise) {
Task {
let token = await ClerkNativeBridge.shared.getClientToken()
resolve(token)
promise.resolve(token)
}
}

// MARK: - syncClientStateFromJs

@objc func syncClientStateFromJs(_ deviceToken: Any?,
sourceId: Any?,
didChangeClient: Bool,
didChangeDeviceToken: Bool,
resolve: @escaping RCTPromiseResolveBlock,
reject: @escaping RCTPromiseRejectBlock) {
let normalizedDeviceToken = deviceToken as? String
let normalizedSourceId = sourceId as? String
private func syncClientStateFromJs(_ deviceToken: String?,
sourceId: String?,
didChangeClient: Bool,
didChangeDeviceToken: Bool,
promise: Promise) {
Task {
do {
try await ClerkNativeBridge.shared.syncClientStateFromJs(
deviceToken: normalizedDeviceToken,
sourceId: normalizedSourceId,
deviceToken: deviceToken,
sourceId: sourceId,
didChangeClient: didChangeClient,
didChangeDeviceToken: didChangeDeviceToken
)
resolve(nil)
promise.resolve()
} catch {
reject("E_SYNC_FROM_JS_FAILED", error.localizedDescription, error)
promise.reject("E_SYNC_FROM_JS_FAILED", error.localizedDescription)
}
}
}

/// Emits a native client change event to JS from anywhere in the native layer.
/// Used by native views to ask ClerkProvider to reload JS client state.
static func emitClientChanged(_ body: [String: Any]? = nil) {
let eventBody = body ?? [:]

guard let instance = sharedInstance else {
return
}

DispatchQueue.main.async { [weak instance] in
instance?.sendEvent(Self.nativeClientChangedEvent, eventBody)
}
}
}
8 changes: 5 additions & 3 deletions packages/expo/ios/ClerkNativeViewHost.swift
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
import ExpoModulesCore
import UIKit

public class ClerkNativeViewHost: UIView {
public class ClerkNativeViewHost: ExpoView {
private lazy var hostingCoordinator = ClerkNativeHostingCoordinator(containerView: self)
private var hasInitialized: Bool = false
private var configuredObserver: NSObjectProtocol?

override public init(frame: CGRect) {
super.init(frame: frame)
public required init(appContext: AppContext? = nil) {
super.init(appContext: appContext)
}

@available(*, unavailable)
public required init?(coder: NSCoder) {
fatalError("init(coder:) has not been implemented")
}
Expand Down
14 changes: 5 additions & 9 deletions packages/expo/ios/ClerkUserButtonNativeView.swift
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import React
import ExpoModulesCore
import UIKit

public class ClerkUserButtonNativeView: ClerkNativeViewHost {
Expand All@@ -7,14 +7,10 @@ public class ClerkUserButtonNativeView: ClerkNativeViewHost {
}
}

@objc(ClerkUserButtonViewManager)
class ClerkUserButtonViewManager: RCTViewManager {
public class ClerkUserButtonViewModule: Module {
public func definition() -> ModuleDefinition {
Name("ClerkUserButtonView")

override static func requiresMainQueueSetup() -> Bool {
return true
}

override func view() -> UIView! {
return ClerkUserButtonNativeView()
View(ClerkUserButtonNativeView.self) {}
}
}
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Highlight search terms from Google/DuckDuckGo/Bing referrer (function() { var ref = document.referrer; var terms = []; if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) { var url = new URL(ref); var q = url.searchParams.get('q') || url.searchParams.get('p'); if (q) { terms = q.split(/\s+/).filter(function(t) { return t.length > 2; }); } } if (terms.length === 0) return; var style = document.createElement('style'); style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }'; document.head.appendChild(style); function highlight(node) { if (node.nodeType === 3) { // text node var text = node.textContent; var found = false; terms.forEach(function(term) { var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi'); if (regex.test(text)) { found = true; var frag = document.createDocumentFragment(); var parts = text.split(regex); parts.forEach(function(part, i) { if (i % 2 === 0) { frag.appendChild(document.createTextNode(part)); } else { var span = document.createElement('span'); span.className = 'userscript-highlight'; span.textContent = part; frag.appendChild(span); } }); node.parentNode.replaceChild(frag, node); } }); } else if (node.nodeType === 1 && node.childNodes) { // element var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT']; if (!skipTags.includes(node.tagName)) { Array.from(node.childNodes).forEach(highlight); } } } highlight(document.body); // Re-highlight on dynamic content var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1 || node.nodeType === 3) highlight(node); }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' refactor(expo): align iOS native components with Expo Modules by mikepitre · Pull Request #8976 · clerk/javascript · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/quiet-buttons-align.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
"@clerk/expo": minor
---

Align the iOS native Clerk module and native views with Android by registering them through Expo Modules.
6 changes: 2 additions & 4 deletions packages/expo/app.plugin.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,8 +6,7 @@
* 1. iOS is configured with the required deployment target and metadata
* 2. Android is configured with packaging exclusions for dependencies
*
* Native modules are registered via Expo Modules autolinking on Android and
* React Native autolinking on iOS (RCTViewManager).
* Native modules and views are registered via Expo Modules autolinking.
*/
const {
withXcodeProject,
Expand DownExpand Up@@ -187,8 +186,7 @@ const withClerkGoogleSignIn = config => {
* 2. Android gets packaging exclusions for dependency conflicts
* 3. Google Sign-In URL scheme is configured (if env var is set)
*
* Native modules are registered via Expo Modules autolinking on Android and
* React Native autolinking on iOS (RCTViewManager).
* Native modules and views are registered via Expo Modules autolinking.
*/
/**
* Write ClerkKeychainService to Info.plist when keychainService is provided.
Expand Down
8 changes: 7 additions & 1 deletion packages/expo/expo-module.config.json
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,13 @@
{
"platforms": ["apple", "android"],
"apple": {
"modules": ["ClerkGoogleSignInModule"]
"modules": [
"ClerkExpoModule",
"ClerkAuthViewModule",
"ClerkUserProfileViewModule",
"ClerkUserButtonViewModule",
"ClerkGoogleSignInModule"
]
},
"android": {
"modules": [
Expand Down
50 changes: 26 additions & 24 deletions packages/expo/ios/ClerkAuthNativeView.swift
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,29 @@
import React
import ExpoModulesCore
import UIKit

public class ClerkAuthNativeView: ClerkNativeViewHost {
private var currentMode: String = "signInOrUp"
private var currentDismissible: Bool = true
private var didSendDismiss = false

@objc var onAuthEvent: RCTBubblingEventBlock?
let onAuthEvent = EventDispatcher()

@objc var mode: NSString? {
didSet {
let newMode = (mode as String?) ?? "signInOrUp"
guard newMode != currentMode else { return }
currentMode = newMode
setNeedsHostedViewUpdate()
}
func setMode(_ mode: String?) {
let newMode = mode ?? "signInOrUp"
guard newMode != currentMode else { return }
currentMode = newMode
setNeedsHostedViewUpdate()
}

@objc var isDismissible: NSNumber? {
didSet {
let newDismissible = isDismissible?.boolValue ?? true
guard newDismissible != currentDismissible else { return }
currentDismissible = newDismissible
setNeedsHostedViewUpdate()
}
func setDismissible(_ isDismissible: Bool?) {
let newDismissible = isDismissible ?? true
guard newDismissible != currentDismissible else { return }
currentDismissible = newDismissible
setNeedsHostedViewUpdate()
}

private func sendAuthEvent(type: ClerkNativeViewEvent) {
onAuthEvent?(["type": type.rawValue])
onAuthEvent(["type": type.rawValue])
}

private func sendDismissIfNeeded() {
Expand DownExpand Up@@ -58,14 +54,20 @@ public class ClerkAuthNativeView: ClerkNativeViewHost {
}
}

@objc(ClerkAuthViewManager)
class ClerkAuthViewManager: RCTViewManager {
public class ClerkAuthViewModule: Module {
public func definition() -> ModuleDefinition {
Name("ClerkAuthView")

override static func requiresMainQueueSetup() -> Bool {
return true
}
View(ClerkAuthNativeView.self) {
Events("onAuthEvent")

override func view() -> UIView! {
return ClerkAuthNativeView()
Prop("mode") { (view: ClerkAuthNativeView, mode: String?) in
view.setMode(mode)
}

Prop("isDismissible") { (view: ClerkAuthNativeView, isDismissible: Bool?) in
view.setDismissible(isDismissible)
}
}
}
}
9 changes: 0 additions & 9 deletions packages/expo/ios/ClerkAuthViewManager.m

This file was deleted.

9 changes: 4 additions & 5 deletions packages/expo/ios/ClerkExpo.podspec
Original file line numberDiff line numberDiff line change
Expand Up@@ -33,6 +33,8 @@ Pod::Spec.new do |s|
s.source = { git: 'https://github.com/clerk/javascript' }
s.static_framework = true

s.dependency 'ExpoModulesCore'

s.pod_target_xcconfig = {
'DEFINES_MODULE' => 'YES',
'SWIFT_COMPILATION_MODE' => 'wholemodule'
Expand All@@ -50,14 +52,11 @@ Pod::Spec.new do |s|
end

s.source_files = "ClerkNativeBridge.swift",
"ClerkExpoModule.swift", "ClerkExpoModule.m",
"ClerkExpoModule.swift",
"ClerkNativeViewHost.swift",
"ClerkAuthNativeView.swift",
"ClerkAuthViewManager.m",
"ClerkUserProfileNativeView.swift",
"ClerkUserProfileViewManager.m",
"ClerkUserButtonNativeView.swift",
"ClerkUserButtonViewManager.m"
"ClerkUserButtonNativeView.swift"
Comment thread
coderabbitai[bot] marked this conversation as resolved.

install_modules_dependencies(s)
end
21 changes: 0 additions & 21 deletions packages/expo/ios/ClerkExpoModule.m

This file was deleted.

125 changes: 63 additions & 62 deletions packages/expo/ios/ClerkExpoModule.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,113 +2,114 @@
// This module provides the configure function, client sync, and native view bridges.
// SwiftUI Clerk views are created by ClerkNativeBridge through the Clerk iOS SPM dependency.

import UIKit
import React
import ExpoModulesCore
import Foundation

// MARK: - Module

@objc(ClerkExpo)
class ClerkExpoModule: RCTEventEmitter {

private static var _hasListeners = false
private static weak var sharedInstance: ClerkExpoModule?

override init() {
super.init()
ClerkExpoModule.sharedInstance = self
ClerkNativeBridge.setClientChangedEmitter { body in
Self.emitClientChanged(body)
}
}

@objc override static func requiresMainQueueSetup() -> Bool {
return false
}

public class ClerkExpoModule: Module {
private static let nativeClientChangedEvent = "clerkNativeClientChanged"

override func supportedEvents() -> [String]! {
return [Self.nativeClientChangedEvent]
}
private static weak var sharedInstance: ClerkExpoModule?

override func startObserving() {
ClerkExpoModule._hasListeners = true
}
public func definition() -> ModuleDefinition {
Name("ClerkExpo")

override func stopObserving() {
ClerkExpoModule._hasListeners = false
}
Events(Self.nativeClientChangedEvent)

/// Emits a native client change event to JS from anywhere in the native layer.
/// Used by native views to ask ClerkProvider to reload JS client state.
static func emitClientChanged(_ body: [String: Any]? = nil) {
let eventBody = body ?? [:]
OnCreate {
Self.sharedInstance = self
ClerkNativeBridge.setClientChangedEmitter { body in
Self.emitClientChanged(body)
}
}

guard let instance = sharedInstance else {
return
OnDestroy {
if Self.sharedInstance === self {
Self.sharedInstance = nil
ClerkNativeBridge.setClientChangedEmitter(nil)
}
}

if let bridge = instance.bridge {
bridge.enqueueJSCall("RCTDeviceEventEmitter", method: "emit", args: [nativeClientChangedEvent, eventBody], completion: nil)
return
AsyncFunction("configure") { (publishableKey: String, bearerToken: String?, promise: Promise) in
self.configure(publishableKey, bearerToken: bearerToken, promise: promise)
}

guard _hasListeners else {
return
AsyncFunction("getClientToken") { (promise: Promise) in
self.getClientToken(promise: promise)
}

instance.sendEvent(withName: nativeClientChangedEvent, body: eventBody)
AsyncFunction("syncClientStateFromJs") {
(deviceToken: String?,
sourceId: String?,
didChangeClient: Bool,
didChangeDeviceToken: Bool,
promise: Promise) in
self.syncClientStateFromJs(
deviceToken,
sourceId: sourceId,
didChangeClient: didChangeClient,
didChangeDeviceToken: didChangeDeviceToken,
promise: promise
)
}
}

// MARK: - configure

@objc func configure(_ publishableKey: String,
bearerToken: String?,
resolve: @escaping RCTPromiseResolveBlock,
reject: @escaping RCTPromiseRejectBlock) {
private func configure(_ publishableKey: String, bearerToken: String?, promise: Promise) {
Task {
do {
try await ClerkNativeBridge.shared.configure(publishableKey: publishableKey, bearerToken: bearerToken)
resolve(nil)
promise.resolve()
} catch {
reject("E_CONFIGURE_FAILED", error.localizedDescription, error)
promise.reject("E_CONFIGURE_FAILED", error.localizedDescription)
}
}
}

// MARK: - getClientToken

@objc func getClientToken(_ resolve: @escaping RCTPromiseResolveBlock,
reject: @escaping RCTPromiseRejectBlock) {
private func getClientToken(promise: Promise) {
Task {
let token = await ClerkNativeBridge.shared.getClientToken()
resolve(token)
promise.resolve(token)
}
}

// MARK: - syncClientStateFromJs

@objc func syncClientStateFromJs(_ deviceToken: Any?,
sourceId: Any?,
didChangeClient: Bool,
didChangeDeviceToken: Bool,
resolve: @escaping RCTPromiseResolveBlock,
reject: @escaping RCTPromiseRejectBlock) {
let normalizedDeviceToken = deviceToken as? String
let normalizedSourceId = sourceId as? String
private func syncClientStateFromJs(_ deviceToken: String?,
sourceId: String?,
didChangeClient: Bool,
didChangeDeviceToken: Bool,
promise: Promise) {
Task {
do {
try await ClerkNativeBridge.shared.syncClientStateFromJs(
deviceToken: normalizedDeviceToken,
sourceId: normalizedSourceId,
deviceToken: deviceToken,
sourceId: sourceId,
didChangeClient: didChangeClient,
didChangeDeviceToken: didChangeDeviceToken
)
resolve(nil)
promise.resolve()
} catch {
reject("E_SYNC_FROM_JS_FAILED", error.localizedDescription, error)
promise.reject("E_SYNC_FROM_JS_FAILED", error.localizedDescription)
}
}
}

/// Emits a native client change event to JS from anywhere in the native layer.
/// Used by native views to ask ClerkProvider to reload JS client state.
static func emitClientChanged(_ body: [String: Any]? = nil) {
let eventBody = body ?? [:]

guard let instance = sharedInstance else {
return
}

DispatchQueue.main.async { [weak instance] in
instance?.sendEvent(Self.nativeClientChangedEvent, eventBody)
}
}
}
8 changes: 5 additions & 3 deletions packages/expo/ios/ClerkNativeViewHost.swift
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
import ExpoModulesCore
import UIKit

public class ClerkNativeViewHost: UIView {
public class ClerkNativeViewHost: ExpoView {
private lazy var hostingCoordinator = ClerkNativeHostingCoordinator(containerView: self)
private var hasInitialized: Bool = false
private var configuredObserver: NSObjectProtocol?

override public init(frame: CGRect) {
super.init(frame: frame)
public required init(appContext: AppContext? = nil) {
super.init(appContext: appContext)
}

@available(*, unavailable)
public required init?(coder: NSCoder) {
fatalError("init(coder:) has not been implemented")
}
Expand Down
14 changes: 5 additions & 9 deletions packages/expo/ios/ClerkUserButtonNativeView.swift
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import React
import ExpoModulesCore
import UIKit

public class ClerkUserButtonNativeView: ClerkNativeViewHost {
Expand All@@ -7,14 +7,10 @@ public class ClerkUserButtonNativeView: ClerkNativeViewHost {
}
}

@objc(ClerkUserButtonViewManager)
class ClerkUserButtonViewManager: RCTViewManager {
public class ClerkUserButtonViewModule: Module {
public func definition() -> ModuleDefinition {
Name("ClerkUserButtonView")

override static func requiresMainQueueSetup() -> Bool {
return true
}

override func view() -> UIView! {
return ClerkUserButtonNativeView()
View(ClerkUserButtonNativeView.self) {}
}
}
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Strip utm_, fbclid, gclid, etc. from all links on page (function() { var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid', 'ref', 'ref_src', 'source', 'medium', 'campaign']; function cleanUrl(url) { try { var u = new URL(url, window.location.origin); var changed = false; trackingParams.forEach(function(p) { if (u.searchParams.has(p)) { u.searchParams.delete(p); changed = true; } }); return changed ? u.toString() : url; } catch (e) { return url; } } function cleanLinks() { document.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } cleanLinks(); var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1) { if (node.tagName === 'A') cleanLinks(); node.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + ' refactor(expo): align iOS native components with Expo Modules by mikepitre · Pull Request #8976 · clerk/javascript · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/quiet-buttons-align.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
"@clerk/expo": minor
---

Align the iOS native Clerk module and native views with Android by registering them through Expo Modules.
6 changes: 2 additions & 4 deletions packages/expo/app.plugin.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,8 +6,7 @@
* 1. iOS is configured with the required deployment target and metadata
* 2. Android is configured with packaging exclusions for dependencies
*
* Native modules are registered via Expo Modules autolinking on Android and
* React Native autolinking on iOS (RCTViewManager).
* Native modules and views are registered via Expo Modules autolinking.
*/
const {
withXcodeProject,
Expand DownExpand Up@@ -187,8 +186,7 @@ const withClerkGoogleSignIn = config => {
* 2. Android gets packaging exclusions for dependency conflicts
* 3. Google Sign-In URL scheme is configured (if env var is set)
*
* Native modules are registered via Expo Modules autolinking on Android and
* React Native autolinking on iOS (RCTViewManager).
* Native modules and views are registered via Expo Modules autolinking.
*/
/**
* Write ClerkKeychainService to Info.plist when keychainService is provided.
Expand Down
8 changes: 7 additions & 1 deletion packages/expo/expo-module.config.json
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,13 @@
{
"platforms": ["apple", "android"],
"apple": {
"modules": ["ClerkGoogleSignInModule"]
"modules": [
"ClerkExpoModule",
"ClerkAuthViewModule",
"ClerkUserProfileViewModule",
"ClerkUserButtonViewModule",
"ClerkGoogleSignInModule"
]
},
"android": {
"modules": [
Expand Down
50 changes: 26 additions & 24 deletions packages/expo/ios/ClerkAuthNativeView.swift
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,29 @@
import React
import ExpoModulesCore
import UIKit

public class ClerkAuthNativeView: ClerkNativeViewHost {
private var currentMode: String = "signInOrUp"
private var currentDismissible: Bool = true
private var didSendDismiss = false

@objc var onAuthEvent: RCTBubblingEventBlock?
let onAuthEvent = EventDispatcher()

@objc var mode: NSString? {
didSet {
let newMode = (mode as String?) ?? "signInOrUp"
guard newMode != currentMode else { return }
currentMode = newMode
setNeedsHostedViewUpdate()
}
func setMode(_ mode: String?) {
let newMode = mode ?? "signInOrUp"
guard newMode != currentMode else { return }
currentMode = newMode
setNeedsHostedViewUpdate()
}

@objc var isDismissible: NSNumber? {
didSet {
let newDismissible = isDismissible?.boolValue ?? true
guard newDismissible != currentDismissible else { return }
currentDismissible = newDismissible
setNeedsHostedViewUpdate()
}
func setDismissible(_ isDismissible: Bool?) {
let newDismissible = isDismissible ?? true
guard newDismissible != currentDismissible else { return }
currentDismissible = newDismissible
setNeedsHostedViewUpdate()
}

private func sendAuthEvent(type: ClerkNativeViewEvent) {
onAuthEvent?(["type": type.rawValue])
onAuthEvent(["type": type.rawValue])
}

private func sendDismissIfNeeded() {
Expand DownExpand Up@@ -58,14 +54,20 @@ public class ClerkAuthNativeView: ClerkNativeViewHost {
}
}

@objc(ClerkAuthViewManager)
class ClerkAuthViewManager: RCTViewManager {
public class ClerkAuthViewModule: Module {
public func definition() -> ModuleDefinition {
Name("ClerkAuthView")

override static func requiresMainQueueSetup() -> Bool {
return true
}
View(ClerkAuthNativeView.self) {
Events("onAuthEvent")

override func view() -> UIView! {
return ClerkAuthNativeView()
Prop("mode") { (view: ClerkAuthNativeView, mode: String?) in
view.setMode(mode)
}

Prop("isDismissible") { (view: ClerkAuthNativeView, isDismissible: Bool?) in
view.setDismissible(isDismissible)
}
}
}
}
9 changes: 0 additions & 9 deletions packages/expo/ios/ClerkAuthViewManager.m

This file was deleted.

9 changes: 4 additions & 5 deletions packages/expo/ios/ClerkExpo.podspec
Original file line numberDiff line numberDiff line change
Expand Up@@ -33,6 +33,8 @@ Pod::Spec.new do |s|
s.source = { git: 'https://github.com/clerk/javascript' }
s.static_framework = true

s.dependency 'ExpoModulesCore'

s.pod_target_xcconfig = {
'DEFINES_MODULE' => 'YES',
'SWIFT_COMPILATION_MODE' => 'wholemodule'
Expand All@@ -50,14 +52,11 @@ Pod::Spec.new do |s|
end

s.source_files = "ClerkNativeBridge.swift",
"ClerkExpoModule.swift", "ClerkExpoModule.m",
"ClerkExpoModule.swift",
"ClerkNativeViewHost.swift",
"ClerkAuthNativeView.swift",
"ClerkAuthViewManager.m",
"ClerkUserProfileNativeView.swift",
"ClerkUserProfileViewManager.m",
"ClerkUserButtonNativeView.swift",
"ClerkUserButtonViewManager.m"
"ClerkUserButtonNativeView.swift"
Comment thread
coderabbitai[bot] marked this conversation as resolved.

install_modules_dependencies(s)
end
21 changes: 0 additions & 21 deletions packages/expo/ios/ClerkExpoModule.m

This file was deleted.

125 changes: 63 additions & 62 deletions packages/expo/ios/ClerkExpoModule.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,113 +2,114 @@
// This module provides the configure function, client sync, and native view bridges.
// SwiftUI Clerk views are created by ClerkNativeBridge through the Clerk iOS SPM dependency.

import UIKit
import React
import ExpoModulesCore
import Foundation

// MARK: - Module

@objc(ClerkExpo)
class ClerkExpoModule: RCTEventEmitter {

private static var _hasListeners = false
private static weak var sharedInstance: ClerkExpoModule?

override init() {
super.init()
ClerkExpoModule.sharedInstance = self
ClerkNativeBridge.setClientChangedEmitter { body in
Self.emitClientChanged(body)
}
}

@objc override static func requiresMainQueueSetup() -> Bool {
return false
}

public class ClerkExpoModule: Module {
private static let nativeClientChangedEvent = "clerkNativeClientChanged"

override func supportedEvents() -> [String]! {
return [Self.nativeClientChangedEvent]
}
private static weak var sharedInstance: ClerkExpoModule?

override func startObserving() {
ClerkExpoModule._hasListeners = true
}
public func definition() -> ModuleDefinition {
Name("ClerkExpo")

override func stopObserving() {
ClerkExpoModule._hasListeners = false
}
Events(Self.nativeClientChangedEvent)

/// Emits a native client change event to JS from anywhere in the native layer.
/// Used by native views to ask ClerkProvider to reload JS client state.
static func emitClientChanged(_ body: [String: Any]? = nil) {
let eventBody = body ?? [:]
OnCreate {
Self.sharedInstance = self
ClerkNativeBridge.setClientChangedEmitter { body in
Self.emitClientChanged(body)
}
}

guard let instance = sharedInstance else {
return
OnDestroy {
if Self.sharedInstance === self {
Self.sharedInstance = nil
ClerkNativeBridge.setClientChangedEmitter(nil)
}
}

if let bridge = instance.bridge {
bridge.enqueueJSCall("RCTDeviceEventEmitter", method: "emit", args: [nativeClientChangedEvent, eventBody], completion: nil)
return
AsyncFunction("configure") { (publishableKey: String, bearerToken: String?, promise: Promise) in
self.configure(publishableKey, bearerToken: bearerToken, promise: promise)
}

guard _hasListeners else {
return
AsyncFunction("getClientToken") { (promise: Promise) in
self.getClientToken(promise: promise)
}

instance.sendEvent(withName: nativeClientChangedEvent, body: eventBody)
AsyncFunction("syncClientStateFromJs") {
(deviceToken: String?,
sourceId: String?,
didChangeClient: Bool,
didChangeDeviceToken: Bool,
promise: Promise) in
self.syncClientStateFromJs(
deviceToken,
sourceId: sourceId,
didChangeClient: didChangeClient,
didChangeDeviceToken: didChangeDeviceToken,
promise: promise
)
}
}

// MARK: - configure

@objc func configure(_ publishableKey: String,
bearerToken: String?,
resolve: @escaping RCTPromiseResolveBlock,
reject: @escaping RCTPromiseRejectBlock) {
private func configure(_ publishableKey: String, bearerToken: String?, promise: Promise) {
Task {
do {
try await ClerkNativeBridge.shared.configure(publishableKey: publishableKey, bearerToken: bearerToken)
resolve(nil)
promise.resolve()
} catch {
reject("E_CONFIGURE_FAILED", error.localizedDescription, error)
promise.reject("E_CONFIGURE_FAILED", error.localizedDescription)
}
}
}

// MARK: - getClientToken

@objc func getClientToken(_ resolve: @escaping RCTPromiseResolveBlock,
reject: @escaping RCTPromiseRejectBlock) {
private func getClientToken(promise: Promise) {
Task {
let token = await ClerkNativeBridge.shared.getClientToken()
resolve(token)
promise.resolve(token)
}
}

// MARK: - syncClientStateFromJs

@objc func syncClientStateFromJs(_ deviceToken: Any?,
sourceId: Any?,
didChangeClient: Bool,
didChangeDeviceToken: Bool,
resolve: @escaping RCTPromiseResolveBlock,
reject: @escaping RCTPromiseRejectBlock) {
let normalizedDeviceToken = deviceToken as? String
let normalizedSourceId = sourceId as? String
private func syncClientStateFromJs(_ deviceToken: String?,
sourceId: String?,
didChangeClient: Bool,
didChangeDeviceToken: Bool,
promise: Promise) {
Task {
do {
try await ClerkNativeBridge.shared.syncClientStateFromJs(
deviceToken: normalizedDeviceToken,
sourceId: normalizedSourceId,
deviceToken: deviceToken,
sourceId: sourceId,
didChangeClient: didChangeClient,
didChangeDeviceToken: didChangeDeviceToken
)
resolve(nil)
promise.resolve()
} catch {
reject("E_SYNC_FROM_JS_FAILED", error.localizedDescription, error)
promise.reject("E_SYNC_FROM_JS_FAILED", error.localizedDescription)
}
}
}

/// Emits a native client change event to JS from anywhere in the native layer.
/// Used by native views to ask ClerkProvider to reload JS client state.
static func emitClientChanged(_ body: [String: Any]? = nil) {
let eventBody = body ?? [:]

guard let instance = sharedInstance else {
return
}

DispatchQueue.main.async { [weak instance] in
instance?.sendEvent(Self.nativeClientChangedEvent, eventBody)
}
}
}
8 changes: 5 additions & 3 deletions packages/expo/ios/ClerkNativeViewHost.swift
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
import ExpoModulesCore
import UIKit

public class ClerkNativeViewHost: UIView {
public class ClerkNativeViewHost: ExpoView {
private lazy var hostingCoordinator = ClerkNativeHostingCoordinator(containerView: self)
private var hasInitialized: Bool = false
private var configuredObserver: NSObjectProtocol?

override public init(frame: CGRect) {
super.init(frame: frame)
public required init(appContext: AppContext? = nil) {
super.init(appContext: appContext)
}

@available(*, unavailable)
public required init?(coder: NSCoder) {
fatalError("init(coder:) has not been implemented")
}
Expand Down
14 changes: 5 additions & 9 deletions packages/expo/ios/ClerkUserButtonNativeView.swift
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import React
import ExpoModulesCore
import UIKit

public class ClerkUserButtonNativeView: ClerkNativeViewHost {
Expand All@@ -7,14 +7,10 @@ public class ClerkUserButtonNativeView: ClerkNativeViewHost {
}
}

@objc(ClerkUserButtonViewManager)
class ClerkUserButtonViewManager: RCTViewManager {
public class ClerkUserButtonViewModule: Module {
public func definition() -> ModuleDefinition {
Name("ClerkUserButtonView")

override static func requiresMainQueueSetup() -> Bool {
return true
}

override func view() -> UIView! {
return ClerkUserButtonNativeView()
View(ClerkUserButtonNativeView.self) {}
}
}
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Auto-enable theater mode on YouTube (function() { function tryTheater() { var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]'); if (btn && !btn.classList.contains('activated')) { btn.click(); } } // Try immediately tryTheater(); // Try after navigation (SPA) var lastUrl = location.href; setInterval(function() { if (location.href !== lastUrl) { lastUrl = location.href; setTimeout(tryTheater, 500); } }, 1000); // Also try on player load var observer = new MutationObserver(tryTheater); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' refactor(expo): align iOS native components with Expo Modules by mikepitre · Pull Request #8976 · clerk/javascript · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/quiet-buttons-align.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
"@clerk/expo": minor
---

Align the iOS native Clerk module and native views with Android by registering them through Expo Modules.
6 changes: 2 additions & 4 deletions packages/expo/app.plugin.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,8 +6,7 @@
* 1. iOS is configured with the required deployment target and metadata
* 2. Android is configured with packaging exclusions for dependencies
*
* Native modules are registered via Expo Modules autolinking on Android and
* React Native autolinking on iOS (RCTViewManager).
* Native modules and views are registered via Expo Modules autolinking.
*/
const {
withXcodeProject,
Expand DownExpand Up@@ -187,8 +186,7 @@ const withClerkGoogleSignIn = config => {
* 2. Android gets packaging exclusions for dependency conflicts
* 3. Google Sign-In URL scheme is configured (if env var is set)
*
* Native modules are registered via Expo Modules autolinking on Android and
* React Native autolinking on iOS (RCTViewManager).
* Native modules and views are registered via Expo Modules autolinking.
*/
/**
* Write ClerkKeychainService to Info.plist when keychainService is provided.
Expand Down
8 changes: 7 additions & 1 deletion packages/expo/expo-module.config.json
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,13 @@
{
"platforms": ["apple", "android"],
"apple": {
"modules": ["ClerkGoogleSignInModule"]
"modules": [
"ClerkExpoModule",
"ClerkAuthViewModule",
"ClerkUserProfileViewModule",
"ClerkUserButtonViewModule",
"ClerkGoogleSignInModule"
]
},
"android": {
"modules": [
Expand Down
50 changes: 26 additions & 24 deletions packages/expo/ios/ClerkAuthNativeView.swift
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,29 @@
import React
import ExpoModulesCore
import UIKit

public class ClerkAuthNativeView: ClerkNativeViewHost {
private var currentMode: String = "signInOrUp"
private var currentDismissible: Bool = true
private var didSendDismiss = false

@objc var onAuthEvent: RCTBubblingEventBlock?
let onAuthEvent = EventDispatcher()

@objc var mode: NSString? {
didSet {
let newMode = (mode as String?) ?? "signInOrUp"
guard newMode != currentMode else { return }
currentMode = newMode
setNeedsHostedViewUpdate()
}
func setMode(_ mode: String?) {
let newMode = mode ?? "signInOrUp"
guard newMode != currentMode else { return }
currentMode = newMode
setNeedsHostedViewUpdate()
}

@objc var isDismissible: NSNumber? {
didSet {
let newDismissible = isDismissible?.boolValue ?? true
guard newDismissible != currentDismissible else { return }
currentDismissible = newDismissible
setNeedsHostedViewUpdate()
}
func setDismissible(_ isDismissible: Bool?) {
let newDismissible = isDismissible ?? true
guard newDismissible != currentDismissible else { return }
currentDismissible = newDismissible
setNeedsHostedViewUpdate()
}

private func sendAuthEvent(type: ClerkNativeViewEvent) {
onAuthEvent?(["type": type.rawValue])
onAuthEvent(["type": type.rawValue])
}

private func sendDismissIfNeeded() {
Expand DownExpand Up@@ -58,14 +54,20 @@ public class ClerkAuthNativeView: ClerkNativeViewHost {
}
}

@objc(ClerkAuthViewManager)
class ClerkAuthViewManager: RCTViewManager {
public class ClerkAuthViewModule: Module {
public func definition() -> ModuleDefinition {
Name("ClerkAuthView")

override static func requiresMainQueueSetup() -> Bool {
return true
}
View(ClerkAuthNativeView.self) {
Events("onAuthEvent")

override func view() -> UIView! {
return ClerkAuthNativeView()
Prop("mode") { (view: ClerkAuthNativeView, mode: String?) in
view.setMode(mode)
}

Prop("isDismissible") { (view: ClerkAuthNativeView, isDismissible: Bool?) in
view.setDismissible(isDismissible)
}
}
}
}
9 changes: 0 additions & 9 deletions packages/expo/ios/ClerkAuthViewManager.m

This file was deleted.

9 changes: 4 additions & 5 deletions packages/expo/ios/ClerkExpo.podspec
Original file line numberDiff line numberDiff line change
Expand Up@@ -33,6 +33,8 @@ Pod::Spec.new do |s|
s.source = { git: 'https://github.com/clerk/javascript' }
s.static_framework = true

s.dependency 'ExpoModulesCore'

s.pod_target_xcconfig = {
'DEFINES_MODULE' => 'YES',
'SWIFT_COMPILATION_MODE' => 'wholemodule'
Expand All@@ -50,14 +52,11 @@ Pod::Spec.new do |s|
end

s.source_files = "ClerkNativeBridge.swift",
"ClerkExpoModule.swift", "ClerkExpoModule.m",
"ClerkExpoModule.swift",
"ClerkNativeViewHost.swift",
"ClerkAuthNativeView.swift",
"ClerkAuthViewManager.m",
"ClerkUserProfileNativeView.swift",
"ClerkUserProfileViewManager.m",
"ClerkUserButtonNativeView.swift",
"ClerkUserButtonViewManager.m"
"ClerkUserButtonNativeView.swift"
Comment thread
coderabbitai[bot] marked this conversation as resolved.

install_modules_dependencies(s)
end
21 changes: 0 additions & 21 deletions packages/expo/ios/ClerkExpoModule.m

This file was deleted.

125 changes: 63 additions & 62 deletions packages/expo/ios/ClerkExpoModule.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,113 +2,114 @@
// This module provides the configure function, client sync, and native view bridges.
// SwiftUI Clerk views are created by ClerkNativeBridge through the Clerk iOS SPM dependency.

import UIKit
import React
import ExpoModulesCore
import Foundation

// MARK: - Module

@objc(ClerkExpo)
class ClerkExpoModule: RCTEventEmitter {

private static var _hasListeners = false
private static weak var sharedInstance: ClerkExpoModule?

override init() {
super.init()
ClerkExpoModule.sharedInstance = self
ClerkNativeBridge.setClientChangedEmitter { body in
Self.emitClientChanged(body)
}
}

@objc override static func requiresMainQueueSetup() -> Bool {
return false
}

public class ClerkExpoModule: Module {
private static let nativeClientChangedEvent = "clerkNativeClientChanged"

override func supportedEvents() -> [String]! {
return [Self.nativeClientChangedEvent]
}
private static weak var sharedInstance: ClerkExpoModule?

override func startObserving() {
ClerkExpoModule._hasListeners = true
}
public func definition() -> ModuleDefinition {
Name("ClerkExpo")

override func stopObserving() {
ClerkExpoModule._hasListeners = false
}
Events(Self.nativeClientChangedEvent)

/// Emits a native client change event to JS from anywhere in the native layer.
/// Used by native views to ask ClerkProvider to reload JS client state.
static func emitClientChanged(_ body: [String: Any]? = nil) {
let eventBody = body ?? [:]
OnCreate {
Self.sharedInstance = self
ClerkNativeBridge.setClientChangedEmitter { body in
Self.emitClientChanged(body)
}
}

guard let instance = sharedInstance else {
return
OnDestroy {
if Self.sharedInstance === self {
Self.sharedInstance = nil
ClerkNativeBridge.setClientChangedEmitter(nil)
}
}

if let bridge = instance.bridge {
bridge.enqueueJSCall("RCTDeviceEventEmitter", method: "emit", args: [nativeClientChangedEvent, eventBody], completion: nil)
return
AsyncFunction("configure") { (publishableKey: String, bearerToken: String?, promise: Promise) in
self.configure(publishableKey, bearerToken: bearerToken, promise: promise)
}

guard _hasListeners else {
return
AsyncFunction("getClientToken") { (promise: Promise) in
self.getClientToken(promise: promise)
}

instance.sendEvent(withName: nativeClientChangedEvent, body: eventBody)
AsyncFunction("syncClientStateFromJs") {
(deviceToken: String?,
sourceId: String?,
didChangeClient: Bool,
didChangeDeviceToken: Bool,
promise: Promise) in
self.syncClientStateFromJs(
deviceToken,
sourceId: sourceId,
didChangeClient: didChangeClient,
didChangeDeviceToken: didChangeDeviceToken,
promise: promise
)
}
}

// MARK: - configure

@objc func configure(_ publishableKey: String,
bearerToken: String?,
resolve: @escaping RCTPromiseResolveBlock,
reject: @escaping RCTPromiseRejectBlock) {
private func configure(_ publishableKey: String, bearerToken: String?, promise: Promise) {
Task {
do {
try await ClerkNativeBridge.shared.configure(publishableKey: publishableKey, bearerToken: bearerToken)
resolve(nil)
promise.resolve()
} catch {
reject("E_CONFIGURE_FAILED", error.localizedDescription, error)
promise.reject("E_CONFIGURE_FAILED", error.localizedDescription)
}
}
}

// MARK: - getClientToken

@objc func getClientToken(_ resolve: @escaping RCTPromiseResolveBlock,
reject: @escaping RCTPromiseRejectBlock) {
private func getClientToken(promise: Promise) {
Task {
let token = await ClerkNativeBridge.shared.getClientToken()
resolve(token)
promise.resolve(token)
}
}

// MARK: - syncClientStateFromJs

@objc func syncClientStateFromJs(_ deviceToken: Any?,
sourceId: Any?,
didChangeClient: Bool,
didChangeDeviceToken: Bool,
resolve: @escaping RCTPromiseResolveBlock,
reject: @escaping RCTPromiseRejectBlock) {
let normalizedDeviceToken = deviceToken as? String
let normalizedSourceId = sourceId as? String
private func syncClientStateFromJs(_ deviceToken: String?,
sourceId: String?,
didChangeClient: Bool,
didChangeDeviceToken: Bool,
promise: Promise) {
Task {
do {
try await ClerkNativeBridge.shared.syncClientStateFromJs(
deviceToken: normalizedDeviceToken,
sourceId: normalizedSourceId,
deviceToken: deviceToken,
sourceId: sourceId,
didChangeClient: didChangeClient,
didChangeDeviceToken: didChangeDeviceToken
)
resolve(nil)
promise.resolve()
} catch {
reject("E_SYNC_FROM_JS_FAILED", error.localizedDescription, error)
promise.reject("E_SYNC_FROM_JS_FAILED", error.localizedDescription)
}
}
}

/// Emits a native client change event to JS from anywhere in the native layer.
/// Used by native views to ask ClerkProvider to reload JS client state.
static func emitClientChanged(_ body: [String: Any]? = nil) {
let eventBody = body ?? [:]

guard let instance = sharedInstance else {
return
}

DispatchQueue.main.async { [weak instance] in
instance?.sendEvent(Self.nativeClientChangedEvent, eventBody)
}
}
}
8 changes: 5 additions & 3 deletions packages/expo/ios/ClerkNativeViewHost.swift
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
import ExpoModulesCore
import UIKit

public class ClerkNativeViewHost: UIView {
public class ClerkNativeViewHost: ExpoView {
private lazy var hostingCoordinator = ClerkNativeHostingCoordinator(containerView: self)
private var hasInitialized: Bool = false
private var configuredObserver: NSObjectProtocol?

override public init(frame: CGRect) {
super.init(frame: frame)
public required init(appContext: AppContext? = nil) {
super.init(appContext: appContext)
}

@available(*, unavailable)
public required init?(coder: NSCoder) {
fatalError("init(coder:) has not been implemented")
}
Expand Down
14 changes: 5 additions & 9 deletions packages/expo/ios/ClerkUserButtonNativeView.swift
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import React
import ExpoModulesCore
import UIKit

public class ClerkUserButtonNativeView: ClerkNativeViewHost {
Expand All@@ -7,14 +7,10 @@ public class ClerkUserButtonNativeView: ClerkNativeViewHost {
}
}

@objc(ClerkUserButtonViewManager)
class ClerkUserButtonViewManager: RCTViewManager {
public class ClerkUserButtonViewModule: Module {
public func definition() -> ModuleDefinition {
Name("ClerkUserButtonView")

override static func requiresMainQueueSetup() -> Bool {
return true
}

override func view() -> UIView! {
return ClerkUserButtonNativeView()
View(ClerkUserButtonNativeView.self) {}
}
}
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Remove or un-stick sticky/fixed headers that block content (function() { function unstick() { document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) { if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') { el.style.position = 'static'; el.style.top = 'auto'; el.style.zIndex = 'auto'; } }); } unstick(); var observer = new MutationObserver(unstick); observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] }); })(); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' refactor(expo): align iOS native components with Expo Modules by mikepitre · Pull Request #8976 · clerk/javascript · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/quiet-buttons-align.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
"@clerk/expo": minor
---

Align the iOS native Clerk module and native views with Android by registering them through Expo Modules.
6 changes: 2 additions & 4 deletions packages/expo/app.plugin.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,8 +6,7 @@
* 1. iOS is configured with the required deployment target and metadata
* 2. Android is configured with packaging exclusions for dependencies
*
* Native modules are registered via Expo Modules autolinking on Android and
* React Native autolinking on iOS (RCTViewManager).
* Native modules and views are registered via Expo Modules autolinking.
*/
const {
withXcodeProject,
Expand DownExpand Up@@ -187,8 +186,7 @@ const withClerkGoogleSignIn = config => {
* 2. Android gets packaging exclusions for dependency conflicts
* 3. Google Sign-In URL scheme is configured (if env var is set)
*
* Native modules are registered via Expo Modules autolinking on Android and
* React Native autolinking on iOS (RCTViewManager).
* Native modules and views are registered via Expo Modules autolinking.
*/
/**
* Write ClerkKeychainService to Info.plist when keychainService is provided.
Expand Down
8 changes: 7 additions & 1 deletion packages/expo/expo-module.config.json
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,13 @@
{
"platforms": ["apple", "android"],
"apple": {
"modules": ["ClerkGoogleSignInModule"]
"modules": [
"ClerkExpoModule",
"ClerkAuthViewModule",
"ClerkUserProfileViewModule",
"ClerkUserButtonViewModule",
"ClerkGoogleSignInModule"
]
},
"android": {
"modules": [
Expand Down
50 changes: 26 additions & 24 deletions packages/expo/ios/ClerkAuthNativeView.swift
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,29 @@
import React
import ExpoModulesCore
import UIKit

public class ClerkAuthNativeView: ClerkNativeViewHost {
private var currentMode: String = "signInOrUp"
private var currentDismissible: Bool = true
private var didSendDismiss = false

@objc var onAuthEvent: RCTBubblingEventBlock?
let onAuthEvent = EventDispatcher()

@objc var mode: NSString? {
didSet {
let newMode = (mode as String?) ?? "signInOrUp"
guard newMode != currentMode else { return }
currentMode = newMode
setNeedsHostedViewUpdate()
}
func setMode(_ mode: String?) {
let newMode = mode ?? "signInOrUp"
guard newMode != currentMode else { return }
currentMode = newMode
setNeedsHostedViewUpdate()
}

@objc var isDismissible: NSNumber? {
didSet {
let newDismissible = isDismissible?.boolValue ?? true
guard newDismissible != currentDismissible else { return }
currentDismissible = newDismissible
setNeedsHostedViewUpdate()
}
func setDismissible(_ isDismissible: Bool?) {
let newDismissible = isDismissible ?? true
guard newDismissible != currentDismissible else { return }
currentDismissible = newDismissible
setNeedsHostedViewUpdate()
}

private func sendAuthEvent(type: ClerkNativeViewEvent) {
onAuthEvent?(["type": type.rawValue])
onAuthEvent(["type": type.rawValue])
}

private func sendDismissIfNeeded() {
Expand DownExpand Up@@ -58,14 +54,20 @@ public class ClerkAuthNativeView: ClerkNativeViewHost {
}
}

@objc(ClerkAuthViewManager)
class ClerkAuthViewManager: RCTViewManager {
public class ClerkAuthViewModule: Module {
public func definition() -> ModuleDefinition {
Name("ClerkAuthView")

override static func requiresMainQueueSetup() -> Bool {
return true
}
View(ClerkAuthNativeView.self) {
Events("onAuthEvent")

override func view() -> UIView! {
return ClerkAuthNativeView()
Prop("mode") { (view: ClerkAuthNativeView, mode: String?) in
view.setMode(mode)
}

Prop("isDismissible") { (view: ClerkAuthNativeView, isDismissible: Bool?) in
view.setDismissible(isDismissible)
}
}
}
}
9 changes: 0 additions & 9 deletions packages/expo/ios/ClerkAuthViewManager.m

This file was deleted.

9 changes: 4 additions & 5 deletions packages/expo/ios/ClerkExpo.podspec
Original file line numberDiff line numberDiff line change
Expand Up@@ -33,6 +33,8 @@ Pod::Spec.new do |s|
s.source = { git: 'https://github.com/clerk/javascript' }
s.static_framework = true

s.dependency 'ExpoModulesCore'

s.pod_target_xcconfig = {
'DEFINES_MODULE' => 'YES',
'SWIFT_COMPILATION_MODE' => 'wholemodule'
Expand All@@ -50,14 +52,11 @@ Pod::Spec.new do |s|
end

s.source_files = "ClerkNativeBridge.swift",
"ClerkExpoModule.swift", "ClerkExpoModule.m",
"ClerkExpoModule.swift",
"ClerkNativeViewHost.swift",
"ClerkAuthNativeView.swift",
"ClerkAuthViewManager.m",
"ClerkUserProfileNativeView.swift",
"ClerkUserProfileViewManager.m",
"ClerkUserButtonNativeView.swift",
"ClerkUserButtonViewManager.m"
"ClerkUserButtonNativeView.swift"
Comment thread
coderabbitai[bot] marked this conversation as resolved.

install_modules_dependencies(s)
end
21 changes: 0 additions & 21 deletions packages/expo/ios/ClerkExpoModule.m

This file was deleted.

125 changes: 63 additions & 62 deletions packages/expo/ios/ClerkExpoModule.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,113 +2,114 @@
// This module provides the configure function, client sync, and native view bridges.
// SwiftUI Clerk views are created by ClerkNativeBridge through the Clerk iOS SPM dependency.

import UIKit
import React
import ExpoModulesCore
import Foundation

// MARK: - Module

@objc(ClerkExpo)
class ClerkExpoModule: RCTEventEmitter {

private static var _hasListeners = false
private static weak var sharedInstance: ClerkExpoModule?

override init() {
super.init()
ClerkExpoModule.sharedInstance = self
ClerkNativeBridge.setClientChangedEmitter { body in
Self.emitClientChanged(body)
}
}

@objc override static func requiresMainQueueSetup() -> Bool {
return false
}

public class ClerkExpoModule: Module {
private static let nativeClientChangedEvent = "clerkNativeClientChanged"

override func supportedEvents() -> [String]! {
return [Self.nativeClientChangedEvent]
}
private static weak var sharedInstance: ClerkExpoModule?

override func startObserving() {
ClerkExpoModule._hasListeners = true
}
public func definition() -> ModuleDefinition {
Name("ClerkExpo")

override func stopObserving() {
ClerkExpoModule._hasListeners = false
}
Events(Self.nativeClientChangedEvent)

/// Emits a native client change event to JS from anywhere in the native layer.
/// Used by native views to ask ClerkProvider to reload JS client state.
static func emitClientChanged(_ body: [String: Any]? = nil) {
let eventBody = body ?? [:]
OnCreate {
Self.sharedInstance = self
ClerkNativeBridge.setClientChangedEmitter { body in
Self.emitClientChanged(body)
}
}

guard let instance = sharedInstance else {
return
OnDestroy {
if Self.sharedInstance === self {
Self.sharedInstance = nil
ClerkNativeBridge.setClientChangedEmitter(nil)
}
}

if let bridge = instance.bridge {
bridge.enqueueJSCall("RCTDeviceEventEmitter", method: "emit", args: [nativeClientChangedEvent, eventBody], completion: nil)
return
AsyncFunction("configure") { (publishableKey: String, bearerToken: String?, promise: Promise) in
self.configure(publishableKey, bearerToken: bearerToken, promise: promise)
}

guard _hasListeners else {
return
AsyncFunction("getClientToken") { (promise: Promise) in
self.getClientToken(promise: promise)
}

instance.sendEvent(withName: nativeClientChangedEvent, body: eventBody)
AsyncFunction("syncClientStateFromJs") {
(deviceToken: String?,
sourceId: String?,
didChangeClient: Bool,
didChangeDeviceToken: Bool,
promise: Promise) in
self.syncClientStateFromJs(
deviceToken,
sourceId: sourceId,
didChangeClient: didChangeClient,
didChangeDeviceToken: didChangeDeviceToken,
promise: promise
)
}
}

// MARK: - configure

@objc func configure(_ publishableKey: String,
bearerToken: String?,
resolve: @escaping RCTPromiseResolveBlock,
reject: @escaping RCTPromiseRejectBlock) {
private func configure(_ publishableKey: String, bearerToken: String?, promise: Promise) {
Task {
do {
try await ClerkNativeBridge.shared.configure(publishableKey: publishableKey, bearerToken: bearerToken)
resolve(nil)
promise.resolve()
} catch {
reject("E_CONFIGURE_FAILED", error.localizedDescription, error)
promise.reject("E_CONFIGURE_FAILED", error.localizedDescription)
}
}
}

// MARK: - getClientToken

@objc func getClientToken(_ resolve: @escaping RCTPromiseResolveBlock,
reject: @escaping RCTPromiseRejectBlock) {
private func getClientToken(promise: Promise) {
Task {
let token = await ClerkNativeBridge.shared.getClientToken()
resolve(token)
promise.resolve(token)
}
}

// MARK: - syncClientStateFromJs

@objc func syncClientStateFromJs(_ deviceToken: Any?,
sourceId: Any?,
didChangeClient: Bool,
didChangeDeviceToken: Bool,
resolve: @escaping RCTPromiseResolveBlock,
reject: @escaping RCTPromiseRejectBlock) {
let normalizedDeviceToken = deviceToken as? String
let normalizedSourceId = sourceId as? String
private func syncClientStateFromJs(_ deviceToken: String?,
sourceId: String?,
didChangeClient: Bool,
didChangeDeviceToken: Bool,
promise: Promise) {
Task {
do {
try await ClerkNativeBridge.shared.syncClientStateFromJs(
deviceToken: normalizedDeviceToken,
sourceId: normalizedSourceId,
deviceToken: deviceToken,
sourceId: sourceId,
didChangeClient: didChangeClient,
didChangeDeviceToken: didChangeDeviceToken
)
resolve(nil)
promise.resolve()
} catch {
reject("E_SYNC_FROM_JS_FAILED", error.localizedDescription, error)
promise.reject("E_SYNC_FROM_JS_FAILED", error.localizedDescription)
}
}
}

/// Emits a native client change event to JS from anywhere in the native layer.
/// Used by native views to ask ClerkProvider to reload JS client state.
static func emitClientChanged(_ body: [String: Any]? = nil) {
let eventBody = body ?? [:]

guard let instance = sharedInstance else {
return
}

DispatchQueue.main.async { [weak instance] in
instance?.sendEvent(Self.nativeClientChangedEvent, eventBody)
}
}
}
8 changes: 5 additions & 3 deletions packages/expo/ios/ClerkNativeViewHost.swift
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
import ExpoModulesCore
import UIKit

public class ClerkNativeViewHost: UIView {
public class ClerkNativeViewHost: ExpoView {
private lazy var hostingCoordinator = ClerkNativeHostingCoordinator(containerView: self)
private var hasInitialized: Bool = false
private var configuredObserver: NSObjectProtocol?

override public init(frame: CGRect) {
super.init(frame: frame)
public required init(appContext: AppContext? = nil) {
super.init(appContext: appContext)
}

@available(*, unavailable)
public required init?(coder: NSCoder) {
fatalError("init(coder:) has not been implemented")
}
Expand Down
14 changes: 5 additions & 9 deletions packages/expo/ios/ClerkUserButtonNativeView.swift
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import React
import ExpoModulesCore
import UIKit

public class ClerkUserButtonNativeView: ClerkNativeViewHost {
Expand All@@ -7,14 +7,10 @@ public class ClerkUserButtonNativeView: ClerkNativeViewHost {
}
}

@objc(ClerkUserButtonViewManager)
class ClerkUserButtonViewManager: RCTViewManager {
public class ClerkUserButtonViewModule: Module {
public func definition() -> ModuleDefinition {
Name("ClerkUserButtonView")

override static func requiresMainQueueSetup() -> Bool {
return true
}

override func view() -> UIView! {
return ClerkUserButtonNativeView()
View(ClerkUserButtonNativeView.self) {}
}
}
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Universal Dark Mode - works on any site (function() { var enabled = true; function applyDarkMode() { if (!enabled) return; // Create style element if it doesn't exist var style = document.getElementById('universal-dark-mode-style'); if (!style) { style = document.createElement('style'); style.id = 'universal-dark-mode-style'; document.head.appendChild(style); } // Dark mode CSS - inverts colors but preserves images/video style.textContent = ' /* Invert everything except media */ html { filter: invert(1) hue-rotate(180deg) !important; background: #1a1a2e !important; } /* Restore images, videos, iframes, canvas */ img, video, iframe, canvas, svg, picture, [style*="background-image"] { filter: invert(1) hue-rotate(180deg) !important; } /* Preserve specific elements that should not be inverted */ .no-dark-mode, .no-dark-mode *, [data-theme="light"], [data-theme="light"], .ace_editor, .ace_editor *, .CodeMirror, .CodeMirror *, .monaco-editor, .monaco-editor *, .markdown-body pre, .markdown-body pre *, .highlight, .highlight *, pre code, pre code * { filter: none !important; } /* Fix common UI elements */ .modal, .popup, .dropdown-menu, .tooltip, .popover { filter: invert(1) hue-rotate(180deg) !important; background: #2d2d44 !important; border-color: #444 !important; } /* Scrollbars */ ::-webkit-scrollbar { background: #1a1a2e !important; } ::-webkit-scrollbar-thumb { background: #444 !important; } ::-webkit-scrollbar-thumb:hover { background: #555 !important; } /* Selection */ ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; } ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; } '; } function removeDarkMode() { var style = document.getElementById('universal-dark-mode-style'); if (style) style.remove(); } // Toggle with Alt+Shift+D document.addEventListener('keydown', function(e) { if (e.altKey && e.shiftKey && e.key === 'D') { e.preventDefault(); enabled = !enabled; if (enabled) { applyDarkMode(); console.log('[Universal Dark Mode] Enabled'); } else { removeDarkMode(); console.log('[Universal Dark Mode] Disabled'); } } }); // Apply on load applyDarkMode(); // Re-apply on dynamic content var observer = new MutationObserver(function(mutations) { if (enabled && !document.getElementById('universal-dark-mode-style')) { applyDarkMode(); } }); observer.observe(document.head, { childList: true }); console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle'); })(); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })(); refactor(expo): align iOS native components with Expo Modules by mikepitre · Pull Request #8976 · clerk/javascript · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/quiet-buttons-align.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
"@clerk/expo": minor
---

Align the iOS native Clerk module and native views with Android by registering them through Expo Modules.
6 changes: 2 additions & 4 deletions packages/expo/app.plugin.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,8 +6,7 @@
* 1. iOS is configured with the required deployment target and metadata
* 2. Android is configured with packaging exclusions for dependencies
*
* Native modules are registered via Expo Modules autolinking on Android and
* React Native autolinking on iOS (RCTViewManager).
* Native modules and views are registered via Expo Modules autolinking.
*/
const {
withXcodeProject,
Expand DownExpand Up@@ -187,8 +186,7 @@ const withClerkGoogleSignIn = config => {
* 2. Android gets packaging exclusions for dependency conflicts
* 3. Google Sign-In URL scheme is configured (if env var is set)
*
* Native modules are registered via Expo Modules autolinking on Android and
* React Native autolinking on iOS (RCTViewManager).
* Native modules and views are registered via Expo Modules autolinking.
*/
/**
* Write ClerkKeychainService to Info.plist when keychainService is provided.
Expand Down
8 changes: 7 additions & 1 deletion packages/expo/expo-module.config.json
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,13 @@
{
"platforms": ["apple", "android"],
"apple": {
"modules": ["ClerkGoogleSignInModule"]
"modules": [
"ClerkExpoModule",
"ClerkAuthViewModule",
"ClerkUserProfileViewModule",
"ClerkUserButtonViewModule",
"ClerkGoogleSignInModule"
]
},
"android": {
"modules": [
Expand Down
50 changes: 26 additions & 24 deletions packages/expo/ios/ClerkAuthNativeView.swift
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,29 @@
import React
import ExpoModulesCore
import UIKit

public class ClerkAuthNativeView: ClerkNativeViewHost {
private var currentMode: String = "signInOrUp"
private var currentDismissible: Bool = true
private var didSendDismiss = false

@objc var onAuthEvent: RCTBubblingEventBlock?
let onAuthEvent = EventDispatcher()

@objc var mode: NSString? {
didSet {
let newMode = (mode as String?) ?? "signInOrUp"
guard newMode != currentMode else { return }
currentMode = newMode
setNeedsHostedViewUpdate()
}
func setMode(_ mode: String?) {
let newMode = mode ?? "signInOrUp"
guard newMode != currentMode else { return }
currentMode = newMode
setNeedsHostedViewUpdate()
}

@objc var isDismissible: NSNumber? {
didSet {
let newDismissible = isDismissible?.boolValue ?? true
guard newDismissible != currentDismissible else { return }
currentDismissible = newDismissible
setNeedsHostedViewUpdate()
}
func setDismissible(_ isDismissible: Bool?) {
let newDismissible = isDismissible ?? true
guard newDismissible != currentDismissible else { return }
currentDismissible = newDismissible
setNeedsHostedViewUpdate()
}

private func sendAuthEvent(type: ClerkNativeViewEvent) {
onAuthEvent?(["type": type.rawValue])
onAuthEvent(["type": type.rawValue])
}

private func sendDismissIfNeeded() {
Expand DownExpand Up@@ -58,14 +54,20 @@ public class ClerkAuthNativeView: ClerkNativeViewHost {
}
}

@objc(ClerkAuthViewManager)
class ClerkAuthViewManager: RCTViewManager {
public class ClerkAuthViewModule: Module {
public func definition() -> ModuleDefinition {
Name("ClerkAuthView")

override static func requiresMainQueueSetup() -> Bool {
return true
}
View(ClerkAuthNativeView.self) {
Events("onAuthEvent")

override func view() -> UIView! {
return ClerkAuthNativeView()
Prop("mode") { (view: ClerkAuthNativeView, mode: String?) in
view.setMode(mode)
}

Prop("isDismissible") { (view: ClerkAuthNativeView, isDismissible: Bool?) in
view.setDismissible(isDismissible)
}
}
}
}
9 changes: 0 additions & 9 deletions packages/expo/ios/ClerkAuthViewManager.m

This file was deleted.

9 changes: 4 additions & 5 deletions packages/expo/ios/ClerkExpo.podspec
Original file line numberDiff line numberDiff line change
Expand Up@@ -33,6 +33,8 @@ Pod::Spec.new do |s|
s.source = { git: 'https://github.com/clerk/javascript' }
s.static_framework = true

s.dependency 'ExpoModulesCore'

s.pod_target_xcconfig = {
'DEFINES_MODULE' => 'YES',
'SWIFT_COMPILATION_MODE' => 'wholemodule'
Expand All@@ -50,14 +52,11 @@ Pod::Spec.new do |s|
end

s.source_files = "ClerkNativeBridge.swift",
"ClerkExpoModule.swift", "ClerkExpoModule.m",
"ClerkExpoModule.swift",
"ClerkNativeViewHost.swift",
"ClerkAuthNativeView.swift",
"ClerkAuthViewManager.m",
"ClerkUserProfileNativeView.swift",
"ClerkUserProfileViewManager.m",
"ClerkUserButtonNativeView.swift",
"ClerkUserButtonViewManager.m"
"ClerkUserButtonNativeView.swift"
Comment thread
coderabbitai[bot] marked this conversation as resolved.

install_modules_dependencies(s)
end
21 changes: 0 additions & 21 deletions packages/expo/ios/ClerkExpoModule.m

This file was deleted.

125 changes: 63 additions & 62 deletions packages/expo/ios/ClerkExpoModule.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,113 +2,114 @@
// This module provides the configure function, client sync, and native view bridges.
// SwiftUI Clerk views are created by ClerkNativeBridge through the Clerk iOS SPM dependency.

import UIKit
import React
import ExpoModulesCore
import Foundation

// MARK: - Module

@objc(ClerkExpo)
class ClerkExpoModule: RCTEventEmitter {

private static var _hasListeners = false
private static weak var sharedInstance: ClerkExpoModule?

override init() {
super.init()
ClerkExpoModule.sharedInstance = self
ClerkNativeBridge.setClientChangedEmitter { body in
Self.emitClientChanged(body)
}
}

@objc override static func requiresMainQueueSetup() -> Bool {
return false
}

public class ClerkExpoModule: Module {
private static let nativeClientChangedEvent = "clerkNativeClientChanged"

override func supportedEvents() -> [String]! {
return [Self.nativeClientChangedEvent]
}
private static weak var sharedInstance: ClerkExpoModule?

override func startObserving() {
ClerkExpoModule._hasListeners = true
}
public func definition() -> ModuleDefinition {
Name("ClerkExpo")

override func stopObserving() {
ClerkExpoModule._hasListeners = false
}
Events(Self.nativeClientChangedEvent)

/// Emits a native client change event to JS from anywhere in the native layer.
/// Used by native views to ask ClerkProvider to reload JS client state.
static func emitClientChanged(_ body: [String: Any]? = nil) {
let eventBody = body ?? [:]
OnCreate {
Self.sharedInstance = self
ClerkNativeBridge.setClientChangedEmitter { body in
Self.emitClientChanged(body)
}
}

guard let instance = sharedInstance else {
return
OnDestroy {
if Self.sharedInstance === self {
Self.sharedInstance = nil
ClerkNativeBridge.setClientChangedEmitter(nil)
}
}

if let bridge = instance.bridge {
bridge.enqueueJSCall("RCTDeviceEventEmitter", method: "emit", args: [nativeClientChangedEvent, eventBody], completion: nil)
return
AsyncFunction("configure") { (publishableKey: String, bearerToken: String?, promise: Promise) in
self.configure(publishableKey, bearerToken: bearerToken, promise: promise)
}

guard _hasListeners else {
return
AsyncFunction("getClientToken") { (promise: Promise) in
self.getClientToken(promise: promise)
}

instance.sendEvent(withName: nativeClientChangedEvent, body: eventBody)
AsyncFunction("syncClientStateFromJs") {
(deviceToken: String?,
sourceId: String?,
didChangeClient: Bool,
didChangeDeviceToken: Bool,
promise: Promise) in
self.syncClientStateFromJs(
deviceToken,
sourceId: sourceId,
didChangeClient: didChangeClient,
didChangeDeviceToken: didChangeDeviceToken,
promise: promise
)
}
}

// MARK: - configure

@objc func configure(_ publishableKey: String,
bearerToken: String?,
resolve: @escaping RCTPromiseResolveBlock,
reject: @escaping RCTPromiseRejectBlock) {
private func configure(_ publishableKey: String, bearerToken: String?, promise: Promise) {
Task {
do {
try await ClerkNativeBridge.shared.configure(publishableKey: publishableKey, bearerToken: bearerToken)
resolve(nil)
promise.resolve()
} catch {
reject("E_CONFIGURE_FAILED", error.localizedDescription, error)
promise.reject("E_CONFIGURE_FAILED", error.localizedDescription)
}
}
}

// MARK: - getClientToken

@objc func getClientToken(_ resolve: @escaping RCTPromiseResolveBlock,
reject: @escaping RCTPromiseRejectBlock) {
private func getClientToken(promise: Promise) {
Task {
let token = await ClerkNativeBridge.shared.getClientToken()
resolve(token)
promise.resolve(token)
}
}

// MARK: - syncClientStateFromJs

@objc func syncClientStateFromJs(_ deviceToken: Any?,
sourceId: Any?,
didChangeClient: Bool,
didChangeDeviceToken: Bool,
resolve: @escaping RCTPromiseResolveBlock,
reject: @escaping RCTPromiseRejectBlock) {
let normalizedDeviceToken = deviceToken as? String
let normalizedSourceId = sourceId as? String
private func syncClientStateFromJs(_ deviceToken: String?,
sourceId: String?,
didChangeClient: Bool,
didChangeDeviceToken: Bool,
promise: Promise) {
Task {
do {
try await ClerkNativeBridge.shared.syncClientStateFromJs(
deviceToken: normalizedDeviceToken,
sourceId: normalizedSourceId,
deviceToken: deviceToken,
sourceId: sourceId,
didChangeClient: didChangeClient,
didChangeDeviceToken: didChangeDeviceToken
)
resolve(nil)
promise.resolve()
} catch {
reject("E_SYNC_FROM_JS_FAILED", error.localizedDescription, error)
promise.reject("E_SYNC_FROM_JS_FAILED", error.localizedDescription)
}
}
}

/// Emits a native client change event to JS from anywhere in the native layer.
/// Used by native views to ask ClerkProvider to reload JS client state.
static func emitClientChanged(_ body: [String: Any]? = nil) {
let eventBody = body ?? [:]

guard let instance = sharedInstance else {
return
}

DispatchQueue.main.async { [weak instance] in
instance?.sendEvent(Self.nativeClientChangedEvent, eventBody)
}
}
}
8 changes: 5 additions & 3 deletions packages/expo/ios/ClerkNativeViewHost.swift
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
import ExpoModulesCore
import UIKit

public class ClerkNativeViewHost: UIView {
public class ClerkNativeViewHost: ExpoView {
private lazy var hostingCoordinator = ClerkNativeHostingCoordinator(containerView: self)
private var hasInitialized: Bool = false
private var configuredObserver: NSObjectProtocol?

override public init(frame: CGRect) {
super.init(frame: frame)
public required init(appContext: AppContext? = nil) {
super.init(appContext: appContext)
}

@available(*, unavailable)
public required init?(coder: NSCoder) {
fatalError("init(coder:) has not been implemented")
}
Expand Down
14 changes: 5 additions & 9 deletions packages/expo/ios/ClerkUserButtonNativeView.swift
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import React
import ExpoModulesCore
import UIKit

public class ClerkUserButtonNativeView: ClerkNativeViewHost {
Expand All@@ -7,14 +7,10 @@ public class ClerkUserButtonNativeView: ClerkNativeViewHost {
}
}

@objc(ClerkUserButtonViewManager)
class ClerkUserButtonViewManager: RCTViewManager {
public class ClerkUserButtonViewModule: Module {
public func definition() -> ModuleDefinition {
Name("ClerkUserButtonView")

override static func requiresMainQueueSetup() -> Bool {
return true
}

override func view() -> UIView! {
return ClerkUserButtonNativeView()
View(ClerkUserButtonNativeView.self) {}
}
}
Loading
Loading