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

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/polite-pants-talk.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/clerk-js': minor
---

Password managers will now autofill OTP code verifications.
1 change: 0 additions & 1 deletion integration/templates/elements-next/src/app/otp/page.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -87,7 +87,6 @@ export default function OTP() {
className='segmented-otp-with-props-wrapper flex justify-center has-[:disabled]:opacity-50'
type='otp'
data-testid='segmented-otp-with-props'
passwordManagerOffset={4}
length={4}
render={({ value, status }) => {
return (
Expand Down
7 changes: 0 additions & 7 deletions integration/tests/elements/otp.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -221,12 +221,5 @@ testAgainstRunningApps({ withEnv: [appConfigs.envs.withEmailCodes] })('OTP @elem
// Check that only 4 segments are rendered
await expect(otpSegmentsWrapper.locator('> div')).toHaveCount(4);
});

test('passwordManagerOffset', async ({ page }) => {
const otp = page.getByTestId(otpTypes.segmentedOtpWithProps);

// The computed styles are different on CI/local etc. so it's not use to check the exact value
await expect(otp).toHaveCSS('clip-path', /inset\(0px \d+\.\d+px 0px 0px\)/i);
});
});
});
1 change: 1 addition & 0 deletions packages/clerk-js/bundlewatch.config.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@
{ "path": "./dist/clerk.legacy.browser.js", "maxSize": "115KB" },
{ "path": "./dist/clerk.headless*.js", "maxSize": "55KB" },
{ "path": "./dist/ui-common*.js", "maxSize": "111.8KB" },
{ "path": "./dist/ui-common*.legacy.*.js", "maxSize": "112.1KB" },
{ "path": "./dist/vendors*.js", "maxSize": "40.2KB" },
{ "path": "./dist/coinbase*.js", "maxSize": "38KB" },
{ "path": "./dist/stripe-vendors*.js", "maxSize": "1KB" },
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -98,6 +98,7 @@ export const APPEARANCE_KEYS = containsAllElementsConfigKeys([
'otpCodeField',
'otpCodeFieldInputs',
'otpCodeFieldInput',
'otpCodeFieldInputContainer',
'otpCodeFieldErrorText',
'formResendCodeLink',

Expand Down
126 changes: 95 additions & 31 deletions packages/clerk-js/src/ui/elements/CodeControl.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@ import type { PropsWithChildren } from 'react';
import React, { useCallback } from 'react';

import type { LocalizationKey } from '../customizables';
import { descriptors, Flex, Input } from '../customizables';
import { Box, descriptors, Flex, Input } from '../customizables';
import { useCardState } from '../elements/contexts';
import { useLoadingStatus } from '../hooks';
import type { PropsOfComponent } from '../styledSystem';
Expand DownExpand Up@@ -160,6 +160,7 @@ export const OTPResendButton = () => {
export const OTPCodeControl = React.forwardRef<{ reset: any }>((_, ref) => {
const [disabled, setDisabled] = React.useState(false);
const refs = React.useRef<Array<HTMLInputElement | null>>([]);
const hiddenInputRef = React.useRef<HTMLInputElement>(null);
const firstClickRef = React.useRef(false);

const { otpControl, isLoading, isDisabled, centerAlign = true } = useOTPInputContext();
Expand All@@ -169,6 +170,11 @@ export const OTPCodeControl = React.forwardRef<{ reset: any }>((_, ref) => {
reset: () => {
setValues(values.map(() => ''));
setDisabled(false);

if (hiddenInputRef.current) {
hiddenInputRef.current.value = '';
}

setTimeout(() => focusInputAt(0), 0);
},
}));
Expand All@@ -183,6 +189,13 @@ export const OTPCodeControl = React.forwardRef<{ reset: any }>((_, ref) => {
}
}, [feedback]);

// Update hidden input when values change
React.useEffect(() => {
if (hiddenInputRef.current) {
hiddenInputRef.current.value = values.join('');
}
}, [values]);

const handleMultipleCharValue = ({ eventValue, inputPosition }: { eventValue: string; inputPosition: number }) => {
const eventValues = (eventValue || '').split('');

Expand DownExpand Up@@ -274,40 +287,91 @@ export const OTPCodeControl = React.forwardRef<{ reset: any }>((_, ref) => {
}
};

// Handle hidden input changes (for password manager autofill)
const handleHiddenInputChange = (e: React.ChangeEvent<HTMLInputElement>) => {
const value = e.target.value.replace(/\D/g, '').slice(0, length);
const newValues = value.split('').concat(Array.from({ length: length - value.length }, () => ''));
setValues(newValues);

// Focus the appropriate visible input
if (value.length > 0) {
focusInputAt(Math.min(value.length - 1, length - 1));
}
};

const centerSx = centerAlign ? { justifyContent: 'center', alignItems: 'center' } : {};

return (
<Flex
isLoading={isLoading}
hasError={feedbackType === 'error'}
elementDescriptor={descriptors.otpCodeFieldInputs}
gap={2}
sx={t => ({ direction: 'ltr', padding: t.space.$1, marginLeft: `-${t.space.$1}`, ...centerSx })}
<Box
elementDescriptor={descriptors.otpCodeFieldInputContainer}
sx={{ position: 'relative' }}
>
{values.map((value, index: number) => (
<SingleCharInput
elementDescriptor={descriptors.otpCodeFieldInput}
key={index}
value={value}
onClick={handleOnClick(index)}
onChange={handleOnChange(index)}
onKeyDown={handleOnKeyDown(index)}
onInput={handleOnInput(index)}
onPaste={handleOnPaste(index)}
id={`digit-${index}-field`}
ref={node => (refs.current[index] = node)}
autoFocus={index === 0 || undefined}
autoComplete='one-time-code'
aria-label={`${index === 0 ? 'Enter verification code. ' : ''}Digit ${index + 1}`}
isDisabled={isDisabled || isLoading || disabled || feedbackType === 'success'}
hasError={feedbackType === 'error'}
isSuccessfullyFilled={feedbackType === 'success'}
type='text'
inputMode='numeric'
name={`codeInput-${index}`}
/>
))}
</Flex>
{/* Hidden input for password manager compatibility */}
<Input
ref={hiddenInputRef}
type='text'
autoComplete='one-time-code'
data-otp-hidden-input
inputMode='numeric'
pattern={`[0-9]{${length}}`}
minLength={length}
maxLength={length}
spellCheck={false}
aria-hidden='true'
tabIndex={-1}
onChange={handleHiddenInputChange}
onFocus={() => {
// When password manager focuses the hidden input, focus the first visible input
focusInputAt(0);
}}
sx={() => ({
...common.visuallyHidden(),
left: '-9999px',
pointerEvents: 'none',
})}
/>

<Flex
isLoading={isLoading}
hasError={feedbackType === 'error'}
elementDescriptor={descriptors.otpCodeFieldInputs}
gap={2}
sx={t => ({ direction: 'ltr', padding: t.space.$1, marginLeft: `-${t.space.$1}`, ...centerSx })}
role='group'
aria-label='Verification code input'
>
{values.map((value: string, index: number) => (
<SingleCharInput
elementDescriptor={descriptors.otpCodeFieldInput}
// eslint-disable-next-line react/no-array-index-key
key={index}
value={value}
onClick={handleOnClick(index)}
onChange={handleOnChange(index)}
onKeyDown={handleOnKeyDown(index)}
onInput={handleOnInput(index)}
onPaste={handleOnPaste(index)}
id={`digit-${index}-field`}
ref={node => (refs.current[index] = node)}
// eslint-disable-next-line jsx-a11y/no-autofocus
autoFocus={index === 0 || undefined}
autoComplete='off'
aria-label={`${index === 0 ? 'Enter verification code. ' : ''}Digit ${index + 1}`}
isDisabled={isDisabled || isLoading || disabled || feedbackType === 'success'}
hasError={feedbackType === 'error'}
isSuccessfullyFilled={feedbackType === 'success'}
type='text'
inputMode='numeric'
name={`codeInput-${index}`}
data-otp-segment
data-1p-ignore
data-lpignore='true'
maxLength={1}
pattern='[0-9]'
/>
))}
</Flex>
</Box>
);
});

Expand Down
Loading
, '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
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/polite-pants-talk.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/clerk-js': minor
---

Password managers will now autofill OTP code verifications.
1 change: 0 additions & 1 deletion integration/templates/elements-next/src/app/otp/page.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -87,7 +87,6 @@ export default function OTP() {
className='segmented-otp-with-props-wrapper flex justify-center has-[:disabled]:opacity-50'
type='otp'
data-testid='segmented-otp-with-props'
passwordManagerOffset={4}
length={4}
render={({ value, status }) => {
return (
Expand Down
7 changes: 0 additions & 7 deletions integration/tests/elements/otp.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -221,12 +221,5 @@ testAgainstRunningApps({ withEnv: [appConfigs.envs.withEmailCodes] })('OTP @elem
// Check that only 4 segments are rendered
await expect(otpSegmentsWrapper.locator('> div')).toHaveCount(4);
});

test('passwordManagerOffset', async ({ page }) => {
const otp = page.getByTestId(otpTypes.segmentedOtpWithProps);

// The computed styles are different on CI/local etc. so it's not use to check the exact value
await expect(otp).toHaveCSS('clip-path', /inset\(0px \d+\.\d+px 0px 0px\)/i);
});
});
});
1 change: 1 addition & 0 deletions packages/clerk-js/bundlewatch.config.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@
{ "path": "./dist/clerk.legacy.browser.js", "maxSize": "115KB" },
{ "path": "./dist/clerk.headless*.js", "maxSize": "55KB" },
{ "path": "./dist/ui-common*.js", "maxSize": "111.8KB" },
{ "path": "./dist/ui-common*.legacy.*.js", "maxSize": "112.1KB" },
{ "path": "./dist/vendors*.js", "maxSize": "40.2KB" },
{ "path": "./dist/coinbase*.js", "maxSize": "38KB" },
{ "path": "./dist/stripe-vendors*.js", "maxSize": "1KB" },
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -98,6 +98,7 @@ export const APPEARANCE_KEYS = containsAllElementsConfigKeys([
'otpCodeField',
'otpCodeFieldInputs',
'otpCodeFieldInput',
'otpCodeFieldInputContainer',
'otpCodeFieldErrorText',
'formResendCodeLink',

Expand Down
126 changes: 95 additions & 31 deletions packages/clerk-js/src/ui/elements/CodeControl.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@ import type { PropsWithChildren } from 'react';
import React, { useCallback } from 'react';

import type { LocalizationKey } from '../customizables';
import { descriptors, Flex, Input } from '../customizables';
import { Box, descriptors, Flex, Input } from '../customizables';
import { useCardState } from '../elements/contexts';
import { useLoadingStatus } from '../hooks';
import type { PropsOfComponent } from '../styledSystem';
Expand DownExpand Up@@ -160,6 +160,7 @@ export const OTPResendButton = () => {
export const OTPCodeControl = React.forwardRef<{ reset: any }>((_, ref) => {
const [disabled, setDisabled] = React.useState(false);
const refs = React.useRef<Array<HTMLInputElement | null>>([]);
const hiddenInputRef = React.useRef<HTMLInputElement>(null);
const firstClickRef = React.useRef(false);

const { otpControl, isLoading, isDisabled, centerAlign = true } = useOTPInputContext();
Expand All@@ -169,6 +170,11 @@ export const OTPCodeControl = React.forwardRef<{ reset: any }>((_, ref) => {
reset: () => {
setValues(values.map(() => ''));
setDisabled(false);

if (hiddenInputRef.current) {
hiddenInputRef.current.value = '';
}

setTimeout(() => focusInputAt(0), 0);
},
}));
Expand All@@ -183,6 +189,13 @@ export const OTPCodeControl = React.forwardRef<{ reset: any }>((_, ref) => {
}
}, [feedback]);

// Update hidden input when values change
React.useEffect(() => {
if (hiddenInputRef.current) {
hiddenInputRef.current.value = values.join('');
}
}, [values]);

const handleMultipleCharValue = ({ eventValue, inputPosition }: { eventValue: string; inputPosition: number }) => {
const eventValues = (eventValue || '').split('');

Expand DownExpand Up@@ -274,40 +287,91 @@ export const OTPCodeControl = React.forwardRef<{ reset: any }>((_, ref) => {
}
};

// Handle hidden input changes (for password manager autofill)
const handleHiddenInputChange = (e: React.ChangeEvent<HTMLInputElement>) => {
const value = e.target.value.replace(/\D/g, '').slice(0, length);
const newValues = value.split('').concat(Array.from({ length: length - value.length }, () => ''));
setValues(newValues);

// Focus the appropriate visible input
if (value.length > 0) {
focusInputAt(Math.min(value.length - 1, length - 1));
}
};

const centerSx = centerAlign ? { justifyContent: 'center', alignItems: 'center' } : {};

return (
<Flex
isLoading={isLoading}
hasError={feedbackType === 'error'}
elementDescriptor={descriptors.otpCodeFieldInputs}
gap={2}
sx={t => ({ direction: 'ltr', padding: t.space.$1, marginLeft: `-${t.space.$1}`, ...centerSx })}
<Box
elementDescriptor={descriptors.otpCodeFieldInputContainer}
sx={{ position: 'relative' }}
>
{values.map((value, index: number) => (
<SingleCharInput
elementDescriptor={descriptors.otpCodeFieldInput}
key={index}
value={value}
onClick={handleOnClick(index)}
onChange={handleOnChange(index)}
onKeyDown={handleOnKeyDown(index)}
onInput={handleOnInput(index)}
onPaste={handleOnPaste(index)}
id={`digit-${index}-field`}
ref={node => (refs.current[index] = node)}
autoFocus={index === 0 || undefined}
autoComplete='one-time-code'
aria-label={`${index === 0 ? 'Enter verification code. ' : ''}Digit ${index + 1}`}
isDisabled={isDisabled || isLoading || disabled || feedbackType === 'success'}
hasError={feedbackType === 'error'}
isSuccessfullyFilled={feedbackType === 'success'}
type='text'
inputMode='numeric'
name={`codeInput-${index}`}
/>
))}
</Flex>
{/* Hidden input for password manager compatibility */}
<Input
ref={hiddenInputRef}
type='text'
autoComplete='one-time-code'
data-otp-hidden-input
inputMode='numeric'
pattern={`[0-9]{${length}}`}
minLength={length}
maxLength={length}
spellCheck={false}
aria-hidden='true'
tabIndex={-1}
onChange={handleHiddenInputChange}
onFocus={() => {
// When password manager focuses the hidden input, focus the first visible input
focusInputAt(0);
}}
sx={() => ({
...common.visuallyHidden(),
left: '-9999px',
pointerEvents: 'none',
})}
/>

<Flex
isLoading={isLoading}
hasError={feedbackType === 'error'}
elementDescriptor={descriptors.otpCodeFieldInputs}
gap={2}
sx={t => ({ direction: 'ltr', padding: t.space.$1, marginLeft: `-${t.space.$1}`, ...centerSx })}
role='group'
aria-label='Verification code input'
>
{values.map((value: string, index: number) => (
<SingleCharInput
elementDescriptor={descriptors.otpCodeFieldInput}
// eslint-disable-next-line react/no-array-index-key
key={index}
value={value}
onClick={handleOnClick(index)}
onChange={handleOnChange(index)}
onKeyDown={handleOnKeyDown(index)}
onInput={handleOnInput(index)}
onPaste={handleOnPaste(index)}
id={`digit-${index}-field`}
ref={node => (refs.current[index] = node)}
// eslint-disable-next-line jsx-a11y/no-autofocus
autoFocus={index === 0 || undefined}
autoComplete='off'
aria-label={`${index === 0 ? 'Enter verification code. ' : ''}Digit ${index + 1}`}
isDisabled={isDisabled || isLoading || disabled || feedbackType === 'success'}
hasError={feedbackType === 'error'}
isSuccessfullyFilled={feedbackType === 'success'}
type='text'
inputMode='numeric'
name={`codeInput-${index}`}
data-otp-segment
data-1p-ignore
data-lpignore='true'
maxLength={1}
pattern='[0-9]'
/>
))}
</Flex>
</Box>
);
});

Expand Down
Loading
, '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
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/polite-pants-talk.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/clerk-js': minor
---

Password managers will now autofill OTP code verifications.
1 change: 0 additions & 1 deletion integration/templates/elements-next/src/app/otp/page.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -87,7 +87,6 @@ export default function OTP() {
className='segmented-otp-with-props-wrapper flex justify-center has-[:disabled]:opacity-50'
type='otp'
data-testid='segmented-otp-with-props'
passwordManagerOffset={4}
length={4}
render={({ value, status }) => {
return (
Expand Down
7 changes: 0 additions & 7 deletions integration/tests/elements/otp.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -221,12 +221,5 @@ testAgainstRunningApps({ withEnv: [appConfigs.envs.withEmailCodes] })('OTP @elem
// Check that only 4 segments are rendered
await expect(otpSegmentsWrapper.locator('> div')).toHaveCount(4);
});

test('passwordManagerOffset', async ({ page }) => {
const otp = page.getByTestId(otpTypes.segmentedOtpWithProps);

// The computed styles are different on CI/local etc. so it's not use to check the exact value
await expect(otp).toHaveCSS('clip-path', /inset\(0px \d+\.\d+px 0px 0px\)/i);
});
});
});
1 change: 1 addition & 0 deletions packages/clerk-js/bundlewatch.config.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@
{ "path": "./dist/clerk.legacy.browser.js", "maxSize": "115KB" },
{ "path": "./dist/clerk.headless*.js", "maxSize": "55KB" },
{ "path": "./dist/ui-common*.js", "maxSize": "111.8KB" },
{ "path": "./dist/ui-common*.legacy.*.js", "maxSize": "112.1KB" },
{ "path": "./dist/vendors*.js", "maxSize": "40.2KB" },
{ "path": "./dist/coinbase*.js", "maxSize": "38KB" },
{ "path": "./dist/stripe-vendors*.js", "maxSize": "1KB" },
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -98,6 +98,7 @@ export const APPEARANCE_KEYS = containsAllElementsConfigKeys([
'otpCodeField',
'otpCodeFieldInputs',
'otpCodeFieldInput',
'otpCodeFieldInputContainer',
'otpCodeFieldErrorText',
'formResendCodeLink',

Expand Down
126 changes: 95 additions & 31 deletions packages/clerk-js/src/ui/elements/CodeControl.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@ import type { PropsWithChildren } from 'react';
import React, { useCallback } from 'react';

import type { LocalizationKey } from '../customizables';
import { descriptors, Flex, Input } from '../customizables';
import { Box, descriptors, Flex, Input } from '../customizables';
import { useCardState } from '../elements/contexts';
import { useLoadingStatus } from '../hooks';
import type { PropsOfComponent } from '../styledSystem';
Expand DownExpand Up@@ -160,6 +160,7 @@ export const OTPResendButton = () => {
export const OTPCodeControl = React.forwardRef<{ reset: any }>((_, ref) => {
const [disabled, setDisabled] = React.useState(false);
const refs = React.useRef<Array<HTMLInputElement | null>>([]);
const hiddenInputRef = React.useRef<HTMLInputElement>(null);
const firstClickRef = React.useRef(false);

const { otpControl, isLoading, isDisabled, centerAlign = true } = useOTPInputContext();
Expand All@@ -169,6 +170,11 @@ export const OTPCodeControl = React.forwardRef<{ reset: any }>((_, ref) => {
reset: () => {
setValues(values.map(() => ''));
setDisabled(false);

if (hiddenInputRef.current) {
hiddenInputRef.current.value = '';
}

setTimeout(() => focusInputAt(0), 0);
},
}));
Expand All@@ -183,6 +189,13 @@ export const OTPCodeControl = React.forwardRef<{ reset: any }>((_, ref) => {
}
}, [feedback]);

// Update hidden input when values change
React.useEffect(() => {
if (hiddenInputRef.current) {
hiddenInputRef.current.value = values.join('');
}
}, [values]);

const handleMultipleCharValue = ({ eventValue, inputPosition }: { eventValue: string; inputPosition: number }) => {
const eventValues = (eventValue || '').split('');

Expand DownExpand Up@@ -274,40 +287,91 @@ export const OTPCodeControl = React.forwardRef<{ reset: any }>((_, ref) => {
}
};

// Handle hidden input changes (for password manager autofill)
const handleHiddenInputChange = (e: React.ChangeEvent<HTMLInputElement>) => {
const value = e.target.value.replace(/\D/g, '').slice(0, length);
const newValues = value.split('').concat(Array.from({ length: length - value.length }, () => ''));
setValues(newValues);

// Focus the appropriate visible input
if (value.length > 0) {
focusInputAt(Math.min(value.length - 1, length - 1));
}
};

const centerSx = centerAlign ? { justifyContent: 'center', alignItems: 'center' } : {};

return (
<Flex
isLoading={isLoading}
hasError={feedbackType === 'error'}
elementDescriptor={descriptors.otpCodeFieldInputs}
gap={2}
sx={t => ({ direction: 'ltr', padding: t.space.$1, marginLeft: `-${t.space.$1}`, ...centerSx })}
<Box
elementDescriptor={descriptors.otpCodeFieldInputContainer}
sx={{ position: 'relative' }}
>
{values.map((value, index: number) => (
<SingleCharInput
elementDescriptor={descriptors.otpCodeFieldInput}
key={index}
value={value}
onClick={handleOnClick(index)}
onChange={handleOnChange(index)}
onKeyDown={handleOnKeyDown(index)}
onInput={handleOnInput(index)}
onPaste={handleOnPaste(index)}
id={`digit-${index}-field`}
ref={node => (refs.current[index] = node)}
autoFocus={index === 0 || undefined}
autoComplete='one-time-code'
aria-label={`${index === 0 ? 'Enter verification code. ' : ''}Digit ${index + 1}`}
isDisabled={isDisabled || isLoading || disabled || feedbackType === 'success'}
hasError={feedbackType === 'error'}
isSuccessfullyFilled={feedbackType === 'success'}
type='text'
inputMode='numeric'
name={`codeInput-${index}`}
/>
))}
</Flex>
{/* Hidden input for password manager compatibility */}
<Input
ref={hiddenInputRef}
type='text'
autoComplete='one-time-code'
data-otp-hidden-input
inputMode='numeric'
pattern={`[0-9]{${length}}`}
minLength={length}
maxLength={length}
spellCheck={false}
aria-hidden='true'
tabIndex={-1}
onChange={handleHiddenInputChange}
onFocus={() => {
// When password manager focuses the hidden input, focus the first visible input
focusInputAt(0);
}}
sx={() => ({
...common.visuallyHidden(),
left: '-9999px',
pointerEvents: 'none',
})}
/>

<Flex
isLoading={isLoading}
hasError={feedbackType === 'error'}
elementDescriptor={descriptors.otpCodeFieldInputs}
gap={2}
sx={t => ({ direction: 'ltr', padding: t.space.$1, marginLeft: `-${t.space.$1}`, ...centerSx })}
role='group'
aria-label='Verification code input'
>
{values.map((value: string, index: number) => (
<SingleCharInput
elementDescriptor={descriptors.otpCodeFieldInput}
// eslint-disable-next-line react/no-array-index-key
key={index}
value={value}
onClick={handleOnClick(index)}
onChange={handleOnChange(index)}
onKeyDown={handleOnKeyDown(index)}
onInput={handleOnInput(index)}
onPaste={handleOnPaste(index)}
id={`digit-${index}-field`}
ref={node => (refs.current[index] = node)}
// eslint-disable-next-line jsx-a11y/no-autofocus
autoFocus={index === 0 || undefined}
autoComplete='off'
aria-label={`${index === 0 ? 'Enter verification code. ' : ''}Digit ${index + 1}`}
isDisabled={isDisabled || isLoading || disabled || feedbackType === 'success'}
hasError={feedbackType === 'error'}
isSuccessfullyFilled={feedbackType === 'success'}
type='text'
inputMode='numeric'
name={`codeInput-${index}`}
data-otp-segment
data-1p-ignore
data-lpignore='true'
maxLength={1}
pattern='[0-9]'
/>
))}
</Flex>
</Box>
);
});

Expand Down
Loading
, '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
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/polite-pants-talk.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/clerk-js': minor
---

Password managers will now autofill OTP code verifications.
1 change: 0 additions & 1 deletion integration/templates/elements-next/src/app/otp/page.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -87,7 +87,6 @@ export default function OTP() {
className='segmented-otp-with-props-wrapper flex justify-center has-[:disabled]:opacity-50'
type='otp'
data-testid='segmented-otp-with-props'
passwordManagerOffset={4}
length={4}
render={({ value, status }) => {
return (
Expand Down
7 changes: 0 additions & 7 deletions integration/tests/elements/otp.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -221,12 +221,5 @@ testAgainstRunningApps({ withEnv: [appConfigs.envs.withEmailCodes] })('OTP @elem
// Check that only 4 segments are rendered
await expect(otpSegmentsWrapper.locator('> div')).toHaveCount(4);
});

test('passwordManagerOffset', async ({ page }) => {
const otp = page.getByTestId(otpTypes.segmentedOtpWithProps);

// The computed styles are different on CI/local etc. so it's not use to check the exact value
await expect(otp).toHaveCSS('clip-path', /inset\(0px \d+\.\d+px 0px 0px\)/i);
});
});
});
1 change: 1 addition & 0 deletions packages/clerk-js/bundlewatch.config.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@
{ "path": "./dist/clerk.legacy.browser.js", "maxSize": "115KB" },
{ "path": "./dist/clerk.headless*.js", "maxSize": "55KB" },
{ "path": "./dist/ui-common*.js", "maxSize": "111.8KB" },
{ "path": "./dist/ui-common*.legacy.*.js", "maxSize": "112.1KB" },
{ "path": "./dist/vendors*.js", "maxSize": "40.2KB" },
{ "path": "./dist/coinbase*.js", "maxSize": "38KB" },
{ "path": "./dist/stripe-vendors*.js", "maxSize": "1KB" },
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -98,6 +98,7 @@ export const APPEARANCE_KEYS = containsAllElementsConfigKeys([
'otpCodeField',
'otpCodeFieldInputs',
'otpCodeFieldInput',
'otpCodeFieldInputContainer',
'otpCodeFieldErrorText',
'formResendCodeLink',

Expand Down
126 changes: 95 additions & 31 deletions packages/clerk-js/src/ui/elements/CodeControl.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@ import type { PropsWithChildren } from 'react';
import React, { useCallback } from 'react';

import type { LocalizationKey } from '../customizables';
import { descriptors, Flex, Input } from '../customizables';
import { Box, descriptors, Flex, Input } from '../customizables';
import { useCardState } from '../elements/contexts';
import { useLoadingStatus } from '../hooks';
import type { PropsOfComponent } from '../styledSystem';
Expand DownExpand Up@@ -160,6 +160,7 @@ export const OTPResendButton = () => {
export const OTPCodeControl = React.forwardRef<{ reset: any }>((_, ref) => {
const [disabled, setDisabled] = React.useState(false);
const refs = React.useRef<Array<HTMLInputElement | null>>([]);
const hiddenInputRef = React.useRef<HTMLInputElement>(null);
const firstClickRef = React.useRef(false);

const { otpControl, isLoading, isDisabled, centerAlign = true } = useOTPInputContext();
Expand All@@ -169,6 +170,11 @@ export const OTPCodeControl = React.forwardRef<{ reset: any }>((_, ref) => {
reset: () => {
setValues(values.map(() => ''));
setDisabled(false);

if (hiddenInputRef.current) {
hiddenInputRef.current.value = '';
}

setTimeout(() => focusInputAt(0), 0);
},
}));
Expand All@@ -183,6 +189,13 @@ export const OTPCodeControl = React.forwardRef<{ reset: any }>((_, ref) => {
}
}, [feedback]);

// Update hidden input when values change
React.useEffect(() => {
if (hiddenInputRef.current) {
hiddenInputRef.current.value = values.join('');
}
}, [values]);

const handleMultipleCharValue = ({ eventValue, inputPosition }: { eventValue: string; inputPosition: number }) => {
const eventValues = (eventValue || '').split('');

Expand DownExpand Up@@ -274,40 +287,91 @@ export const OTPCodeControl = React.forwardRef<{ reset: any }>((_, ref) => {
}
};

// Handle hidden input changes (for password manager autofill)
const handleHiddenInputChange = (e: React.ChangeEvent<HTMLInputElement>) => {
const value = e.target.value.replace(/\D/g, '').slice(0, length);
const newValues = value.split('').concat(Array.from({ length: length - value.length }, () => ''));
setValues(newValues);

// Focus the appropriate visible input
if (value.length > 0) {
focusInputAt(Math.min(value.length - 1, length - 1));
}
};

const centerSx = centerAlign ? { justifyContent: 'center', alignItems: 'center' } : {};

return (
<Flex
isLoading={isLoading}
hasError={feedbackType === 'error'}
elementDescriptor={descriptors.otpCodeFieldInputs}
gap={2}
sx={t => ({ direction: 'ltr', padding: t.space.$1, marginLeft: `-${t.space.$1}`, ...centerSx })}
<Box
elementDescriptor={descriptors.otpCodeFieldInputContainer}
sx={{ position: 'relative' }}
>
{values.map((value, index: number) => (
<SingleCharInput
elementDescriptor={descriptors.otpCodeFieldInput}
key={index}
value={value}
onClick={handleOnClick(index)}
onChange={handleOnChange(index)}
onKeyDown={handleOnKeyDown(index)}
onInput={handleOnInput(index)}
onPaste={handleOnPaste(index)}
id={`digit-${index}-field`}
ref={node => (refs.current[index] = node)}
autoFocus={index === 0 || undefined}
autoComplete='one-time-code'
aria-label={`${index === 0 ? 'Enter verification code. ' : ''}Digit ${index + 1}`}
isDisabled={isDisabled || isLoading || disabled || feedbackType === 'success'}
hasError={feedbackType === 'error'}
isSuccessfullyFilled={feedbackType === 'success'}
type='text'
inputMode='numeric'
name={`codeInput-${index}`}
/>
))}
</Flex>
{/* Hidden input for password manager compatibility */}
<Input
ref={hiddenInputRef}
type='text'
autoComplete='one-time-code'
data-otp-hidden-input
inputMode='numeric'
pattern={`[0-9]{${length}}`}
minLength={length}
maxLength={length}
spellCheck={false}
aria-hidden='true'
tabIndex={-1}
onChange={handleHiddenInputChange}
onFocus={() => {
// When password manager focuses the hidden input, focus the first visible input
focusInputAt(0);
}}
sx={() => ({
...common.visuallyHidden(),
left: '-9999px',
pointerEvents: 'none',
})}
/>

<Flex
isLoading={isLoading}
hasError={feedbackType === 'error'}
elementDescriptor={descriptors.otpCodeFieldInputs}
gap={2}
sx={t => ({ direction: 'ltr', padding: t.space.$1, marginLeft: `-${t.space.$1}`, ...centerSx })}
role='group'
aria-label='Verification code input'
>
{values.map((value: string, index: number) => (
<SingleCharInput
elementDescriptor={descriptors.otpCodeFieldInput}
// eslint-disable-next-line react/no-array-index-key
key={index}
value={value}
onClick={handleOnClick(index)}
onChange={handleOnChange(index)}
onKeyDown={handleOnKeyDown(index)}
onInput={handleOnInput(index)}
onPaste={handleOnPaste(index)}
id={`digit-${index}-field`}
ref={node => (refs.current[index] = node)}
// eslint-disable-next-line jsx-a11y/no-autofocus
autoFocus={index === 0 || undefined}
autoComplete='off'
aria-label={`${index === 0 ? 'Enter verification code. ' : ''}Digit ${index + 1}`}
isDisabled={isDisabled || isLoading || disabled || feedbackType === 'success'}
hasError={feedbackType === 'error'}
isSuccessfullyFilled={feedbackType === 'success'}
type='text'
inputMode='numeric'
name={`codeInput-${index}`}
data-otp-segment
data-1p-ignore
data-lpignore='true'
maxLength={1}
pattern='[0-9]'
/>
))}
</Flex>
</Box>
);
});

Expand Down
Loading
, '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
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/polite-pants-talk.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/clerk-js': minor
---

Password managers will now autofill OTP code verifications.
1 change: 0 additions & 1 deletion integration/templates/elements-next/src/app/otp/page.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -87,7 +87,6 @@ export default function OTP() {
className='segmented-otp-with-props-wrapper flex justify-center has-[:disabled]:opacity-50'
type='otp'
data-testid='segmented-otp-with-props'
passwordManagerOffset={4}
length={4}
render={({ value, status }) => {
return (
Expand Down
7 changes: 0 additions & 7 deletions integration/tests/elements/otp.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -221,12 +221,5 @@ testAgainstRunningApps({ withEnv: [appConfigs.envs.withEmailCodes] })('OTP @elem
// Check that only 4 segments are rendered
await expect(otpSegmentsWrapper.locator('> div')).toHaveCount(4);
});

test('passwordManagerOffset', async ({ page }) => {
const otp = page.getByTestId(otpTypes.segmentedOtpWithProps);

// The computed styles are different on CI/local etc. so it's not use to check the exact value
await expect(otp).toHaveCSS('clip-path', /inset\(0px \d+\.\d+px 0px 0px\)/i);
});
});
});
1 change: 1 addition & 0 deletions packages/clerk-js/bundlewatch.config.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@
{ "path": "./dist/clerk.legacy.browser.js", "maxSize": "115KB" },
{ "path": "./dist/clerk.headless*.js", "maxSize": "55KB" },
{ "path": "./dist/ui-common*.js", "maxSize": "111.8KB" },
{ "path": "./dist/ui-common*.legacy.*.js", "maxSize": "112.1KB" },
{ "path": "./dist/vendors*.js", "maxSize": "40.2KB" },
{ "path": "./dist/coinbase*.js", "maxSize": "38KB" },
{ "path": "./dist/stripe-vendors*.js", "maxSize": "1KB" },
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -98,6 +98,7 @@ export const APPEARANCE_KEYS = containsAllElementsConfigKeys([
'otpCodeField',
'otpCodeFieldInputs',
'otpCodeFieldInput',
'otpCodeFieldInputContainer',
'otpCodeFieldErrorText',
'formResendCodeLink',

Expand Down
126 changes: 95 additions & 31 deletions packages/clerk-js/src/ui/elements/CodeControl.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@ import type { PropsWithChildren } from 'react';
import React, { useCallback } from 'react';

import type { LocalizationKey } from '../customizables';
import { descriptors, Flex, Input } from '../customizables';
import { Box, descriptors, Flex, Input } from '../customizables';
import { useCardState } from '../elements/contexts';
import { useLoadingStatus } from '../hooks';
import type { PropsOfComponent } from '../styledSystem';
Expand DownExpand Up@@ -160,6 +160,7 @@ export const OTPResendButton = () => {
export const OTPCodeControl = React.forwardRef<{ reset: any }>((_, ref) => {
const [disabled, setDisabled] = React.useState(false);
const refs = React.useRef<Array<HTMLInputElement | null>>([]);
const hiddenInputRef = React.useRef<HTMLInputElement>(null);
const firstClickRef = React.useRef(false);

const { otpControl, isLoading, isDisabled, centerAlign = true } = useOTPInputContext();
Expand All@@ -169,6 +170,11 @@ export const OTPCodeControl = React.forwardRef<{ reset: any }>((_, ref) => {
reset: () => {
setValues(values.map(() => ''));
setDisabled(false);

if (hiddenInputRef.current) {
hiddenInputRef.current.value = '';
}

setTimeout(() => focusInputAt(0), 0);
},
}));
Expand All@@ -183,6 +189,13 @@ export const OTPCodeControl = React.forwardRef<{ reset: any }>((_, ref) => {
}
}, [feedback]);

// Update hidden input when values change
React.useEffect(() => {
if (hiddenInputRef.current) {
hiddenInputRef.current.value = values.join('');
}
}, [values]);

const handleMultipleCharValue = ({ eventValue, inputPosition }: { eventValue: string; inputPosition: number }) => {
const eventValues = (eventValue || '').split('');

Expand DownExpand Up@@ -274,40 +287,91 @@ export const OTPCodeControl = React.forwardRef<{ reset: any }>((_, ref) => {
}
};

// Handle hidden input changes (for password manager autofill)
const handleHiddenInputChange = (e: React.ChangeEvent<HTMLInputElement>) => {
const value = e.target.value.replace(/\D/g, '').slice(0, length);
const newValues = value.split('').concat(Array.from({ length: length - value.length }, () => ''));
setValues(newValues);

// Focus the appropriate visible input
if (value.length > 0) {
focusInputAt(Math.min(value.length - 1, length - 1));
}
};

const centerSx = centerAlign ? { justifyContent: 'center', alignItems: 'center' } : {};

return (
<Flex
isLoading={isLoading}
hasError={feedbackType === 'error'}
elementDescriptor={descriptors.otpCodeFieldInputs}
gap={2}
sx={t => ({ direction: 'ltr', padding: t.space.$1, marginLeft: `-${t.space.$1}`, ...centerSx })}
<Box
elementDescriptor={descriptors.otpCodeFieldInputContainer}
sx={{ position: 'relative' }}
>
{values.map((value, index: number) => (
<SingleCharInput
elementDescriptor={descriptors.otpCodeFieldInput}
key={index}
value={value}
onClick={handleOnClick(index)}
onChange={handleOnChange(index)}
onKeyDown={handleOnKeyDown(index)}
onInput={handleOnInput(index)}
onPaste={handleOnPaste(index)}
id={`digit-${index}-field`}
ref={node => (refs.current[index] = node)}
autoFocus={index === 0 || undefined}
autoComplete='one-time-code'
aria-label={`${index === 0 ? 'Enter verification code. ' : ''}Digit ${index + 1}`}
isDisabled={isDisabled || isLoading || disabled || feedbackType === 'success'}
hasError={feedbackType === 'error'}
isSuccessfullyFilled={feedbackType === 'success'}
type='text'
inputMode='numeric'
name={`codeInput-${index}`}
/>
))}
</Flex>
{/* Hidden input for password manager compatibility */}
<Input
ref={hiddenInputRef}
type='text'
autoComplete='one-time-code'
data-otp-hidden-input
inputMode='numeric'
pattern={`[0-9]{${length}}`}
minLength={length}
maxLength={length}
spellCheck={false}
aria-hidden='true'
tabIndex={-1}
onChange={handleHiddenInputChange}
onFocus={() => {
// When password manager focuses the hidden input, focus the first visible input
focusInputAt(0);
}}
sx={() => ({
...common.visuallyHidden(),
left: '-9999px',
pointerEvents: 'none',
})}
/>

<Flex
isLoading={isLoading}
hasError={feedbackType === 'error'}
elementDescriptor={descriptors.otpCodeFieldInputs}
gap={2}
sx={t => ({ direction: 'ltr', padding: t.space.$1, marginLeft: `-${t.space.$1}`, ...centerSx })}
role='group'
aria-label='Verification code input'
>
{values.map((value: string, index: number) => (
<SingleCharInput
elementDescriptor={descriptors.otpCodeFieldInput}
// eslint-disable-next-line react/no-array-index-key
key={index}
value={value}
onClick={handleOnClick(index)}
onChange={handleOnChange(index)}
onKeyDown={handleOnKeyDown(index)}
onInput={handleOnInput(index)}
onPaste={handleOnPaste(index)}
id={`digit-${index}-field`}
ref={node => (refs.current[index] = node)}
// eslint-disable-next-line jsx-a11y/no-autofocus
autoFocus={index === 0 || undefined}
autoComplete='off'
aria-label={`${index === 0 ? 'Enter verification code. ' : ''}Digit ${index + 1}`}
isDisabled={isDisabled || isLoading || disabled || feedbackType === 'success'}
hasError={feedbackType === 'error'}
isSuccessfullyFilled={feedbackType === 'success'}
type='text'
inputMode='numeric'
name={`codeInput-${index}`}
data-otp-segment
data-1p-ignore
data-lpignore='true'
maxLength={1}
pattern='[0-9]'
/>
))}
</Flex>
</Box>
);
});

Expand Down
Loading
, '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
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/polite-pants-talk.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/clerk-js': minor
---

Password managers will now autofill OTP code verifications.
1 change: 0 additions & 1 deletion integration/templates/elements-next/src/app/otp/page.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -87,7 +87,6 @@ export default function OTP() {
className='segmented-otp-with-props-wrapper flex justify-center has-[:disabled]:opacity-50'
type='otp'
data-testid='segmented-otp-with-props'
passwordManagerOffset={4}
length={4}
render={({ value, status }) => {
return (
Expand Down
7 changes: 0 additions & 7 deletions integration/tests/elements/otp.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -221,12 +221,5 @@ testAgainstRunningApps({ withEnv: [appConfigs.envs.withEmailCodes] })('OTP @elem
// Check that only 4 segments are rendered
await expect(otpSegmentsWrapper.locator('> div')).toHaveCount(4);
});

test('passwordManagerOffset', async ({ page }) => {
const otp = page.getByTestId(otpTypes.segmentedOtpWithProps);

// The computed styles are different on CI/local etc. so it's not use to check the exact value
await expect(otp).toHaveCSS('clip-path', /inset\(0px \d+\.\d+px 0px 0px\)/i);
});
});
});
1 change: 1 addition & 0 deletions packages/clerk-js/bundlewatch.config.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@
{ "path": "./dist/clerk.legacy.browser.js", "maxSize": "115KB" },
{ "path": "./dist/clerk.headless*.js", "maxSize": "55KB" },
{ "path": "./dist/ui-common*.js", "maxSize": "111.8KB" },
{ "path": "./dist/ui-common*.legacy.*.js", "maxSize": "112.1KB" },
{ "path": "./dist/vendors*.js", "maxSize": "40.2KB" },
{ "path": "./dist/coinbase*.js", "maxSize": "38KB" },
{ "path": "./dist/stripe-vendors*.js", "maxSize": "1KB" },
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -98,6 +98,7 @@ export const APPEARANCE_KEYS = containsAllElementsConfigKeys([
'otpCodeField',
'otpCodeFieldInputs',
'otpCodeFieldInput',
'otpCodeFieldInputContainer',
'otpCodeFieldErrorText',
'formResendCodeLink',

Expand Down
126 changes: 95 additions & 31 deletions packages/clerk-js/src/ui/elements/CodeControl.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@ import type { PropsWithChildren } from 'react';
import React, { useCallback } from 'react';

import type { LocalizationKey } from '../customizables';
import { descriptors, Flex, Input } from '../customizables';
import { Box, descriptors, Flex, Input } from '../customizables';
import { useCardState } from '../elements/contexts';
import { useLoadingStatus } from '../hooks';
import type { PropsOfComponent } from '../styledSystem';
Expand DownExpand Up@@ -160,6 +160,7 @@ export const OTPResendButton = () => {
export const OTPCodeControl = React.forwardRef<{ reset: any }>((_, ref) => {
const [disabled, setDisabled] = React.useState(false);
const refs = React.useRef<Array<HTMLInputElement | null>>([]);
const hiddenInputRef = React.useRef<HTMLInputElement>(null);
const firstClickRef = React.useRef(false);

const { otpControl, isLoading, isDisabled, centerAlign = true } = useOTPInputContext();
Expand All@@ -169,6 +170,11 @@ export const OTPCodeControl = React.forwardRef<{ reset: any }>((_, ref) => {
reset: () => {
setValues(values.map(() => ''));
setDisabled(false);

if (hiddenInputRef.current) {
hiddenInputRef.current.value = '';
}

setTimeout(() => focusInputAt(0), 0);
},
}));
Expand All@@ -183,6 +189,13 @@ export const OTPCodeControl = React.forwardRef<{ reset: any }>((_, ref) => {
}
}, [feedback]);

// Update hidden input when values change
React.useEffect(() => {
if (hiddenInputRef.current) {
hiddenInputRef.current.value = values.join('');
}
}, [values]);

const handleMultipleCharValue = ({ eventValue, inputPosition }: { eventValue: string; inputPosition: number }) => {
const eventValues = (eventValue || '').split('');

Expand DownExpand Up@@ -274,40 +287,91 @@ export const OTPCodeControl = React.forwardRef<{ reset: any }>((_, ref) => {
}
};

// Handle hidden input changes (for password manager autofill)
const handleHiddenInputChange = (e: React.ChangeEvent<HTMLInputElement>) => {
const value = e.target.value.replace(/\D/g, '').slice(0, length);
const newValues = value.split('').concat(Array.from({ length: length - value.length }, () => ''));
setValues(newValues);

// Focus the appropriate visible input
if (value.length > 0) {
focusInputAt(Math.min(value.length - 1, length - 1));
}
};

const centerSx = centerAlign ? { justifyContent: 'center', alignItems: 'center' } : {};

return (
<Flex
isLoading={isLoading}
hasError={feedbackType === 'error'}
elementDescriptor={descriptors.otpCodeFieldInputs}
gap={2}
sx={t => ({ direction: 'ltr', padding: t.space.$1, marginLeft: `-${t.space.$1}`, ...centerSx })}
<Box
elementDescriptor={descriptors.otpCodeFieldInputContainer}
sx={{ position: 'relative' }}
>
{values.map((value, index: number) => (
<SingleCharInput
elementDescriptor={descriptors.otpCodeFieldInput}
key={index}
value={value}
onClick={handleOnClick(index)}
onChange={handleOnChange(index)}
onKeyDown={handleOnKeyDown(index)}
onInput={handleOnInput(index)}
onPaste={handleOnPaste(index)}
id={`digit-${index}-field`}
ref={node => (refs.current[index] = node)}
autoFocus={index === 0 || undefined}
autoComplete='one-time-code'
aria-label={`${index === 0 ? 'Enter verification code. ' : ''}Digit ${index + 1}`}
isDisabled={isDisabled || isLoading || disabled || feedbackType === 'success'}
hasError={feedbackType === 'error'}
isSuccessfullyFilled={feedbackType === 'success'}
type='text'
inputMode='numeric'
name={`codeInput-${index}`}
/>
))}
</Flex>
{/* Hidden input for password manager compatibility */}
<Input
ref={hiddenInputRef}
type='text'
autoComplete='one-time-code'
data-otp-hidden-input
inputMode='numeric'
pattern={`[0-9]{${length}}`}
minLength={length}
maxLength={length}
spellCheck={false}
aria-hidden='true'
tabIndex={-1}
onChange={handleHiddenInputChange}
onFocus={() => {
// When password manager focuses the hidden input, focus the first visible input
focusInputAt(0);
}}
sx={() => ({
...common.visuallyHidden(),
left: '-9999px',
pointerEvents: 'none',
})}
/>

<Flex
isLoading={isLoading}
hasError={feedbackType === 'error'}
elementDescriptor={descriptors.otpCodeFieldInputs}
gap={2}
sx={t => ({ direction: 'ltr', padding: t.space.$1, marginLeft: `-${t.space.$1}`, ...centerSx })}
role='group'
aria-label='Verification code input'
>
{values.map((value: string, index: number) => (
<SingleCharInput
elementDescriptor={descriptors.otpCodeFieldInput}
// eslint-disable-next-line react/no-array-index-key
key={index}
value={value}
onClick={handleOnClick(index)}
onChange={handleOnChange(index)}
onKeyDown={handleOnKeyDown(index)}
onInput={handleOnInput(index)}
onPaste={handleOnPaste(index)}
id={`digit-${index}-field`}
ref={node => (refs.current[index] = node)}
// eslint-disable-next-line jsx-a11y/no-autofocus
autoFocus={index === 0 || undefined}
autoComplete='off'
aria-label={`${index === 0 ? 'Enter verification code. ' : ''}Digit ${index + 1}`}
isDisabled={isDisabled || isLoading || disabled || feedbackType === 'success'}
hasError={feedbackType === 'error'}
isSuccessfullyFilled={feedbackType === 'success'}
type='text'
inputMode='numeric'
name={`codeInput-${index}`}
data-otp-segment
data-1p-ignore
data-lpignore='true'
maxLength={1}
pattern='[0-9]'
/>
))}
</Flex>
</Box>
);
});

Expand Down
Loading
, '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
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/polite-pants-talk.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/clerk-js': minor
---

Password managers will now autofill OTP code verifications.
1 change: 0 additions & 1 deletion integration/templates/elements-next/src/app/otp/page.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -87,7 +87,6 @@ export default function OTP() {
className='segmented-otp-with-props-wrapper flex justify-center has-[:disabled]:opacity-50'
type='otp'
data-testid='segmented-otp-with-props'
passwordManagerOffset={4}
length={4}
render={({ value, status }) => {
return (
Expand Down
7 changes: 0 additions & 7 deletions integration/tests/elements/otp.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -221,12 +221,5 @@ testAgainstRunningApps({ withEnv: [appConfigs.envs.withEmailCodes] })('OTP @elem
// Check that only 4 segments are rendered
await expect(otpSegmentsWrapper.locator('> div')).toHaveCount(4);
});

test('passwordManagerOffset', async ({ page }) => {
const otp = page.getByTestId(otpTypes.segmentedOtpWithProps);

// The computed styles are different on CI/local etc. so it's not use to check the exact value
await expect(otp).toHaveCSS('clip-path', /inset\(0px \d+\.\d+px 0px 0px\)/i);
});
});
});
1 change: 1 addition & 0 deletions packages/clerk-js/bundlewatch.config.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@
{ "path": "./dist/clerk.legacy.browser.js", "maxSize": "115KB" },
{ "path": "./dist/clerk.headless*.js", "maxSize": "55KB" },
{ "path": "./dist/ui-common*.js", "maxSize": "111.8KB" },
{ "path": "./dist/ui-common*.legacy.*.js", "maxSize": "112.1KB" },
{ "path": "./dist/vendors*.js", "maxSize": "40.2KB" },
{ "path": "./dist/coinbase*.js", "maxSize": "38KB" },
{ "path": "./dist/stripe-vendors*.js", "maxSize": "1KB" },
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -98,6 +98,7 @@ export const APPEARANCE_KEYS = containsAllElementsConfigKeys([
'otpCodeField',
'otpCodeFieldInputs',
'otpCodeFieldInput',
'otpCodeFieldInputContainer',
'otpCodeFieldErrorText',
'formResendCodeLink',

Expand Down
126 changes: 95 additions & 31 deletions packages/clerk-js/src/ui/elements/CodeControl.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@ import type { PropsWithChildren } from 'react';
import React, { useCallback } from 'react';

import type { LocalizationKey } from '../customizables';
import { descriptors, Flex, Input } from '../customizables';
import { Box, descriptors, Flex, Input } from '../customizables';
import { useCardState } from '../elements/contexts';
import { useLoadingStatus } from '../hooks';
import type { PropsOfComponent } from '../styledSystem';
Expand DownExpand Up@@ -160,6 +160,7 @@ export const OTPResendButton = () => {
export const OTPCodeControl = React.forwardRef<{ reset: any }>((_, ref) => {
const [disabled, setDisabled] = React.useState(false);
const refs = React.useRef<Array<HTMLInputElement | null>>([]);
const hiddenInputRef = React.useRef<HTMLInputElement>(null);
const firstClickRef = React.useRef(false);

const { otpControl, isLoading, isDisabled, centerAlign = true } = useOTPInputContext();
Expand All@@ -169,6 +170,11 @@ export const OTPCodeControl = React.forwardRef<{ reset: any }>((_, ref) => {
reset: () => {
setValues(values.map(() => ''));
setDisabled(false);

if (hiddenInputRef.current) {
hiddenInputRef.current.value = '';
}

setTimeout(() => focusInputAt(0), 0);
},
}));
Expand All@@ -183,6 +189,13 @@ export const OTPCodeControl = React.forwardRef<{ reset: any }>((_, ref) => {
}
}, [feedback]);

// Update hidden input when values change
React.useEffect(() => {
if (hiddenInputRef.current) {
hiddenInputRef.current.value = values.join('');
}
}, [values]);

const handleMultipleCharValue = ({ eventValue, inputPosition }: { eventValue: string; inputPosition: number }) => {
const eventValues = (eventValue || '').split('');

Expand DownExpand Up@@ -274,40 +287,91 @@ export const OTPCodeControl = React.forwardRef<{ reset: any }>((_, ref) => {
}
};

// Handle hidden input changes (for password manager autofill)
const handleHiddenInputChange = (e: React.ChangeEvent<HTMLInputElement>) => {
const value = e.target.value.replace(/\D/g, '').slice(0, length);
const newValues = value.split('').concat(Array.from({ length: length - value.length }, () => ''));
setValues(newValues);

// Focus the appropriate visible input
if (value.length > 0) {
focusInputAt(Math.min(value.length - 1, length - 1));
}
};

const centerSx = centerAlign ? { justifyContent: 'center', alignItems: 'center' } : {};

return (
<Flex
isLoading={isLoading}
hasError={feedbackType === 'error'}
elementDescriptor={descriptors.otpCodeFieldInputs}
gap={2}
sx={t => ({ direction: 'ltr', padding: t.space.$1, marginLeft: `-${t.space.$1}`, ...centerSx })}
<Box
elementDescriptor={descriptors.otpCodeFieldInputContainer}
sx={{ position: 'relative' }}
>
{values.map((value, index: number) => (
<SingleCharInput
elementDescriptor={descriptors.otpCodeFieldInput}
key={index}
value={value}
onClick={handleOnClick(index)}
onChange={handleOnChange(index)}
onKeyDown={handleOnKeyDown(index)}
onInput={handleOnInput(index)}
onPaste={handleOnPaste(index)}
id={`digit-${index}-field`}
ref={node => (refs.current[index] = node)}
autoFocus={index === 0 || undefined}
autoComplete='one-time-code'
aria-label={`${index === 0 ? 'Enter verification code. ' : ''}Digit ${index + 1}`}
isDisabled={isDisabled || isLoading || disabled || feedbackType === 'success'}
hasError={feedbackType === 'error'}
isSuccessfullyFilled={feedbackType === 'success'}
type='text'
inputMode='numeric'
name={`codeInput-${index}`}
/>
))}
</Flex>
{/* Hidden input for password manager compatibility */}
<Input
ref={hiddenInputRef}
type='text'
autoComplete='one-time-code'
data-otp-hidden-input
inputMode='numeric'
pattern={`[0-9]{${length}}`}
minLength={length}
maxLength={length}
spellCheck={false}
aria-hidden='true'
tabIndex={-1}
onChange={handleHiddenInputChange}
onFocus={() => {
// When password manager focuses the hidden input, focus the first visible input
focusInputAt(0);
}}
sx={() => ({
...common.visuallyHidden(),
left: '-9999px',
pointerEvents: 'none',
})}
/>

<Flex
isLoading={isLoading}
hasError={feedbackType === 'error'}
elementDescriptor={descriptors.otpCodeFieldInputs}
gap={2}
sx={t => ({ direction: 'ltr', padding: t.space.$1, marginLeft: `-${t.space.$1}`, ...centerSx })}
role='group'
aria-label='Verification code input'
>
{values.map((value: string, index: number) => (
<SingleCharInput
elementDescriptor={descriptors.otpCodeFieldInput}
// eslint-disable-next-line react/no-array-index-key
key={index}
value={value}
onClick={handleOnClick(index)}
onChange={handleOnChange(index)}
onKeyDown={handleOnKeyDown(index)}
onInput={handleOnInput(index)}
onPaste={handleOnPaste(index)}
id={`digit-${index}-field`}
ref={node => (refs.current[index] = node)}
// eslint-disable-next-line jsx-a11y/no-autofocus
autoFocus={index === 0 || undefined}
autoComplete='off'
aria-label={`${index === 0 ? 'Enter verification code. ' : ''}Digit ${index + 1}`}
isDisabled={isDisabled || isLoading || disabled || feedbackType === 'success'}
hasError={feedbackType === 'error'}
isSuccessfullyFilled={feedbackType === 'success'}
type='text'
inputMode='numeric'
name={`codeInput-${index}`}
data-otp-segment
data-1p-ignore
data-lpignore='true'
maxLength={1}
pattern='[0-9]'
/>
))}
</Flex>
</Box>
);
});

Expand Down
Loading
, '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
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/polite-pants-talk.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/clerk-js': minor
---

Password managers will now autofill OTP code verifications.
1 change: 0 additions & 1 deletion integration/templates/elements-next/src/app/otp/page.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -87,7 +87,6 @@ export default function OTP() {
className='segmented-otp-with-props-wrapper flex justify-center has-[:disabled]:opacity-50'
type='otp'
data-testid='segmented-otp-with-props'
passwordManagerOffset={4}
length={4}
render={({ value, status }) => {
return (
Expand Down
7 changes: 0 additions & 7 deletions integration/tests/elements/otp.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -221,12 +221,5 @@ testAgainstRunningApps({ withEnv: [appConfigs.envs.withEmailCodes] })('OTP @elem
// Check that only 4 segments are rendered
await expect(otpSegmentsWrapper.locator('> div')).toHaveCount(4);
});

test('passwordManagerOffset', async ({ page }) => {
const otp = page.getByTestId(otpTypes.segmentedOtpWithProps);

// The computed styles are different on CI/local etc. so it's not use to check the exact value
await expect(otp).toHaveCSS('clip-path', /inset\(0px \d+\.\d+px 0px 0px\)/i);
});
});
});
1 change: 1 addition & 0 deletions packages/clerk-js/bundlewatch.config.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@
{ "path": "./dist/clerk.legacy.browser.js", "maxSize": "115KB" },
{ "path": "./dist/clerk.headless*.js", "maxSize": "55KB" },
{ "path": "./dist/ui-common*.js", "maxSize": "111.8KB" },
{ "path": "./dist/ui-common*.legacy.*.js", "maxSize": "112.1KB" },
{ "path": "./dist/vendors*.js", "maxSize": "40.2KB" },
{ "path": "./dist/coinbase*.js", "maxSize": "38KB" },
{ "path": "./dist/stripe-vendors*.js", "maxSize": "1KB" },
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -98,6 +98,7 @@ export const APPEARANCE_KEYS = containsAllElementsConfigKeys([
'otpCodeField',
'otpCodeFieldInputs',
'otpCodeFieldInput',
'otpCodeFieldInputContainer',
'otpCodeFieldErrorText',
'formResendCodeLink',

Expand Down
126 changes: 95 additions & 31 deletions packages/clerk-js/src/ui/elements/CodeControl.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@ import type { PropsWithChildren } from 'react';
import React, { useCallback } from 'react';

import type { LocalizationKey } from '../customizables';
import { descriptors, Flex, Input } from '../customizables';
import { Box, descriptors, Flex, Input } from '../customizables';
import { useCardState } from '../elements/contexts';
import { useLoadingStatus } from '../hooks';
import type { PropsOfComponent } from '../styledSystem';
Expand DownExpand Up@@ -160,6 +160,7 @@ export const OTPResendButton = () => {
export const OTPCodeControl = React.forwardRef<{ reset: any }>((_, ref) => {
const [disabled, setDisabled] = React.useState(false);
const refs = React.useRef<Array<HTMLInputElement | null>>([]);
const hiddenInputRef = React.useRef<HTMLInputElement>(null);
const firstClickRef = React.useRef(false);

const { otpControl, isLoading, isDisabled, centerAlign = true } = useOTPInputContext();
Expand All@@ -169,6 +170,11 @@ export const OTPCodeControl = React.forwardRef<{ reset: any }>((_, ref) => {
reset: () => {
setValues(values.map(() => ''));
setDisabled(false);

if (hiddenInputRef.current) {
hiddenInputRef.current.value = '';
}

setTimeout(() => focusInputAt(0), 0);
},
}));
Expand All@@ -183,6 +189,13 @@ export const OTPCodeControl = React.forwardRef<{ reset: any }>((_, ref) => {
}
}, [feedback]);

// Update hidden input when values change
React.useEffect(() => {
if (hiddenInputRef.current) {
hiddenInputRef.current.value = values.join('');
}
}, [values]);

const handleMultipleCharValue = ({ eventValue, inputPosition }: { eventValue: string; inputPosition: number }) => {
const eventValues = (eventValue || '').split('');

Expand DownExpand Up@@ -274,40 +287,91 @@ export const OTPCodeControl = React.forwardRef<{ reset: any }>((_, ref) => {
}
};

// Handle hidden input changes (for password manager autofill)
const handleHiddenInputChange = (e: React.ChangeEvent<HTMLInputElement>) => {
const value = e.target.value.replace(/\D/g, '').slice(0, length);
const newValues = value.split('').concat(Array.from({ length: length - value.length }, () => ''));
setValues(newValues);

// Focus the appropriate visible input
if (value.length > 0) {
focusInputAt(Math.min(value.length - 1, length - 1));
}
};

const centerSx = centerAlign ? { justifyContent: 'center', alignItems: 'center' } : {};

return (
<Flex
isLoading={isLoading}
hasError={feedbackType === 'error'}
elementDescriptor={descriptors.otpCodeFieldInputs}
gap={2}
sx={t => ({ direction: 'ltr', padding: t.space.$1, marginLeft: `-${t.space.$1}`, ...centerSx })}
<Box
elementDescriptor={descriptors.otpCodeFieldInputContainer}
sx={{ position: 'relative' }}
>
{values.map((value, index: number) => (
<SingleCharInput
elementDescriptor={descriptors.otpCodeFieldInput}
key={index}
value={value}
onClick={handleOnClick(index)}
onChange={handleOnChange(index)}
onKeyDown={handleOnKeyDown(index)}
onInput={handleOnInput(index)}
onPaste={handleOnPaste(index)}
id={`digit-${index}-field`}
ref={node => (refs.current[index] = node)}
autoFocus={index === 0 || undefined}
autoComplete='one-time-code'
aria-label={`${index === 0 ? 'Enter verification code. ' : ''}Digit ${index + 1}`}
isDisabled={isDisabled || isLoading || disabled || feedbackType === 'success'}
hasError={feedbackType === 'error'}
isSuccessfullyFilled={feedbackType === 'success'}
type='text'
inputMode='numeric'
name={`codeInput-${index}`}
/>
))}
</Flex>
{/* Hidden input for password manager compatibility */}
<Input
ref={hiddenInputRef}
type='text'
autoComplete='one-time-code'
data-otp-hidden-input
inputMode='numeric'
pattern={`[0-9]{${length}}`}
minLength={length}
maxLength={length}
spellCheck={false}
aria-hidden='true'
tabIndex={-1}
onChange={handleHiddenInputChange}
onFocus={() => {
// When password manager focuses the hidden input, focus the first visible input
focusInputAt(0);
}}
sx={() => ({
...common.visuallyHidden(),
left: '-9999px',
pointerEvents: 'none',
})}
/>

<Flex
isLoading={isLoading}
hasError={feedbackType === 'error'}
elementDescriptor={descriptors.otpCodeFieldInputs}
gap={2}
sx={t => ({ direction: 'ltr', padding: t.space.$1, marginLeft: `-${t.space.$1}`, ...centerSx })}
role='group'
aria-label='Verification code input'
>
{values.map((value: string, index: number) => (
<SingleCharInput
elementDescriptor={descriptors.otpCodeFieldInput}
// eslint-disable-next-line react/no-array-index-key
key={index}
value={value}
onClick={handleOnClick(index)}
onChange={handleOnChange(index)}
onKeyDown={handleOnKeyDown(index)}
onInput={handleOnInput(index)}
onPaste={handleOnPaste(index)}
id={`digit-${index}-field`}
ref={node => (refs.current[index] = node)}
// eslint-disable-next-line jsx-a11y/no-autofocus
autoFocus={index === 0 || undefined}
autoComplete='off'
aria-label={`${index === 0 ? 'Enter verification code. ' : ''}Digit ${index + 1}`}
isDisabled={isDisabled || isLoading || disabled || feedbackType === 'success'}
hasError={feedbackType === 'error'}
isSuccessfullyFilled={feedbackType === 'success'}
type='text'
inputMode='numeric'
name={`codeInput-${index}`}
data-otp-segment
data-1p-ignore
data-lpignore='true'
maxLength={1}
pattern='[0-9]'
/>
))}
</Flex>
</Box>
);
});

Expand Down
Loading