Skip to content

feat(clerk-js,types): Add css layer name option #5552

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 32 commits into from
May 29, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
90a57a8
feat(clerk-js,types): Add experimental css layer name option
alexcarpenter Apr 7, 2025
5cdfd53
Update app.ts
alexcarpenter Apr 7, 2025
52e311c
add changeset
alexcarpenter Apr 7, 2025
07a90cb
getInsertionPoint
alexcarpenter Apr 7, 2025
ffa35fe
document
alexcarpenter Apr 8, 2025
1e594b7
document
alexcarpenter Apr 8, 2025
2c23dbf
add tests
alexcarpenter Apr 8, 2025
b1b13d2
Merge branch 'main' into alexcarpenter/css-layer-name
alexcarpenter Apr 28, 2025
1bd14cb
use singleton pattern
alexcarpenter Apr 28, 2025
5548d43
wip
alexcarpenter Apr 28, 2025
89107ac
wip
alexcarpenter Apr 28, 2025
eda061f
wip
alexcarpenter Apr 28, 2025
a8070b3
Merge branch 'main' into alexcarpenter/css-layer-name
alexcarpenter May 19, 2025
195d3c4
Merge branch 'main' into alexcarpenter/css-layer-name
alexcarpenter May 28, 2025
558990a
simplify
alexcarpenter May 28, 2025
caca4ed
Update StyleCacheProvider.test.tsx
alexcarpenter May 28, 2025
baa3259
fix
alexcarpenter May 28, 2025
14f80f1
Merge branch 'main' into alexcarpenter/css-layer-name
alexcarpenter May 28, 2025
0027407
Merge branch 'main' into alexcarpenter/css-layer-name
alexcarpenter May 28, 2025
f69ab01
update comment
alexcarpenter May 28, 2025
3ac70ac
Merge branch 'alexcarpenter/css-layer-name' of github.com:clerk/javas…
alexcarpenter May 28, 2025
8354d5b
Update bundlewatch.config.json
alexcarpenter May 28, 2025
2ca72a6
fix
alexcarpenter May 28, 2025
c92c971
Update metal-phones-like.md
alexcarpenter May 28, 2025
31c03ea
Update .changeset/metal-phones-like.md
alexcarpenter May 28, 2025
43c879e
remove from experimental
alexcarpenter May 28, 2025
fb3445a
Update StyleCacheProvider.tsx
alexcarpenter May 29, 2025
4c31b58
Merge branch 'main' into alexcarpenter/css-layer-name
alexcarpenter May 29, 2025
6c4cac9
Update metal-phones-like.md
alexcarpenter May 29, 2025
6727466
remove comment examples
alexcarpenter May 29, 2025
3dca9aa
refactor: move under top level appearance
alexcarpenter May 29, 2025
300922f
Merge branch 'main' into alexcarpenter/css-layer-name
alexcarpenter May 29, 2025
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
6 changes: 6 additions & 0 deletions .changeset/metal-phones-like.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
'@clerk/clerk-js': minor
'@clerk/types': minor
---

Introduce `cssLayerName` option to allow users to opt Clerk styles into a native CSS layer.
2 changes: 1 addition & 1 deletion packages/clerk-js/src/ui/customizables/parseAppearance.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ export type ParsedCaptcha = Required<CaptchaAppearanceOptions>;

type PublicAppearanceTopLevelKey = keyof Omit<
Appearance,
'baseTheme' | 'elements' | 'layout' | 'variables' | 'captcha'
'baseTheme' | 'elements' | 'layout' | 'variables' | 'captcha' | 'cssLayerName'
>;

