Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
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/fluffy-hairs-thank.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
---
'@clerk/clerk-js': minor
'@clerk/types': minor
---

Introduce the `appearance.captcha` property for the CAPTCHA widget
2 changes: 1 addition & 1 deletion packages/clerk-js/bundlewatch.config.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@
"files": [
{ "path": "./dist/clerk.js", "maxSize": "560kB" },
{ "path": "./dist/clerk.browser.js", "maxSize": "75kB" },
{ "path": "./dist/clerk.headless.js", "maxSize": "48.2KB" },
{ "path": "./dist/clerk.headless.js", "maxSize": "48.3KB" },
{ "path": "./dist/ui-common*.js", "maxSize": "89KB" },
{ "path": "./dist/vendors*.js", "maxSize": "25KB" },
{ "path": "./dist/coinbase*.js", "maxSize": "35.5KB" },
Expand Down
15 changes: 13 additions & 2 deletions packages/clerk-js/src/ui/components/BlankCaptchaModal/index.tsx
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,23 @@
import { Flow } from '../../customizables';
import { Flow, useAppearance, useLocalizations } from '../../customizables';
import { Card, withCardStateProvider } from '../../elements';
import { Route, Switch } from '../../router';

const BlankCard = withCardStateProvider(() => {
const { parsedCaptcha } = useAppearance();
const { locale } = useLocalizations();
const captchaTheme = parsedCaptcha?.theme;
const captchaSize = parsedCaptcha?.size;
const captchaLanguage = parsedCaptcha?.language || locale;

return (
<Card.Root>
<Card.Content>
<div id='cl-modal-captcha-container' />
<div
id='cl-modal-captcha-container'
data-cl-theme={captchaTheme}
data-cl-size={captchaSize}
data-cl-language={captchaLanguage}
/>
</Card.Content>
</Card.Root>
);
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -380,3 +380,87 @@ describe('AppearanceProvider layout flows', () => {
expect(result.current.parsedElements[0]['alert'].backgroundColor).toBe(themeBColor);
});
});

describe('AppearanceProvider captcha', () => {
it('sets the parsedCaptcha correctly from the globalAppearance prop', () => {
const wrapper = ({ children }) => (
<AppearanceProvider
appearanceKey='signIn'
globalAppearance={{
captcha: {
theme: 'dark',
size: 'compact',
language: 'el-GR',
},
}}
>
{children}
</AppearanceProvider>
);

const { result } = renderHook(() => useAppearance(), { wrapper });
expect(result.current.parsedCaptcha.theme).toBe('dark');
expect(result.current.parsedCaptcha.size).toBe('compact');
expect(result.current.parsedCaptcha.language).toBe('el-GR');
});

it('sets the parsedCaptcha correctly from the appearance prop', () => {
const wrapper = ({ children }) => (
<AppearanceProvider
appearanceKey='signIn'
appearance={{
captcha: {
theme: 'dark',
size: 'compact',
language: 'el-GR',
},
}}
>
{children}
</AppearanceProvider>
);

const { result } = renderHook(() => useAppearance(), { wrapper });
expect(result.current.parsedCaptcha.theme).toBe('dark');
expect(result.current.parsedCaptcha.size).toBe('compact');
expect(result.current.parsedCaptcha.language).toBe('el-GR');
});

it('sets the parsedLayout correctly from the globalAppearance and appearance prop', () => {
const wrapper = ({ children }) => (
<AppearanceProvider
appearanceKey='signIn'
globalAppearance={{
captcha: {
theme: 'light',
size: 'flexible',
language: 'en-US',
},
}}
appearance={{
captcha: {
theme: 'dark',
size: 'compact',
language: 'el-GR',
},
}}
>
{children}
</AppearanceProvider>
);

const { result } = renderHook(() => useAppearance(), { wrapper });
expect(result.current.parsedCaptcha.theme).toBe('dark');
expect(result.current.parsedCaptcha.size).toBe('compact');
expect(result.current.parsedCaptcha.language).toBe('el-GR');
});

it('uses the default values when no captcha property is passed', () => {
const wrapper = ({ children }) => <AppearanceProvider appearanceKey='signIn'>{children}</AppearanceProvider>;

const { result } = renderHook(() => useAppearance(), { wrapper });
expect(result.current.parsedCaptcha.theme).toBe('auto');
expect(result.current.parsedCaptcha.size).toBe('normal');
expect(result.current.parsedCaptcha.language).toBe('');
});
});
25 changes: 22 additions & 3 deletions packages/clerk-js/src/ui/customizables/parseAppearance.ts
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
import { fastDeepMergeAndReplace } from '@clerk/shared/utils';
import type { Appearance, DeepPartial, Elements, Layout, Theme } from '@clerk/types';
import type { Appearance, CaptchaAppearanceOptions, DeepPartial, Elements, Layout, Theme } from '@clerk/types';

import { createInternalTheme, defaultInternalTheme } from '../foundations';
import { polishedAppearance } from '../polishedAppearance';
Expand All@@ -16,8 +16,12 @@ import {
export type ParsedElements = Elements[];
export type ParsedInternalTheme = InternalTheme;
export type ParsedLayout = Required<Layout>;
export type ParsedCaptcha = Required<CaptchaAppearanceOptions>;

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

export type AppearanceCascade = {
globalAppearance?: Appearance;
Expand All@@ -29,6 +33,7 @@ export type ParsedAppearance = {
parsedElements: ParsedElements;
parsedInternalTheme: ParsedInternalTheme;
parsedLayout: ParsedLayout;
parsedCaptcha: ParsedCaptcha;
};

const defaultLayout: ParsedLayout = {
Expand All@@ -46,6 +51,12 @@ const defaultLayout: ParsedLayout = {
unsafe_disableDevelopmentModeWarnings: false,
};

const defaultCaptchaOptions: ParsedCaptcha = {
theme: 'auto',
size: 'normal',
language: '',
};

/**
* Parses the public appearance object.
* It splits the resulting styles into 2 objects: parsedElements, parsedInternalTheme
Expand All@@ -63,6 +74,7 @@ export const parseAppearance = (cascade: AppearanceCascade): ParsedAppearance =>

const parsedInternalTheme = parseVariables(appearanceList);
const parsedLayout = parseLayout(appearanceList);
const parsedCaptcha = parseCaptcha(appearanceList);

if (
!appearanceList.find(a => {
Expand All@@ -83,7 +95,7 @@ export const parseAppearance = (cascade: AppearanceCascade): ParsedAppearance =>
return res;
}),
);
return { parsedElements, parsedInternalTheme, parsedLayout };
return { parsedElements, parsedInternalTheme, parsedLayout, parsedCaptcha };
};

const expand = (theme: Theme | undefined, cascade: any[]) => {
Expand All@@ -106,6 +118,13 @@ const parseLayout = (appearanceList: Appearance[]) => {
return { ...defaultLayout, ...appearanceList.reduce((acc, appearance) => ({ ...acc, ...appearance.layout }), {}) };
};

const parseCaptcha = (appearanceList: Appearance[]) => {
return {
...defaultCaptchaOptions,
...appearanceList.reduce((acc, appearance) => ({ ...acc, ...appearance.captcha }), {}),
};
};

const parseVariables = (appearances: Appearance[]) => {
const res = {} as DeepPartial<InternalTheme>;
fastDeepMergeAndReplace({ ...defaultInternalTheme }, res);
Expand Down
10 changes: 9 additions & 1 deletion packages/clerk-js/src/ui/elements/CaptchaElement.tsx
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
import { useEffect, useRef } from 'react';

import { CAPTCHA_ELEMENT_ID } from '../../utils/captcha';
import { Box } from '../customizables';
import { Box, useAppearance, useLocalizations } from '../customizables';

/**
* This component uses a MutationObserver to listen for DOM changes made by our Turnstile logic,
Expand All@@ -14,6 +14,11 @@ export const CaptchaElement = () => {
const maxHeightValueRef = useRef('0');
const minHeightValueRef = useRef('unset');
const marginBottomValueRef = useRef('unset');
const { parsedCaptcha } = useAppearance();
const { locale } = useLocalizations();
const captchaTheme = parsedCaptcha?.theme;
const captchaSize = parsedCaptcha?.size;
const captchaLanguage = parsedCaptcha?.language || locale;

useEffect(() => {
if (!elementRef.current) return;
Expand DownExpand Up@@ -48,6 +53,9 @@ export const CaptchaElement = () => {
minHeight: minHeightValueRef.current,
marginBottom: marginBottomValueRef.current,
}}
data-cl-theme={captchaTheme}
data-cl-size={captchaSize}
data-cl-language={captchaLanguage}
/>
);
};
54 changes: 51 additions & 3 deletions packages/clerk-js/src/utils/captcha/turnstile.ts
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import { waitForElement } from '@clerk/shared/dom';
import { loadScript } from '@clerk/shared/loadScript';
import type { CaptchaWidgetType } from '@clerk/types';
import type { CaptchaAppearanceOptions, CaptchaWidgetType } from '@clerk/types';

import { CAPTCHA_ELEMENT_ID, CAPTCHA_INVISIBLE_CLASSNAME } from './constants';
import type { CaptchaOptions } from './types';
Expand All@@ -9,6 +9,12 @@ import type { CaptchaOptions } from './types';
// CF docs: https://developers.cloudflare.com/turnstile/get-started/client-side-rendering/#disable-implicit-rendering
const CLOUDFLARE_TURNSTILE_ORIGINAL_URL = 'https://challenges.cloudflare.com/turnstile/v0/api.js?render=explicit';

type CaptchaAttributes = {
theme?: RenderOptions['theme'];
language?: RenderOptions['language'];
size: RenderOptions['size'];
};

interface RenderOptions {
/**
* Every widget has a sitekey. This sitekey is associated with the corresponding widget configuration and is created upon the widget creation.
Expand DownExpand Up@@ -58,6 +64,24 @@ interface RenderOptions {
* @default 'always'
*/
appearance?: 'always' | 'execute' | 'interaction-only';
/**
* The widget theme. Can take the following values: light, dark, auto.
* The default is auto, which respects the user preference. This can be forced to light or dark by setting the theme accordingly.
Comment thread
anagstef marked this conversation as resolved.
* @default 'auto'
*/
theme?: CaptchaAppearanceOptions['theme'];
/**
* The widget size. Can take the following values: normal, flexible, compact.
* @default 'normal'
*/
size?: CaptchaAppearanceOptions['size'];
/**
* Language to display, must be either: auto (default) to use the language that the visitor has chosen,
* or an ISO 639-1 two-letter language code (e.g. en) or language and country code (e.g. en-US).
* Refer to the list of supported languages for more information.
* https://developers.cloudflare.com/turnstile/reference/supported-languages
*/
language?: CaptchaAppearanceOptions['language'];
/**
* A custom value that can be used to differentiate widgets under the same sitekey
* in analytics and which is returned upon validation. This can only contain up to
Expand DownExpand Up@@ -109,6 +133,14 @@ async function loadCaptchaFromCloudflareURL() {
}
}

function getCaptchaAttibutesFromElemenet(element: HTMLElement): CaptchaAttributes {
const theme = (element.getAttribute('data-cl-theme') as RenderOptions['theme']) || undefined;
const language = (element.getAttribute('data-cl-language') as RenderOptions['language']) || undefined;
const size = (element.getAttribute('data-cl-size') as RenderOptions['size']) || undefined;

return { theme, language, size };
}

/*
* How this function works:
* The widgetType is either 'invisible' or 'smart'.
Expand All@@ -125,6 +157,9 @@ export const getTurnstileToken = async (opts: CaptchaOptions) => {
let captchaToken = '';
let id = '';
let turnstileSiteKey = siteKey;
let captchaTheme: RenderOptions['theme'];
let captchaSize: RenderOptions['size'];
let captchaLanguage: RenderOptions['language'];
let retries = 0;
let widgetContainerQuerySelector: string | undefined;
// The backend uses this to determine which Turnstile site-key was used in order to verify the token
Expand All@@ -138,7 +173,13 @@ export const getTurnstileToken = async (opts: CaptchaOptions) => {
captchaWidgetType = widgetType;
widgetContainerQuerySelector = modalContainerQuerySelector;
await openModal?.();
await waitForElement(modalContainerQuerySelector);
const modalContainderEl = await waitForElement(modalContainerQuerySelector);
if (modalContainderEl) {
const { theme, language, size } = getCaptchaAttibutesFromElemenet(modalContainderEl);
captchaTheme = theme;
captchaLanguage = language;
captchaSize = size;
}
}

// smart widget with container provided by user
Expand All@@ -148,6 +189,10 @@ export const getTurnstileToken = async (opts: CaptchaOptions) => {
captchaWidgetType = 'smart';
widgetContainerQuerySelector = `#${CAPTCHA_ELEMENT_ID}`;
visibleDiv.style.maxHeight = '0'; // This is to prevent the layout shift when the render method is called
const { theme, language, size } = getCaptchaAttibutesFromElemenet(visibleDiv);
captchaTheme = theme;
captchaLanguage = language;
captchaSize = size;
} else {
console.error(
'Cannot initialize Smart CAPTCHA widget because the `clerk-captcha` DOM element was not found; falling back to Invisible CAPTCHA widget. If you are using a custom flow, visit https://clerk.com/docs/custom-flows/bot-sign-up-protection for instructions',
Expand All@@ -172,6 +217,9 @@ export const getTurnstileToken = async (opts: CaptchaOptions) => {
const id = captcha.render(widgetContainerQuerySelector, {
sitekey: turnstileSiteKey,
appearance: 'interaction-only',
theme: captchaTheme || 'auto',
Comment thread
anagstef marked this conversation as resolved.
size: captchaSize || 'normal',
language: captchaLanguage || 'auto',
action: opts.action,
retry: 'never',
'refresh-expired': 'auto',
Expand All@@ -192,7 +240,7 @@ export const getTurnstileToken = async (opts: CaptchaOptions) => {
// We set the min-height to the height of the Turnstile widget
// because the widget initially does a small layout shift
// and then expands to the correct height
visibleWidget.style.minHeight = '68px';
visibleWidget.style.minHeight = captchaSize === 'compact' ? '140px' : '68px';
visibleWidget.style.marginBottom = '1.5rem';
}
}
Expand Down
24 changes: 24 additions & 0 deletions packages/types/src/appearance.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -551,6 +551,12 @@ export type Theme = {
* Eg: `formButtonPrimary__loading: { backgroundColor: 'gray' }`
*/
elements?: Elements;
/**
* The appearance of the CAPTCHA widget.
* This will be used to style the CAPTCHA widget.
* Eg: `theme: 'dark'`
*/
captcha?: CaptchaAppearanceOptions;
};

export type Layout = {
Expand DownExpand Up@@ -632,6 +638,24 @@ export type Layout = {
unsafe_disableDevelopmentModeWarnings?: boolean;
};

export type CaptchaAppearanceOptions = {
/**
* The widget theme. Can take the following values: light, dark, auto.
* @default 'auto'
*/
theme?: 'auto' | 'light' | 'dark';
/**
* The widget size. Can take the following values: normal, flexible, compact.
* @default 'normal'
*/
size?: 'normal' | 'flexible' | 'compact';
/**
* Language to display, must be either: auto (default) to use the language that the visitor has chosen, or an ISO 639-1 two-letter language code (e.g. en) or language and country code (e.g. en-US).
* Refer to the list of supported languages for more information: https://developers.cloudflare.com/turnstile/reference/supported-languages
*/
language?: string;
};

export type SignInTheme = Theme;
export type SignUpTheme = Theme;
export type UserButtonTheme = Theme;
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n 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;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
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/fluffy-hairs-thank.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
---
'@clerk/clerk-js': minor
'@clerk/types': minor
---

Introduce the `appearance.captcha` property for the CAPTCHA widget
2 changes: 1 addition & 1 deletion packages/clerk-js/bundlewatch.config.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@
"files": [
{ "path": "./dist/clerk.js", "maxSize": "560kB" },
{ "path": "./dist/clerk.browser.js", "maxSize": "75kB" },
{ "path": "./dist/clerk.headless.js", "maxSize": "48.2KB" },
{ "path": "./dist/clerk.headless.js", "maxSize": "48.3KB" },
{ "path": "./dist/ui-common*.js", "maxSize": "89KB" },
{ "path": "./dist/vendors*.js", "maxSize": "25KB" },
{ "path": "./dist/coinbase*.js", "maxSize": "35.5KB" },
Expand Down
15 changes: 13 additions & 2 deletions packages/clerk-js/src/ui/components/BlankCaptchaModal/index.tsx
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,23 @@
import { Flow } from '../../customizables';
import { Flow, useAppearance, useLocalizations } from '../../customizables';
import { Card, withCardStateProvider } from '../../elements';
import { Route, Switch } from '../../router';

const BlankCard = withCardStateProvider(() => {
const { parsedCaptcha } = useAppearance();
const { locale } = useLocalizations();
const captchaTheme = parsedCaptcha?.theme;
const captchaSize = parsedCaptcha?.size;
const captchaLanguage = parsedCaptcha?.language || locale;

return (
<Card.Root>
<Card.Content>
<div id='cl-modal-captcha-container' />
<div
id='cl-modal-captcha-container'
data-cl-theme={captchaTheme}
data-cl-size={captchaSize}
data-cl-language={captchaLanguage}
/>
</Card.Content>
</Card.Root>
);
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -380,3 +380,87 @@ describe('AppearanceProvider layout flows', () => {
expect(result.current.parsedElements[0]['alert'].backgroundColor).toBe(themeBColor);
});
});

describe('AppearanceProvider captcha', () => {
it('sets the parsedCaptcha correctly from the globalAppearance prop', () => {
const wrapper = ({ children }) => (
<AppearanceProvider
appearanceKey='signIn'
globalAppearance={{
captcha: {
theme: 'dark',
size: 'compact',
language: 'el-GR',
},
}}
>
{children}
</AppearanceProvider>
);

const { result } = renderHook(() => useAppearance(), { wrapper });
expect(result.current.parsedCaptcha.theme).toBe('dark');
expect(result.current.parsedCaptcha.size).toBe('compact');
expect(result.current.parsedCaptcha.language).toBe('el-GR');
});

it('sets the parsedCaptcha correctly from the appearance prop', () => {
const wrapper = ({ children }) => (
<AppearanceProvider
appearanceKey='signIn'
appearance={{
captcha: {
theme: 'dark',
size: 'compact',
language: 'el-GR',
},
}}
>
{children}
</AppearanceProvider>
);

const { result } = renderHook(() => useAppearance(), { wrapper });
expect(result.current.parsedCaptcha.theme).toBe('dark');
expect(result.current.parsedCaptcha.size).toBe('compact');
expect(result.current.parsedCaptcha.language).toBe('el-GR');
});

it('sets the parsedLayout correctly from the globalAppearance and appearance prop', () => {
const wrapper = ({ children }) => (
<AppearanceProvider
appearanceKey='signIn'
globalAppearance={{
captcha: {
theme: 'light',
size: 'flexible',
language: 'en-US',
},
}}
appearance={{
captcha: {
theme: 'dark',
size: 'compact',
language: 'el-GR',
},
}}
>
{children}
</AppearanceProvider>
);

const { result } = renderHook(() => useAppearance(), { wrapper });
expect(result.current.parsedCaptcha.theme).toBe('dark');
expect(result.current.parsedCaptcha.size).toBe('compact');
expect(result.current.parsedCaptcha.language).toBe('el-GR');
});

it('uses the default values when no captcha property is passed', () => {
const wrapper = ({ children }) => <AppearanceProvider appearanceKey='signIn'>{children}</AppearanceProvider>;

const { result } = renderHook(() => useAppearance(), { wrapper });
expect(result.current.parsedCaptcha.theme).toBe('auto');
expect(result.current.parsedCaptcha.size).toBe('normal');
expect(result.current.parsedCaptcha.language).toBe('');
});
});
25 changes: 22 additions & 3 deletions packages/clerk-js/src/ui/customizables/parseAppearance.ts
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
import { fastDeepMergeAndReplace } from '@clerk/shared/utils';
import type { Appearance, DeepPartial, Elements, Layout, Theme } from '@clerk/types';
import type { Appearance, CaptchaAppearanceOptions, DeepPartial, Elements, Layout, Theme } from '@clerk/types';

import { createInternalTheme, defaultInternalTheme } from '../foundations';
import { polishedAppearance } from '../polishedAppearance';
Expand All@@ -16,8 +16,12 @@ import {
export type ParsedElements = Elements[];
export type ParsedInternalTheme = InternalTheme;
export type ParsedLayout = Required<Layout>;
export type ParsedCaptcha = Required<CaptchaAppearanceOptions>;

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

export type AppearanceCascade = {
globalAppearance?: Appearance;
Expand All@@ -29,6 +33,7 @@ export type ParsedAppearance = {
parsedElements: ParsedElements;
parsedInternalTheme: ParsedInternalTheme;
parsedLayout: ParsedLayout;
parsedCaptcha: ParsedCaptcha;
};

const defaultLayout: ParsedLayout = {
Expand All@@ -46,6 +51,12 @@ const defaultLayout: ParsedLayout = {
unsafe_disableDevelopmentModeWarnings: false,
};

const defaultCaptchaOptions: ParsedCaptcha = {
theme: 'auto',
size: 'normal',
language: '',
};

/**
* Parses the public appearance object.
* It splits the resulting styles into 2 objects: parsedElements, parsedInternalTheme
Expand All@@ -63,6 +74,7 @@ export const parseAppearance = (cascade: AppearanceCascade): ParsedAppearance =>

const parsedInternalTheme = parseVariables(appearanceList);
const parsedLayout = parseLayout(appearanceList);
const parsedCaptcha = parseCaptcha(appearanceList);

if (
!appearanceList.find(a => {
Expand All@@ -83,7 +95,7 @@ export const parseAppearance = (cascade: AppearanceCascade): ParsedAppearance =>
return res;
}),
);
return { parsedElements, parsedInternalTheme, parsedLayout };
return { parsedElements, parsedInternalTheme, parsedLayout, parsedCaptcha };
};

const expand = (theme: Theme | undefined, cascade: any[]) => {
Expand All@@ -106,6 +118,13 @@ const parseLayout = (appearanceList: Appearance[]) => {
return { ...defaultLayout, ...appearanceList.reduce((acc, appearance) => ({ ...acc, ...appearance.layout }), {}) };
};

const parseCaptcha = (appearanceList: Appearance[]) => {
return {
...defaultCaptchaOptions,
...appearanceList.reduce((acc, appearance) => ({ ...acc, ...appearance.captcha }), {}),
};
};

const parseVariables = (appearances: Appearance[]) => {
const res = {} as DeepPartial<InternalTheme>;
fastDeepMergeAndReplace({ ...defaultInternalTheme }, res);
Expand Down
10 changes: 9 additions & 1 deletion packages/clerk-js/src/ui/elements/CaptchaElement.tsx
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
import { useEffect, useRef } from 'react';

import { CAPTCHA_ELEMENT_ID } from '../../utils/captcha';
import { Box } from '../customizables';
import { Box, useAppearance, useLocalizations } from '../customizables';

/**
* This component uses a MutationObserver to listen for DOM changes made by our Turnstile logic,
Expand All@@ -14,6 +14,11 @@ export const CaptchaElement = () => {
const maxHeightValueRef = useRef('0');
const minHeightValueRef = useRef('unset');
const marginBottomValueRef = useRef('unset');
const { parsedCaptcha } = useAppearance();
const { locale } = useLocalizations();
const captchaTheme = parsedCaptcha?.theme;
const captchaSize = parsedCaptcha?.size;
const captchaLanguage = parsedCaptcha?.language || locale;

useEffect(() => {
if (!elementRef.current) return;
Expand DownExpand Up@@ -48,6 +53,9 @@ export const CaptchaElement = () => {
minHeight: minHeightValueRef.current,
marginBottom: marginBottomValueRef.current,
}}
data-cl-theme={captchaTheme}
data-cl-size={captchaSize}
data-cl-language={captchaLanguage}
/>
);
};
54 changes: 51 additions & 3 deletions packages/clerk-js/src/utils/captcha/turnstile.ts
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import { waitForElement } from '@clerk/shared/dom';
import { loadScript } from '@clerk/shared/loadScript';
import type { CaptchaWidgetType } from '@clerk/types';
import type { CaptchaAppearanceOptions, CaptchaWidgetType } from '@clerk/types';

import { CAPTCHA_ELEMENT_ID, CAPTCHA_INVISIBLE_CLASSNAME } from './constants';
import type { CaptchaOptions } from './types';
Expand All@@ -9,6 +9,12 @@ import type { CaptchaOptions } from './types';
// CF docs: https://developers.cloudflare.com/turnstile/get-started/client-side-rendering/#disable-implicit-rendering
const CLOUDFLARE_TURNSTILE_ORIGINAL_URL = 'https://challenges.cloudflare.com/turnstile/v0/api.js?render=explicit';

type CaptchaAttributes = {
theme?: RenderOptions['theme'];
language?: RenderOptions['language'];
size: RenderOptions['size'];
};

interface RenderOptions {
/**
* Every widget has a sitekey. This sitekey is associated with the corresponding widget configuration and is created upon the widget creation.
Expand DownExpand Up@@ -58,6 +64,24 @@ interface RenderOptions {
* @default 'always'
*/
appearance?: 'always' | 'execute' | 'interaction-only';
/**
* The widget theme. Can take the following values: light, dark, auto.
* The default is auto, which respects the user preference. This can be forced to light or dark by setting the theme accordingly.
Comment thread
anagstef marked this conversation as resolved.
* @default 'auto'
*/
theme?: CaptchaAppearanceOptions['theme'];
/**
* The widget size. Can take the following values: normal, flexible, compact.
* @default 'normal'
*/
size?: CaptchaAppearanceOptions['size'];
/**
* Language to display, must be either: auto (default) to use the language that the visitor has chosen,
* or an ISO 639-1 two-letter language code (e.g. en) or language and country code (e.g. en-US).
* Refer to the list of supported languages for more information.
* https://developers.cloudflare.com/turnstile/reference/supported-languages
*/
language?: CaptchaAppearanceOptions['language'];
/**
* A custom value that can be used to differentiate widgets under the same sitekey
* in analytics and which is returned upon validation. This can only contain up to
Expand DownExpand Up@@ -109,6 +133,14 @@ async function loadCaptchaFromCloudflareURL() {
}
}

function getCaptchaAttibutesFromElemenet(element: HTMLElement): CaptchaAttributes {
const theme = (element.getAttribute('data-cl-theme') as RenderOptions['theme']) || undefined;
const language = (element.getAttribute('data-cl-language') as RenderOptions['language']) || undefined;
const size = (element.getAttribute('data-cl-size') as RenderOptions['size']) || undefined;

return { theme, language, size };
}

/*
* How this function works:
* The widgetType is either 'invisible' or 'smart'.
Expand All@@ -125,6 +157,9 @@ export const getTurnstileToken = async (opts: CaptchaOptions) => {
let captchaToken = '';
let id = '';
let turnstileSiteKey = siteKey;
let captchaTheme: RenderOptions['theme'];
let captchaSize: RenderOptions['size'];
let captchaLanguage: RenderOptions['language'];
let retries = 0;
let widgetContainerQuerySelector: string | undefined;
// The backend uses this to determine which Turnstile site-key was used in order to verify the token
Expand All@@ -138,7 +173,13 @@ export const getTurnstileToken = async (opts: CaptchaOptions) => {
captchaWidgetType = widgetType;
widgetContainerQuerySelector = modalContainerQuerySelector;
await openModal?.();
await waitForElement(modalContainerQuerySelector);
const modalContainderEl = await waitForElement(modalContainerQuerySelector);
if (modalContainderEl) {
const { theme, language, size } = getCaptchaAttibutesFromElemenet(modalContainderEl);
captchaTheme = theme;
captchaLanguage = language;
captchaSize = size;
}
}

// smart widget with container provided by user
Expand All@@ -148,6 +189,10 @@ export const getTurnstileToken = async (opts: CaptchaOptions) => {
captchaWidgetType = 'smart';
widgetContainerQuerySelector = `#${CAPTCHA_ELEMENT_ID}`;
visibleDiv.style.maxHeight = '0'; // This is to prevent the layout shift when the render method is called
const { theme, language, size } = getCaptchaAttibutesFromElemenet(visibleDiv);
captchaTheme = theme;
captchaLanguage = language;
captchaSize = size;
} else {
console.error(
'Cannot initialize Smart CAPTCHA widget because the `clerk-captcha` DOM element was not found; falling back to Invisible CAPTCHA widget. If you are using a custom flow, visit https://clerk.com/docs/custom-flows/bot-sign-up-protection for instructions',
Expand All@@ -172,6 +217,9 @@ export const getTurnstileToken = async (opts: CaptchaOptions) => {
const id = captcha.render(widgetContainerQuerySelector, {
sitekey: turnstileSiteKey,
appearance: 'interaction-only',
theme: captchaTheme || 'auto',
Comment thread
anagstef marked this conversation as resolved.
size: captchaSize || 'normal',
language: captchaLanguage || 'auto',
action: opts.action,
retry: 'never',
'refresh-expired': 'auto',
Expand All@@ -192,7 +240,7 @@ export const getTurnstileToken = async (opts: CaptchaOptions) => {
// We set the min-height to the height of the Turnstile widget
// because the widget initially does a small layout shift
// and then expands to the correct height
visibleWidget.style.minHeight = '68px';
visibleWidget.style.minHeight = captchaSize === 'compact' ? '140px' : '68px';
visibleWidget.style.marginBottom = '1.5rem';
}
}
Expand Down
24 changes: 24 additions & 0 deletions packages/types/src/appearance.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -551,6 +551,12 @@ export type Theme = {
* Eg: `formButtonPrimary__loading: { backgroundColor: 'gray' }`
*/
elements?: Elements;
/**
* The appearance of the CAPTCHA widget.
* This will be used to style the CAPTCHA widget.
* Eg: `theme: 'dark'`
*/
captcha?: CaptchaAppearanceOptions;
};

export type Layout = {
Expand DownExpand Up@@ -632,6 +638,24 @@ export type Layout = {
unsafe_disableDevelopmentModeWarnings?: boolean;
};

export type CaptchaAppearanceOptions = {
/**
* The widget theme. Can take the following values: light, dark, auto.
* @default 'auto'
*/
theme?: 'auto' | 'light' | 'dark';
/**
* The widget size. Can take the following values: normal, flexible, compact.
* @default 'normal'
*/
size?: 'normal' | 'flexible' | 'compact';
/**
* Language to display, must be either: auto (default) to use the language that the visitor has chosen, or an ISO 639-1 two-letter language code (e.g. en) or language and country code (e.g. en-US).
* Refer to the list of supported languages for more information: https://developers.cloudflare.com/turnstile/reference/supported-languages
*/
language?: string;
};

export type SignInTheme = Theme;
export type SignUpTheme = Theme;
export type UserButtonTheme = Theme;
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
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/fluffy-hairs-thank.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
---
'@clerk/clerk-js': minor
'@clerk/types': minor
---

Introduce the `appearance.captcha` property for the CAPTCHA widget
2 changes: 1 addition & 1 deletion packages/clerk-js/bundlewatch.config.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@
"files": [
{ "path": "./dist/clerk.js", "maxSize": "560kB" },
{ "path": "./dist/clerk.browser.js", "maxSize": "75kB" },
{ "path": "./dist/clerk.headless.js", "maxSize": "48.2KB" },
{ "path": "./dist/clerk.headless.js", "maxSize": "48.3KB" },
{ "path": "./dist/ui-common*.js", "maxSize": "89KB" },
{ "path": "./dist/vendors*.js", "maxSize": "25KB" },
{ "path": "./dist/coinbase*.js", "maxSize": "35.5KB" },
Expand Down
15 changes: 13 additions & 2 deletions packages/clerk-js/src/ui/components/BlankCaptchaModal/index.tsx
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,23 @@
import { Flow } from '../../customizables';
import { Flow, useAppearance, useLocalizations } from '../../customizables';
import { Card, withCardStateProvider } from '../../elements';
import { Route, Switch } from '../../router';

const BlankCard = withCardStateProvider(() => {
const { parsedCaptcha } = useAppearance();
const { locale } = useLocalizations();
const captchaTheme = parsedCaptcha?.theme;
const captchaSize = parsedCaptcha?.size;
const captchaLanguage = parsedCaptcha?.language || locale;

return (
<Card.Root>
<Card.Content>
<div id='cl-modal-captcha-container' />
<div
id='cl-modal-captcha-container'
data-cl-theme={captchaTheme}
data-cl-size={captchaSize}
data-cl-language={captchaLanguage}
/>
</Card.Content>
</Card.Root>
);
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -380,3 +380,87 @@ describe('AppearanceProvider layout flows', () => {
expect(result.current.parsedElements[0]['alert'].backgroundColor).toBe(themeBColor);
});
});

describe('AppearanceProvider captcha', () => {
it('sets the parsedCaptcha correctly from the globalAppearance prop', () => {
const wrapper = ({ children }) => (
<AppearanceProvider
appearanceKey='signIn'
globalAppearance={{
captcha: {
theme: 'dark',
size: 'compact',
language: 'el-GR',
},
}}
>
{children}
</AppearanceProvider>
);

const { result } = renderHook(() => useAppearance(), { wrapper });
expect(result.current.parsedCaptcha.theme).toBe('dark');
expect(result.current.parsedCaptcha.size).toBe('compact');
expect(result.current.parsedCaptcha.language).toBe('el-GR');
});

it('sets the parsedCaptcha correctly from the appearance prop', () => {
const wrapper = ({ children }) => (
<AppearanceProvider
appearanceKey='signIn'
appearance={{
captcha: {
theme: 'dark',
size: 'compact',
language: 'el-GR',
},
}}
>
{children}
</AppearanceProvider>
);

const { result } = renderHook(() => useAppearance(), { wrapper });
expect(result.current.parsedCaptcha.theme).toBe('dark');
expect(result.current.parsedCaptcha.size).toBe('compact');
expect(result.current.parsedCaptcha.language).toBe('el-GR');
});

it('sets the parsedLayout correctly from the globalAppearance and appearance prop', () => {
const wrapper = ({ children }) => (
<AppearanceProvider
appearanceKey='signIn'
globalAppearance={{
captcha: {
theme: 'light',
size: 'flexible',
language: 'en-US',
},
}}
appearance={{
captcha: {
theme: 'dark',
size: 'compact',
language: 'el-GR',
},
}}
>
{children}
</AppearanceProvider>
);

const { result } = renderHook(() => useAppearance(), { wrapper });
expect(result.current.parsedCaptcha.theme).toBe('dark');
expect(result.current.parsedCaptcha.size).toBe('compact');
expect(result.current.parsedCaptcha.language).toBe('el-GR');
});

it('uses the default values when no captcha property is passed', () => {
const wrapper = ({ children }) => <AppearanceProvider appearanceKey='signIn'>{children}</AppearanceProvider>;

const { result } = renderHook(() => useAppearance(), { wrapper });
expect(result.current.parsedCaptcha.theme).toBe('auto');
expect(result.current.parsedCaptcha.size).toBe('normal');
expect(result.current.parsedCaptcha.language).toBe('');
});
});
25 changes: 22 additions & 3 deletions packages/clerk-js/src/ui/customizables/parseAppearance.ts
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
import { fastDeepMergeAndReplace } from '@clerk/shared/utils';
import type { Appearance, DeepPartial, Elements, Layout, Theme } from '@clerk/types';
import type { Appearance, CaptchaAppearanceOptions, DeepPartial, Elements, Layout, Theme } from '@clerk/types';

import { createInternalTheme, defaultInternalTheme } from '../foundations';
import { polishedAppearance } from '../polishedAppearance';
Expand All@@ -16,8 +16,12 @@ import {
export type ParsedElements = Elements[];
export type ParsedInternalTheme = InternalTheme;
export type ParsedLayout = Required<Layout>;
export type ParsedCaptcha = Required<CaptchaAppearanceOptions>;

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

export type AppearanceCascade = {
globalAppearance?: Appearance;
Expand All@@ -29,6 +33,7 @@ export type ParsedAppearance = {
parsedElements: ParsedElements;
parsedInternalTheme: ParsedInternalTheme;
parsedLayout: ParsedLayout;
parsedCaptcha: ParsedCaptcha;
};

const defaultLayout: ParsedLayout = {
Expand All@@ -46,6 +51,12 @@ const defaultLayout: ParsedLayout = {
unsafe_disableDevelopmentModeWarnings: false,
};

const defaultCaptchaOptions: ParsedCaptcha = {
theme: 'auto',
size: 'normal',
language: '',
};

/**
* Parses the public appearance object.
* It splits the resulting styles into 2 objects: parsedElements, parsedInternalTheme
Expand All@@ -63,6 +74,7 @@ export const parseAppearance = (cascade: AppearanceCascade): ParsedAppearance =>

const parsedInternalTheme = parseVariables(appearanceList);
const parsedLayout = parseLayout(appearanceList);
const parsedCaptcha = parseCaptcha(appearanceList);

if (
!appearanceList.find(a => {
Expand All@@ -83,7 +95,7 @@ export const parseAppearance = (cascade: AppearanceCascade): ParsedAppearance =>
return res;
}),
);
return { parsedElements, parsedInternalTheme, parsedLayout };
return { parsedElements, parsedInternalTheme, parsedLayout, parsedCaptcha };
};

const expand = (theme: Theme | undefined, cascade: any[]) => {
Expand All@@ -106,6 +118,13 @@ const parseLayout = (appearanceList: Appearance[]) => {
return { ...defaultLayout, ...appearanceList.reduce((acc, appearance) => ({ ...acc, ...appearance.layout }), {}) };
};

const parseCaptcha = (appearanceList: Appearance[]) => {
return {
...defaultCaptchaOptions,
...appearanceList.reduce((acc, appearance) => ({ ...acc, ...appearance.captcha }), {}),
};
};

const parseVariables = (appearances: Appearance[]) => {
const res = {} as DeepPartial<InternalTheme>;
fastDeepMergeAndReplace({ ...defaultInternalTheme }, res);
Expand Down
10 changes: 9 additions & 1 deletion packages/clerk-js/src/ui/elements/CaptchaElement.tsx
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
import { useEffect, useRef } from 'react';

import { CAPTCHA_ELEMENT_ID } from '../../utils/captcha';
import { Box } from '../customizables';
import { Box, useAppearance, useLocalizations } from '../customizables';

/**
* This component uses a MutationObserver to listen for DOM changes made by our Turnstile logic,
Expand All@@ -14,6 +14,11 @@ export const CaptchaElement = () => {
const maxHeightValueRef = useRef('0');
const minHeightValueRef = useRef('unset');
const marginBottomValueRef = useRef('unset');
const { parsedCaptcha } = useAppearance();
const { locale } = useLocalizations();
const captchaTheme = parsedCaptcha?.theme;
const captchaSize = parsedCaptcha?.size;
const captchaLanguage = parsedCaptcha?.language || locale;

useEffect(() => {
if (!elementRef.current) return;
Expand DownExpand Up@@ -48,6 +53,9 @@ export const CaptchaElement = () => {
minHeight: minHeightValueRef.current,
marginBottom: marginBottomValueRef.current,
}}
data-cl-theme={captchaTheme}
data-cl-size={captchaSize}
data-cl-language={captchaLanguage}
/>
);
};
54 changes: 51 additions & 3 deletions packages/clerk-js/src/utils/captcha/turnstile.ts
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import { waitForElement } from '@clerk/shared/dom';
import { loadScript } from '@clerk/shared/loadScript';
import type { CaptchaWidgetType } from '@clerk/types';
import type { CaptchaAppearanceOptions, CaptchaWidgetType } from '@clerk/types';

import { CAPTCHA_ELEMENT_ID, CAPTCHA_INVISIBLE_CLASSNAME } from './constants';
import type { CaptchaOptions } from './types';
Expand All@@ -9,6 +9,12 @@ import type { CaptchaOptions } from './types';
// CF docs: https://developers.cloudflare.com/turnstile/get-started/client-side-rendering/#disable-implicit-rendering
const CLOUDFLARE_TURNSTILE_ORIGINAL_URL = 'https://challenges.cloudflare.com/turnstile/v0/api.js?render=explicit';

type CaptchaAttributes = {
theme?: RenderOptions['theme'];
language?: RenderOptions['language'];
size: RenderOptions['size'];
};

interface RenderOptions {
/**
* Every widget has a sitekey. This sitekey is associated with the corresponding widget configuration and is created upon the widget creation.
Expand DownExpand Up@@ -58,6 +64,24 @@ interface RenderOptions {
* @default 'always'
*/
appearance?: 'always' | 'execute' | 'interaction-only';
/**
* The widget theme. Can take the following values: light, dark, auto.
* The default is auto, which respects the user preference. This can be forced to light or dark by setting the theme accordingly.
Comment thread
anagstef marked this conversation as resolved.
* @default 'auto'
*/
theme?: CaptchaAppearanceOptions['theme'];
/**
* The widget size. Can take the following values: normal, flexible, compact.
* @default 'normal'
*/
size?: CaptchaAppearanceOptions['size'];
/**
* Language to display, must be either: auto (default) to use the language that the visitor has chosen,
* or an ISO 639-1 two-letter language code (e.g. en) or language and country code (e.g. en-US).
* Refer to the list of supported languages for more information.
* https://developers.cloudflare.com/turnstile/reference/supported-languages
*/
language?: CaptchaAppearanceOptions['language'];
/**
* A custom value that can be used to differentiate widgets under the same sitekey
* in analytics and which is returned upon validation. This can only contain up to
Expand DownExpand Up@@ -109,6 +133,14 @@ async function loadCaptchaFromCloudflareURL() {
}
}

function getCaptchaAttibutesFromElemenet(element: HTMLElement): CaptchaAttributes {
const theme = (element.getAttribute('data-cl-theme') as RenderOptions['theme']) || undefined;
const language = (element.getAttribute('data-cl-language') as RenderOptions['language']) || undefined;
const size = (element.getAttribute('data-cl-size') as RenderOptions['size']) || undefined;

return { theme, language, size };
}

/*
* How this function works:
* The widgetType is either 'invisible' or 'smart'.
Expand All@@ -125,6 +157,9 @@ export const getTurnstileToken = async (opts: CaptchaOptions) => {
let captchaToken = '';
let id = '';
let turnstileSiteKey = siteKey;
let captchaTheme: RenderOptions['theme'];
let captchaSize: RenderOptions['size'];
let captchaLanguage: RenderOptions['language'];
let retries = 0;
let widgetContainerQuerySelector: string | undefined;
// The backend uses this to determine which Turnstile site-key was used in order to verify the token
Expand All@@ -138,7 +173,13 @@ export const getTurnstileToken = async (opts: CaptchaOptions) => {
captchaWidgetType = widgetType;
widgetContainerQuerySelector = modalContainerQuerySelector;
await openModal?.();
await waitForElement(modalContainerQuerySelector);
const modalContainderEl = await waitForElement(modalContainerQuerySelector);
if (modalContainderEl) {
const { theme, language, size } = getCaptchaAttibutesFromElemenet(modalContainderEl);
captchaTheme = theme;
captchaLanguage = language;
captchaSize = size;
}
}

// smart widget with container provided by user
Expand All@@ -148,6 +189,10 @@ export const getTurnstileToken = async (opts: CaptchaOptions) => {
captchaWidgetType = 'smart';
widgetContainerQuerySelector = `#${CAPTCHA_ELEMENT_ID}`;
visibleDiv.style.maxHeight = '0'; // This is to prevent the layout shift when the render method is called
const { theme, language, size } = getCaptchaAttibutesFromElemenet(visibleDiv);
captchaTheme = theme;
captchaLanguage = language;
captchaSize = size;
} else {
console.error(
'Cannot initialize Smart CAPTCHA widget because the `clerk-captcha` DOM element was not found; falling back to Invisible CAPTCHA widget. If you are using a custom flow, visit https://clerk.com/docs/custom-flows/bot-sign-up-protection for instructions',
Expand All@@ -172,6 +217,9 @@ export const getTurnstileToken = async (opts: CaptchaOptions) => {
const id = captcha.render(widgetContainerQuerySelector, {
sitekey: turnstileSiteKey,
appearance: 'interaction-only',
theme: captchaTheme || 'auto',
Comment thread
anagstef marked this conversation as resolved.
size: captchaSize || 'normal',
language: captchaLanguage || 'auto',
action: opts.action,
retry: 'never',
'refresh-expired': 'auto',
Expand All@@ -192,7 +240,7 @@ export const getTurnstileToken = async (opts: CaptchaOptions) => {
// We set the min-height to the height of the Turnstile widget
// because the widget initially does a small layout shift
// and then expands to the correct height
visibleWidget.style.minHeight = '68px';
visibleWidget.style.minHeight = captchaSize === 'compact' ? '140px' : '68px';
visibleWidget.style.marginBottom = '1.5rem';
}
}
Expand Down
24 changes: 24 additions & 0 deletions packages/types/src/appearance.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -551,6 +551,12 @@ export type Theme = {
* Eg: `formButtonPrimary__loading: { backgroundColor: 'gray' }`
*/
elements?: Elements;
/**
* The appearance of the CAPTCHA widget.
* This will be used to style the CAPTCHA widget.
* Eg: `theme: 'dark'`
*/
captcha?: CaptchaAppearanceOptions;
};

export type Layout = {
Expand DownExpand Up@@ -632,6 +638,24 @@ export type Layout = {
unsafe_disableDevelopmentModeWarnings?: boolean;
};

export type CaptchaAppearanceOptions = {
/**
* The widget theme. Can take the following values: light, dark, auto.
* @default 'auto'
*/
theme?: 'auto' | 'light' | 'dark';
/**
* The widget size. Can take the following values: normal, flexible, compact.
* @default 'normal'
*/
size?: 'normal' | 'flexible' | 'compact';
/**
* Language to display, must be either: auto (default) to use the language that the visitor has chosen, or an ISO 639-1 two-letter language code (e.g. en) or language and country code (e.g. en-US).
* Refer to the list of supported languages for more information: https://developers.cloudflare.com/turnstile/reference/supported-languages
*/
language?: string;
};

export type SignInTheme = Theme;
export type SignUpTheme = Theme;
export type UserButtonTheme = Theme;
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
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/fluffy-hairs-thank.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
---
'@clerk/clerk-js': minor
'@clerk/types': minor
---

Introduce the `appearance.captcha` property for the CAPTCHA widget
2 changes: 1 addition & 1 deletion packages/clerk-js/bundlewatch.config.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@
"files": [
{ "path": "./dist/clerk.js", "maxSize": "560kB" },
{ "path": "./dist/clerk.browser.js", "maxSize": "75kB" },
{ "path": "./dist/clerk.headless.js", "maxSize": "48.2KB" },
{ "path": "./dist/clerk.headless.js", "maxSize": "48.3KB" },
{ "path": "./dist/ui-common*.js", "maxSize": "89KB" },
{ "path": "./dist/vendors*.js", "maxSize": "25KB" },
{ "path": "./dist/coinbase*.js", "maxSize": "35.5KB" },
Expand Down
15 changes: 13 additions & 2 deletions packages/clerk-js/src/ui/components/BlankCaptchaModal/index.tsx
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,23 @@
import { Flow } from '../../customizables';
import { Flow, useAppearance, useLocalizations } from '../../customizables';
import { Card, withCardStateProvider } from '../../elements';
import { Route, Switch } from '../../router';

const BlankCard = withCardStateProvider(() => {
const { parsedCaptcha } = useAppearance();
const { locale } = useLocalizations();
const captchaTheme = parsedCaptcha?.theme;
const captchaSize = parsedCaptcha?.size;
const captchaLanguage = parsedCaptcha?.language || locale;

return (
<Card.Root>
<Card.Content>
<div id='cl-modal-captcha-container' />
<div
id='cl-modal-captcha-container'
data-cl-theme={captchaTheme}
data-cl-size={captchaSize}
data-cl-language={captchaLanguage}
/>
</Card.Content>
</Card.Root>
);
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -380,3 +380,87 @@ describe('AppearanceProvider layout flows', () => {
expect(result.current.parsedElements[0]['alert'].backgroundColor).toBe(themeBColor);
});
});

describe('AppearanceProvider captcha', () => {
it('sets the parsedCaptcha correctly from the globalAppearance prop', () => {
const wrapper = ({ children }) => (
<AppearanceProvider
appearanceKey='signIn'
globalAppearance={{
captcha: {
theme: 'dark',
size: 'compact',
language: 'el-GR',
},
}}
>
{children}
</AppearanceProvider>
);

const { result } = renderHook(() => useAppearance(), { wrapper });
expect(result.current.parsedCaptcha.theme).toBe('dark');
expect(result.current.parsedCaptcha.size).toBe('compact');
expect(result.current.parsedCaptcha.language).toBe('el-GR');
});

it('sets the parsedCaptcha correctly from the appearance prop', () => {
const wrapper = ({ children }) => (
<AppearanceProvider
appearanceKey='signIn'
appearance={{
captcha: {
theme: 'dark',
size: 'compact',
language: 'el-GR',
},
}}
>
{children}
</AppearanceProvider>
);

const { result } = renderHook(() => useAppearance(), { wrapper });
expect(result.current.parsedCaptcha.theme).toBe('dark');
expect(result.current.parsedCaptcha.size).toBe('compact');
expect(result.current.parsedCaptcha.language).toBe('el-GR');
});

it('sets the parsedLayout correctly from the globalAppearance and appearance prop', () => {
const wrapper = ({ children }) => (
<AppearanceProvider
appearanceKey='signIn'
globalAppearance={{
captcha: {
theme: 'light',
size: 'flexible',
language: 'en-US',
},
}}
appearance={{
captcha: {
theme: 'dark',
size: 'compact',
language: 'el-GR',
},
}}
>
{children}
</AppearanceProvider>
);

const { result } = renderHook(() => useAppearance(), { wrapper });
expect(result.current.parsedCaptcha.theme).toBe('dark');
expect(result.current.parsedCaptcha.size).toBe('compact');
expect(result.current.parsedCaptcha.language).toBe('el-GR');
});

it('uses the default values when no captcha property is passed', () => {
const wrapper = ({ children }) => <AppearanceProvider appearanceKey='signIn'>{children}</AppearanceProvider>;

const { result } = renderHook(() => useAppearance(), { wrapper });
expect(result.current.parsedCaptcha.theme).toBe('auto');
expect(result.current.parsedCaptcha.size).toBe('normal');
expect(result.current.parsedCaptcha.language).toBe('');
});
});
25 changes: 22 additions & 3 deletions packages/clerk-js/src/ui/customizables/parseAppearance.ts
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
import { fastDeepMergeAndReplace } from '@clerk/shared/utils';
import type { Appearance, DeepPartial, Elements, Layout, Theme } from '@clerk/types';
import type { Appearance, CaptchaAppearanceOptions, DeepPartial, Elements, Layout, Theme } from '@clerk/types';

import { createInternalTheme, defaultInternalTheme } from '../foundations';
import { polishedAppearance } from '../polishedAppearance';
Expand All@@ -16,8 +16,12 @@ import {
export type ParsedElements = Elements[];
export type ParsedInternalTheme = InternalTheme;
export type ParsedLayout = Required<Layout>;
export type ParsedCaptcha = Required<CaptchaAppearanceOptions>;

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

export type AppearanceCascade = {
globalAppearance?: Appearance;
Expand All@@ -29,6 +33,7 @@ export type ParsedAppearance = {
parsedElements: ParsedElements;
parsedInternalTheme: ParsedInternalTheme;
parsedLayout: ParsedLayout;
parsedCaptcha: ParsedCaptcha;
};

const defaultLayout: ParsedLayout = {
Expand All@@ -46,6 +51,12 @@ const defaultLayout: ParsedLayout = {
unsafe_disableDevelopmentModeWarnings: false,
};

const defaultCaptchaOptions: ParsedCaptcha = {
theme: 'auto',
size: 'normal',
language: '',
};

/**
* Parses the public appearance object.
* It splits the resulting styles into 2 objects: parsedElements, parsedInternalTheme
Expand All@@ -63,6 +74,7 @@ export const parseAppearance = (cascade: AppearanceCascade): ParsedAppearance =>

const parsedInternalTheme = parseVariables(appearanceList);
const parsedLayout = parseLayout(appearanceList);
const parsedCaptcha = parseCaptcha(appearanceList);

if (
!appearanceList.find(a => {
Expand All@@ -83,7 +95,7 @@ export const parseAppearance = (cascade: AppearanceCascade): ParsedAppearance =>
return res;
}),
);
return { parsedElements, parsedInternalTheme, parsedLayout };
return { parsedElements, parsedInternalTheme, parsedLayout, parsedCaptcha };
};

const expand = (theme: Theme | undefined, cascade: any[]) => {
Expand All@@ -106,6 +118,13 @@ const parseLayout = (appearanceList: Appearance[]) => {
return { ...defaultLayout, ...appearanceList.reduce((acc, appearance) => ({ ...acc, ...appearance.layout }), {}) };
};

const parseCaptcha = (appearanceList: Appearance[]) => {
return {
...defaultCaptchaOptions,
...appearanceList.reduce((acc, appearance) => ({ ...acc, ...appearance.captcha }), {}),
};
};

const parseVariables = (appearances: Appearance[]) => {
const res = {} as DeepPartial<InternalTheme>;
fastDeepMergeAndReplace({ ...defaultInternalTheme }, res);
Expand Down
10 changes: 9 additions & 1 deletion packages/clerk-js/src/ui/elements/CaptchaElement.tsx
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
import { useEffect, useRef } from 'react';

import { CAPTCHA_ELEMENT_ID } from '../../utils/captcha';
import { Box } from '../customizables';
import { Box, useAppearance, useLocalizations } from '../customizables';

/**
* This component uses a MutationObserver to listen for DOM changes made by our Turnstile logic,
Expand All@@ -14,6 +14,11 @@ export const CaptchaElement = () => {
const maxHeightValueRef = useRef('0');
const minHeightValueRef = useRef('unset');
const marginBottomValueRef = useRef('unset');
const { parsedCaptcha } = useAppearance();
const { locale } = useLocalizations();
const captchaTheme = parsedCaptcha?.theme;
const captchaSize = parsedCaptcha?.size;
const captchaLanguage = parsedCaptcha?.language || locale;

useEffect(() => {
if (!elementRef.current) return;
Expand DownExpand Up@@ -48,6 +53,9 @@ export const CaptchaElement = () => {
minHeight: minHeightValueRef.current,
marginBottom: marginBottomValueRef.current,
}}
data-cl-theme={captchaTheme}
data-cl-size={captchaSize}
data-cl-language={captchaLanguage}
/>
);
};
54 changes: 51 additions & 3 deletions packages/clerk-js/src/utils/captcha/turnstile.ts
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import { waitForElement } from '@clerk/shared/dom';
import { loadScript } from '@clerk/shared/loadScript';
import type { CaptchaWidgetType } from '@clerk/types';
import type { CaptchaAppearanceOptions, CaptchaWidgetType } from '@clerk/types';

import { CAPTCHA_ELEMENT_ID, CAPTCHA_INVISIBLE_CLASSNAME } from './constants';
import type { CaptchaOptions } from './types';
Expand All@@ -9,6 +9,12 @@ import type { CaptchaOptions } from './types';
// CF docs: https://developers.cloudflare.com/turnstile/get-started/client-side-rendering/#disable-implicit-rendering
const CLOUDFLARE_TURNSTILE_ORIGINAL_URL = 'https://challenges.cloudflare.com/turnstile/v0/api.js?render=explicit';

type CaptchaAttributes = {
theme?: RenderOptions['theme'];
language?: RenderOptions['language'];
size: RenderOptions['size'];
};

interface RenderOptions {
/**
* Every widget has a sitekey. This sitekey is associated with the corresponding widget configuration and is created upon the widget creation.
Expand DownExpand Up@@ -58,6 +64,24 @@ interface RenderOptions {
* @default 'always'
*/
appearance?: 'always' | 'execute' | 'interaction-only';
/**
* The widget theme. Can take the following values: light, dark, auto.
* The default is auto, which respects the user preference. This can be forced to light or dark by setting the theme accordingly.
Comment thread
anagstef marked this conversation as resolved.
* @default 'auto'
*/
theme?: CaptchaAppearanceOptions['theme'];
/**
* The widget size. Can take the following values: normal, flexible, compact.
* @default 'normal'
*/
size?: CaptchaAppearanceOptions['size'];
/**
* Language to display, must be either: auto (default) to use the language that the visitor has chosen,
* or an ISO 639-1 two-letter language code (e.g. en) or language and country code (e.g. en-US).
* Refer to the list of supported languages for more information.
* https://developers.cloudflare.com/turnstile/reference/supported-languages
*/
language?: CaptchaAppearanceOptions['language'];
/**
* A custom value that can be used to differentiate widgets under the same sitekey
* in analytics and which is returned upon validation. This can only contain up to
Expand DownExpand Up@@ -109,6 +133,14 @@ async function loadCaptchaFromCloudflareURL() {
}
}

function getCaptchaAttibutesFromElemenet(element: HTMLElement): CaptchaAttributes {
const theme = (element.getAttribute('data-cl-theme') as RenderOptions['theme']) || undefined;
const language = (element.getAttribute('data-cl-language') as RenderOptions['language']) || undefined;
const size = (element.getAttribute('data-cl-size') as RenderOptions['size']) || undefined;

return { theme, language, size };
}

/*
* How this function works:
* The widgetType is either 'invisible' or 'smart'.
Expand All@@ -125,6 +157,9 @@ export const getTurnstileToken = async (opts: CaptchaOptions) => {
let captchaToken = '';
let id = '';
let turnstileSiteKey = siteKey;
let captchaTheme: RenderOptions['theme'];
let captchaSize: RenderOptions['size'];
let captchaLanguage: RenderOptions['language'];
let retries = 0;
let widgetContainerQuerySelector: string | undefined;
// The backend uses this to determine which Turnstile site-key was used in order to verify the token
Expand All@@ -138,7 +173,13 @@ export const getTurnstileToken = async (opts: CaptchaOptions) => {
captchaWidgetType = widgetType;
widgetContainerQuerySelector = modalContainerQuerySelector;
await openModal?.();
await waitForElement(modalContainerQuerySelector);
const modalContainderEl = await waitForElement(modalContainerQuerySelector);
if (modalContainderEl) {
const { theme, language, size } = getCaptchaAttibutesFromElemenet(modalContainderEl);
captchaTheme = theme;
captchaLanguage = language;
captchaSize = size;
}
}

// smart widget with container provided by user
Expand All@@ -148,6 +189,10 @@ export const getTurnstileToken = async (opts: CaptchaOptions) => {
captchaWidgetType = 'smart';
widgetContainerQuerySelector = `#${CAPTCHA_ELEMENT_ID}`;
visibleDiv.style.maxHeight = '0'; // This is to prevent the layout shift when the render method is called
const { theme, language, size } = getCaptchaAttibutesFromElemenet(visibleDiv);
captchaTheme = theme;
captchaLanguage = language;
captchaSize = size;
} else {
console.error(
'Cannot initialize Smart CAPTCHA widget because the `clerk-captcha` DOM element was not found; falling back to Invisible CAPTCHA widget. If you are using a custom flow, visit https://clerk.com/docs/custom-flows/bot-sign-up-protection for instructions',
Expand All@@ -172,6 +217,9 @@ export const getTurnstileToken = async (opts: CaptchaOptions) => {
const id = captcha.render(widgetContainerQuerySelector, {
sitekey: turnstileSiteKey,
appearance: 'interaction-only',
theme: captchaTheme || 'auto',
Comment thread
anagstef marked this conversation as resolved.
size: captchaSize || 'normal',
language: captchaLanguage || 'auto',
action: opts.action,
retry: 'never',
'refresh-expired': 'auto',
Expand All@@ -192,7 +240,7 @@ export const getTurnstileToken = async (opts: CaptchaOptions) => {
// We set the min-height to the height of the Turnstile widget
// because the widget initially does a small layout shift
// and then expands to the correct height
visibleWidget.style.minHeight = '68px';
visibleWidget.style.minHeight = captchaSize === 'compact' ? '140px' : '68px';
visibleWidget.style.marginBottom = '1.5rem';
}
}
Expand Down
24 changes: 24 additions & 0 deletions packages/types/src/appearance.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -551,6 +551,12 @@ export type Theme = {
* Eg: `formButtonPrimary__loading: { backgroundColor: 'gray' }`
*/
elements?: Elements;
/**
* The appearance of the CAPTCHA widget.
* This will be used to style the CAPTCHA widget.
* Eg: `theme: 'dark'`
*/
captcha?: CaptchaAppearanceOptions;
};

export type Layout = {
Expand DownExpand Up@@ -632,6 +638,24 @@ export type Layout = {
unsafe_disableDevelopmentModeWarnings?: boolean;
};

export type CaptchaAppearanceOptions = {
/**
* The widget theme. Can take the following values: light, dark, auto.
* @default 'auto'
*/
theme?: 'auto' | 'light' | 'dark';
/**
* The widget size. Can take the following values: normal, flexible, compact.
* @default 'normal'
*/
size?: 'normal' | 'flexible' | 'compact';
/**
* Language to display, must be either: auto (default) to use the language that the visitor has chosen, or an ISO 639-1 two-letter language code (e.g. en) or language and country code (e.g. en-US).
* Refer to the list of supported languages for more information: https://developers.cloudflare.com/turnstile/reference/supported-languages
*/
language?: string;
};

export type SignInTheme = Theme;
export type SignUpTheme = Theme;
export type UserButtonTheme = Theme;
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
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/fluffy-hairs-thank.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
---
'@clerk/clerk-js': minor
'@clerk/types': minor
---

Introduce the `appearance.captcha` property for the CAPTCHA widget
2 changes: 1 addition & 1 deletion packages/clerk-js/bundlewatch.config.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@
"files": [
{ "path": "./dist/clerk.js", "maxSize": "560kB" },
{ "path": "./dist/clerk.browser.js", "maxSize": "75kB" },
{ "path": "./dist/clerk.headless.js", "maxSize": "48.2KB" },
{ "path": "./dist/clerk.headless.js", "maxSize": "48.3KB" },
{ "path": "./dist/ui-common*.js", "maxSize": "89KB" },
{ "path": "./dist/vendors*.js", "maxSize": "25KB" },
{ "path": "./dist/coinbase*.js", "maxSize": "35.5KB" },
Expand Down
15 changes: 13 additions & 2 deletions packages/clerk-js/src/ui/components/BlankCaptchaModal/index.tsx
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,23 @@
import { Flow } from '../../customizables';
import { Flow, useAppearance, useLocalizations } from '../../customizables';
import { Card, withCardStateProvider } from '../../elements';
import { Route, Switch } from '../../router';

const BlankCard = withCardStateProvider(() => {
const { parsedCaptcha } = useAppearance();
const { locale } = useLocalizations();
const captchaTheme = parsedCaptcha?.theme;
const captchaSize = parsedCaptcha?.size;
const captchaLanguage = parsedCaptcha?.language || locale;

return (
<Card.Root>
<Card.Content>
<div id='cl-modal-captcha-container' />
<div
id='cl-modal-captcha-container'
data-cl-theme={captchaTheme}
data-cl-size={captchaSize}
data-cl-language={captchaLanguage}
/>
</Card.Content>
</Card.Root>
);
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -380,3 +380,87 @@ describe('AppearanceProvider layout flows', () => {
expect(result.current.parsedElements[0]['alert'].backgroundColor).toBe(themeBColor);
});
});

describe('AppearanceProvider captcha', () => {
it('sets the parsedCaptcha correctly from the globalAppearance prop', () => {
const wrapper = ({ children }) => (
<AppearanceProvider
appearanceKey='signIn'
globalAppearance={{
captcha: {
theme: 'dark',
size: 'compact',
language: 'el-GR',
},
}}
>
{children}
</AppearanceProvider>
);

const { result } = renderHook(() => useAppearance(), { wrapper });
expect(result.current.parsedCaptcha.theme).toBe('dark');
expect(result.current.parsedCaptcha.size).toBe('compact');
expect(result.current.parsedCaptcha.language).toBe('el-GR');
});

it('sets the parsedCaptcha correctly from the appearance prop', () => {
const wrapper = ({ children }) => (
<AppearanceProvider
appearanceKey='signIn'
appearance={{
captcha: {
theme: 'dark',
size: 'compact',
language: 'el-GR',
},
}}
>
{children}
</AppearanceProvider>
);

const { result } = renderHook(() => useAppearance(), { wrapper });
expect(result.current.parsedCaptcha.theme).toBe('dark');
expect(result.current.parsedCaptcha.size).toBe('compact');
expect(result.current.parsedCaptcha.language).toBe('el-GR');
});

it('sets the parsedLayout correctly from the globalAppearance and appearance prop', () => {
const wrapper = ({ children }) => (
<AppearanceProvider
appearanceKey='signIn'
globalAppearance={{
captcha: {
theme: 'light',
size: 'flexible',
language: 'en-US',
},
}}
appearance={{
captcha: {
theme: 'dark',
size: 'compact',
language: 'el-GR',
},
}}
>
{children}
</AppearanceProvider>
);

const { result } = renderHook(() => useAppearance(), { wrapper });
expect(result.current.parsedCaptcha.theme).toBe('dark');
expect(result.current.parsedCaptcha.size).toBe('compact');
expect(result.current.parsedCaptcha.language).toBe('el-GR');
});

it('uses the default values when no captcha property is passed', () => {
const wrapper = ({ children }) => <AppearanceProvider appearanceKey='signIn'>{children}</AppearanceProvider>;

const { result } = renderHook(() => useAppearance(), { wrapper });
expect(result.current.parsedCaptcha.theme).toBe('auto');
expect(result.current.parsedCaptcha.size).toBe('normal');
expect(result.current.parsedCaptcha.language).toBe('');
});
});
25 changes: 22 additions & 3 deletions packages/clerk-js/src/ui/customizables/parseAppearance.ts
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
import { fastDeepMergeAndReplace } from '@clerk/shared/utils';
import type { Appearance, DeepPartial, Elements, Layout, Theme } from '@clerk/types';
import type { Appearance, CaptchaAppearanceOptions, DeepPartial, Elements, Layout, Theme } from '@clerk/types';

import { createInternalTheme, defaultInternalTheme } from '../foundations';
import { polishedAppearance } from '../polishedAppearance';
Expand All@@ -16,8 +16,12 @@ import {
export type ParsedElements = Elements[];
export type ParsedInternalTheme = InternalTheme;
export type ParsedLayout = Required<Layout>;
export type ParsedCaptcha = Required<CaptchaAppearanceOptions>;

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

export type AppearanceCascade = {
globalAppearance?: Appearance;
Expand All@@ -29,6 +33,7 @@ export type ParsedAppearance = {
parsedElements: ParsedElements;
parsedInternalTheme: ParsedInternalTheme;
parsedLayout: ParsedLayout;
parsedCaptcha: ParsedCaptcha;
};

const defaultLayout: ParsedLayout = {
Expand All@@ -46,6 +51,12 @@ const defaultLayout: ParsedLayout = {
unsafe_disableDevelopmentModeWarnings: false,
};

const defaultCaptchaOptions: ParsedCaptcha = {
theme: 'auto',
size: 'normal',
language: '',
};

/**
* Parses the public appearance object.
* It splits the resulting styles into 2 objects: parsedElements, parsedInternalTheme
Expand All@@ -63,6 +74,7 @@ export const parseAppearance = (cascade: AppearanceCascade): ParsedAppearance =>

const parsedInternalTheme = parseVariables(appearanceList);
const parsedLayout = parseLayout(appearanceList);
const parsedCaptcha = parseCaptcha(appearanceList);

if (
!appearanceList.find(a => {
Expand All@@ -83,7 +95,7 @@ export const parseAppearance = (cascade: AppearanceCascade): ParsedAppearance =>
return res;
}),
);
return { parsedElements, parsedInternalTheme, parsedLayout };
return { parsedElements, parsedInternalTheme, parsedLayout, parsedCaptcha };
};

const expand = (theme: Theme | undefined, cascade: any[]) => {
Expand All@@ -106,6 +118,13 @@ const parseLayout = (appearanceList: Appearance[]) => {
return { ...defaultLayout, ...appearanceList.reduce((acc, appearance) => ({ ...acc, ...appearance.layout }), {}) };
};

const parseCaptcha = (appearanceList: Appearance[]) => {
return {
...defaultCaptchaOptions,
...appearanceList.reduce((acc, appearance) => ({ ...acc, ...appearance.captcha }), {}),
};
};

const parseVariables = (appearances: Appearance[]) => {
const res = {} as DeepPartial<InternalTheme>;
fastDeepMergeAndReplace({ ...defaultInternalTheme }, res);
Expand Down
10 changes: 9 additions & 1 deletion packages/clerk-js/src/ui/elements/CaptchaElement.tsx
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
import { useEffect, useRef } from 'react';

import { CAPTCHA_ELEMENT_ID } from '../../utils/captcha';
import { Box } from '../customizables';
import { Box, useAppearance, useLocalizations } from '../customizables';

/**
* This component uses a MutationObserver to listen for DOM changes made by our Turnstile logic,
Expand All@@ -14,6 +14,11 @@ export const CaptchaElement = () => {
const maxHeightValueRef = useRef('0');
const minHeightValueRef = useRef('unset');
const marginBottomValueRef = useRef('unset');
const { parsedCaptcha } = useAppearance();
const { locale } = useLocalizations();
const captchaTheme = parsedCaptcha?.theme;
const captchaSize = parsedCaptcha?.size;
const captchaLanguage = parsedCaptcha?.language || locale;

useEffect(() => {
if (!elementRef.current) return;
Expand DownExpand Up@@ -48,6 +53,9 @@ export const CaptchaElement = () => {
minHeight: minHeightValueRef.current,
marginBottom: marginBottomValueRef.current,
}}
data-cl-theme={captchaTheme}
data-cl-size={captchaSize}
data-cl-language={captchaLanguage}
/>
);
};
54 changes: 51 additions & 3 deletions packages/clerk-js/src/utils/captcha/turnstile.ts
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import { waitForElement } from '@clerk/shared/dom';
import { loadScript } from '@clerk/shared/loadScript';
import type { CaptchaWidgetType } from '@clerk/types';
import type { CaptchaAppearanceOptions, CaptchaWidgetType } from '@clerk/types';

import { CAPTCHA_ELEMENT_ID, CAPTCHA_INVISIBLE_CLASSNAME } from './constants';
import type { CaptchaOptions } from './types';
Expand All@@ -9,6 +9,12 @@ import type { CaptchaOptions } from './types';
// CF docs: https://developers.cloudflare.com/turnstile/get-started/client-side-rendering/#disable-implicit-rendering
const CLOUDFLARE_TURNSTILE_ORIGINAL_URL = 'https://challenges.cloudflare.com/turnstile/v0/api.js?render=explicit';

type CaptchaAttributes = {
theme?: RenderOptions['theme'];
language?: RenderOptions['language'];
size: RenderOptions['size'];
};

interface RenderOptions {
/**
* Every widget has a sitekey. This sitekey is associated with the corresponding widget configuration and is created upon the widget creation.
Expand DownExpand Up@@ -58,6 +64,24 @@ interface RenderOptions {
* @default 'always'
*/
appearance?: 'always' | 'execute' | 'interaction-only';
/**
* The widget theme. Can take the following values: light, dark, auto.
* The default is auto, which respects the user preference. This can be forced to light or dark by setting the theme accordingly.
Comment thread
anagstef marked this conversation as resolved.
* @default 'auto'
*/
theme?: CaptchaAppearanceOptions['theme'];
/**
* The widget size. Can take the following values: normal, flexible, compact.
* @default 'normal'
*/
size?: CaptchaAppearanceOptions['size'];
/**
* Language to display, must be either: auto (default) to use the language that the visitor has chosen,
* or an ISO 639-1 two-letter language code (e.g. en) or language and country code (e.g. en-US).
* Refer to the list of supported languages for more information.
* https://developers.cloudflare.com/turnstile/reference/supported-languages
*/
language?: CaptchaAppearanceOptions['language'];
/**
* A custom value that can be used to differentiate widgets under the same sitekey
* in analytics and which is returned upon validation. This can only contain up to
Expand DownExpand Up@@ -109,6 +133,14 @@ async function loadCaptchaFromCloudflareURL() {
}
}

function getCaptchaAttibutesFromElemenet(element: HTMLElement): CaptchaAttributes {
const theme = (element.getAttribute('data-cl-theme') as RenderOptions['theme']) || undefined;
const language = (element.getAttribute('data-cl-language') as RenderOptions['language']) || undefined;
const size = (element.getAttribute('data-cl-size') as RenderOptions['size']) || undefined;

return { theme, language, size };
}

/*
* How this function works:
* The widgetType is either 'invisible' or 'smart'.
Expand All@@ -125,6 +157,9 @@ export const getTurnstileToken = async (opts: CaptchaOptions) => {
let captchaToken = '';
let id = '';
let turnstileSiteKey = siteKey;
let captchaTheme: RenderOptions['theme'];
let captchaSize: RenderOptions['size'];
let captchaLanguage: RenderOptions['language'];
let retries = 0;
let widgetContainerQuerySelector: string | undefined;
// The backend uses this to determine which Turnstile site-key was used in order to verify the token
Expand All@@ -138,7 +173,13 @@ export const getTurnstileToken = async (opts: CaptchaOptions) => {
captchaWidgetType = widgetType;
widgetContainerQuerySelector = modalContainerQuerySelector;
await openModal?.();
await waitForElement(modalContainerQuerySelector);
const modalContainderEl = await waitForElement(modalContainerQuerySelector);
if (modalContainderEl) {
const { theme, language, size } = getCaptchaAttibutesFromElemenet(modalContainderEl);
captchaTheme = theme;
captchaLanguage = language;
captchaSize = size;
}
}

// smart widget with container provided by user
Expand All@@ -148,6 +189,10 @@ export const getTurnstileToken = async (opts: CaptchaOptions) => {
captchaWidgetType = 'smart';
widgetContainerQuerySelector = `#${CAPTCHA_ELEMENT_ID}`;
visibleDiv.style.maxHeight = '0'; // This is to prevent the layout shift when the render method is called
const { theme, language, size } = getCaptchaAttibutesFromElemenet(visibleDiv);
captchaTheme = theme;
captchaLanguage = language;
captchaSize = size;
} else {
console.error(
'Cannot initialize Smart CAPTCHA widget because the `clerk-captcha` DOM element was not found; falling back to Invisible CAPTCHA widget. If you are using a custom flow, visit https://clerk.com/docs/custom-flows/bot-sign-up-protection for instructions',
Expand All@@ -172,6 +217,9 @@ export const getTurnstileToken = async (opts: CaptchaOptions) => {
const id = captcha.render(widgetContainerQuerySelector, {
sitekey: turnstileSiteKey,
appearance: 'interaction-only',
theme: captchaTheme || 'auto',
Comment thread
anagstef marked this conversation as resolved.
size: captchaSize || 'normal',
language: captchaLanguage || 'auto',
action: opts.action,
retry: 'never',
'refresh-expired': 'auto',
Expand All@@ -192,7 +240,7 @@ export const getTurnstileToken = async (opts: CaptchaOptions) => {
// We set the min-height to the height of the Turnstile widget
// because the widget initially does a small layout shift
// and then expands to the correct height
visibleWidget.style.minHeight = '68px';
visibleWidget.style.minHeight = captchaSize === 'compact' ? '140px' : '68px';
visibleWidget.style.marginBottom = '1.5rem';
}
}
Expand Down
24 changes: 24 additions & 0 deletions packages/types/src/appearance.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -551,6 +551,12 @@ export type Theme = {
* Eg: `formButtonPrimary__loading: { backgroundColor: 'gray' }`
*/
elements?: Elements;
/**
* The appearance of the CAPTCHA widget.
* This will be used to style the CAPTCHA widget.
* Eg: `theme: 'dark'`
*/
captcha?: CaptchaAppearanceOptions;
};

export type Layout = {
Expand DownExpand Up@@ -632,6 +638,24 @@ export type Layout = {
unsafe_disableDevelopmentModeWarnings?: boolean;
};

export type CaptchaAppearanceOptions = {
/**
* The widget theme. Can take the following values: light, dark, auto.
* @default 'auto'
*/
theme?: 'auto' | 'light' | 'dark';
/**
* The widget size. Can take the following values: normal, flexible, compact.
* @default 'normal'
*/
size?: 'normal' | 'flexible' | 'compact';
/**
* Language to display, must be either: auto (default) to use the language that the visitor has chosen, or an ISO 639-1 two-letter language code (e.g. en) or language and country code (e.g. en-US).
* Refer to the list of supported languages for more information: https://developers.cloudflare.com/turnstile/reference/supported-languages
*/
language?: string;
};

export type SignInTheme = Theme;
export type SignUpTheme = Theme;
export type UserButtonTheme = Theme;
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
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/fluffy-hairs-thank.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
---
'@clerk/clerk-js': minor
'@clerk/types': minor
---

Introduce the `appearance.captcha` property for the CAPTCHA widget
2 changes: 1 addition & 1 deletion packages/clerk-js/bundlewatch.config.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@
"files": [
{ "path": "./dist/clerk.js", "maxSize": "560kB" },
{ "path": "./dist/clerk.browser.js", "maxSize": "75kB" },
{ "path": "./dist/clerk.headless.js", "maxSize": "48.2KB" },
{ "path": "./dist/clerk.headless.js", "maxSize": "48.3KB" },
{ "path": "./dist/ui-common*.js", "maxSize": "89KB" },
{ "path": "./dist/vendors*.js", "maxSize": "25KB" },
{ "path": "./dist/coinbase*.js", "maxSize": "35.5KB" },
Expand Down
15 changes: 13 additions & 2 deletions packages/clerk-js/src/ui/components/BlankCaptchaModal/index.tsx
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,23 @@
import { Flow } from '../../customizables';
import { Flow, useAppearance, useLocalizations } from '../../customizables';
import { Card, withCardStateProvider } from '../../elements';
import { Route, Switch } from '../../router';

const BlankCard = withCardStateProvider(() => {
const { parsedCaptcha } = useAppearance();
const { locale } = useLocalizations();
const captchaTheme = parsedCaptcha?.theme;
const captchaSize = parsedCaptcha?.size;
const captchaLanguage = parsedCaptcha?.language || locale;

return (
<Card.Root>
<Card.Content>
<div id='cl-modal-captcha-container' />
<div
id='cl-modal-captcha-container'
data-cl-theme={captchaTheme}
data-cl-size={captchaSize}
data-cl-language={captchaLanguage}
/>
</Card.Content>
</Card.Root>
);
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -380,3 +380,87 @@ describe('AppearanceProvider layout flows', () => {
expect(result.current.parsedElements[0]['alert'].backgroundColor).toBe(themeBColor);
});
});

describe('AppearanceProvider captcha', () => {
it('sets the parsedCaptcha correctly from the globalAppearance prop', () => {
const wrapper = ({ children }) => (
<AppearanceProvider
appearanceKey='signIn'
globalAppearance={{
captcha: {
theme: 'dark',
size: 'compact',
language: 'el-GR',
},
}}
>
{children}
</AppearanceProvider>
);

const { result } = renderHook(() => useAppearance(), { wrapper });
expect(result.current.parsedCaptcha.theme).toBe('dark');
expect(result.current.parsedCaptcha.size).toBe('compact');
expect(result.current.parsedCaptcha.language).toBe('el-GR');
});

it('sets the parsedCaptcha correctly from the appearance prop', () => {
const wrapper = ({ children }) => (
<AppearanceProvider
appearanceKey='signIn'
appearance={{
captcha: {
theme: 'dark',
size: 'compact',
language: 'el-GR',
},
}}
>
{children}
</AppearanceProvider>
);

const { result } = renderHook(() => useAppearance(), { wrapper });
expect(result.current.parsedCaptcha.theme).toBe('dark');
expect(result.current.parsedCaptcha.size).toBe('compact');
expect(result.current.parsedCaptcha.language).toBe('el-GR');
});

it('sets the parsedLayout correctly from the globalAppearance and appearance prop', () => {
const wrapper = ({ children }) => (
<AppearanceProvider
appearanceKey='signIn'
globalAppearance={{
captcha: {
theme: 'light',
size: 'flexible',
language: 'en-US',
},
}}
appearance={{
captcha: {
theme: 'dark',
size: 'compact',
language: 'el-GR',
},
}}
>
{children}
</AppearanceProvider>
);

const { result } = renderHook(() => useAppearance(), { wrapper });
expect(result.current.parsedCaptcha.theme).toBe('dark');
expect(result.current.parsedCaptcha.size).toBe('compact');
expect(result.current.parsedCaptcha.language).toBe('el-GR');
});

it('uses the default values when no captcha property is passed', () => {
const wrapper = ({ children }) => <AppearanceProvider appearanceKey='signIn'>{children}</AppearanceProvider>;

const { result } = renderHook(() => useAppearance(), { wrapper });
expect(result.current.parsedCaptcha.theme).toBe('auto');
expect(result.current.parsedCaptcha.size).toBe('normal');
expect(result.current.parsedCaptcha.language).toBe('');
});
});
25 changes: 22 additions & 3 deletions packages/clerk-js/src/ui/customizables/parseAppearance.ts
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
import { fastDeepMergeAndReplace } from '@clerk/shared/utils';
import type { Appearance, DeepPartial, Elements, Layout, Theme } from '@clerk/types';
import type { Appearance, CaptchaAppearanceOptions, DeepPartial, Elements, Layout, Theme } from '@clerk/types';

import { createInternalTheme, defaultInternalTheme } from '../foundations';
import { polishedAppearance } from '../polishedAppearance';
Expand All@@ -16,8 +16,12 @@ import {
export type ParsedElements = Elements[];
export type ParsedInternalTheme = InternalTheme;
export type ParsedLayout = Required<Layout>;
export type ParsedCaptcha = Required<CaptchaAppearanceOptions>;

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

export type AppearanceCascade = {
globalAppearance?: Appearance;
Expand All@@ -29,6 +33,7 @@ export type ParsedAppearance = {
parsedElements: ParsedElements;
parsedInternalTheme: ParsedInternalTheme;
parsedLayout: ParsedLayout;
parsedCaptcha: ParsedCaptcha;
};

const defaultLayout: ParsedLayout = {
Expand All@@ -46,6 +51,12 @@ const defaultLayout: ParsedLayout = {
unsafe_disableDevelopmentModeWarnings: false,
};

const defaultCaptchaOptions: ParsedCaptcha = {
theme: 'auto',
size: 'normal',
language: '',
};

/**
* Parses the public appearance object.
* It splits the resulting styles into 2 objects: parsedElements, parsedInternalTheme
Expand All@@ -63,6 +74,7 @@ export const parseAppearance = (cascade: AppearanceCascade): ParsedAppearance =>

const parsedInternalTheme = parseVariables(appearanceList);
const parsedLayout = parseLayout(appearanceList);
const parsedCaptcha = parseCaptcha(appearanceList);

if (
!appearanceList.find(a => {
Expand All@@ -83,7 +95,7 @@ export const parseAppearance = (cascade: AppearanceCascade): ParsedAppearance =>
return res;
}),
);
return { parsedElements, parsedInternalTheme, parsedLayout };
return { parsedElements, parsedInternalTheme, parsedLayout, parsedCaptcha };
};

const expand = (theme: Theme | undefined, cascade: any[]) => {
Expand All@@ -106,6 +118,13 @@ const parseLayout = (appearanceList: Appearance[]) => {
return { ...defaultLayout, ...appearanceList.reduce((acc, appearance) => ({ ...acc, ...appearance.layout }), {}) };
};

const parseCaptcha = (appearanceList: Appearance[]) => {
return {
...defaultCaptchaOptions,
...appearanceList.reduce((acc, appearance) => ({ ...acc, ...appearance.captcha }), {}),
};
};

const parseVariables = (appearances: Appearance[]) => {
const res = {} as DeepPartial<InternalTheme>;
fastDeepMergeAndReplace({ ...defaultInternalTheme }, res);
Expand Down
10 changes: 9 additions & 1 deletion packages/clerk-js/src/ui/elements/CaptchaElement.tsx
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
import { useEffect, useRef } from 'react';

import { CAPTCHA_ELEMENT_ID } from '../../utils/captcha';
import { Box } from '../customizables';
import { Box, useAppearance, useLocalizations } from '../customizables';

/**
* This component uses a MutationObserver to listen for DOM changes made by our Turnstile logic,
Expand All@@ -14,6 +14,11 @@ export const CaptchaElement = () => {
const maxHeightValueRef = useRef('0');
const minHeightValueRef = useRef('unset');
const marginBottomValueRef = useRef('unset');
const { parsedCaptcha } = useAppearance();
const { locale } = useLocalizations();
const captchaTheme = parsedCaptcha?.theme;
const captchaSize = parsedCaptcha?.size;
const captchaLanguage = parsedCaptcha?.language || locale;

useEffect(() => {
if (!elementRef.current) return;
Expand DownExpand Up@@ -48,6 +53,9 @@ export const CaptchaElement = () => {
minHeight: minHeightValueRef.current,
marginBottom: marginBottomValueRef.current,
}}
data-cl-theme={captchaTheme}
data-cl-size={captchaSize}
data-cl-language={captchaLanguage}
/>
);
};
54 changes: 51 additions & 3 deletions packages/clerk-js/src/utils/captcha/turnstile.ts
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import { waitForElement } from '@clerk/shared/dom';
import { loadScript } from '@clerk/shared/loadScript';
import type { CaptchaWidgetType } from '@clerk/types';
import type { CaptchaAppearanceOptions, CaptchaWidgetType } from '@clerk/types';

import { CAPTCHA_ELEMENT_ID, CAPTCHA_INVISIBLE_CLASSNAME } from './constants';
import type { CaptchaOptions } from './types';
Expand All@@ -9,6 +9,12 @@ import type { CaptchaOptions } from './types';
// CF docs: https://developers.cloudflare.com/turnstile/get-started/client-side-rendering/#disable-implicit-rendering
const CLOUDFLARE_TURNSTILE_ORIGINAL_URL = 'https://challenges.cloudflare.com/turnstile/v0/api.js?render=explicit';

type CaptchaAttributes = {
theme?: RenderOptions['theme'];
language?: RenderOptions['language'];
size: RenderOptions['size'];
};

interface RenderOptions {
/**
* Every widget has a sitekey. This sitekey is associated with the corresponding widget configuration and is created upon the widget creation.
Expand DownExpand Up@@ -58,6 +64,24 @@ interface RenderOptions {
* @default 'always'
*/
appearance?: 'always' | 'execute' | 'interaction-only';
/**
* The widget theme. Can take the following values: light, dark, auto.
* The default is auto, which respects the user preference. This can be forced to light or dark by setting the theme accordingly.
Comment thread
anagstef marked this conversation as resolved.
* @default 'auto'
*/
theme?: CaptchaAppearanceOptions['theme'];
/**
* The widget size. Can take the following values: normal, flexible, compact.
* @default 'normal'
*/
size?: CaptchaAppearanceOptions['size'];
/**
* Language to display, must be either: auto (default) to use the language that the visitor has chosen,
* or an ISO 639-1 two-letter language code (e.g. en) or language and country code (e.g. en-US).
* Refer to the list of supported languages for more information.
* https://developers.cloudflare.com/turnstile/reference/supported-languages
*/
language?: CaptchaAppearanceOptions['language'];
/**
* A custom value that can be used to differentiate widgets under the same sitekey
* in analytics and which is returned upon validation. This can only contain up to
Expand DownExpand Up@@ -109,6 +133,14 @@ async function loadCaptchaFromCloudflareURL() {
}
}

function getCaptchaAttibutesFromElemenet(element: HTMLElement): CaptchaAttributes {
const theme = (element.getAttribute('data-cl-theme') as RenderOptions['theme']) || undefined;
const language = (element.getAttribute('data-cl-language') as RenderOptions['language']) || undefined;
const size = (element.getAttribute('data-cl-size') as RenderOptions['size']) || undefined;

return { theme, language, size };
}

/*
* How this function works:
* The widgetType is either 'invisible' or 'smart'.
Expand All@@ -125,6 +157,9 @@ export const getTurnstileToken = async (opts: CaptchaOptions) => {
let captchaToken = '';
let id = '';
let turnstileSiteKey = siteKey;
let captchaTheme: RenderOptions['theme'];
let captchaSize: RenderOptions['size'];
let captchaLanguage: RenderOptions['language'];
let retries = 0;
let widgetContainerQuerySelector: string | undefined;
// The backend uses this to determine which Turnstile site-key was used in order to verify the token
Expand All@@ -138,7 +173,13 @@ export const getTurnstileToken = async (opts: CaptchaOptions) => {
captchaWidgetType = widgetType;
widgetContainerQuerySelector = modalContainerQuerySelector;
await openModal?.();
await waitForElement(modalContainerQuerySelector);
const modalContainderEl = await waitForElement(modalContainerQuerySelector);
if (modalContainderEl) {
const { theme, language, size } = getCaptchaAttibutesFromElemenet(modalContainderEl);
captchaTheme = theme;
captchaLanguage = language;
captchaSize = size;
}
}

// smart widget with container provided by user
Expand All@@ -148,6 +189,10 @@ export const getTurnstileToken = async (opts: CaptchaOptions) => {
captchaWidgetType = 'smart';
widgetContainerQuerySelector = `#${CAPTCHA_ELEMENT_ID}`;
visibleDiv.style.maxHeight = '0'; // This is to prevent the layout shift when the render method is called
const { theme, language, size } = getCaptchaAttibutesFromElemenet(visibleDiv);
captchaTheme = theme;
captchaLanguage = language;
captchaSize = size;
} else {
console.error(
'Cannot initialize Smart CAPTCHA widget because the `clerk-captcha` DOM element was not found; falling back to Invisible CAPTCHA widget. If you are using a custom flow, visit https://clerk.com/docs/custom-flows/bot-sign-up-protection for instructions',
Expand All@@ -172,6 +217,9 @@ export const getTurnstileToken = async (opts: CaptchaOptions) => {
const id = captcha.render(widgetContainerQuerySelector, {
sitekey: turnstileSiteKey,
appearance: 'interaction-only',
theme: captchaTheme || 'auto',
Comment thread
anagstef marked this conversation as resolved.
size: captchaSize || 'normal',
language: captchaLanguage || 'auto',
action: opts.action,
retry: 'never',
'refresh-expired': 'auto',
Expand All@@ -192,7 +240,7 @@ export const getTurnstileToken = async (opts: CaptchaOptions) => {
// We set the min-height to the height of the Turnstile widget
// because the widget initially does a small layout shift
// and then expands to the correct height
visibleWidget.style.minHeight = '68px';
visibleWidget.style.minHeight = captchaSize === 'compact' ? '140px' : '68px';
visibleWidget.style.marginBottom = '1.5rem';
}
}
Expand Down
24 changes: 24 additions & 0 deletions packages/types/src/appearance.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -551,6 +551,12 @@ export type Theme = {
* Eg: `formButtonPrimary__loading: { backgroundColor: 'gray' }`
*/
elements?: Elements;
/**
* The appearance of the CAPTCHA widget.
* This will be used to style the CAPTCHA widget.
* Eg: `theme: 'dark'`
*/
captcha?: CaptchaAppearanceOptions;
};

export type Layout = {
Expand DownExpand Up@@ -632,6 +638,24 @@ export type Layout = {
unsafe_disableDevelopmentModeWarnings?: boolean;
};

export type CaptchaAppearanceOptions = {
/**
* The widget theme. Can take the following values: light, dark, auto.
* @default 'auto'
*/
theme?: 'auto' | 'light' | 'dark';
/**
* The widget size. Can take the following values: normal, flexible, compact.
* @default 'normal'
*/
size?: 'normal' | 'flexible' | 'compact';
/**
* Language to display, must be either: auto (default) to use the language that the visitor has chosen, or an ISO 639-1 two-letter language code (e.g. en) or language and country code (e.g. en-US).
* Refer to the list of supported languages for more information: https://developers.cloudflare.com/turnstile/reference/supported-languages
*/
language?: string;
};

export type SignInTheme = Theme;
export type SignUpTheme = Theme;
export type UserButtonTheme = Theme;
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
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/fluffy-hairs-thank.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
---
'@clerk/clerk-js': minor
'@clerk/types': minor
---

Introduce the `appearance.captcha` property for the CAPTCHA widget
2 changes: 1 addition & 1 deletion packages/clerk-js/bundlewatch.config.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@
"files": [
{ "path": "./dist/clerk.js", "maxSize": "560kB" },
{ "path": "./dist/clerk.browser.js", "maxSize": "75kB" },
{ "path": "./dist/clerk.headless.js", "maxSize": "48.2KB" },
{ "path": "./dist/clerk.headless.js", "maxSize": "48.3KB" },
{ "path": "./dist/ui-common*.js", "maxSize": "89KB" },
{ "path": "./dist/vendors*.js", "maxSize": "25KB" },
{ "path": "./dist/coinbase*.js", "maxSize": "35.5KB" },
Expand Down
15 changes: 13 additions & 2 deletions packages/clerk-js/src/ui/components/BlankCaptchaModal/index.tsx
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,23 @@
import { Flow } from '../../customizables';
import { Flow, useAppearance, useLocalizations } from '../../customizables';
import { Card, withCardStateProvider } from '../../elements';
import { Route, Switch } from '../../router';

const BlankCard = withCardStateProvider(() => {
const { parsedCaptcha } = useAppearance();
const { locale } = useLocalizations();
const captchaTheme = parsedCaptcha?.theme;
const captchaSize = parsedCaptcha?.size;
const captchaLanguage = parsedCaptcha?.language || locale;

return (
<Card.Root>
<Card.Content>
<div id='cl-modal-captcha-container' />
<div
id='cl-modal-captcha-container'
data-cl-theme={captchaTheme}
data-cl-size={captchaSize}
data-cl-language={captchaLanguage}
/>
</Card.Content>
</Card.Root>
);
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -380,3 +380,87 @@ describe('AppearanceProvider layout flows', () => {
expect(result.current.parsedElements[0]['alert'].backgroundColor).toBe(themeBColor);
});
});

describe('AppearanceProvider captcha', () => {
it('sets the parsedCaptcha correctly from the globalAppearance prop', () => {
const wrapper = ({ children }) => (
<AppearanceProvider
appearanceKey='signIn'
globalAppearance={{
captcha: {
theme: 'dark',
size: 'compact',
language: 'el-GR',
},
}}
>
{children}
</AppearanceProvider>
);

const { result } = renderHook(() => useAppearance(), { wrapper });
expect(result.current.parsedCaptcha.theme).toBe('dark');
expect(result.current.parsedCaptcha.size).toBe('compact');
expect(result.current.parsedCaptcha.language).toBe('el-GR');
});

it('sets the parsedCaptcha correctly from the appearance prop', () => {
const wrapper = ({ children }) => (
<AppearanceProvider
appearanceKey='signIn'
appearance={{
captcha: {
theme: 'dark',
size: 'compact',
language: 'el-GR',
},
}}
>
{children}
</AppearanceProvider>
);

const { result } = renderHook(() => useAppearance(), { wrapper });
expect(result.current.parsedCaptcha.theme).toBe('dark');
expect(result.current.parsedCaptcha.size).toBe('compact');
expect(result.current.parsedCaptcha.language).toBe('el-GR');
});

it('sets the parsedLayout correctly from the globalAppearance and appearance prop', () => {
const wrapper = ({ children }) => (
<AppearanceProvider
appearanceKey='signIn'
globalAppearance={{
captcha: {
theme: 'light',
size: 'flexible',
language: 'en-US',
},
}}
appearance={{
captcha: {
theme: 'dark',
size: 'compact',
language: 'el-GR',
},
}}
>
{children}
</AppearanceProvider>
);

const { result } = renderHook(() => useAppearance(), { wrapper });
expect(result.current.parsedCaptcha.theme).toBe('dark');
expect(result.current.parsedCaptcha.size).toBe('compact');
expect(result.current.parsedCaptcha.language).toBe('el-GR');
});

it('uses the default values when no captcha property is passed', () => {
const wrapper = ({ children }) => <AppearanceProvider appearanceKey='signIn'>{children}</AppearanceProvider>;

const { result } = renderHook(() => useAppearance(), { wrapper });
expect(result.current.parsedCaptcha.theme).toBe('auto');
expect(result.current.parsedCaptcha.size).toBe('normal');
expect(result.current.parsedCaptcha.language).toBe('');
});
});
25 changes: 22 additions & 3 deletions packages/clerk-js/src/ui/customizables/parseAppearance.ts
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
import { fastDeepMergeAndReplace } from '@clerk/shared/utils';
import type { Appearance, DeepPartial, Elements, Layout, Theme } from '@clerk/types';
import type { Appearance, CaptchaAppearanceOptions, DeepPartial, Elements, Layout, Theme } from '@clerk/types';

import { createInternalTheme, defaultInternalTheme } from '../foundations';
import { polishedAppearance } from '../polishedAppearance';
Expand All@@ -16,8 +16,12 @@ import {
export type ParsedElements = Elements[];
export type ParsedInternalTheme = InternalTheme;
export type ParsedLayout = Required<Layout>;
export type ParsedCaptcha = Required<CaptchaAppearanceOptions>;

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

export type AppearanceCascade = {
globalAppearance?: Appearance;
Expand All@@ -29,6 +33,7 @@ export type ParsedAppearance = {
parsedElements: ParsedElements;
parsedInternalTheme: ParsedInternalTheme;
parsedLayout: ParsedLayout;
parsedCaptcha: ParsedCaptcha;
};

const defaultLayout: ParsedLayout = {
Expand All@@ -46,6 +51,12 @@ const defaultLayout: ParsedLayout = {
unsafe_disableDevelopmentModeWarnings: false,
};

const defaultCaptchaOptions: ParsedCaptcha = {
theme: 'auto',
size: 'normal',
language: '',
};

/**
* Parses the public appearance object.
* It splits the resulting styles into 2 objects: parsedElements, parsedInternalTheme
Expand All@@ -63,6 +74,7 @@ export const parseAppearance = (cascade: AppearanceCascade): ParsedAppearance =>

const parsedInternalTheme = parseVariables(appearanceList);
const parsedLayout = parseLayout(appearanceList);
const parsedCaptcha = parseCaptcha(appearanceList);

if (
!appearanceList.find(a => {
Expand All@@ -83,7 +95,7 @@ export const parseAppearance = (cascade: AppearanceCascade): ParsedAppearance =>
return res;
}),
);
return { parsedElements, parsedInternalTheme, parsedLayout };
return { parsedElements, parsedInternalTheme, parsedLayout, parsedCaptcha };
};

const expand = (theme: Theme | undefined, cascade: any[]) => {
Expand All@@ -106,6 +118,13 @@ const parseLayout = (appearanceList: Appearance[]) => {
return { ...defaultLayout, ...appearanceList.reduce((acc, appearance) => ({ ...acc, ...appearance.layout }), {}) };
};

const parseCaptcha = (appearanceList: Appearance[]) => {
return {
...defaultCaptchaOptions,
...appearanceList.reduce((acc, appearance) => ({ ...acc, ...appearance.captcha }), {}),
};
};

const parseVariables = (appearances: Appearance[]) => {
const res = {} as DeepPartial<InternalTheme>;
fastDeepMergeAndReplace({ ...defaultInternalTheme }, res);
Expand Down
10 changes: 9 additions & 1 deletion packages/clerk-js/src/ui/elements/CaptchaElement.tsx
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
import { useEffect, useRef } from 'react';

import { CAPTCHA_ELEMENT_ID } from '../../utils/captcha';
import { Box } from '../customizables';
import { Box, useAppearance, useLocalizations } from '../customizables';

/**
* This component uses a MutationObserver to listen for DOM changes made by our Turnstile logic,
Expand All@@ -14,6 +14,11 @@ export const CaptchaElement = () => {
const maxHeightValueRef = useRef('0');
const minHeightValueRef = useRef('unset');
const marginBottomValueRef = useRef('unset');
const { parsedCaptcha } = useAppearance();
const { locale } = useLocalizations();
const captchaTheme = parsedCaptcha?.theme;
const captchaSize = parsedCaptcha?.size;
const captchaLanguage = parsedCaptcha?.language || locale;

useEffect(() => {
if (!elementRef.current) return;
Expand DownExpand Up@@ -48,6 +53,9 @@ export const CaptchaElement = () => {
minHeight: minHeightValueRef.current,
marginBottom: marginBottomValueRef.current,
}}
data-cl-theme={captchaTheme}
data-cl-size={captchaSize}
data-cl-language={captchaLanguage}
/>
);
};
54 changes: 51 additions & 3 deletions packages/clerk-js/src/utils/captcha/turnstile.ts
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import { waitForElement } from '@clerk/shared/dom';
import { loadScript } from '@clerk/shared/loadScript';
import type { CaptchaWidgetType } from '@clerk/types';
import type { CaptchaAppearanceOptions, CaptchaWidgetType } from '@clerk/types';

import { CAPTCHA_ELEMENT_ID, CAPTCHA_INVISIBLE_CLASSNAME } from './constants';
import type { CaptchaOptions } from './types';
Expand All@@ -9,6 +9,12 @@ import type { CaptchaOptions } from './types';
// CF docs: https://developers.cloudflare.com/turnstile/get-started/client-side-rendering/#disable-implicit-rendering
const CLOUDFLARE_TURNSTILE_ORIGINAL_URL = 'https://challenges.cloudflare.com/turnstile/v0/api.js?render=explicit';

type CaptchaAttributes = {
theme?: RenderOptions['theme'];
language?: RenderOptions['language'];
size: RenderOptions['size'];
};

interface RenderOptions {
/**
* Every widget has a sitekey. This sitekey is associated with the corresponding widget configuration and is created upon the widget creation.
Expand DownExpand Up@@ -58,6 +64,24 @@ interface RenderOptions {
* @default 'always'
*/
appearance?: 'always' | 'execute' | 'interaction-only';
/**
* The widget theme. Can take the following values: light, dark, auto.
* The default is auto, which respects the user preference. This can be forced to light or dark by setting the theme accordingly.
Comment thread
anagstef marked this conversation as resolved.
* @default 'auto'
*/
theme?: CaptchaAppearanceOptions['theme'];
/**
* The widget size. Can take the following values: normal, flexible, compact.
* @default 'normal'
*/
size?: CaptchaAppearanceOptions['size'];
/**
* Language to display, must be either: auto (default) to use the language that the visitor has chosen,
* or an ISO 639-1 two-letter language code (e.g. en) or language and country code (e.g. en-US).
* Refer to the list of supported languages for more information.
* https://developers.cloudflare.com/turnstile/reference/supported-languages
*/
language?: CaptchaAppearanceOptions['language'];
/**
* A custom value that can be used to differentiate widgets under the same sitekey
* in analytics and which is returned upon validation. This can only contain up to
Expand DownExpand Up@@ -109,6 +133,14 @@ async function loadCaptchaFromCloudflareURL() {
}
}

function getCaptchaAttibutesFromElemenet(element: HTMLElement): CaptchaAttributes {
const theme = (element.getAttribute('data-cl-theme') as RenderOptions['theme']) || undefined;
const language = (element.getAttribute('data-cl-language') as RenderOptions['language']) || undefined;
const size = (element.getAttribute('data-cl-size') as RenderOptions['size']) || undefined;

return { theme, language, size };
}

/*
* How this function works:
* The widgetType is either 'invisible' or 'smart'.
Expand All@@ -125,6 +157,9 @@ export const getTurnstileToken = async (opts: CaptchaOptions) => {
let captchaToken = '';
let id = '';
let turnstileSiteKey = siteKey;
let captchaTheme: RenderOptions['theme'];
let captchaSize: RenderOptions['size'];
let captchaLanguage: RenderOptions['language'];
let retries = 0;
let widgetContainerQuerySelector: string | undefined;
// The backend uses this to determine which Turnstile site-key was used in order to verify the token
Expand All@@ -138,7 +173,13 @@ export const getTurnstileToken = async (opts: CaptchaOptions) => {
captchaWidgetType = widgetType;
widgetContainerQuerySelector = modalContainerQuerySelector;
await openModal?.();
await waitForElement(modalContainerQuerySelector);
const modalContainderEl = await waitForElement(modalContainerQuerySelector);
if (modalContainderEl) {
const { theme, language, size } = getCaptchaAttibutesFromElemenet(modalContainderEl);
captchaTheme = theme;
captchaLanguage = language;
captchaSize = size;
}
}

// smart widget with container provided by user
Expand All@@ -148,6 +189,10 @@ export const getTurnstileToken = async (opts: CaptchaOptions) => {
captchaWidgetType = 'smart';
widgetContainerQuerySelector = `#${CAPTCHA_ELEMENT_ID}`;
visibleDiv.style.maxHeight = '0'; // This is to prevent the layout shift when the render method is called
const { theme, language, size } = getCaptchaAttibutesFromElemenet(visibleDiv);
captchaTheme = theme;
captchaLanguage = language;
captchaSize = size;
} else {
console.error(
'Cannot initialize Smart CAPTCHA widget because the `clerk-captcha` DOM element was not found; falling back to Invisible CAPTCHA widget. If you are using a custom flow, visit https://clerk.com/docs/custom-flows/bot-sign-up-protection for instructions',
Expand All@@ -172,6 +217,9 @@ export const getTurnstileToken = async (opts: CaptchaOptions) => {
const id = captcha.render(widgetContainerQuerySelector, {
sitekey: turnstileSiteKey,
appearance: 'interaction-only',
theme: captchaTheme || 'auto',
Comment thread
anagstef marked this conversation as resolved.
size: captchaSize || 'normal',
language: captchaLanguage || 'auto',
action: opts.action,
retry: 'never',
'refresh-expired': 'auto',
Expand All@@ -192,7 +240,7 @@ export const getTurnstileToken = async (opts: CaptchaOptions) => {
// We set the min-height to the height of the Turnstile widget
// because the widget initially does a small layout shift
// and then expands to the correct height
visibleWidget.style.minHeight = '68px';
visibleWidget.style.minHeight = captchaSize === 'compact' ? '140px' : '68px';
visibleWidget.style.marginBottom = '1.5rem';
}
}
Expand Down
24 changes: 24 additions & 0 deletions packages/types/src/appearance.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -551,6 +551,12 @@ export type Theme = {
* Eg: `formButtonPrimary__loading: { backgroundColor: 'gray' }`
*/
elements?: Elements;
/**
* The appearance of the CAPTCHA widget.
* This will be used to style the CAPTCHA widget.
* Eg: `theme: 'dark'`
*/
captcha?: CaptchaAppearanceOptions;
};

export type Layout = {
Expand DownExpand Up@@ -632,6 +638,24 @@ export type Layout = {
unsafe_disableDevelopmentModeWarnings?: boolean;
};

export type CaptchaAppearanceOptions = {
/**
* The widget theme. Can take the following values: light, dark, auto.
* @default 'auto'
*/
theme?: 'auto' | 'light' | 'dark';
/**
* The widget size. Can take the following values: normal, flexible, compact.
* @default 'normal'
*/
size?: 'normal' | 'flexible' | 'compact';
/**
* Language to display, must be either: auto (default) to use the language that the visitor has chosen, or an ISO 639-1 two-letter language code (e.g. en) or language and country code (e.g. en-US).
* Refer to the list of supported languages for more information: https://developers.cloudflare.com/turnstile/reference/supported-languages
*/
language?: string;
};

export type SignInTheme = Theme;
export type SignUpTheme = Theme;
export type UserButtonTheme = Theme;
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
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/fluffy-hairs-thank.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
---
'@clerk/clerk-js': minor
'@clerk/types': minor
---

Introduce the `appearance.captcha` property for the CAPTCHA widget
2 changes: 1 addition & 1 deletion packages/clerk-js/bundlewatch.config.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@
"files": [
{ "path": "./dist/clerk.js", "maxSize": "560kB" },
{ "path": "./dist/clerk.browser.js", "maxSize": "75kB" },
{ "path": "./dist/clerk.headless.js", "maxSize": "48.2KB" },
{ "path": "./dist/clerk.headless.js", "maxSize": "48.3KB" },
{ "path": "./dist/ui-common*.js", "maxSize": "89KB" },
{ "path": "./dist/vendors*.js", "maxSize": "25KB" },
{ "path": "./dist/coinbase*.js", "maxSize": "35.5KB" },
Expand Down
15 changes: 13 additions & 2 deletions packages/clerk-js/src/ui/components/BlankCaptchaModal/index.tsx
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,23 @@
import { Flow } from '../../customizables';
import { Flow, useAppearance, useLocalizations } from '../../customizables';
import { Card, withCardStateProvider } from '../../elements';
import { Route, Switch } from '../../router';

const BlankCard = withCardStateProvider(() => {
const { parsedCaptcha } = useAppearance();
const { locale } = useLocalizations();
const captchaTheme = parsedCaptcha?.theme;
const captchaSize = parsedCaptcha?.size;
const captchaLanguage = parsedCaptcha?.language || locale;

return (
<Card.Root>
<Card.Content>
<div id='cl-modal-captcha-container' />
<div
id='cl-modal-captcha-container'
data-cl-theme={captchaTheme}
data-cl-size={captchaSize}
data-cl-language={captchaLanguage}
/>
</Card.Content>
</Card.Root>
);
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -380,3 +380,87 @@ describe('AppearanceProvider layout flows', () => {
expect(result.current.parsedElements[0]['alert'].backgroundColor).toBe(themeBColor);
});
});

describe('AppearanceProvider captcha', () => {
it('sets the parsedCaptcha correctly from the globalAppearance prop', () => {
const wrapper = ({ children }) => (
<AppearanceProvider
appearanceKey='signIn'
globalAppearance={{
captcha: {
theme: 'dark',
size: 'compact',
language: 'el-GR',
},
}}
>
{children}
</AppearanceProvider>
);

const { result } = renderHook(() => useAppearance(), { wrapper });
expect(result.current.parsedCaptcha.theme).toBe('dark');
expect(result.current.parsedCaptcha.size).toBe('compact');
expect(result.current.parsedCaptcha.language).toBe('el-GR');
});

it('sets the parsedCaptcha correctly from the appearance prop', () => {
const wrapper = ({ children }) => (
<AppearanceProvider
appearanceKey='signIn'
appearance={{
captcha: {
theme: 'dark',
size: 'compact',
language: 'el-GR',
},
}}
>
{children}
</AppearanceProvider>
);

const { result } = renderHook(() => useAppearance(), { wrapper });
expect(result.current.parsedCaptcha.theme).toBe('dark');
expect(result.current.parsedCaptcha.size).toBe('compact');
expect(result.current.parsedCaptcha.language).toBe('el-GR');
});

it('sets the parsedLayout correctly from the globalAppearance and appearance prop', () => {
const wrapper = ({ children }) => (
<AppearanceProvider
appearanceKey='signIn'
globalAppearance={{
captcha: {
theme: 'light',
size: 'flexible',
language: 'en-US',
},
}}
appearance={{
captcha: {
theme: 'dark',
size: 'compact',
language: 'el-GR',
},
}}
>
{children}
</AppearanceProvider>
);

const { result } = renderHook(() => useAppearance(), { wrapper });
expect(result.current.parsedCaptcha.theme).toBe('dark');
expect(result.current.parsedCaptcha.size).toBe('compact');
expect(result.current.parsedCaptcha.language).toBe('el-GR');
});

it('uses the default values when no captcha property is passed', () => {
const wrapper = ({ children }) => <AppearanceProvider appearanceKey='signIn'>{children}</AppearanceProvider>;

const { result } = renderHook(() => useAppearance(), { wrapper });
expect(result.current.parsedCaptcha.theme).toBe('auto');
expect(result.current.parsedCaptcha.size).toBe('normal');
expect(result.current.parsedCaptcha.language).toBe('');
});
});
25 changes: 22 additions & 3 deletions packages/clerk-js/src/ui/customizables/parseAppearance.ts
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
import { fastDeepMergeAndReplace } from '@clerk/shared/utils';
import type { Appearance, DeepPartial, Elements, Layout, Theme } from '@clerk/types';
import type { Appearance, CaptchaAppearanceOptions, DeepPartial, Elements, Layout, Theme } from '@clerk/types';

import { createInternalTheme, defaultInternalTheme } from '../foundations';
import { polishedAppearance } from '../polishedAppearance';
Expand All@@ -16,8 +16,12 @@ import {
export type ParsedElements = Elements[];
export type ParsedInternalTheme = InternalTheme;
export type ParsedLayout = Required<Layout>;
export type ParsedCaptcha = Required<CaptchaAppearanceOptions>;

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

export type AppearanceCascade = {
globalAppearance?: Appearance;
Expand All@@ -29,6 +33,7 @@ export type ParsedAppearance = {
parsedElements: ParsedElements;
parsedInternalTheme: ParsedInternalTheme;
parsedLayout: ParsedLayout;
parsedCaptcha: ParsedCaptcha;
};

const defaultLayout: ParsedLayout = {
Expand All@@ -46,6 +51,12 @@ const defaultLayout: ParsedLayout = {
unsafe_disableDevelopmentModeWarnings: false,
};

const defaultCaptchaOptions: ParsedCaptcha = {
theme: 'auto',
size: 'normal',
language: '',
};

/**
* Parses the public appearance object.
* It splits the resulting styles into 2 objects: parsedElements, parsedInternalTheme
Expand All@@ -63,6 +74,7 @@ export const parseAppearance = (cascade: AppearanceCascade): ParsedAppearance =>

const parsedInternalTheme = parseVariables(appearanceList);
const parsedLayout = parseLayout(appearanceList);
const parsedCaptcha = parseCaptcha(appearanceList);

if (
!appearanceList.find(a => {
Expand All@@ -83,7 +95,7 @@ export const parseAppearance = (cascade: AppearanceCascade): ParsedAppearance =>
return res;
}),
);
return { parsedElements, parsedInternalTheme, parsedLayout };
return { parsedElements, parsedInternalTheme, parsedLayout, parsedCaptcha };
};

const expand = (theme: Theme | undefined, cascade: any[]) => {
Expand All@@ -106,6 +118,13 @@ const parseLayout = (appearanceList: Appearance[]) => {
return { ...defaultLayout, ...appearanceList.reduce((acc, appearance) => ({ ...acc, ...appearance.layout }), {}) };
};

const parseCaptcha = (appearanceList: Appearance[]) => {
return {
...defaultCaptchaOptions,
...appearanceList.reduce((acc, appearance) => ({ ...acc, ...appearance.captcha }), {}),
};
};

const parseVariables = (appearances: Appearance[]) => {
const res = {} as DeepPartial<InternalTheme>;
fastDeepMergeAndReplace({ ...defaultInternalTheme }, res);
Expand Down
10 changes: 9 additions & 1 deletion packages/clerk-js/src/ui/elements/CaptchaElement.tsx
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
import { useEffect, useRef } from 'react';

import { CAPTCHA_ELEMENT_ID } from '../../utils/captcha';
import { Box } from '../customizables';
import { Box, useAppearance, useLocalizations } from '../customizables';

/**
* This component uses a MutationObserver to listen for DOM changes made by our Turnstile logic,
Expand All@@ -14,6 +14,11 @@ export const CaptchaElement = () => {
const maxHeightValueRef = useRef('0');
const minHeightValueRef = useRef('unset');
const marginBottomValueRef = useRef('unset');
const { parsedCaptcha } = useAppearance();
const { locale } = useLocalizations();
const captchaTheme = parsedCaptcha?.theme;
const captchaSize = parsedCaptcha?.size;
const captchaLanguage = parsedCaptcha?.language || locale;

useEffect(() => {
if (!elementRef.current) return;
Expand DownExpand Up@@ -48,6 +53,9 @@ export const CaptchaElement = () => {
minHeight: minHeightValueRef.current,
marginBottom: marginBottomValueRef.current,
}}
data-cl-theme={captchaTheme}
data-cl-size={captchaSize}
data-cl-language={captchaLanguage}
/>
);
};
54 changes: 51 additions & 3 deletions packages/clerk-js/src/utils/captcha/turnstile.ts
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import { waitForElement } from '@clerk/shared/dom';
import { loadScript } from '@clerk/shared/loadScript';
import type { CaptchaWidgetType } from '@clerk/types';
import type { CaptchaAppearanceOptions, CaptchaWidgetType } from '@clerk/types';

import { CAPTCHA_ELEMENT_ID, CAPTCHA_INVISIBLE_CLASSNAME } from './constants';
import type { CaptchaOptions } from './types';
Expand All@@ -9,6 +9,12 @@ import type { CaptchaOptions } from './types';
// CF docs: https://developers.cloudflare.com/turnstile/get-started/client-side-rendering/#disable-implicit-rendering
const CLOUDFLARE_TURNSTILE_ORIGINAL_URL = 'https://challenges.cloudflare.com/turnstile/v0/api.js?render=explicit';

type CaptchaAttributes = {
theme?: RenderOptions['theme'];
language?: RenderOptions['language'];
size: RenderOptions['size'];
};

interface RenderOptions {
/**
* Every widget has a sitekey. This sitekey is associated with the corresponding widget configuration and is created upon the widget creation.
Expand DownExpand Up@@ -58,6 +64,24 @@ interface RenderOptions {
* @default 'always'
*/
appearance?: 'always' | 'execute' | 'interaction-only';
/**
* The widget theme. Can take the following values: light, dark, auto.
* The default is auto, which respects the user preference. This can be forced to light or dark by setting the theme accordingly.
Comment thread
anagstef marked this conversation as resolved.
* @default 'auto'
*/
theme?: CaptchaAppearanceOptions['theme'];
/**
* The widget size. Can take the following values: normal, flexible, compact.
* @default 'normal'
*/
size?: CaptchaAppearanceOptions['size'];
/**
* Language to display, must be either: auto (default) to use the language that the visitor has chosen,
* or an ISO 639-1 two-letter language code (e.g. en) or language and country code (e.g. en-US).
* Refer to the list of supported languages for more information.
* https://developers.cloudflare.com/turnstile/reference/supported-languages
*/
language?: CaptchaAppearanceOptions['language'];
/**
* A custom value that can be used to differentiate widgets under the same sitekey
* in analytics and which is returned upon validation. This can only contain up to
Expand DownExpand Up@@ -109,6 +133,14 @@ async function loadCaptchaFromCloudflareURL() {
}
}

function getCaptchaAttibutesFromElemenet(element: HTMLElement): CaptchaAttributes {
const theme = (element.getAttribute('data-cl-theme') as RenderOptions['theme']) || undefined;
const language = (element.getAttribute('data-cl-language') as RenderOptions['language']) || undefined;
const size = (element.getAttribute('data-cl-size') as RenderOptions['size']) || undefined;

return { theme, language, size };
}

/*
* How this function works:
* The widgetType is either 'invisible' or 'smart'.
Expand All@@ -125,6 +157,9 @@ export const getTurnstileToken = async (opts: CaptchaOptions) => {
let captchaToken = '';
let id = '';
let turnstileSiteKey = siteKey;
let captchaTheme: RenderOptions['theme'];
let captchaSize: RenderOptions['size'];
let captchaLanguage: RenderOptions['language'];
let retries = 0;
let widgetContainerQuerySelector: string | undefined;
// The backend uses this to determine which Turnstile site-key was used in order to verify the token
Expand All@@ -138,7 +173,13 @@ export const getTurnstileToken = async (opts: CaptchaOptions) => {
captchaWidgetType = widgetType;
widgetContainerQuerySelector = modalContainerQuerySelector;
await openModal?.();
await waitForElement(modalContainerQuerySelector);
const modalContainderEl = await waitForElement(modalContainerQuerySelector);
if (modalContainderEl) {
const { theme, language, size } = getCaptchaAttibutesFromElemenet(modalContainderEl);
captchaTheme = theme;
captchaLanguage = language;
captchaSize = size;
}
}

// smart widget with container provided by user
Expand All@@ -148,6 +189,10 @@ export const getTurnstileToken = async (opts: CaptchaOptions) => {
captchaWidgetType = 'smart';
widgetContainerQuerySelector = `#${CAPTCHA_ELEMENT_ID}`;
visibleDiv.style.maxHeight = '0'; // This is to prevent the layout shift when the render method is called
const { theme, language, size } = getCaptchaAttibutesFromElemenet(visibleDiv);
captchaTheme = theme;
captchaLanguage = language;
captchaSize = size;
} else {
console.error(
'Cannot initialize Smart CAPTCHA widget because the `clerk-captcha` DOM element was not found; falling back to Invisible CAPTCHA widget. If you are using a custom flow, visit https://clerk.com/docs/custom-flows/bot-sign-up-protection for instructions',
Expand All@@ -172,6 +217,9 @@ export const getTurnstileToken = async (opts: CaptchaOptions) => {
const id = captcha.render(widgetContainerQuerySelector, {
sitekey: turnstileSiteKey,
appearance: 'interaction-only',
theme: captchaTheme || 'auto',
Comment thread
anagstef marked this conversation as resolved.
size: captchaSize || 'normal',
language: captchaLanguage || 'auto',
action: opts.action,
retry: 'never',
'refresh-expired': 'auto',
Expand All@@ -192,7 +240,7 @@ export const getTurnstileToken = async (opts: CaptchaOptions) => {
// We set the min-height to the height of the Turnstile widget
// because the widget initially does a small layout shift
// and then expands to the correct height
visibleWidget.style.minHeight = '68px';
visibleWidget.style.minHeight = captchaSize === 'compact' ? '140px' : '68px';
visibleWidget.style.marginBottom = '1.5rem';
}
}
Expand Down
24 changes: 24 additions & 0 deletions packages/types/src/appearance.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -551,6 +551,12 @@ export type Theme = {
* Eg: `formButtonPrimary__loading: { backgroundColor: 'gray' }`
*/
elements?: Elements;
/**
* The appearance of the CAPTCHA widget.
* This will be used to style the CAPTCHA widget.
* Eg: `theme: 'dark'`
*/
captcha?: CaptchaAppearanceOptions;
};

export type Layout = {
Expand DownExpand Up@@ -632,6 +638,24 @@ export type Layout = {
unsafe_disableDevelopmentModeWarnings?: boolean;
};

export type CaptchaAppearanceOptions = {
/**
* The widget theme. Can take the following values: light, dark, auto.
* @default 'auto'
*/
theme?: 'auto' | 'light' | 'dark';
/**
* The widget size. Can take the following values: normal, flexible, compact.
* @default 'normal'
*/
size?: 'normal' | 'flexible' | 'compact';
/**
* Language to display, must be either: auto (default) to use the language that the visitor has chosen, or an ISO 639-1 two-letter language code (e.g. en) or language and country code (e.g. en-US).
* Refer to the list of supported languages for more information: https://developers.cloudflare.com/turnstile/reference/supported-languages
*/
language?: string;
};

export type SignInTheme = Theme;
export type SignUpTheme = Theme;
export type UserButtonTheme = Theme;
Expand Down