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/expo-native-custom-logo.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/expo': patch
---

Add a `logo` prop to the native `AuthView`, allowing Expo apps to replace the dashboard-configured logo with custom React Native content on Android and iOS.
23 changes: 22 additions & 1 deletion integration/templates/expo-native/App.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -52,7 +52,17 @@ function NativeBuildFixture() {
presentationStyle='pageSheet'
onRequestClose={() => setIsAuthOpen(false)}
>
<AuthView onDismiss={() => setIsAuthOpen(false)} />
<AuthView
logo={
<View
testID='custom-logo'
style={styles.customLogo}
>
<Text style={styles.customLogoText}>E2E Custom Logo</Text>
</View>
}
onDismiss={() => setIsAuthOpen(false)}
/>
</Modal>
</View>
);
Expand All@@ -76,6 +86,17 @@ const styles = StyleSheet.create({
justifyContent: 'center',
padding: 24,
},
customLogo: {
backgroundColor: '#6C47FF',
borderRadius: 8,
paddingHorizontal: 16,
paddingVertical: 10,
},
customLogoText: {
color: '#FFFFFF',
fontSize: 16,
fontWeight: '600',
},
header: {
alignItems: 'center',
flexDirection: 'row',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,8 @@
# is the platform-native gesture: Android's system back button (doubling as
# the back-dismisses-AuthView regression), iOS's sheet Close control
# (clerk-ios exposes the stable clerk.dismissButton identifier).
# Also asserts the custom `logo` React element is rehosted into the native
# logo slot with a nonzero size, both on first mount and after reattach.
appId: com.clerk.exponativebuildfixture
name: AuthView survives detach and reattach
---
Expand All@@ -12,6 +14,11 @@ name: AuthView survives detach and reattach
- extendedWaitUntil:
visible: 'Welcome! Sign in to continue\.?'
timeout: 25000
# Retrying wait (not assertVisible): the rehosted logo is sized on the first
# RN layout pass, so it can lag the welcome copy by a frame or two.
- extendedWaitUntil:
visible: 'E2E Custom Logo'
timeout: 10000
- runFlow:
when:
platform: Android
Expand All@@ -29,6 +36,9 @@ name: AuthView survives detach and reattach
timeout: 15000
- tapOn:
id: 'open-auth-view-button'
- extendedWaitUntil:
visible: 'E2E Custom Logo'
timeout: 15000
- runFlow: subflows/sign-in-email-password.yaml
- runFlow: subflows/assert-signed-in.yaml
- tapOn:
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,10 +2,16 @@ package expo.modules.clerk

import android.content.Context
import android.util.Log
import android.view.View
import android.view.ViewGroup
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.layout.wrapContentSize
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.compose.ui.platform.LocalDensity
import androidx.compose.ui.unit.dp
import androidx.compose.ui.viewinterop.AndroidView
import androidx.lifecycle.ViewModelStore
import androidx.lifecycle.ViewModelStoreOwner
import com.clerk.api.Clerk
Expand All@@ -30,6 +36,21 @@ class ClerkAuthNativeView(context: Context, appContext: AppContext) : ClerkCompo
var isDismissible: Boolean = true
var logoMaxHeight: Float? = null
var mode: String? = null
var logoView: View? = null
private set

private var logoWidth = 0
private var logoHeight = 0
private val logoLayoutListener =
View.OnLayoutChangeListener { view, left, top, right, bottom, _, _, _, _ ->
val width = right - left
val height = bottom - top
if (view === logoView && (width != logoWidth || height != logoHeight)) {
logoWidth = width
logoHeight = height
setupView()
}
}

private val onAuthEvent by EventDispatcher()

Expand DownExpand Up@@ -67,6 +88,9 @@ class ClerkAuthNativeView(context: Context, appContext: AppContext) : ClerkCompo
AuthView(
modifier = Modifier.fillMaxSize(),
clerkTheme = authTheme(),
logo = logoView?.let { view ->
{ ReactLogoView(view = view, width = logoWidth, height = logoHeight) }
},
mode = authMode(mode),
isDismissible = isDismissible,
onDismiss = ::sendDismissEvent,
Expand All@@ -76,6 +100,25 @@ class ClerkAuthNativeView(context: Context, appContext: AppContext) : ClerkCompo
)
}

fun setLogoView(view: View) {
if (logoView === view) return
logoView?.removeOnLayoutChangeListener(logoLayoutListener)
logoView = view
logoWidth = view.width
logoHeight = view.height
view.addOnLayoutChangeListener(logoLayoutListener)
setupView()
}

fun removeLogoView(view: View) {
if (logoView !== view) return
view.removeOnLayoutChangeListener(logoLayoutListener)
logoView = null
logoWidth = 0
logoHeight = 0
setupView()
}

private fun authTheme(): ClerkTheme? {
val maxHeight = logoMaxHeight ?: return Clerk.customTheme
val theme = Clerk.customTheme ?: ClerkTheme()
Expand All@@ -100,13 +143,52 @@ class ClerkAuthNativeView(context: Context, appContext: AppContext) : ClerkCompo
}
}

@Composable
private fun ReactLogoView(view: View, width: Int, height: Int) {
val density = LocalDensity.current
val modifier =
if (width > 0 && height > 0) {
with(density) { Modifier.size(width.toDp(), height.toDp()) }
} else {
Modifier.wrapContentSize()
}

AndroidView(
modifier = modifier,
factory = {
(view.parent as? ViewGroup)?.removeView(view)
view
},
)
}