export type AppearanceCascade = {
Expand Down
5 changes: 4 additions & 1 deletion packages/clerk-js/src/ui/lazyModules/providers.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,10 @@ type LazyProvidersProps = React.PropsWithChildren<{ clerk: any; environment: any

export const LazyProviders = (props: LazyProvidersProps) => {
return (
<StyleCacheProvider nonce={props.options.nonce}>
<StyleCacheProvider
nonce={props.options.nonce}
cssLayerName={props.options.appearance?.cssLayerName}
>
<CoreClerkContextWrapper clerk={props.clerk}>
<EnvironmentProvider value={props.environment}>
<OptionsProvider value={props.options}>{props.children}</OptionsProvider>
Expand Down
36 changes: 25 additions & 11 deletions packages/clerk-js/src/ui/styledSystem/StyleCacheProvider.tsx
Original file line number Diff line number Diff line change
@@ -1,26 +1,40 @@
// eslint-disable-next-line no-restricted-imports
import createCache from '@emotion/cache';
// eslint-disable-next-line no-restricted-imports
import { CacheProvider } from '@emotion/react';
import { CacheProvider, type SerializedStyles } from '@emotion/react';
import React, { useMemo } from 'react';

const el = document.querySelector('style#cl-style-insertion-point');

type StyleCacheProviderProps = React.PropsWithChildren<{
/** Optional nonce value for CSP (Content Security Policy) */
nonce?: string;
/** Optional CSS layer name to wrap styles in */
cssLayerName?: string;
}>;

export const StyleCacheProvider = (props: StyleCacheProviderProps) => {
const cache = useMemo(
() =>
createCache({
key: 'cl-internal',
prepend: !el,
insertionPoint: el ? (el as HTMLElement) : undefined,
nonce: props.nonce,
}),
[props.nonce],
);
const cache = useMemo(() => {
const emotionCache = createCache({
key: 'cl-internal',
prepend: props.cssLayerName ? false : !el,
insertionPoint: el ? (el as HTMLElement) : undefined,
nonce: props.nonce,
});

if (props.cssLayerName) {
const prevInsert = emotionCache.insert.bind(emotionCache);
emotionCache.insert = (selector: string, serialized: SerializedStyles, sheet: any, shouldCache: boolean) => {
if (serialized && typeof serialized.styles === 'string' && !serialized.styles.startsWith('@layer')) {
const newSerialized = { ...serialized };
newSerialized.styles = `@layer ${props.cssLayerName} {${serialized.styles}}`;
return prevInsert(selector, newSerialized, sheet, shouldCache);
}
return prevInsert(selector, serialized, sheet, shouldCache);
};
}
return emotionCache;
}, [props.nonce, props.cssLayerName]);

return <CacheProvider value={cache}>{props.children}</CacheProvider>;
};
112 changes: 61 additions & 51 deletions packages/types/src/appearance.ts
Original file line number Diff line number Diff line change
Expand Up @@ -833,57 +833,67 @@ export type PricingTableTheme = Theme;
export type CheckoutTheme = Theme;
export type PlanDetailTheme = Theme;

export type Appearance<T = Theme> = T & {
type GlobalAppearanceOptions = {
/**
* Theme overrides that only apply to the `<SignIn/>` component
* The name of the CSS layer for Clerk component styles.
* This is useful for advanced CSS customization, allowing you to control the cascade and prevent style conflicts by isolating Clerk's styles within a specific layer.
* For more information on CSS layers, see the [MDN documentation on @layer](https://developer.mozilla.org/en-US/docs/Web/CSS/@layer).
*/
signIn?: T;
/**
* Theme overrides that only apply to the `<SignUp/>` component
*/
signUp?: T;
/**
* Theme overrides that only apply to the `<UserButton/>` component
*/
userButton?: T;
/**
* Theme overrides that only apply to the `<UserProfile/>` component
*/
userProfile?: T;
/**
* Theme overrides that only apply to the `<UserVerification/>` component
*/
userVerification?: T;
/**
* Theme overrides that only apply to the `<OrganizationSwitcher/>` component
*/
organizationSwitcher?: T;
/**
* Theme overrides that only apply to the `<OrganizationList/>` component
*/
organizationList?: T;
/**
* Theme overrides that only apply to the `<OrganizationProfile/>` component
*/
organizationProfile?: T;
/**
* Theme overrides that only apply to the `<CreateOrganization />` component
*/
createOrganization?: T;
/**
* Theme overrides that only apply to the `<CreateOrganization />` component
*/
oneTap?: T;
/**
* Theme overrides that only apply to the `<Waitlist />` component
*/
waitlist?: T;
/**
* Theme overrides that only apply to the `<PricingTable />` component
*/
pricingTable?: T;
/**
* Theme overrides that only apply to the `<Checkout />` component
*/
checkout?: T;
cssLayerName?: string;
};

export type Appearance<T = Theme> = T &
GlobalAppearanceOptions & {
/**
* Theme overrides that only apply to the `<SignIn/>` component
*/
signIn?: T;
/**
* Theme overrides that only apply to the `<SignUp/>` component
*/
signUp?: T;
/**
* Theme overrides that only apply to the `<UserButton/>` component
*/
userButton?: T;
/**
* Theme overrides that only apply to the `<UserProfile/>` component
*/
userProfile?: T;
/**
* Theme overrides that only apply to the `<UserVerification/>` component
*/
userVerification?: T;
/**
* Theme overrides that only apply to the `<OrganizationSwitcher/>` component
*/
organizationSwitcher?: T;
/**
* Theme overrides that only apply to the `<OrganizationList/>` component
*/
organizationList?: T;
/**
* Theme overrides that only apply to the `<OrganizationProfile/>` component
*/
organizationProfile?: T;
/**
* Theme overrides that only apply to the `<CreateOrganization />` component
*/
createOrganization?: T;
/**
* Theme overrides that only apply to the `<CreateOrganization />` component
*/
oneTap?: T;
/**
* Theme overrides that only apply to the `<Waitlist />` component
*/
waitlist?: T;
/**
* Theme overrides that only apply to the `<PricingTable />` component
*/
pricingTable?: T;
/**
* Theme overrides that only apply to the `<Checkout />` component
*/
checkout?: T;
};