class ClerkAuthViewModule : Module() {
override fun definition() = ModuleDefinition {
Name("ClerkAuthView")

View(ClerkAuthNativeView::class) {
Events("onAuthEvent")

GroupView<ClerkAuthNativeView> {
AddChildView<View> { parent, child, _ ->
parent.setLogoView(child)
}
GetChildCount { parent ->
if (parent.logoView == null) 0 else 1
}
GetChildViewAt<View> { parent, index ->
if (index == 0) parent.logoView else null
}
RemoveChildView<View> { parent, child ->
parent.removeLogoView(child)
}
RemoveChildViewAt { parent, index ->
if (index == 0) {
parent.logoView?.let(parent::removeLogoView)
}
}
}

Prop("mode") { view: ClerkAuthNativeView, mode: String? ->
view.mode = mode
}
Expand Down
50 changes: 50 additions & 0 deletions packages/expo/ios/ClerkAuthNativeView.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,8 @@ public class ClerkAuthNativeView: ClerkNativeViewHost {
private var currentMode: String = "signInOrUp"
private var currentDismissible: Bool = true
private var currentLogoMaxHeight: CGFloat?
private let logoState = ClerkInlineAuthLogoState()
private var logoBoundsObservation: NSKeyValueObservation?
private var didSendDismiss = false

let onAuthEvent = EventDispatcher()
Expand DownExpand Up@@ -48,10 +50,58 @@ public class ClerkAuthNativeView: ClerkNativeViewHost {
sendDismissIfNeeded()
}

override public func layoutSubviews() {
super.layoutSubviews()
guard let logoView = logoState.content?.view else { return }
logoState.updateSize(for: logoView)
}

#if RCT_NEW_ARCH_ENABLED
override public func mountChildComponentView(_ childComponentView: UIView, index: Int) {
setLogoView(childComponentView)
}

override public func unmountChildComponentView(_ childComponentView: UIView, index: Int) {
removeLogoView(childComponentView)
}
#else
override public func insertReactSubview(_ subview: UIView!, at atIndex: Int) {
super.insertReactSubview(subview, at: atIndex)
setLogoView(subview)
}

override public func removeReactSubview(_ subview: UIView!) {
removeLogoView(subview)
super.removeReactSubview(subview)
}

override public func didUpdateReactSubviews() {}
#endif

private func setLogoView(_ view: UIView) {
guard logoState.content?.view !== view else { return }
logoBoundsObservation = nil
logoState.setView(view)
logoBoundsObservation = view.observe(\.bounds, options: [.new]) { [weak self, weak view] _, _ in
DispatchQueue.main.async { [weak self, weak view] in
guard let self, let view, self.logoState.content?.view === view else { return }
self.logoState.updateSize(for: view)
}
}
}

private func removeLogoView(_ view: UIView) {
guard logoState.content?.view === view else { return }
logoBoundsObservation = nil
view.removeFromSuperview()
logoState.removeView(view)
}

override func makeHostedController() -> UIViewController? {
return ClerkNativeBridge.shared.makeAuthViewController(
mode: currentMode,
dismissible: currentDismissible,
logoState: logoState,
logoMaxHeight: currentLogoMaxHeight,
onEvent: { [weak self] event, _ in
if event == .dismissed {
Expand Down
4 changes: 4 additions & 0 deletions packages/expo/ios/ClerkExpo.podspec
Original file line numberDiff line numberDiff line change
Expand Up@@ -58,5 +58,9 @@ Pod::Spec.new do |s|
"ClerkUserProfileNativeView.swift",
"ClerkUserButtonNativeView.swift"

s.test_spec 'Tests' do |test_spec|
test_spec.source_files = 'Tests/**/*.swift'
end

install_modules_dependencies(s)
end
75 changes: 74 additions & 1 deletion packages/expo/ios/ClerkNativeBridge.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,32 @@ extension Notification.Name {
static let clerkNativeSDKDidConfigure = Notification.Name("com.clerk.expo.native-sdk.did-configure")
}

@Observable
final class ClerkInlineAuthLogoState {
struct Content {
let view: UIView
let size: CGSize
}

private(set) var content: Content?

func setView(_ view: UIView) {
content = Content(view: view, size: view.bounds.size)
}

func updateSize(for view: UIView) {
guard content?.view === view else { return }
let currentSize = view.bounds.size
guard content?.size != currentSize else { return }
content = Content(view: view, size: currentSize)
}

func removeView(_ view: UIView) {
guard content?.view === view else { return }
content = nil
}
}

private let clerkNativeClientEventQueue = DispatchQueue(label: "com.clerk.expo.native-client-events")
private var clerkNativeClientChangedEmitter: (([String: Any]?) -> Void)?

Expand DownExpand Up@@ -243,6 +269,7 @@ final class ClerkNativeBridge {
func makeAuthViewController(
mode: String,
dismissible: Bool,
logoState: ClerkInlineAuthLogoState,
logoMaxHeight: CGFloat?,
onEvent: @escaping (ClerkNativeViewEvent, [String: Any]) -> Void
) -> UIViewController? {
Expand All@@ -254,6 +281,7 @@ final class ClerkNativeBridge {
dismissible: dismissible,
lightTheme: lightTheme,
darkTheme: darkTheme,
logoState: logoState,
logoMaxHeight: logoMaxHeight
),
onDismiss: dismissible ? { onEvent(.dismissed, [:]) } : nil
Expand DownExpand Up@@ -505,6 +533,7 @@ struct ClerkInlineAuthWrapperView: View {
let dismissible: Bool
let lightTheme: ClerkTheme?
let darkTheme: ClerkTheme?
let logoState: ClerkInlineAuthLogoState
let logoMaxHeight: CGFloat?

@Environment(\.colorScheme) private var colorScheme
Expand All@@ -521,7 +550,12 @@ struct ClerkInlineAuthWrapperView: View {
}
}

if let logoMaxHeight {
if let logo = logoState.content {
themedView.clerkAppIconView {
ClerkReactLogoView(view: logo.view)
.frame(width: logo.size.width, height: logo.size.height)
}
} else if let logoMaxHeight {
themedView.clerkAppIcon(maxHeight: logoMaxHeight)
} else {
themedView
Expand All@@ -533,6 +567,45 @@ struct ClerkInlineAuthWrapperView: View {
}
}

private struct ClerkReactLogoView: UIViewRepresentable {
let view: UIView

func makeUIView(context: Context) -> ClerkReactLogoContainerView {
return ClerkReactLogoContainerView(contentView: view)
}

func updateUIView(_ uiView: ClerkReactLogoContainerView, context: Context) {
uiView.setContentView(view)
}
}

private final class ClerkReactLogoContainerView: UIView {
private var contentView: UIView?

init(contentView: UIView) {
super.init(frame: .zero)
setContentView(contentView)
}

required init?(coder: NSCoder) {
return nil
}

func setContentView(_ view: UIView) {
guard contentView !== view else { return }
contentView?.removeFromSuperview()
view.removeFromSuperview()
contentView = view
addSubview(view)
setNeedsLayout()
}

override func layoutSubviews() {
super.layoutSubviews()
contentView?.frame = bounds
}
}

private final class ClerkNativeHostingController<Content: View>: UIHostingController<Content> {
private let onDismiss: (() -> Void)?
private var didSendDismiss = false
Expand Down
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" + '
feat(expo): support custom logos in native AuthView by swolfand · Pull Request #9163 · 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/expo-native-custom-logo.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/expo': patch
---

Add a `logo` prop to the native `AuthView`, allowing Expo apps to replace the dashboard-configured logo with custom React Native content on Android and iOS.
23 changes: 22 additions & 1 deletion integration/templates/expo-native/App.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -52,7 +52,17 @@ function NativeBuildFixture() {
presentationStyle='pageSheet'
onRequestClose={() => setIsAuthOpen(false)}
>
<AuthView onDismiss={() => setIsAuthOpen(false)} />
<AuthView
logo={
<View
testID='custom-logo'
style={styles.customLogo}
>
<Text style={styles.customLogoText}>E2E Custom Logo</Text>
</View>
}
onDismiss={() => setIsAuthOpen(false)}
/>
</Modal>
</View>
);
Expand All@@ -76,6 +86,17 @@ const styles = StyleSheet.create({
justifyContent: 'center',
padding: 24,
},
customLogo: {
backgroundColor: '#6C47FF',
borderRadius: 8,
paddingHorizontal: 16,
paddingVertical: 10,
},
customLogoText: {
color: '#FFFFFF',
fontSize: 16,
fontWeight: '600',
},
header: {
alignItems: 'center',
flexDirection: 'row',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,8 @@
# is the platform-native gesture: Android's system back button (doubling as
# the back-dismisses-AuthView regression), iOS's sheet Close control
# (clerk-ios exposes the stable clerk.dismissButton identifier).
# Also asserts the custom `logo` React element is rehosted into the native
# logo slot with a nonzero size, both on first mount and after reattach.
appId: com.clerk.exponativebuildfixture
name: AuthView survives detach and reattach
---
Expand All@@ -12,6 +14,11 @@ name: AuthView survives detach and reattach
- extendedWaitUntil:
visible: 'Welcome! Sign in to continue\.?'
timeout: 25000
# Retrying wait (not assertVisible): the rehosted logo is sized on the first
# RN layout pass, so it can lag the welcome copy by a frame or two.
- extendedWaitUntil:
visible: 'E2E Custom Logo'
timeout: 10000
- runFlow:
when:
platform: Android
Expand All@@ -29,6 +36,9 @@ name: AuthView survives detach and reattach
timeout: 15000
- tapOn:
id: 'open-auth-view-button'
- extendedWaitUntil:
visible: 'E2E Custom Logo'
timeout: 15000
- runFlow: subflows/sign-in-email-password.yaml
- runFlow: subflows/assert-signed-in.yaml
- tapOn:
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,10 +2,16 @@ package expo.modules.clerk

import android.content.Context
import android.util.Log
import android.view.View
import android.view.ViewGroup
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.layout.wrapContentSize
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.compose.ui.platform.LocalDensity
import androidx.compose.ui.unit.dp
import androidx.compose.ui.viewinterop.AndroidView
import androidx.lifecycle.ViewModelStore
import androidx.lifecycle.ViewModelStoreOwner
import com.clerk.api.Clerk
Expand All@@ -30,6 +36,21 @@ class ClerkAuthNativeView(context: Context, appContext: AppContext) : ClerkCompo
var isDismissible: Boolean = true
var logoMaxHeight: Float? = null
var mode: String? = null
var logoView: View? = null
private set

private var logoWidth = 0
private var logoHeight = 0
private val logoLayoutListener =
View.OnLayoutChangeListener { view, left, top, right, bottom, _, _, _, _ ->
val width = right - left
val height = bottom - top
if (view === logoView && (width != logoWidth || height != logoHeight)) {
logoWidth = width
logoHeight = height
setupView()
}
}

private val onAuthEvent by EventDispatcher()

Expand DownExpand Up@@ -67,6 +88,9 @@ class ClerkAuthNativeView(context: Context, appContext: AppContext) : ClerkCompo
AuthView(
modifier = Modifier.fillMaxSize(),
clerkTheme = authTheme(),
logo = logoView?.let { view ->
{ ReactLogoView(view = view, width = logoWidth, height = logoHeight) }
},
mode = authMode(mode),
isDismissible = isDismissible,
onDismiss = ::sendDismissEvent,
Expand All@@ -76,6 +100,25 @@ class ClerkAuthNativeView(context: Context, appContext: AppContext) : ClerkCompo
)
}

fun setLogoView(view: View) {
if (logoView === view) return
logoView?.removeOnLayoutChangeListener(logoLayoutListener)
logoView = view
logoWidth = view.width
logoHeight = view.height
view.addOnLayoutChangeListener(logoLayoutListener)
setupView()
}

fun removeLogoView(view: View) {
if (logoView !== view) return
view.removeOnLayoutChangeListener(logoLayoutListener)
logoView = null
logoWidth = 0
logoHeight = 0
setupView()
}

private fun authTheme(): ClerkTheme? {
val maxHeight = logoMaxHeight ?: return Clerk.customTheme
val theme = Clerk.customTheme ?: ClerkTheme()
Expand All@@ -100,13 +143,52 @@ class ClerkAuthNativeView(context: Context, appContext: AppContext) : ClerkCompo
}
}

@Composable
private fun ReactLogoView(view: View, width: Int, height: Int) {
val density = LocalDensity.current
val modifier =
if (width > 0 && height > 0) {
with(density) { Modifier.size(width.toDp(), height.toDp()) }
} else {
Modifier.wrapContentSize()
}

AndroidView(
modifier = modifier,
factory = {
(view.parent as? ViewGroup)?.removeView(view)
view
},
)
}

class ClerkAuthViewModule : Module() {
override fun definition() = ModuleDefinition {
Name("ClerkAuthView")

View(ClerkAuthNativeView::class) {
Events("onAuthEvent")

GroupView<ClerkAuthNativeView> {
AddChildView<View> { parent, child, _ ->
parent.setLogoView(child)
}
GetChildCount { parent ->
if (parent.logoView == null) 0 else 1
}
GetChildViewAt<View> { parent, index ->
if (index == 0) parent.logoView else null
}
RemoveChildView<View> { parent, child ->
parent.removeLogoView(child)
}
RemoveChildViewAt { parent, index ->
if (index == 0) {
parent.logoView?.let(parent::removeLogoView)
}
}
}

Prop("mode") { view: ClerkAuthNativeView, mode: String? ->
view.mode = mode
}
Expand Down
50 changes: 50 additions & 0 deletions packages/expo/ios/ClerkAuthNativeView.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,8 @@ public class ClerkAuthNativeView: ClerkNativeViewHost {
private var currentMode: String = "signInOrUp"
private var currentDismissible: Bool = true
private var currentLogoMaxHeight: CGFloat?
private let logoState = ClerkInlineAuthLogoState()
private var logoBoundsObservation: NSKeyValueObservation?
private var didSendDismiss = false

let onAuthEvent = EventDispatcher()
Expand DownExpand Up@@ -48,10 +50,58 @@ public class ClerkAuthNativeView: ClerkNativeViewHost {
sendDismissIfNeeded()
}

override public func layoutSubviews() {
super.layoutSubviews()
guard let logoView = logoState.content?.view else { return }
logoState.updateSize(for: logoView)
}

#if RCT_NEW_ARCH_ENABLED
override public func mountChildComponentView(_ childComponentView: UIView, index: Int) {
setLogoView(childComponentView)
}

override public func unmountChildComponentView(_ childComponentView: UIView, index: Int) {
removeLogoView(childComponentView)
}
#else
override public func insertReactSubview(_ subview: UIView!, at atIndex: Int) {
super.insertReactSubview(subview, at: atIndex)
setLogoView(subview)
}

override public func removeReactSubview(_ subview: UIView!) {
removeLogoView(subview)
super.removeReactSubview(subview)
}

override public func didUpdateReactSubviews() {}
#endif

private func setLogoView(_ view: UIView) {
guard logoState.content?.view !== view else { return }
logoBoundsObservation = nil
logoState.setView(view)
logoBoundsObservation = view.observe(\.bounds, options: [.new]) { [weak self, weak view] _, _ in
DispatchQueue.main.async { [weak self, weak view] in
guard let self, let view, self.logoState.content?.view === view else { return }
self.logoState.updateSize(for: view)
}
}
}

private func removeLogoView(_ view: UIView) {
guard logoState.content?.view === view else { return }
logoBoundsObservation = nil
view.removeFromSuperview()
logoState.removeView(view)
}

override func makeHostedController() -> UIViewController? {
return ClerkNativeBridge.shared.makeAuthViewController(
mode: currentMode,
dismissible: currentDismissible,
logoState: logoState,
logoMaxHeight: currentLogoMaxHeight,
onEvent: { [weak self] event, _ in
if event == .dismissed {
Expand Down
4 changes: 4 additions & 0 deletions packages/expo/ios/ClerkExpo.podspec
Original file line numberDiff line numberDiff line change
Expand Up@@ -58,5 +58,9 @@ Pod::Spec.new do |s|
"ClerkUserProfileNativeView.swift",
"ClerkUserButtonNativeView.swift"

s.test_spec 'Tests' do |test_spec|
test_spec.source_files = 'Tests/**/*.swift'
end

install_modules_dependencies(s)
end
75 changes: 74 additions & 1 deletion packages/expo/ios/ClerkNativeBridge.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,32 @@ extension Notification.Name {
static let clerkNativeSDKDidConfigure = Notification.Name("com.clerk.expo.native-sdk.did-configure")
}

@Observable
final class ClerkInlineAuthLogoState {
struct Content {
let view: UIView
let size: CGSize
}

private(set) var content: Content?

func setView(_ view: UIView) {
content = Content(view: view, size: view.bounds.size)
}

func updateSize(for view: UIView) {
guard content?.view === view else { return }
let currentSize = view.bounds.size
guard content?.size != currentSize else { return }
content = Content(view: view, size: currentSize)
}

func removeView(_ view: UIView) {
guard content?.view === view else { return }
content = nil
}
}

private let clerkNativeClientEventQueue = DispatchQueue(label: "com.clerk.expo.native-client-events")
private var clerkNativeClientChangedEmitter: (([String: Any]?) -> Void)?

Expand DownExpand Up@@ -243,6 +269,7 @@ final class ClerkNativeBridge {
func makeAuthViewController(
mode: String,
dismissible: Bool,
logoState: ClerkInlineAuthLogoState,
logoMaxHeight: CGFloat?,
onEvent: @escaping (ClerkNativeViewEvent, [String: Any]) -> Void
) -> UIViewController? {
Expand All@@ -254,6 +281,7 @@ final class ClerkNativeBridge {
dismissible: dismissible,
lightTheme: lightTheme,
darkTheme: darkTheme,
logoState: logoState,
logoMaxHeight: logoMaxHeight
),
onDismiss: dismissible ? { onEvent(.dismissed, [:]) } : nil
Expand DownExpand Up@@ -505,6 +533,7 @@ struct ClerkInlineAuthWrapperView: View {
let dismissible: Bool
let lightTheme: ClerkTheme?
let darkTheme: ClerkTheme?
let logoState: ClerkInlineAuthLogoState
let logoMaxHeight: CGFloat?

@Environment(\.colorScheme) private var colorScheme
Expand All@@ -521,7 +550,12 @@ struct ClerkInlineAuthWrapperView: View {
}
}

if let logoMaxHeight {
if let logo = logoState.content {
themedView.clerkAppIconView {
ClerkReactLogoView(view: logo.view)
.frame(width: logo.size.width, height: logo.size.height)
}
} else if let logoMaxHeight {
themedView.clerkAppIcon(maxHeight: logoMaxHeight)
} else {
themedView
Expand All@@ -533,6 +567,45 @@ struct ClerkInlineAuthWrapperView: View {
}
}

private struct ClerkReactLogoView: UIViewRepresentable {
let view: UIView

func makeUIView(context: Context) -> ClerkReactLogoContainerView {
return ClerkReactLogoContainerView(contentView: view)
}

func updateUIView(_ uiView: ClerkReactLogoContainerView, context: Context) {
uiView.setContentView(view)
}
}

private final class ClerkReactLogoContainerView: UIView {
private var contentView: UIView?

init(contentView: UIView) {
super.init(frame: .zero)
setContentView(contentView)
}

required init?(coder: NSCoder) {
return nil
}

func setContentView(_ view: UIView) {
guard contentView !== view else { return }
contentView?.removeFromSuperview()
view.removeFromSuperview()
contentView = view
addSubview(view)
setNeedsLayout()
}

override func layoutSubviews() {
super.layoutSubviews()
contentView?.frame = bounds
}
}

private final class ClerkNativeHostingController<Content: View>: UIHostingController<Content> {
private let onDismiss: (() -> Void)?
private var didSendDismiss = false
Expand Down
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('^' + ".*" + ' feat(expo): support custom logos in native AuthView by swolfand · Pull Request #9163 · 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/expo-native-custom-logo.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/expo': patch
---

Add a `logo` prop to the native `AuthView`, allowing Expo apps to replace the dashboard-configured logo with custom React Native content on Android and iOS.
23 changes: 22 additions & 1 deletion integration/templates/expo-native/App.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -52,7 +52,17 @@ function NativeBuildFixture() {
presentationStyle='pageSheet'
onRequestClose={() => setIsAuthOpen(false)}
>
<AuthView onDismiss={() => setIsAuthOpen(false)} />
<AuthView
logo={
<View
testID='custom-logo'
style={styles.customLogo}
>
<Text style={styles.customLogoText}>E2E Custom Logo</Text>
</View>
}
onDismiss={() => setIsAuthOpen(false)}
/>
</Modal>
</View>
);
Expand All@@ -76,6 +86,17 @@ const styles = StyleSheet.create({
justifyContent: 'center',
padding: 24,
},
customLogo: {
backgroundColor: '#6C47FF',
borderRadius: 8,
paddingHorizontal: 16,
paddingVertical: 10,
},
customLogoText: {
color: '#FFFFFF',
fontSize: 16,
fontWeight: '600',
},
header: {
alignItems: 'center',
flexDirection: 'row',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,8 @@
# is the platform-native gesture: Android's system back button (doubling as
# the back-dismisses-AuthView regression), iOS's sheet Close control
# (clerk-ios exposes the stable clerk.dismissButton identifier).
# Also asserts the custom `logo` React element is rehosted into the native
# logo slot with a nonzero size, both on first mount and after reattach.
appId: com.clerk.exponativebuildfixture
name: AuthView survives detach and reattach
---
Expand All@@ -12,6 +14,11 @@ name: AuthView survives detach and reattach
- extendedWaitUntil:
visible: 'Welcome! Sign in to continue\.?'
timeout: 25000
# Retrying wait (not assertVisible): the rehosted logo is sized on the first
# RN layout pass, so it can lag the welcome copy by a frame or two.
- extendedWaitUntil:
visible: 'E2E Custom Logo'
timeout: 10000
- runFlow:
when:
platform: Android
Expand All@@ -29,6 +36,9 @@ name: AuthView survives detach and reattach
timeout: 15000
- tapOn:
id: 'open-auth-view-button'
- extendedWaitUntil:
visible: 'E2E Custom Logo'
timeout: 15000
- runFlow: subflows/sign-in-email-password.yaml
- runFlow: subflows/assert-signed-in.yaml
- tapOn:
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,10 +2,16 @@ package expo.modules.clerk

import android.content.Context
import android.util.Log
import android.view.View
import android.view.ViewGroup
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.layout.wrapContentSize
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.compose.ui.platform.LocalDensity
import androidx.compose.ui.unit.dp
import androidx.compose.ui.viewinterop.AndroidView
import androidx.lifecycle.ViewModelStore
import androidx.lifecycle.ViewModelStoreOwner
import com.clerk.api.Clerk
Expand All@@ -30,6 +36,21 @@ class ClerkAuthNativeView(context: Context, appContext: AppContext) : ClerkCompo
var isDismissible: Boolean = true
var logoMaxHeight: Float? = null
var mode: String? = null
var logoView: View? = null
private set

private var logoWidth = 0
private var logoHeight = 0
private val logoLayoutListener =
View.OnLayoutChangeListener { view, left, top, right, bottom, _, _, _, _ ->
val width = right - left
val height = bottom - top
if (view === logoView && (width != logoWidth || height != logoHeight)) {
logoWidth = width
logoHeight = height
setupView()
}
}

private val onAuthEvent by EventDispatcher()

Expand DownExpand Up@@ -67,6 +88,9 @@ class ClerkAuthNativeView(context: Context, appContext: AppContext) : ClerkCompo
AuthView(
modifier = Modifier.fillMaxSize(),
clerkTheme = authTheme(),
logo = logoView?.let { view ->
{ ReactLogoView(view = view, width = logoWidth, height = logoHeight) }
},
mode = authMode(mode),
isDismissible = isDismissible,
onDismiss = ::sendDismissEvent,
Expand All@@ -76,6 +100,25 @@ class ClerkAuthNativeView(context: Context, appContext: AppContext) : ClerkCompo
)
}

fun setLogoView(view: View) {
if (logoView === view) return
logoView?.removeOnLayoutChangeListener(logoLayoutListener)
logoView = view
logoWidth = view.width
logoHeight = view.height
view.addOnLayoutChangeListener(logoLayoutListener)
setupView()
}

fun removeLogoView(view: View) {
if (logoView !== view) return
view.removeOnLayoutChangeListener(logoLayoutListener)
logoView = null
logoWidth = 0
logoHeight = 0
setupView()
}

private fun authTheme(): ClerkTheme? {
val maxHeight = logoMaxHeight ?: return Clerk.customTheme
val theme = Clerk.customTheme ?: ClerkTheme()
Expand All@@ -100,13 +143,52 @@ class ClerkAuthNativeView(context: Context, appContext: AppContext) : ClerkCompo
}
}

@Composable
private fun ReactLogoView(view: View, width: Int, height: Int) {
val density = LocalDensity.current
val modifier =
if (width > 0 && height > 0) {
with(density) { Modifier.size(width.toDp(), height.toDp()) }
} else {
Modifier.wrapContentSize()
}

AndroidView(
modifier = modifier,
factory = {
(view.parent as? ViewGroup)?.removeView(view)
view
},
)
}

class ClerkAuthViewModule : Module() {
override fun definition() = ModuleDefinition {
Name("ClerkAuthView")

View(ClerkAuthNativeView::class) {
Events("onAuthEvent")

GroupView<ClerkAuthNativeView> {
AddChildView<View> { parent, child, _ ->
parent.setLogoView(child)
}
GetChildCount { parent ->
if (parent.logoView == null) 0 else 1
}
GetChildViewAt<View> { parent, index ->
if (index == 0) parent.logoView else null
}
RemoveChildView<View> { parent, child ->
parent.removeLogoView(child)
}
RemoveChildViewAt { parent, index ->
if (index == 0) {
parent.logoView?.let(parent::removeLogoView)
}
}
}

Prop("mode") { view: ClerkAuthNativeView, mode: String? ->
view.mode = mode
}
Expand Down
50 changes: 50 additions & 0 deletions packages/expo/ios/ClerkAuthNativeView.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,8 @@ public class ClerkAuthNativeView: ClerkNativeViewHost {
private var currentMode: String = "signInOrUp"
private var currentDismissible: Bool = true
private var currentLogoMaxHeight: CGFloat?
private let logoState = ClerkInlineAuthLogoState()
private var logoBoundsObservation: NSKeyValueObservation?
private var didSendDismiss = false

let onAuthEvent = EventDispatcher()
Expand DownExpand Up@@ -48,10 +50,58 @@ public class ClerkAuthNativeView: ClerkNativeViewHost {
sendDismissIfNeeded()
}

override public func layoutSubviews() {
super.layoutSubviews()
guard let logoView = logoState.content?.view else { return }
logoState.updateSize(for: logoView)
}

#if RCT_NEW_ARCH_ENABLED
override public func mountChildComponentView(_ childComponentView: UIView, index: Int) {
setLogoView(childComponentView)
}

override public func unmountChildComponentView(_ childComponentView: UIView, index: Int) {
removeLogoView(childComponentView)
}
#else
override public func insertReactSubview(_ subview: UIView!, at atIndex: Int) {
super.insertReactSubview(subview, at: atIndex)
setLogoView(subview)
}

override public func removeReactSubview(_ subview: UIView!) {
removeLogoView(subview)
super.removeReactSubview(subview)
}

override public func didUpdateReactSubviews() {}
#endif

private func setLogoView(_ view: UIView) {
guard logoState.content?.view !== view else { return }
logoBoundsObservation = nil
logoState.setView(view)
logoBoundsObservation = view.observe(\.bounds, options: [.new]) { [weak self, weak view] _, _ in
DispatchQueue.main.async { [weak self, weak view] in
guard let self, let view, self.logoState.content?.view === view else { return }
self.logoState.updateSize(for: view)
}
}
}

private func removeLogoView(_ view: UIView) {
guard logoState.content?.view === view else { return }
logoBoundsObservation = nil
view.removeFromSuperview()
logoState.removeView(view)
}

override func makeHostedController() -> UIViewController? {
return ClerkNativeBridge.shared.makeAuthViewController(
mode: currentMode,
dismissible: currentDismissible,
logoState: logoState,
logoMaxHeight: currentLogoMaxHeight,
onEvent: { [weak self] event, _ in
if event == .dismissed {
Expand Down
4 changes: 4 additions & 0 deletions packages/expo/ios/ClerkExpo.podspec
Original file line numberDiff line numberDiff line change
Expand Up@@ -58,5 +58,9 @@ Pod::Spec.new do |s|
"ClerkUserProfileNativeView.swift",
"ClerkUserButtonNativeView.swift"

s.test_spec 'Tests' do |test_spec|
test_spec.source_files = 'Tests/**/*.swift'
end

install_modules_dependencies(s)
end
75 changes: 74 additions & 1 deletion packages/expo/ios/ClerkNativeBridge.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,32 @@ extension Notification.Name {
static let clerkNativeSDKDidConfigure = Notification.Name("com.clerk.expo.native-sdk.did-configure")
}

@Observable
final class ClerkInlineAuthLogoState {
struct Content {
let view: UIView
let size: CGSize
}

private(set) var content: Content?

func setView(_ view: UIView) {
content = Content(view: view, size: view.bounds.size)
}

func updateSize(for view: UIView) {
guard content?.view === view else { return }
let currentSize = view.bounds.size
guard content?.size != currentSize else { return }
content = Content(view: view, size: currentSize)
}

func removeView(_ view: UIView) {
guard content?.view === view else { return }
content = nil
}
}

private let clerkNativeClientEventQueue = DispatchQueue(label: "com.clerk.expo.native-client-events")
private var clerkNativeClientChangedEmitter: (([String: Any]?) -> Void)?

Expand DownExpand Up@@ -243,6 +269,7 @@ final class ClerkNativeBridge {
func makeAuthViewController(
mode: String,
dismissible: Bool,
logoState: ClerkInlineAuthLogoState,
logoMaxHeight: CGFloat?,
onEvent: @escaping (ClerkNativeViewEvent, [String: Any]) -> Void
) -> UIViewController? {
Expand All@@ -254,6 +281,7 @@ final class ClerkNativeBridge {
dismissible: dismissible,
lightTheme: lightTheme,
darkTheme: darkTheme,
logoState: logoState,
logoMaxHeight: logoMaxHeight
),
onDismiss: dismissible ? { onEvent(.dismissed, [:]) } : nil
Expand DownExpand Up@@ -505,6 +533,7 @@ struct ClerkInlineAuthWrapperView: View {
let dismissible: Bool
let lightTheme: ClerkTheme?
let darkTheme: ClerkTheme?
let logoState: ClerkInlineAuthLogoState
let logoMaxHeight: CGFloat?

@Environment(\.colorScheme) private var colorScheme
Expand All@@ -521,7 +550,12 @@ struct ClerkInlineAuthWrapperView: View {
}
}

if let logoMaxHeight {
if let logo = logoState.content {
themedView.clerkAppIconView {
ClerkReactLogoView(view: logo.view)
.frame(width: logo.size.width, height: logo.size.height)
}
} else if let logoMaxHeight {
themedView.clerkAppIcon(maxHeight: logoMaxHeight)
} else {
themedView
Expand All@@ -533,6 +567,45 @@ struct ClerkInlineAuthWrapperView: View {
}
}

private struct ClerkReactLogoView: UIViewRepresentable {
let view: UIView

func makeUIView(context: Context) -> ClerkReactLogoContainerView {
return ClerkReactLogoContainerView(contentView: view)
}

func updateUIView(_ uiView: ClerkReactLogoContainerView, context: Context) {
uiView.setContentView(view)
}
}

private final class ClerkReactLogoContainerView: UIView {
private var contentView: UIView?

init(contentView: UIView) {
super.init(frame: .zero)
setContentView(contentView)
}

required init?(coder: NSCoder) {
return nil
}

func setContentView(_ view: UIView) {
guard contentView !== view else { return }
contentView?.removeFromSuperview()
view.removeFromSuperview()
contentView = view
addSubview(view)
setNeedsLayout()
}

override func layoutSubviews() {
super.layoutSubviews()
contentView?.frame = bounds
}
}

private final class ClerkNativeHostingController<Content: View>: UIHostingController<Content> {
private let onDismiss: (() -> Void)?
private var didSendDismiss = false
Expand Down
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('^' + ".*" + ' feat(expo): support custom logos in native AuthView by swolfand · Pull Request #9163 · 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/expo-native-custom-logo.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/expo': patch
---

Add a `logo` prop to the native `AuthView`, allowing Expo apps to replace the dashboard-configured logo with custom React Native content on Android and iOS.
23 changes: 22 additions & 1 deletion integration/templates/expo-native/App.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -52,7 +52,17 @@ function NativeBuildFixture() {
presentationStyle='pageSheet'
onRequestClose={() => setIsAuthOpen(false)}
>
<AuthView onDismiss={() => setIsAuthOpen(false)} />
<AuthView
logo={
<View
testID='custom-logo'
style={styles.customLogo}
>
<Text style={styles.customLogoText}>E2E Custom Logo</Text>
</View>
}
onDismiss={() => setIsAuthOpen(false)}
/>
</Modal>
</View>
);
Expand All@@ -76,6 +86,17 @@ const styles = StyleSheet.create({
justifyContent: 'center',
padding: 24,
},
customLogo: {
backgroundColor: '#6C47FF',
borderRadius: 8,
paddingHorizontal: 16,
paddingVertical: 10,
},
customLogoText: {
color: '#FFFFFF',
fontSize: 16,
fontWeight: '600',
},
header: {
alignItems: 'center',
flexDirection: 'row',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,8 @@
# is the platform-native gesture: Android's system back button (doubling as
# the back-dismisses-AuthView regression), iOS's sheet Close control
# (clerk-ios exposes the stable clerk.dismissButton identifier).
# Also asserts the custom `logo` React element is rehosted into the native
# logo slot with a nonzero size, both on first mount and after reattach.
appId: com.clerk.exponativebuildfixture
name: AuthView survives detach and reattach
---
Expand All@@ -12,6 +14,11 @@ name: AuthView survives detach and reattach
- extendedWaitUntil:
visible: 'Welcome! Sign in to continue\.?'
timeout: 25000
# Retrying wait (not assertVisible): the rehosted logo is sized on the first
# RN layout pass, so it can lag the welcome copy by a frame or two.
- extendedWaitUntil:
visible: 'E2E Custom Logo'
timeout: 10000
- runFlow:
when:
platform: Android
Expand All@@ -29,6 +36,9 @@ name: AuthView survives detach and reattach
timeout: 15000
- tapOn:
id: 'open-auth-view-button'
- extendedWaitUntil:
visible: 'E2E Custom Logo'
timeout: 15000
- runFlow: subflows/sign-in-email-password.yaml
- runFlow: subflows/assert-signed-in.yaml
- tapOn:
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,10 +2,16 @@ package expo.modules.clerk

import android.content.Context
import android.util.Log
import android.view.View
import android.view.ViewGroup
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.layout.wrapContentSize
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.compose.ui.platform.LocalDensity
import androidx.compose.ui.unit.dp
import androidx.compose.ui.viewinterop.AndroidView
import androidx.lifecycle.ViewModelStore
import androidx.lifecycle.ViewModelStoreOwner
import com.clerk.api.Clerk
Expand All@@ -30,6 +36,21 @@ class ClerkAuthNativeView(context: Context, appContext: AppContext) : ClerkCompo
var isDismissible: Boolean = true
var logoMaxHeight: Float? = null
var mode: String? = null
var logoView: View? = null
private set

private var logoWidth = 0
private var logoHeight = 0
private val logoLayoutListener =
View.OnLayoutChangeListener { view, left, top, right, bottom, _, _, _, _ ->
val width = right - left
val height = bottom - top
if (view === logoView && (width != logoWidth || height != logoHeight)) {
logoWidth = width
logoHeight = height
setupView()
}
}

private val onAuthEvent by EventDispatcher()

Expand DownExpand Up@@ -67,6 +88,9 @@ class ClerkAuthNativeView(context: Context, appContext: AppContext) : ClerkCompo
AuthView(
modifier = Modifier.fillMaxSize(),
clerkTheme = authTheme(),
logo = logoView?.let { view ->
{ ReactLogoView(view = view, width = logoWidth, height = logoHeight) }
},
mode = authMode(mode),
isDismissible = isDismissible,
onDismiss = ::sendDismissEvent,
Expand All@@ -76,6 +100,25 @@ class ClerkAuthNativeView(context: Context, appContext: AppContext) : ClerkCompo
)
}

fun setLogoView(view: View) {
if (logoView === view) return
logoView?.removeOnLayoutChangeListener(logoLayoutListener)
logoView = view
logoWidth = view.width
logoHeight = view.height
view.addOnLayoutChangeListener(logoLayoutListener)
setupView()
}

fun removeLogoView(view: View) {
if (logoView !== view) return
view.removeOnLayoutChangeListener(logoLayoutListener)
logoView = null
logoWidth = 0
logoHeight = 0
setupView()
}

private fun authTheme(): ClerkTheme? {
val maxHeight = logoMaxHeight ?: return Clerk.customTheme
val theme = Clerk.customTheme ?: ClerkTheme()
Expand All@@ -100,13 +143,52 @@ class ClerkAuthNativeView(context: Context, appContext: AppContext) : ClerkCompo
}
}

@Composable
private fun ReactLogoView(view: View, width: Int, height: Int) {
val density = LocalDensity.current
val modifier =
if (width > 0 && height > 0) {
with(density) { Modifier.size(width.toDp(), height.toDp()) }
} else {
Modifier.wrapContentSize()
}

AndroidView(
modifier = modifier,
factory = {
(view.parent as? ViewGroup)?.removeView(view)
view
},
)
}

class ClerkAuthViewModule : Module() {
override fun definition() = ModuleDefinition {
Name("ClerkAuthView")

View(ClerkAuthNativeView::class) {
Events("onAuthEvent")

GroupView<ClerkAuthNativeView> {
AddChildView<View> { parent, child, _ ->
parent.setLogoView(child)
}
GetChildCount { parent ->
if (parent.logoView == null) 0 else 1
}
GetChildViewAt<View> { parent, index ->
if (index == 0) parent.logoView else null
}
RemoveChildView<View> { parent, child ->
parent.removeLogoView(child)
}
RemoveChildViewAt { parent, index ->
if (index == 0) {
parent.logoView?.let(parent::removeLogoView)
}
}
}

Prop("mode") { view: ClerkAuthNativeView, mode: String? ->
view.mode = mode
}
Expand Down
50 changes: 50 additions & 0 deletions packages/expo/ios/ClerkAuthNativeView.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,8 @@ public class ClerkAuthNativeView: ClerkNativeViewHost {
private var currentMode: String = "signInOrUp"
private var currentDismissible: Bool = true
private var currentLogoMaxHeight: CGFloat?
private let logoState = ClerkInlineAuthLogoState()
private var logoBoundsObservation: NSKeyValueObservation?
private var didSendDismiss = false

let onAuthEvent = EventDispatcher()
Expand DownExpand Up@@ -48,10 +50,58 @@ public class ClerkAuthNativeView: ClerkNativeViewHost {
sendDismissIfNeeded()
}

override public func layoutSubviews() {
super.layoutSubviews()
guard let logoView = logoState.content?.view else { return }
logoState.updateSize(for: logoView)
}

#if RCT_NEW_ARCH_ENABLED
override public func mountChildComponentView(_ childComponentView: UIView, index: Int) {
setLogoView(childComponentView)
}

override public func unmountChildComponentView(_ childComponentView: UIView, index: Int) {
removeLogoView(childComponentView)
}
#else
override public func insertReactSubview(_ subview: UIView!, at atIndex: Int) {
super.insertReactSubview(subview, at: atIndex)
setLogoView(subview)
}

override public func removeReactSubview(_ subview: UIView!) {
removeLogoView(subview)
super.removeReactSubview(subview)
}

override public func didUpdateReactSubviews() {}
#endif

private func setLogoView(_ view: UIView) {
guard logoState.content?.view !== view else { return }
logoBoundsObservation = nil
logoState.setView(view)
logoBoundsObservation = view.observe(\.bounds, options: [.new]) { [weak self, weak view] _, _ in
DispatchQueue.main.async { [weak self, weak view] in
guard let self, let view, self.logoState.content?.view === view else { return }
self.logoState.updateSize(for: view)
}
}
}

private func removeLogoView(_ view: UIView) {
guard logoState.content?.view === view else { return }
logoBoundsObservation = nil
view.removeFromSuperview()
logoState.removeView(view)
}

override func makeHostedController() -> UIViewController? {
return ClerkNativeBridge.shared.makeAuthViewController(
mode: currentMode,
dismissible: currentDismissible,
logoState: logoState,
logoMaxHeight: currentLogoMaxHeight,
onEvent: { [weak self] event, _ in
if event == .dismissed {
Expand Down
4 changes: 4 additions & 0 deletions packages/expo/ios/ClerkExpo.podspec
Original file line numberDiff line numberDiff line change
Expand Up@@ -58,5 +58,9 @@ Pod::Spec.new do |s|
"ClerkUserProfileNativeView.swift",
"ClerkUserButtonNativeView.swift"

s.test_spec 'Tests' do |test_spec|
test_spec.source_files = 'Tests/**/*.swift'
end

install_modules_dependencies(s)
end
75 changes: 74 additions & 1 deletion packages/expo/ios/ClerkNativeBridge.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,32 @@ extension Notification.Name {
static let clerkNativeSDKDidConfigure = Notification.Name("com.clerk.expo.native-sdk.did-configure")
}

@Observable
final class ClerkInlineAuthLogoState {
struct Content {
let view: UIView
let size: CGSize
}

private(set) var content: Content?

func setView(_ view: UIView) {
content = Content(view: view, size: view.bounds.size)
}

func updateSize(for view: UIView) {
guard content?.view === view else { return }
let currentSize = view.bounds.size
guard content?.size != currentSize else { return }
content = Content(view: view, size: currentSize)
}

func removeView(_ view: UIView) {
guard content?.view === view else { return }
content = nil
}
}

private let clerkNativeClientEventQueue = DispatchQueue(label: "com.clerk.expo.native-client-events")
private var clerkNativeClientChangedEmitter: (([String: Any]?) -> Void)?

Expand DownExpand Up@@ -243,6 +269,7 @@ final class ClerkNativeBridge {
func makeAuthViewController(
mode: String,
dismissible: Bool,
logoState: ClerkInlineAuthLogoState,
logoMaxHeight: CGFloat?,
onEvent: @escaping (ClerkNativeViewEvent, [String: Any]) -> Void
) -> UIViewController? {
Expand All@@ -254,6 +281,7 @@ final class ClerkNativeBridge {
dismissible: dismissible,
lightTheme: lightTheme,
darkTheme: darkTheme,
logoState: logoState,
logoMaxHeight: logoMaxHeight
),
onDismiss: dismissible ? { onEvent(.dismissed, [:]) } : nil
Expand DownExpand Up@@ -505,6 +533,7 @@ struct ClerkInlineAuthWrapperView: View {
let dismissible: Bool
let lightTheme: ClerkTheme?
let darkTheme: ClerkTheme?
let logoState: ClerkInlineAuthLogoState
let logoMaxHeight: CGFloat?

@Environment(\.colorScheme) private var colorScheme
Expand All@@ -521,7 +550,12 @@ struct ClerkInlineAuthWrapperView: View {
}
}

if let logoMaxHeight {
if let logo = logoState.content {
themedView.clerkAppIconView {
ClerkReactLogoView(view: logo.view)
.frame(width: logo.size.width, height: logo.size.height)
}
} else if let logoMaxHeight {
themedView.clerkAppIcon(maxHeight: logoMaxHeight)
} else {
themedView
Expand All@@ -533,6 +567,45 @@ struct ClerkInlineAuthWrapperView: View {
}
}

private struct ClerkReactLogoView: UIViewRepresentable {
let view: UIView

func makeUIView(context: Context) -> ClerkReactLogoContainerView {
return ClerkReactLogoContainerView(contentView: view)
}

func updateUIView(_ uiView: ClerkReactLogoContainerView, context: Context) {
uiView.setContentView(view)
}
}

private final class ClerkReactLogoContainerView: UIView {
private var contentView: UIView?

init(contentView: UIView) {
super.init(frame: .zero)
setContentView(contentView)
}

required init?(coder: NSCoder) {
return nil
}

func setContentView(_ view: UIView) {
guard contentView !== view else { return }
contentView?.removeFromSuperview()
view.removeFromSuperview()
contentView = view
addSubview(view)
setNeedsLayout()
}

override func layoutSubviews() {
super.layoutSubviews()
contentView?.frame = bounds
}
}

private final class ClerkNativeHostingController<Content: View>: UIHostingController<Content> {
private let onDismiss: (() -> Void)?
private var didSendDismiss = false
Expand Down
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" + ' feat(expo): support custom logos in native AuthView by swolfand · Pull Request #9163 · 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/expo-native-custom-logo.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/expo': patch
---

Add a `logo` prop to the native `AuthView`, allowing Expo apps to replace the dashboard-configured logo with custom React Native content on Android and iOS.
23 changes: 22 additions & 1 deletion integration/templates/expo-native/App.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -52,7 +52,17 @@ function NativeBuildFixture() {
presentationStyle='pageSheet'
onRequestClose={() => setIsAuthOpen(false)}
>
<AuthView onDismiss={() => setIsAuthOpen(false)} />
<AuthView
logo={
<View
testID='custom-logo'
style={styles.customLogo}
>
<Text style={styles.customLogoText}>E2E Custom Logo</Text>
</View>
}
onDismiss={() => setIsAuthOpen(false)}
/>
</Modal>
</View>
);
Expand All@@ -76,6 +86,17 @@ const styles = StyleSheet.create({
justifyContent: 'center',
padding: 24,
},
customLogo: {
backgroundColor: '#6C47FF',
borderRadius: 8,
paddingHorizontal: 16,
paddingVertical: 10,
},
customLogoText: {
color: '#FFFFFF',
fontSize: 16,
fontWeight: '600',
},
header: {
alignItems: 'center',
flexDirection: 'row',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,8 @@
# is the platform-native gesture: Android's system back button (doubling as
# the back-dismisses-AuthView regression), iOS's sheet Close control
# (clerk-ios exposes the stable clerk.dismissButton identifier).
# Also asserts the custom `logo` React element is rehosted into the native
# logo slot with a nonzero size, both on first mount and after reattach.
appId: com.clerk.exponativebuildfixture
name: AuthView survives detach and reattach
---
Expand All@@ -12,6 +14,11 @@ name: AuthView survives detach and reattach
- extendedWaitUntil:
visible: 'Welcome! Sign in to continue\.?'
timeout: 25000
# Retrying wait (not assertVisible): the rehosted logo is sized on the first
# RN layout pass, so it can lag the welcome copy by a frame or two.
- extendedWaitUntil:
visible: 'E2E Custom Logo'
timeout: 10000
- runFlow:
when:
platform: Android
Expand All@@ -29,6 +36,9 @@ name: AuthView survives detach and reattach
timeout: 15000
- tapOn:
id: 'open-auth-view-button'
- extendedWaitUntil:
visible: 'E2E Custom Logo'
timeout: 15000
- runFlow: subflows/sign-in-email-password.yaml
- runFlow: subflows/assert-signed-in.yaml
- tapOn:
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,10 +2,16 @@ package expo.modules.clerk

import android.content.Context
import android.util.Log
import android.view.View
import android.view.ViewGroup
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.layout.wrapContentSize
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.compose.ui.platform.LocalDensity
import androidx.compose.ui.unit.dp
import androidx.compose.ui.viewinterop.AndroidView
import androidx.lifecycle.ViewModelStore
import androidx.lifecycle.ViewModelStoreOwner
import com.clerk.api.Clerk
Expand All@@ -30,6 +36,21 @@ class ClerkAuthNativeView(context: Context, appContext: AppContext) : ClerkCompo
var isDismissible: Boolean = true
var logoMaxHeight: Float? = null
var mode: String? = null
var logoView: View? = null
private set

private var logoWidth = 0
private var logoHeight = 0
private val logoLayoutListener =
View.OnLayoutChangeListener { view, left, top, right, bottom, _, _, _, _ ->
val width = right - left
val height = bottom - top
if (view === logoView && (width != logoWidth || height != logoHeight)) {
logoWidth = width
logoHeight = height
setupView()
}
}

private val onAuthEvent by EventDispatcher()

Expand DownExpand Up@@ -67,6 +88,9 @@ class ClerkAuthNativeView(context: Context, appContext: AppContext) : ClerkCompo
AuthView(
modifier = Modifier.fillMaxSize(),
clerkTheme = authTheme(),
logo = logoView?.let { view ->
{ ReactLogoView(view = view, width = logoWidth, height = logoHeight) }
},
mode = authMode(mode),
isDismissible = isDismissible,
onDismiss = ::sendDismissEvent,
Expand All@@ -76,6 +100,25 @@ class ClerkAuthNativeView(context: Context, appContext: AppContext) : ClerkCompo
)
}

fun setLogoView(view: View) {
if (logoView === view) return
logoView?.removeOnLayoutChangeListener(logoLayoutListener)
logoView = view
logoWidth = view.width
logoHeight = view.height
view.addOnLayoutChangeListener(logoLayoutListener)
setupView()
}

fun removeLogoView(view: View) {
if (logoView !== view) return
view.removeOnLayoutChangeListener(logoLayoutListener)
logoView = null
logoWidth = 0
logoHeight = 0
setupView()
}

private fun authTheme(): ClerkTheme? {
val maxHeight = logoMaxHeight ?: return Clerk.customTheme
val theme = Clerk.customTheme ?: ClerkTheme()
Expand All@@ -100,13 +143,52 @@ class ClerkAuthNativeView(context: Context, appContext: AppContext) : ClerkCompo
}
}

@Composable
private fun ReactLogoView(view: View, width: Int, height: Int) {
val density = LocalDensity.current
val modifier =
if (width > 0 && height > 0) {
with(density) { Modifier.size(width.toDp(), height.toDp()) }
} else {
Modifier.wrapContentSize()
}

AndroidView(
modifier = modifier,
factory = {
(view.parent as? ViewGroup)?.removeView(view)
view
},
)
}

class ClerkAuthViewModule : Module() {
override fun definition() = ModuleDefinition {
Name("ClerkAuthView")

View(ClerkAuthNativeView::class) {
Events("onAuthEvent")

GroupView<ClerkAuthNativeView> {
AddChildView<View> { parent, child, _ ->
parent.setLogoView(child)
}
GetChildCount { parent ->
if (parent.logoView == null) 0 else 1
}
GetChildViewAt<View> { parent, index ->
if (index == 0) parent.logoView else null
}
RemoveChildView<View> { parent, child ->
parent.removeLogoView(child)
}
RemoveChildViewAt { parent, index ->
if (index == 0) {
parent.logoView?.let(parent::removeLogoView)
}
}
}

Prop("mode") { view: ClerkAuthNativeView, mode: String? ->
view.mode = mode
}
Expand Down
50 changes: 50 additions & 0 deletions packages/expo/ios/ClerkAuthNativeView.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,8 @@ public class ClerkAuthNativeView: ClerkNativeViewHost {
private var currentMode: String = "signInOrUp"
private var currentDismissible: Bool = true
private var currentLogoMaxHeight: CGFloat?
private let logoState = ClerkInlineAuthLogoState()
private var logoBoundsObservation: NSKeyValueObservation?
private var didSendDismiss = false

let onAuthEvent = EventDispatcher()
Expand DownExpand Up@@ -48,10 +50,58 @@ public class ClerkAuthNativeView: ClerkNativeViewHost {
sendDismissIfNeeded()
}

override public func layoutSubviews() {
super.layoutSubviews()
guard let logoView = logoState.content?.view else { return }
logoState.updateSize(for: logoView)
}

#if RCT_NEW_ARCH_ENABLED
override public func mountChildComponentView(_ childComponentView: UIView, index: Int) {
setLogoView(childComponentView)
}

override public func unmountChildComponentView(_ childComponentView: UIView, index: Int) {
removeLogoView(childComponentView)
}
#else
override public func insertReactSubview(_ subview: UIView!, at atIndex: Int) {
super.insertReactSubview(subview, at: atIndex)
setLogoView(subview)
}

override public func removeReactSubview(_ subview: UIView!) {
removeLogoView(subview)
super.removeReactSubview(subview)
}

override public func didUpdateReactSubviews() {}
#endif

private func setLogoView(_ view: UIView) {
guard logoState.content?.view !== view else { return }
logoBoundsObservation = nil
logoState.setView(view)
logoBoundsObservation = view.observe(\.bounds, options: [.new]) { [weak self, weak view] _, _ in
DispatchQueue.main.async { [weak self, weak view] in
guard let self, let view, self.logoState.content?.view === view else { return }
self.logoState.updateSize(for: view)
}
}
}

private func removeLogoView(_ view: UIView) {
guard logoState.content?.view === view else { return }
logoBoundsObservation = nil
view.removeFromSuperview()
logoState.removeView(view)
}

override func makeHostedController() -> UIViewController? {
return ClerkNativeBridge.shared.makeAuthViewController(
mode: currentMode,
dismissible: currentDismissible,
logoState: logoState,
logoMaxHeight: currentLogoMaxHeight,
onEvent: { [weak self] event, _ in
if event == .dismissed {
Expand Down
4 changes: 4 additions & 0 deletions packages/expo/ios/ClerkExpo.podspec
Original file line numberDiff line numberDiff line change
Expand Up@@ -58,5 +58,9 @@ Pod::Spec.new do |s|
"ClerkUserProfileNativeView.swift",
"ClerkUserButtonNativeView.swift"

s.test_spec 'Tests' do |test_spec|
test_spec.source_files = 'Tests/**/*.swift'
end

install_modules_dependencies(s)
end
75 changes: 74 additions & 1 deletion packages/expo/ios/ClerkNativeBridge.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,32 @@ extension Notification.Name {
static let clerkNativeSDKDidConfigure = Notification.Name("com.clerk.expo.native-sdk.did-configure")
}

@Observable
final class ClerkInlineAuthLogoState {
struct Content {
let view: UIView
let size: CGSize
}

private(set) var content: Content?

func setView(_ view: UIView) {
content = Content(view: view, size: view.bounds.size)
}

func updateSize(for view: UIView) {
guard content?.view === view else { return }
let currentSize = view.bounds.size
guard content?.size != currentSize else { return }
content = Content(view: view, size: currentSize)
}

func removeView(_ view: UIView) {
guard content?.view === view else { return }
content = nil
}
}

private let clerkNativeClientEventQueue = DispatchQueue(label: "com.clerk.expo.native-client-events")
private var clerkNativeClientChangedEmitter: (([String: Any]?) -> Void)?

Expand DownExpand Up@@ -243,6 +269,7 @@ final class ClerkNativeBridge {
func makeAuthViewController(
mode: String,
dismissible: Bool,
logoState: ClerkInlineAuthLogoState,
logoMaxHeight: CGFloat?,
onEvent: @escaping (ClerkNativeViewEvent, [String: Any]) -> Void
) -> UIViewController? {
Expand All@@ -254,6 +281,7 @@ final class ClerkNativeBridge {
dismissible: dismissible,
lightTheme: lightTheme,
darkTheme: darkTheme,
logoState: logoState,
logoMaxHeight: logoMaxHeight
),
onDismiss: dismissible ? { onEvent(.dismissed, [:]) } : nil
Expand DownExpand Up@@ -505,6 +533,7 @@ struct ClerkInlineAuthWrapperView: View {
let dismissible: Bool
let lightTheme: ClerkTheme?
let darkTheme: ClerkTheme?
let logoState: ClerkInlineAuthLogoState
let logoMaxHeight: CGFloat?

@Environment(\.colorScheme) private var colorScheme
Expand All@@ -521,7 +550,12 @@ struct ClerkInlineAuthWrapperView: View {
}
}

if let logoMaxHeight {
if let logo = logoState.content {
themedView.clerkAppIconView {
ClerkReactLogoView(view: logo.view)
.frame(width: logo.size.width, height: logo.size.height)
}
} else if let logoMaxHeight {
themedView.clerkAppIcon(maxHeight: logoMaxHeight)
} else {
themedView
Expand All@@ -533,6 +567,45 @@ struct ClerkInlineAuthWrapperView: View {
}
}

private struct ClerkReactLogoView: UIViewRepresentable {
let view: UIView

func makeUIView(context: Context) -> ClerkReactLogoContainerView {
return ClerkReactLogoContainerView(contentView: view)
}

func updateUIView(_ uiView: ClerkReactLogoContainerView, context: Context) {
uiView.setContentView(view)
}
}

private final class ClerkReactLogoContainerView: UIView {
private var contentView: UIView?

init(contentView: UIView) {
super.init(frame: .zero)
setContentView(contentView)
}

required init?(coder: NSCoder) {
return nil
}

func setContentView(_ view: UIView) {
guard contentView !== view else { return }
contentView?.removeFromSuperview()
view.removeFromSuperview()
contentView = view
addSubview(view)
setNeedsLayout()
}

override func layoutSubviews() {
super.layoutSubviews()
contentView?.frame = bounds
}
}

private final class ClerkNativeHostingController<Content: View>: UIHostingController<Content> {
private let onDismiss: (() -> Void)?
private var didSendDismiss = false
Expand Down
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('^' + ".*" + ' feat(expo): support custom logos in native AuthView by swolfand · Pull Request #9163 · 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/expo-native-custom-logo.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/expo': patch
---

Add a `logo` prop to the native `AuthView`, allowing Expo apps to replace the dashboard-configured logo with custom React Native content on Android and iOS.
23 changes: 22 additions & 1 deletion integration/templates/expo-native/App.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -52,7 +52,17 @@ function NativeBuildFixture() {
presentationStyle='pageSheet'
onRequestClose={() => setIsAuthOpen(false)}
>
<AuthView onDismiss={() => setIsAuthOpen(false)} />
<AuthView
logo={
<View
testID='custom-logo'
style={styles.customLogo}
>
<Text style={styles.customLogoText}>E2E Custom Logo</Text>
</View>
}
onDismiss={() => setIsAuthOpen(false)}
/>
</Modal>
</View>
);
Expand All@@ -76,6 +86,17 @@ const styles = StyleSheet.create({
justifyContent: 'center',
padding: 24,
},
customLogo: {
backgroundColor: '#6C47FF',
borderRadius: 8,
paddingHorizontal: 16,
paddingVertical: 10,
},
customLogoText: {
color: '#FFFFFF',
fontSize: 16,
fontWeight: '600',
},
header: {
alignItems: 'center',
flexDirection: 'row',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,8 @@
# is the platform-native gesture: Android's system back button (doubling as
# the back-dismisses-AuthView regression), iOS's sheet Close control
# (clerk-ios exposes the stable clerk.dismissButton identifier).
# Also asserts the custom `logo` React element is rehosted into the native
# logo slot with a nonzero size, both on first mount and after reattach.
appId: com.clerk.exponativebuildfixture
name: AuthView survives detach and reattach
---
Expand All@@ -12,6 +14,11 @@ name: AuthView survives detach and reattach
- extendedWaitUntil:
visible: 'Welcome! Sign in to continue\.?'
timeout: 25000
# Retrying wait (not assertVisible): the rehosted logo is sized on the first
# RN layout pass, so it can lag the welcome copy by a frame or two.
- extendedWaitUntil:
visible: 'E2E Custom Logo'
timeout: 10000
- runFlow:
when:
platform: Android
Expand All@@ -29,6 +36,9 @@ name: AuthView survives detach and reattach
timeout: 15000
- tapOn:
id: 'open-auth-view-button'
- extendedWaitUntil:
visible: 'E2E Custom Logo'
timeout: 15000
- runFlow: subflows/sign-in-email-password.yaml
- runFlow: subflows/assert-signed-in.yaml
- tapOn:
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,10 +2,16 @@ package expo.modules.clerk

import android.content.Context
import android.util.Log
import android.view.View
import android.view.ViewGroup
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.layout.wrapContentSize
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.compose.ui.platform.LocalDensity
import androidx.compose.ui.unit.dp
import androidx.compose.ui.viewinterop.AndroidView
import androidx.lifecycle.ViewModelStore
import androidx.lifecycle.ViewModelStoreOwner
import com.clerk.api.Clerk
Expand All@@ -30,6 +36,21 @@ class ClerkAuthNativeView(context: Context, appContext: AppContext) : ClerkCompo
var isDismissible: Boolean = true
var logoMaxHeight: Float? = null
var mode: String? = null
var logoView: View? = null
private set

private var logoWidth = 0
private var logoHeight = 0
private val logoLayoutListener =
View.OnLayoutChangeListener { view, left, top, right, bottom, _, _, _, _ ->
val width = right - left
val height = bottom - top
if (view === logoView && (width != logoWidth || height != logoHeight)) {
logoWidth = width
logoHeight = height
setupView()
}
}

private val onAuthEvent by EventDispatcher()

Expand DownExpand Up@@ -67,6 +88,9 @@ class ClerkAuthNativeView(context: Context, appContext: AppContext) : ClerkCompo
AuthView(
modifier = Modifier.fillMaxSize(),
clerkTheme = authTheme(),
logo = logoView?.let { view ->
{ ReactLogoView(view = view, width = logoWidth, height = logoHeight) }
},
mode = authMode(mode),
isDismissible = isDismissible,
onDismiss = ::sendDismissEvent,
Expand All@@ -76,6 +100,25 @@ class ClerkAuthNativeView(context: Context, appContext: AppContext) : ClerkCompo
)
}

fun setLogoView(view: View) {
if (logoView === view) return
logoView?.removeOnLayoutChangeListener(logoLayoutListener)
logoView = view
logoWidth = view.width
logoHeight = view.height
view.addOnLayoutChangeListener(logoLayoutListener)
setupView()
}

fun removeLogoView(view: View) {
if (logoView !== view) return
view.removeOnLayoutChangeListener(logoLayoutListener)
logoView = null
logoWidth = 0
logoHeight = 0
setupView()
}

private fun authTheme(): ClerkTheme? {
val maxHeight = logoMaxHeight ?: return Clerk.customTheme
val theme = Clerk.customTheme ?: ClerkTheme()
Expand All@@ -100,13 +143,52 @@ class ClerkAuthNativeView(context: Context, appContext: AppContext) : ClerkCompo
}
}

@Composable
private fun ReactLogoView(view: View, width: Int, height: Int) {
val density = LocalDensity.current
val modifier =
if (width > 0 && height > 0) {
with(density) { Modifier.size(width.toDp(), height.toDp()) }
} else {
Modifier.wrapContentSize()
}

AndroidView(
modifier = modifier,
factory = {
(view.parent as? ViewGroup)?.removeView(view)
view
},
)
}

class ClerkAuthViewModule : Module() {
override fun definition() = ModuleDefinition {
Name("ClerkAuthView")

View(ClerkAuthNativeView::class) {
Events("onAuthEvent")

GroupView<ClerkAuthNativeView> {
AddChildView<View> { parent, child, _ ->
parent.setLogoView(child)
}
GetChildCount { parent ->
if (parent.logoView == null) 0 else 1
}
GetChildViewAt<View> { parent, index ->
if (index == 0) parent.logoView else null
}
RemoveChildView<View> { parent, child ->
parent.removeLogoView(child)
}
RemoveChildViewAt { parent, index ->
if (index == 0) {
parent.logoView?.let(parent::removeLogoView)
}
}
}

Prop("mode") { view: ClerkAuthNativeView, mode: String? ->
view.mode = mode
}
Expand Down
50 changes: 50 additions & 0 deletions packages/expo/ios/ClerkAuthNativeView.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,8 @@ public class ClerkAuthNativeView: ClerkNativeViewHost {
private var currentMode: String = "signInOrUp"
private var currentDismissible: Bool = true
private var currentLogoMaxHeight: CGFloat?
private let logoState = ClerkInlineAuthLogoState()
private var logoBoundsObservation: NSKeyValueObservation?
private var didSendDismiss = false

let onAuthEvent = EventDispatcher()
Expand DownExpand Up@@ -48,10 +50,58 @@ public class ClerkAuthNativeView: ClerkNativeViewHost {
sendDismissIfNeeded()
}

override public func layoutSubviews() {
super.layoutSubviews()
guard let logoView = logoState.content?.view else { return }
logoState.updateSize(for: logoView)
}

#if RCT_NEW_ARCH_ENABLED
override public func mountChildComponentView(_ childComponentView: UIView, index: Int) {
setLogoView(childComponentView)
}

override public func unmountChildComponentView(_ childComponentView: UIView, index: Int) {
removeLogoView(childComponentView)
}
#else
override public func insertReactSubview(_ subview: UIView!, at atIndex: Int) {
super.insertReactSubview(subview, at: atIndex)
setLogoView(subview)
}

override public func removeReactSubview(_ subview: UIView!) {
removeLogoView(subview)
super.removeReactSubview(subview)
}

override public func didUpdateReactSubviews() {}
#endif

private func setLogoView(_ view: UIView) {
guard logoState.content?.view !== view else { return }
logoBoundsObservation = nil
logoState.setView(view)
logoBoundsObservation = view.observe(\.bounds, options: [.new]) { [weak self, weak view] _, _ in
DispatchQueue.main.async { [weak self, weak view] in
guard let self, let view, self.logoState.content?.view === view else { return }
self.logoState.updateSize(for: view)
}
}
}

private func removeLogoView(_ view: UIView) {
guard logoState.content?.view === view else { return }
logoBoundsObservation = nil
view.removeFromSuperview()
logoState.removeView(view)
}

override func makeHostedController() -> UIViewController? {
return ClerkNativeBridge.shared.makeAuthViewController(
mode: currentMode,
dismissible: currentDismissible,
logoState: logoState,
logoMaxHeight: currentLogoMaxHeight,
onEvent: { [weak self] event, _ in
if event == .dismissed {
Expand Down
4 changes: 4 additions & 0 deletions packages/expo/ios/ClerkExpo.podspec
Original file line numberDiff line numberDiff line change
Expand Up@@ -58,5 +58,9 @@ Pod::Spec.new do |s|
"ClerkUserProfileNativeView.swift",
"ClerkUserButtonNativeView.swift"

s.test_spec 'Tests' do |test_spec|
test_spec.source_files = 'Tests/**/*.swift'
end

install_modules_dependencies(s)
end
75 changes: 74 additions & 1 deletion packages/expo/ios/ClerkNativeBridge.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,32 @@ extension Notification.Name {
static let clerkNativeSDKDidConfigure = Notification.Name("com.clerk.expo.native-sdk.did-configure")
}

@Observable
final class ClerkInlineAuthLogoState {
struct Content {
let view: UIView
let size: CGSize
}

private(set) var content: Content?

func setView(_ view: UIView) {
content = Content(view: view, size: view.bounds.size)
}

func updateSize(for view: UIView) {
guard content?.view === view else { return }
let currentSize = view.bounds.size
guard content?.size != currentSize else { return }
content = Content(view: view, size: currentSize)
}

func removeView(_ view: UIView) {
guard content?.view === view else { return }
content = nil
}
}

private let clerkNativeClientEventQueue = DispatchQueue(label: "com.clerk.expo.native-client-events")
private var clerkNativeClientChangedEmitter: (([String: Any]?) -> Void)?

Expand DownExpand Up@@ -243,6 +269,7 @@ final class ClerkNativeBridge {
func makeAuthViewController(
mode: String,
dismissible: Bool,
logoState: ClerkInlineAuthLogoState,
logoMaxHeight: CGFloat?,
onEvent: @escaping (ClerkNativeViewEvent, [String: Any]) -> Void
) -> UIViewController? {
Expand All@@ -254,6 +281,7 @@ final class ClerkNativeBridge {
dismissible: dismissible,
lightTheme: lightTheme,
darkTheme: darkTheme,
logoState: logoState,
logoMaxHeight: logoMaxHeight
),
onDismiss: dismissible ? { onEvent(.dismissed, [:]) } : nil
Expand DownExpand Up@@ -505,6 +533,7 @@ struct ClerkInlineAuthWrapperView: View {
let dismissible: Bool
let lightTheme: ClerkTheme?
let darkTheme: ClerkTheme?
let logoState: ClerkInlineAuthLogoState
let logoMaxHeight: CGFloat?

@Environment(\.colorScheme) private var colorScheme
Expand All@@ -521,7 +550,12 @@ struct ClerkInlineAuthWrapperView: View {
}
}

if let logoMaxHeight {
if let logo = logoState.content {
themedView.clerkAppIconView {
ClerkReactLogoView(view: logo.view)
.frame(width: logo.size.width, height: logo.size.height)
}
} else if let logoMaxHeight {
themedView.clerkAppIcon(maxHeight: logoMaxHeight)
} else {
themedView
Expand All@@ -533,6 +567,45 @@ struct ClerkInlineAuthWrapperView: View {
}
}

private struct ClerkReactLogoView: UIViewRepresentable {
let view: UIView

func makeUIView(context: Context) -> ClerkReactLogoContainerView {
return ClerkReactLogoContainerView(contentView: view)
}

func updateUIView(_ uiView: ClerkReactLogoContainerView, context: Context) {
uiView.setContentView(view)
}
}

private final class ClerkReactLogoContainerView: UIView {
private var contentView: UIView?

init(contentView: UIView) {
super.init(frame: .zero)
setContentView(contentView)
}

required init?(coder: NSCoder) {
return nil
}

func setContentView(_ view: UIView) {
guard contentView !== view else { return }
contentView?.removeFromSuperview()
view.removeFromSuperview()
contentView = view
addSubview(view)
setNeedsLayout()
}

override func layoutSubviews() {
super.layoutSubviews()
contentView?.frame = bounds
}
}

private final class ClerkNativeHostingController<Content: View>: UIHostingController<Content> {
private let onDismiss: (() -> Void)?
private var didSendDismiss = false
Expand Down
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('^' + ".*" + ' feat(expo): support custom logos in native AuthView by swolfand · Pull Request #9163 · 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/expo-native-custom-logo.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/expo': patch
---

Add a `logo` prop to the native `AuthView`, allowing Expo apps to replace the dashboard-configured logo with custom React Native content on Android and iOS.
23 changes: 22 additions & 1 deletion integration/templates/expo-native/App.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -52,7 +52,17 @@ function NativeBuildFixture() {
presentationStyle='pageSheet'
onRequestClose={() => setIsAuthOpen(false)}
>
<AuthView onDismiss={() => setIsAuthOpen(false)} />
<AuthView
logo={
<View
testID='custom-logo'
style={styles.customLogo}
>
<Text style={styles.customLogoText}>E2E Custom Logo</Text>
</View>
}
onDismiss={() => setIsAuthOpen(false)}
/>
</Modal>
</View>
);
Expand All@@ -76,6 +86,17 @@ const styles = StyleSheet.create({
justifyContent: 'center',
padding: 24,
},
customLogo: {
backgroundColor: '#6C47FF',
borderRadius: 8,
paddingHorizontal: 16,
paddingVertical: 10,
},
customLogoText: {
color: '#FFFFFF',
fontSize: 16,
fontWeight: '600',
},
header: {
alignItems: 'center',
flexDirection: 'row',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,8 @@
# is the platform-native gesture: Android's system back button (doubling as
# the back-dismisses-AuthView regression), iOS's sheet Close control
# (clerk-ios exposes the stable clerk.dismissButton identifier).
# Also asserts the custom `logo` React element is rehosted into the native
# logo slot with a nonzero size, both on first mount and after reattach.
appId: com.clerk.exponativebuildfixture
name: AuthView survives detach and reattach
---
Expand All@@ -12,6 +14,11 @@ name: AuthView survives detach and reattach
- extendedWaitUntil:
visible: 'Welcome! Sign in to continue\.?'
timeout: 25000
# Retrying wait (not assertVisible): the rehosted logo is sized on the first
# RN layout pass, so it can lag the welcome copy by a frame or two.
- extendedWaitUntil:
visible: 'E2E Custom Logo'
timeout: 10000
- runFlow:
when:
platform: Android
Expand All@@ -29,6 +36,9 @@ name: AuthView survives detach and reattach
timeout: 15000
- tapOn:
id: 'open-auth-view-button'
- extendedWaitUntil:
visible: 'E2E Custom Logo'
timeout: 15000
- runFlow: subflows/sign-in-email-password.yaml
- runFlow: subflows/assert-signed-in.yaml
- tapOn:
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,10 +2,16 @@ package expo.modules.clerk

import android.content.Context
import android.util.Log
import android.view.View
import android.view.ViewGroup
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.layout.wrapContentSize
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.compose.ui.platform.LocalDensity
import androidx.compose.ui.unit.dp
import androidx.compose.ui.viewinterop.AndroidView
import androidx.lifecycle.ViewModelStore
import androidx.lifecycle.ViewModelStoreOwner
import com.clerk.api.Clerk
Expand All@@ -30,6 +36,21 @@ class ClerkAuthNativeView(context: Context, appContext: AppContext) : ClerkCompo
var isDismissible: Boolean = true
var logoMaxHeight: Float? = null
var mode: String? = null
var logoView: View? = null
private set

private var logoWidth = 0
private var logoHeight = 0
private val logoLayoutListener =
View.OnLayoutChangeListener { view, left, top, right, bottom, _, _, _, _ ->
val width = right - left
val height = bottom - top
if (view === logoView && (width != logoWidth || height != logoHeight)) {
logoWidth = width
logoHeight = height
setupView()
}
}

private val onAuthEvent by EventDispatcher()

Expand DownExpand Up@@ -67,6 +88,9 @@ class ClerkAuthNativeView(context: Context, appContext: AppContext) : ClerkCompo
AuthView(
modifier = Modifier.fillMaxSize(),
clerkTheme = authTheme(),
logo = logoView?.let { view ->
{ ReactLogoView(view = view, width = logoWidth, height = logoHeight) }
},
mode = authMode(mode),
isDismissible = isDismissible,
onDismiss = ::sendDismissEvent,
Expand All@@ -76,6 +100,25 @@ class ClerkAuthNativeView(context: Context, appContext: AppContext) : ClerkCompo
)
}

fun setLogoView(view: View) {
if (logoView === view) return
logoView?.removeOnLayoutChangeListener(logoLayoutListener)
logoView = view
logoWidth = view.width
logoHeight = view.height
view.addOnLayoutChangeListener(logoLayoutListener)
setupView()
}

fun removeLogoView(view: View) {
if (logoView !== view) return
view.removeOnLayoutChangeListener(logoLayoutListener)
logoView = null
logoWidth = 0
logoHeight = 0
setupView()
}

private fun authTheme(): ClerkTheme? {
val maxHeight = logoMaxHeight ?: return Clerk.customTheme
val theme = Clerk.customTheme ?: ClerkTheme()
Expand All@@ -100,13 +143,52 @@ class ClerkAuthNativeView(context: Context, appContext: AppContext) : ClerkCompo
}
}

@Composable
private fun ReactLogoView(view: View, width: Int, height: Int) {
val density = LocalDensity.current
val modifier =
if (width > 0 && height > 0) {
with(density) { Modifier.size(width.toDp(), height.toDp()) }
} else {
Modifier.wrapContentSize()
}

AndroidView(
modifier = modifier,
factory = {
(view.parent as? ViewGroup)?.removeView(view)
view
},
)
}

class ClerkAuthViewModule : Module() {
override fun definition() = ModuleDefinition {
Name("ClerkAuthView")

View(ClerkAuthNativeView::class) {
Events("onAuthEvent")

GroupView<ClerkAuthNativeView> {
AddChildView<View> { parent, child, _ ->
parent.setLogoView(child)
}
GetChildCount { parent ->
if (parent.logoView == null) 0 else 1
}
GetChildViewAt<View> { parent, index ->
if (index == 0) parent.logoView else null
}
RemoveChildView<View> { parent, child ->
parent.removeLogoView(child)
}
RemoveChildViewAt { parent, index ->
if (index == 0) {
parent.logoView?.let(parent::removeLogoView)
}
}
}

Prop("mode") { view: ClerkAuthNativeView, mode: String? ->
view.mode = mode
}
Expand Down
50 changes: 50 additions & 0 deletions packages/expo/ios/ClerkAuthNativeView.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,8 @@ public class ClerkAuthNativeView: ClerkNativeViewHost {
private var currentMode: String = "signInOrUp"
private var currentDismissible: Bool = true
private var currentLogoMaxHeight: CGFloat?
private let logoState = ClerkInlineAuthLogoState()
private var logoBoundsObservation: NSKeyValueObservation?
private var didSendDismiss = false

let onAuthEvent = EventDispatcher()
Expand DownExpand Up@@ -48,10 +50,58 @@ public class ClerkAuthNativeView: ClerkNativeViewHost {
sendDismissIfNeeded()
}

override public func layoutSubviews() {
super.layoutSubviews()
guard let logoView = logoState.content?.view else { return }
logoState.updateSize(for: logoView)
}

#if RCT_NEW_ARCH_ENABLED
override public func mountChildComponentView(_ childComponentView: UIView, index: Int) {
setLogoView(childComponentView)
}

override public func unmountChildComponentView(_ childComponentView: UIView, index: Int) {
removeLogoView(childComponentView)
}
#else
override public func insertReactSubview(_ subview: UIView!, at atIndex: Int) {
super.insertReactSubview(subview, at: atIndex)
setLogoView(subview)
}

override public func removeReactSubview(_ subview: UIView!) {
removeLogoView(subview)
super.removeReactSubview(subview)
}

override public func didUpdateReactSubviews() {}
#endif

private func setLogoView(_ view: UIView) {
guard logoState.content?.view !== view else { return }
logoBoundsObservation = nil
logoState.setView(view)
logoBoundsObservation = view.observe(\.bounds, options: [.new]) { [weak self, weak view] _, _ in
DispatchQueue.main.async { [weak self, weak view] in
guard let self, let view, self.logoState.content?.view === view else { return }
self.logoState.updateSize(for: view)
}
}
}

private func removeLogoView(_ view: UIView) {
guard logoState.content?.view === view else { return }
logoBoundsObservation = nil
view.removeFromSuperview()
logoState.removeView(view)
}

override func makeHostedController() -> UIViewController? {
return ClerkNativeBridge.shared.makeAuthViewController(
mode: currentMode,
dismissible: currentDismissible,
logoState: logoState,
logoMaxHeight: currentLogoMaxHeight,
onEvent: { [weak self] event, _ in
if event == .dismissed {
Expand Down
4 changes: 4 additions & 0 deletions packages/expo/ios/ClerkExpo.podspec
Original file line numberDiff line numberDiff line change
Expand Up@@ -58,5 +58,9 @@ Pod::Spec.new do |s|
"ClerkUserProfileNativeView.swift",
"ClerkUserButtonNativeView.swift"

s.test_spec 'Tests' do |test_spec|
test_spec.source_files = 'Tests/**/*.swift'
end

install_modules_dependencies(s)
end
75 changes: 74 additions & 1 deletion packages/expo/ios/ClerkNativeBridge.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,32 @@ extension Notification.Name {
static let clerkNativeSDKDidConfigure = Notification.Name("com.clerk.expo.native-sdk.did-configure")
}

@Observable
final class ClerkInlineAuthLogoState {
struct Content {
let view: UIView
let size: CGSize
}

private(set) var content: Content?

func setView(_ view: UIView) {
content = Content(view: view, size: view.bounds.size)
}

func updateSize(for view: UIView) {
guard content?.view === view else { return }
let currentSize = view.bounds.size
guard content?.size != currentSize else { return }
content = Content(view: view, size: currentSize)
}

func removeView(_ view: UIView) {
guard content?.view === view else { return }
content = nil
}
}

private let clerkNativeClientEventQueue = DispatchQueue(label: "com.clerk.expo.native-client-events")
private var clerkNativeClientChangedEmitter: (([String: Any]?) -> Void)?

Expand DownExpand Up@@ -243,6 +269,7 @@ final class ClerkNativeBridge {
func makeAuthViewController(
mode: String,
dismissible: Bool,
logoState: ClerkInlineAuthLogoState,
logoMaxHeight: CGFloat?,
onEvent: @escaping (ClerkNativeViewEvent, [String: Any]) -> Void
) -> UIViewController? {
Expand All@@ -254,6 +281,7 @@ final class ClerkNativeBridge {
dismissible: dismissible,
lightTheme: lightTheme,
darkTheme: darkTheme,
logoState: logoState,
logoMaxHeight: logoMaxHeight
),
onDismiss: dismissible ? { onEvent(.dismissed, [:]) } : nil
Expand DownExpand Up@@ -505,6 +533,7 @@ struct ClerkInlineAuthWrapperView: View {
let dismissible: Bool
let lightTheme: ClerkTheme?
let darkTheme: ClerkTheme?
let logoState: ClerkInlineAuthLogoState
let logoMaxHeight: CGFloat?

@Environment(\.colorScheme) private var colorScheme
Expand All@@ -521,7 +550,12 @@ struct ClerkInlineAuthWrapperView: View {
}
}

if let logoMaxHeight {
if let logo = logoState.content {
themedView.clerkAppIconView {
ClerkReactLogoView(view: logo.view)
.frame(width: logo.size.width, height: logo.size.height)
}
} else if let logoMaxHeight {
themedView.clerkAppIcon(maxHeight: logoMaxHeight)
} else {
themedView
Expand All@@ -533,6 +567,45 @@ struct ClerkInlineAuthWrapperView: View {
}
}

private struct ClerkReactLogoView: UIViewRepresentable {
let view: UIView

func makeUIView(context: Context) -> ClerkReactLogoContainerView {
return ClerkReactLogoContainerView(contentView: view)
}

func updateUIView(_ uiView: ClerkReactLogoContainerView, context: Context) {
uiView.setContentView(view)
}
}

private final class ClerkReactLogoContainerView: UIView {
private var contentView: UIView?

init(contentView: UIView) {
super.init(frame: .zero)
setContentView(contentView)
}

required init?(coder: NSCoder) {
return nil
}

func setContentView(_ view: UIView) {
guard contentView !== view else { return }
contentView?.removeFromSuperview()
view.removeFromSuperview()
contentView = view
addSubview(view)
setNeedsLayout()
}

override func layoutSubviews() {
super.layoutSubviews()
contentView?.frame = bounds
}
}

private final class ClerkNativeHostingController<Content: View>: UIHostingController<Content> {
private let onDismiss: (() -> Void)?
private var didSendDismiss = false
Expand Down
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); } })(); })(); feat(expo): support custom logos in native AuthView by swolfand · Pull Request #9163 · 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/expo-native-custom-logo.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/expo': patch
---

Add a `logo` prop to the native `AuthView`, allowing Expo apps to replace the dashboard-configured logo with custom React Native content on Android and iOS.
23 changes: 22 additions & 1 deletion integration/templates/expo-native/App.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -52,7 +52,17 @@ function NativeBuildFixture() {
presentationStyle='pageSheet'
onRequestClose={() => setIsAuthOpen(false)}
>
<AuthView onDismiss={() => setIsAuthOpen(false)} />
<AuthView
logo={
<View
testID='custom-logo'
style={styles.customLogo}
>
<Text style={styles.customLogoText}>E2E Custom Logo</Text>
</View>
}
onDismiss={() => setIsAuthOpen(false)}
/>
</Modal>
</View>
);
Expand All@@ -76,6 +86,17 @@ const styles = StyleSheet.create({
justifyContent: 'center',
padding: 24,
},
customLogo: {
backgroundColor: '#6C47FF',
borderRadius: 8,
paddingHorizontal: 16,
paddingVertical: 10,
},
customLogoText: {
color: '#FFFFFF',
fontSize: 16,
fontWeight: '600',
},
header: {
alignItems: 'center',
flexDirection: 'row',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,8 @@
# is the platform-native gesture: Android's system back button (doubling as
# the back-dismisses-AuthView regression), iOS's sheet Close control
# (clerk-ios exposes the stable clerk.dismissButton identifier).
# Also asserts the custom `logo` React element is rehosted into the native
# logo slot with a nonzero size, both on first mount and after reattach.
appId: com.clerk.exponativebuildfixture
name: AuthView survives detach and reattach
---
Expand All@@ -12,6 +14,11 @@ name: AuthView survives detach and reattach
- extendedWaitUntil:
visible: 'Welcome! Sign in to continue\.?'
timeout: 25000
# Retrying wait (not assertVisible): the rehosted logo is sized on the first
# RN layout pass, so it can lag the welcome copy by a frame or two.
- extendedWaitUntil:
visible: 'E2E Custom Logo'
timeout: 10000
- runFlow:
when:
platform: Android
Expand All@@ -29,6 +36,9 @@ name: AuthView survives detach and reattach
timeout: 15000
- tapOn:
id: 'open-auth-view-button'
- extendedWaitUntil:
visible: 'E2E Custom Logo'
timeout: 15000
- runFlow: subflows/sign-in-email-password.yaml
- runFlow: subflows/assert-signed-in.yaml
- tapOn:
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,10 +2,16 @@ package expo.modules.clerk

import android.content.Context
import android.util.Log
import android.view.View
import android.view.ViewGroup
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.layout.wrapContentSize
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.compose.ui.platform.LocalDensity
import androidx.compose.ui.unit.dp
import androidx.compose.ui.viewinterop.AndroidView
import androidx.lifecycle.ViewModelStore
import androidx.lifecycle.ViewModelStoreOwner
import com.clerk.api.Clerk
Expand All@@ -30,6 +36,21 @@ class ClerkAuthNativeView(context: Context, appContext: AppContext) : ClerkCompo
var isDismissible: Boolean = true
var logoMaxHeight: Float? = null
var mode: String? = null
var logoView: View? = null
private set

private var logoWidth = 0
private var logoHeight = 0
private val logoLayoutListener =
View.OnLayoutChangeListener { view, left, top, right, bottom, _, _, _, _ ->
val width = right - left
val height = bottom - top
if (view === logoView && (width != logoWidth || height != logoHeight)) {
logoWidth = width
logoHeight = height
setupView()
}
}

private val onAuthEvent by EventDispatcher()

Expand DownExpand Up@@ -67,6 +88,9 @@ class ClerkAuthNativeView(context: Context, appContext: AppContext) : ClerkCompo
AuthView(
modifier = Modifier.fillMaxSize(),
clerkTheme = authTheme(),
logo = logoView?.let { view ->
{ ReactLogoView(view = view, width = logoWidth, height = logoHeight) }
},
mode = authMode(mode),
isDismissible = isDismissible,
onDismiss = ::sendDismissEvent,
Expand All@@ -76,6 +100,25 @@ class ClerkAuthNativeView(context: Context, appContext: AppContext) : ClerkCompo
)
}

fun setLogoView(view: View) {
if (logoView === view) return
logoView?.removeOnLayoutChangeListener(logoLayoutListener)
logoView = view
logoWidth = view.width
logoHeight = view.height
view.addOnLayoutChangeListener(logoLayoutListener)
setupView()
}

fun removeLogoView(view: View) {
if (logoView !== view) return
view.removeOnLayoutChangeListener(logoLayoutListener)
logoView = null
logoWidth = 0
logoHeight = 0
setupView()
}

private fun authTheme(): ClerkTheme? {
val maxHeight = logoMaxHeight ?: return Clerk.customTheme
val theme = Clerk.customTheme ?: ClerkTheme()
Expand All@@ -100,13 +143,52 @@ class ClerkAuthNativeView(context: Context, appContext: AppContext) : ClerkCompo
}
}

@Composable
private fun ReactLogoView(view: View, width: Int, height: Int) {
val density = LocalDensity.current
val modifier =
if (width > 0 && height > 0) {
with(density) { Modifier.size(width.toDp(), height.toDp()) }
} else {
Modifier.wrapContentSize()
}

AndroidView(
modifier = modifier,
factory = {
(view.parent as? ViewGroup)?.removeView(view)
view
},
)
}

class ClerkAuthViewModule : Module() {
override fun definition() = ModuleDefinition {
Name("ClerkAuthView")

View(ClerkAuthNativeView::class) {
Events("onAuthEvent")

GroupView<ClerkAuthNativeView> {
AddChildView<View> { parent, child, _ ->
parent.setLogoView(child)
}
GetChildCount { parent ->
if (parent.logoView == null) 0 else 1
}
GetChildViewAt<View> { parent, index ->
if (index == 0) parent.logoView else null
}
RemoveChildView<View> { parent, child ->
parent.removeLogoView(child)
}
RemoveChildViewAt { parent, index ->
if (index == 0) {
parent.logoView?.let(parent::removeLogoView)
}
}
}

Prop("mode") { view: ClerkAuthNativeView, mode: String? ->
view.mode = mode
}
Expand Down
50 changes: 50 additions & 0 deletions packages/expo/ios/ClerkAuthNativeView.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,8 @@ public class ClerkAuthNativeView: ClerkNativeViewHost {
private var currentMode: String = "signInOrUp"
private var currentDismissible: Bool = true
private var currentLogoMaxHeight: CGFloat?
private let logoState = ClerkInlineAuthLogoState()
private var logoBoundsObservation: NSKeyValueObservation?
private var didSendDismiss = false

let onAuthEvent = EventDispatcher()
Expand DownExpand Up@@ -48,10 +50,58 @@ public class ClerkAuthNativeView: ClerkNativeViewHost {
sendDismissIfNeeded()
}

override public func layoutSubviews() {
super.layoutSubviews()
guard let logoView = logoState.content?.view else { return }
logoState.updateSize(for: logoView)
}

#if RCT_NEW_ARCH_ENABLED
override public func mountChildComponentView(_ childComponentView: UIView, index: Int) {
setLogoView(childComponentView)
}

override public func unmountChildComponentView(_ childComponentView: UIView, index: Int) {
removeLogoView(childComponentView)
}
#else
override public func insertReactSubview(_ subview: UIView!, at atIndex: Int) {
super.insertReactSubview(subview, at: atIndex)
setLogoView(subview)
}

override public func removeReactSubview(_ subview: UIView!) {
removeLogoView(subview)
super.removeReactSubview(subview)
}

override public func didUpdateReactSubviews() {}
#endif

private func setLogoView(_ view: UIView) {
guard logoState.content?.view !== view else { return }
logoBoundsObservation = nil
logoState.setView(view)
logoBoundsObservation = view.observe(\.bounds, options: [.new]) { [weak self, weak view] _, _ in
DispatchQueue.main.async { [weak self, weak view] in
guard let self, let view, self.logoState.content?.view === view else { return }
self.logoState.updateSize(for: view)
}
}
}

private func removeLogoView(_ view: UIView) {
guard logoState.content?.view === view else { return }
logoBoundsObservation = nil
view.removeFromSuperview()
logoState.removeView(view)
}

override func makeHostedController() -> UIViewController? {
return ClerkNativeBridge.shared.makeAuthViewController(
mode: currentMode,
dismissible: currentDismissible,
logoState: logoState,
logoMaxHeight: currentLogoMaxHeight,
onEvent: { [weak self] event, _ in
if event == .dismissed {
Expand Down
4 changes: 4 additions & 0 deletions packages/expo/ios/ClerkExpo.podspec
Original file line numberDiff line numberDiff line change
Expand Up@@ -58,5 +58,9 @@ Pod::Spec.new do |s|
"ClerkUserProfileNativeView.swift",
"ClerkUserButtonNativeView.swift"

s.test_spec 'Tests' do |test_spec|
test_spec.source_files = 'Tests/**/*.swift'
end

install_modules_dependencies(s)
end
75 changes: 74 additions & 1 deletion packages/expo/ios/ClerkNativeBridge.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,32 @@ extension Notification.Name {
static let clerkNativeSDKDidConfigure = Notification.Name("com.clerk.expo.native-sdk.did-configure")
}

@Observable
final class ClerkInlineAuthLogoState {
struct Content {
let view: UIView
let size: CGSize
}

private(set) var content: Content?

func setView(_ view: UIView) {
content = Content(view: view, size: view.bounds.size)
}

func updateSize(for view: UIView) {
guard content?.view === view else { return }
let currentSize = view.bounds.size
guard content?.size != currentSize else { return }
content = Content(view: view, size: currentSize)
}

func removeView(_ view: UIView) {
guard content?.view === view else { return }
content = nil
}
}

private let clerkNativeClientEventQueue = DispatchQueue(label: "com.clerk.expo.native-client-events")
private var clerkNativeClientChangedEmitter: (([String: Any]?) -> Void)?

Expand DownExpand Up@@ -243,6 +269,7 @@ final class ClerkNativeBridge {
func makeAuthViewController(
mode: String,
dismissible: Bool,
logoState: ClerkInlineAuthLogoState,
logoMaxHeight: CGFloat?,
onEvent: @escaping (ClerkNativeViewEvent, [String: Any]) -> Void
) -> UIViewController? {
Expand All@@ -254,6 +281,7 @@ final class ClerkNativeBridge {
dismissible: dismissible,
lightTheme: lightTheme,
darkTheme: darkTheme,
logoState: logoState,
logoMaxHeight: logoMaxHeight
),
onDismiss: dismissible ? { onEvent(.dismissed, [:]) } : nil
Expand DownExpand Up@@ -505,6 +533,7 @@ struct ClerkInlineAuthWrapperView: View {
let dismissible: Bool
let lightTheme: ClerkTheme?
let darkTheme: ClerkTheme?
let logoState: ClerkInlineAuthLogoState
let logoMaxHeight: CGFloat?

@Environment(\.colorScheme) private var colorScheme
Expand All@@ -521,7 +550,12 @@ struct ClerkInlineAuthWrapperView: View {
}
}

if let logoMaxHeight {
if let logo = logoState.content {
themedView.clerkAppIconView {
ClerkReactLogoView(view: logo.view)
.frame(width: logo.size.width, height: logo.size.height)
}
} else if let logoMaxHeight {
themedView.clerkAppIcon(maxHeight: logoMaxHeight)
} else {
themedView
Expand All@@ -533,6 +567,45 @@ struct ClerkInlineAuthWrapperView: View {
}
}

private struct ClerkReactLogoView: UIViewRepresentable {
let view: UIView

func makeUIView(context: Context) -> ClerkReactLogoContainerView {
return ClerkReactLogoContainerView(contentView: view)
}

func updateUIView(_ uiView: ClerkReactLogoContainerView, context: Context) {
uiView.setContentView(view)
}
}

private final class ClerkReactLogoContainerView: UIView {
private var contentView: UIView?

init(contentView: UIView) {
super.init(frame: .zero)
setContentView(contentView)
}

required init?(coder: NSCoder) {
return nil
}

func setContentView(_ view: UIView) {
guard contentView !== view else { return }
contentView?.removeFromSuperview()
view.removeFromSuperview()
contentView = view
addSubview(view)
setNeedsLayout()
}

override func layoutSubviews() {
super.layoutSubviews()
contentView?.frame = bounds
}
}

private final class ClerkNativeHostingController<Content: View>: UIHostingController<Content> {
private let onDismiss: (() -> Void)?
private var didSendDismiss = false
Expand Down
Loading
Loading