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
8 changes: 8 additions & 0 deletions .changeset/modern-coins-camp.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
---
"@clerk/clerk-js": minor
"@clerk/nextjs": minor
"@clerk/clerk-react": minor
"@clerk/shared": minor
---

Introduce new `<TaskResetPassword/>` session task component
10 changes: 10 additions & 0 deletions packages/clerk-js/sandbox/app.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -37,6 +37,7 @@ const AVAILABLE_COMPONENTS = [
'apiKeys',
'oauthConsent',
'taskChooseOrganization',
'taskResetPassword',
] as const;

const COMPONENT_PROPS_NAMESPACE = 'clerk-js-sandbox';
Expand DownExpand Up@@ -99,6 +100,7 @@ const componentControls: Record<(typeof AVAILABLE_COMPONENTS)[number], Component
apiKeys: buildComponentControls('apiKeys'),
oauthConsent: buildComponentControls('oauthConsent'),
taskChooseOrganization: buildComponentControls('taskChooseOrganization'),
taskResetPassword: buildComponentControls('taskResetPassword'),
};

declare global {
Expand DownExpand Up@@ -352,6 +354,14 @@ void (async () => {
},
);
},
'/task-reset-password': () => {
Clerk.mountTaskResetPassword(
app,
componentControls.taskResetPassword.getProps() ?? {
redirectUrlComplete: '/user-profile',
},
);
},
'/open-sign-in': () => {
mountOpenSignInButton(app, componentControls.signIn.getProps() ?? {});
},
Expand Down
21 changes: 21 additions & 0 deletions packages/clerk-js/src/core/clerk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -85,6 +85,7 @@ import type {
SignUpRedirectOptions,
SignUpResource,
TaskChooseOrganizationProps,
TaskResetPasswordProps,
TasksRedirectOptions,
UnsubscribeCallback,
UserAvatarProps,
Expand DownExpand Up@@ -1424,6 +1425,26 @@ export class Clerk implements ClerkInterface {
void this.#componentControls.ensureMounted().then(controls => controls.unmountComponent({ node }));
};

public mountTaskResetPassword = (node: HTMLDivElement, props?: TaskResetPasswordProps) => {
this.assertComponentsReady(this.#componentControls);

void this.#componentControls.ensureMounted({ preloadHint: 'TaskResetPassword' }).then(controls =>
controls.mountComponent({
name: 'TaskResetPassword',
appearanceKey: 'taskResetPassword',
node,
props,
}),
);

this.telemetry?.record(eventPrebuiltComponentMounted('TaskResetPassword', props));
};

public unmountTaskResetPassword = (node: HTMLDivElement) => {
this.assertComponentsReady(this.#componentControls);
void this.#componentControls.ensureMounted().then(controls => controls.unmountComponent({ node }));
};

/**
* `setActive` can be used to set the active session and/or organization.
*/
Expand Down
7 changes: 7 additions & 0 deletions packages/clerk-js/src/ui/lazyModules/components.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,8 @@ const componentImportPaths = {
SessionTasks: () => import(/* webpackChunkName: "sessionTasks" */ '../components/SessionTasks'),
TaskChooseOrganization: () =>
import(/* webpackChunkName: "taskChooseOrganization" */ '../components/SessionTasks/tasks/TaskChooseOrganization'),
TaskResetPassword: () =>
import(/* webpackChunkName: "taskResetPassword" */ '../components/SessionTasks/tasks/TaskResetPassword'),
PlanDetails: () => import(/* webpackChunkName: "planDetails" */ '../components/Plans/PlanDetails'),
SubscriptionDetails: () => import(/* webpackChunkName: "subscriptionDetails" */ '../components/SubscriptionDetails'),
APIKeys: () => import(/* webpackChunkName: "apiKeys" */ '../components/APIKeys/APIKeys'),
Expand DownExpand Up@@ -123,6 +125,10 @@ export const TaskChooseOrganization = lazy(() =>
componentImportPaths.TaskChooseOrganization().then(module => ({ default: module.TaskChooseOrganization })),
);

export const TaskResetPassword = lazy(() =>
componentImportPaths.TaskResetPassword().then(module => ({ default: module.TaskResetPassword })),
);

export const PlanDetails = lazy(() =>
componentImportPaths.PlanDetails().then(module => ({ default: module.PlanDetails })),
);
Expand DownExpand Up@@ -172,6 +178,7 @@ export const ClerkComponents = {
OAuthConsent,
SubscriptionDetails,
TaskChooseOrganization,
TaskResetPassword,
};

export type ClerkComponentName = keyof typeof ClerkComponents;
3 changes: 2 additions & 1 deletion packages/clerk-js/src/ui/types.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -59,7 +59,8 @@ export type AvailableComponentProps =
| __internal_SubscriptionDetailsProps
| __internal_PlanDetailsProps
| APIKeysProps
| TaskChooseOrganizationProps;
| TaskChooseOrganizationProps
| TaskResetPasswordProps;

type ComponentMode = 'modal' | 'mounted';
type SignInMode = 'modal' | 'redirect';
Expand Down
1 change: 1 addition & 0 deletions packages/nextjs/src/client-boundary/uiComponents.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,7 @@ export {
SignOutButton,
SignUpButton,
TaskChooseOrganization,
TaskResetPassword,
UserAvatar,
UserButton,
Waitlist,
Expand Down
1 change: 1 addition & 0 deletions packages/nextjs/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -35,6 +35,7 @@ export {
SignUp,
SignUpButton,
TaskChooseOrganization,
TaskResetPassword,
UserAvatar,
UserButton,
UserProfile,
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -38,6 +38,7 @@ exports[`root public exports > should not change unexpectedly 1`] = `
"SignedIn",
"SignedOut",
"TaskChooseOrganization",
"TaskResetPassword",
"UserAvatar",
"UserButton",
"UserProfile",
Expand Down
1 change: 1 addition & 0 deletions packages/react/src/components/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@ export {
SignIn,
SignUp,
TaskChooseOrganization,
TaskResetPassword,
UserAvatar,
UserButton,
UserProfile,
Expand Down
29 changes: 29 additions & 0 deletions packages/react/src/components/uiComponents.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@ import type {
SignInProps,
SignUpProps,
TaskChooseOrganizationProps,
TaskResetPasswordProps,
UserAvatarProps,
UserButtonProps,
UserProfileProps,
Expand DownExpand Up@@ -696,3 +697,31 @@ export const TaskChooseOrganization = withClerk(
},
{ component: 'TaskChooseOrganization', renderWhileLoading: true },
);

export const TaskResetPassword = withClerk(
({ clerk, component, fallback, ...props }: WithClerkProp<TaskResetPasswordProps & FallbackProp>) => {
const mountingStatus = useWaitForComponentMount(component);
const shouldShowFallback = mountingStatus === 'rendering' || !clerk.loaded;

const rendererRootProps = {
...(shouldShowFallback && fallback && { style: { display: 'none' } }),
};

return (
<>
{shouldShowFallback && fallback}
{clerk.loaded && (
<ClerkHostRenderer
component={component}
mount={clerk.mountTaskResetPassword}
unmount={clerk.unmountTaskResetPassword}
updateProps={(clerk as any).__unstable__updateProps}
props={props}
rootProps={rendererRootProps}
/>
)}
</>
);
},
{ component: 'TaskResetPassword', renderWhileLoading: true },
);
23 changes: 22 additions & 1 deletion packages/react/src/isomorphicClerk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -48,6 +48,7 @@ import type {
SignUpResource,
State,
TaskChooseOrganizationProps,
TaskResetPasswordProps,
TasksRedirectOptions,
UnsubscribeCallback,
UserAvatarProps,
Expand DownExpand Up@@ -150,7 +151,7 @@ export class IsomorphicClerk implements IsomorphicLoadedClerk {
private premountAPIKeysNodes = new Map<HTMLDivElement, APIKeysProps | undefined>();
private premountOAuthConsentNodes = new Map<HTMLDivElement, __internal_OAuthConsentProps | undefined>();
private premountTaskChooseOrganizationNodes = new Map<HTMLDivElement, TaskChooseOrganizationProps | undefined>();

private premountTaskResetPasswordNodes = new Map<HTMLDivElement, TaskResetPasswordProps | undefined>();
// A separate Map of `addListener` method calls to handle multiple listeners.
private premountAddListenerCalls = new Map<
ListenerCallback,
Expand DownExpand Up@@ -676,6 +677,10 @@ export class IsomorphicClerk implements IsomorphicLoadedClerk {
clerkjs.mountTaskChooseOrganization(node, props);
});

this.premountTaskResetPasswordNodes.forEach((props, node) => {
clerkjs.mountTaskResetPassword(node, props);
});

/**
* Only update status in case `clerk.status` is missing. In any other case, `clerk-js` should be the orchestrator.
*/
Expand DownExpand Up@@ -1218,6 +1223,22 @@ export class IsomorphicClerk implements IsomorphicLoadedClerk {
}
};

mountTaskResetPassword = (node: HTMLDivElement, props?: TaskResetPasswordProps): void => {
if (this.clerkjs && this.loaded) {
this.clerkjs.mountTaskResetPassword(node, props);
} else {
this.premountTaskResetPasswordNodes.set(node, props);
}
};

unmountTaskResetPassword = (node: HTMLDivElement): void => {
if (this.clerkjs && this.loaded) {
this.clerkjs.unmountTaskResetPassword(node);
} else {
this.premountTaskResetPasswordNodes.delete(node);
}
};

addListener = (listener: ListenerCallback): UnsubscribeCallback => {
if (this.clerkjs) {
return this.clerkjs.addListener(listener);
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -32,6 +32,7 @@ exports[`root public exports > should not change unexpectedly 1`] = `
"SignedIn",
"SignedOut",
"TaskChooseOrganization",
"TaskResetPassword",
"UserAvatar",
"UserButton",
"UserProfile",
Expand Down
2 changes: 2 additions & 0 deletions packages/remix/src/__tests__/exports.test.ts
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
import { describe, expect, it } from 'vitest';

import * as publicExports from '../index';
import * as ssrExports from '../ssr/index';

Expand Down
4 changes: 4 additions & 0 deletions packages/shared/src/types/appearance.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -1125,6 +1125,10 @@ export type Appearance<T = Theme> = T &
* Theme overrides that only apply to the `<TaskChooseOrganization />` component
*/
taskChooseOrganization?: T;
/**
* Theme overrides that only apply to the `<TaskResetPassword />` component
*/
taskResetPassword?: T;
/**
* Theme overrides that only apply to the `<EnableOrganizations/>` component
*/
Expand Down
16 changes: 16 additions & 0 deletions packages/shared/src/types/clerk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -646,6 +646,22 @@ export interface Clerk {
*/
unmountTaskChooseOrganization: (targetNode: HTMLDivElement) => void;

/**
* Mounts a TaskResetPassword component at the target element.
*
* @param targetNode - Target node to mount the TaskResetPassword component.
* @param props - configuration parameters.
*/
mountTaskResetPassword: (targetNode: HTMLDivElement, props?: TaskResetPasswordProps) => void;

/**
* Unmount a TaskResetPassword component from the target element.
* If there is no component mounted at the target node, results in a noop.
*
* @param targetNode - Target node to unmount the TaskResetPassword component from.
*/
unmountTaskResetPassword: (targetNode: HTMLDivElement) => void;
Comment thread
octoper marked this conversation as resolved.

/**
* @internal
* Loads Stripe libraries for commerce functionality
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -43,6 +43,7 @@ exports[`root public exports > should not change unexpectedly 1`] = `
"SignedIn",
"SignedOut",
"TaskChooseOrganization",
"TaskResetPassword",
"UserAvatar",
"UserButton",
"UserProfile",
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
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
8 changes: 8 additions & 0 deletions .changeset/modern-coins-camp.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
---
"@clerk/clerk-js": minor
"@clerk/nextjs": minor
"@clerk/clerk-react": minor
"@clerk/shared": minor
---

Introduce new `<TaskResetPassword/>` session task component
10 changes: 10 additions & 0 deletions packages/clerk-js/sandbox/app.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -37,6 +37,7 @@ const AVAILABLE_COMPONENTS = [
'apiKeys',
'oauthConsent',
'taskChooseOrganization',
'taskResetPassword',
] as const;

const COMPONENT_PROPS_NAMESPACE = 'clerk-js-sandbox';
Expand DownExpand Up@@ -99,6 +100,7 @@ const componentControls: Record<(typeof AVAILABLE_COMPONENTS)[number], Component
apiKeys: buildComponentControls('apiKeys'),
oauthConsent: buildComponentControls('oauthConsent'),
taskChooseOrganization: buildComponentControls('taskChooseOrganization'),
taskResetPassword: buildComponentControls('taskResetPassword'),
};

declare global {
Expand DownExpand Up@@ -352,6 +354,14 @@ void (async () => {
},
);
},
'/task-reset-password': () => {
Clerk.mountTaskResetPassword(
app,
componentControls.taskResetPassword.getProps() ?? {
redirectUrlComplete: '/user-profile',
},
);
},
'/open-sign-in': () => {
mountOpenSignInButton(app, componentControls.signIn.getProps() ?? {});
},
Expand Down
21 changes: 21 additions & 0 deletions packages/clerk-js/src/core/clerk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -85,6 +85,7 @@ import type {
SignUpRedirectOptions,
SignUpResource,
TaskChooseOrganizationProps,
TaskResetPasswordProps,
TasksRedirectOptions,
UnsubscribeCallback,
UserAvatarProps,
Expand DownExpand Up@@ -1424,6 +1425,26 @@ export class Clerk implements ClerkInterface {
void this.#componentControls.ensureMounted().then(controls => controls.unmountComponent({ node }));
};

public mountTaskResetPassword = (node: HTMLDivElement, props?: TaskResetPasswordProps) => {
this.assertComponentsReady(this.#componentControls);

void this.#componentControls.ensureMounted({ preloadHint: 'TaskResetPassword' }).then(controls =>
controls.mountComponent({
name: 'TaskResetPassword',
appearanceKey: 'taskResetPassword',
node,
props,
}),
);

this.telemetry?.record(eventPrebuiltComponentMounted('TaskResetPassword', props));
};

public unmountTaskResetPassword = (node: HTMLDivElement) => {
this.assertComponentsReady(this.#componentControls);
void this.#componentControls.ensureMounted().then(controls => controls.unmountComponent({ node }));
};

/**
* `setActive` can be used to set the active session and/or organization.
*/
Expand Down
7 changes: 7 additions & 0 deletions packages/clerk-js/src/ui/lazyModules/components.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,8 @@ const componentImportPaths = {
SessionTasks: () => import(/* webpackChunkName: "sessionTasks" */ '../components/SessionTasks'),
TaskChooseOrganization: () =>
import(/* webpackChunkName: "taskChooseOrganization" */ '../components/SessionTasks/tasks/TaskChooseOrganization'),
TaskResetPassword: () =>
import(/* webpackChunkName: "taskResetPassword" */ '../components/SessionTasks/tasks/TaskResetPassword'),
PlanDetails: () => import(/* webpackChunkName: "planDetails" */ '../components/Plans/PlanDetails'),
SubscriptionDetails: () => import(/* webpackChunkName: "subscriptionDetails" */ '../components/SubscriptionDetails'),
APIKeys: () => import(/* webpackChunkName: "apiKeys" */ '../components/APIKeys/APIKeys'),
Expand DownExpand Up@@ -123,6 +125,10 @@ export const TaskChooseOrganization = lazy(() =>
componentImportPaths.TaskChooseOrganization().then(module => ({ default: module.TaskChooseOrganization })),
);

export const TaskResetPassword = lazy(() =>
componentImportPaths.TaskResetPassword().then(module => ({ default: module.TaskResetPassword })),
);

export const PlanDetails = lazy(() =>
componentImportPaths.PlanDetails().then(module => ({ default: module.PlanDetails })),
);
Expand DownExpand Up@@ -172,6 +178,7 @@ export const ClerkComponents = {
OAuthConsent,
SubscriptionDetails,
TaskChooseOrganization,
TaskResetPassword,
};

export type ClerkComponentName = keyof typeof ClerkComponents;
3 changes: 2 additions & 1 deletion packages/clerk-js/src/ui/types.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -59,7 +59,8 @@ export type AvailableComponentProps =
| __internal_SubscriptionDetailsProps
| __internal_PlanDetailsProps
| APIKeysProps
| TaskChooseOrganizationProps;
| TaskChooseOrganizationProps
| TaskResetPasswordProps;

type ComponentMode = 'modal' | 'mounted';
type SignInMode = 'modal' | 'redirect';
Expand Down
1 change: 1 addition & 0 deletions packages/nextjs/src/client-boundary/uiComponents.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,7 @@ export {
SignOutButton,
SignUpButton,
TaskChooseOrganization,
TaskResetPassword,
UserAvatar,
UserButton,
Waitlist,
Expand Down
1 change: 1 addition & 0 deletions packages/nextjs/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -35,6 +35,7 @@ export {
SignUp,
SignUpButton,
TaskChooseOrganization,
TaskResetPassword,
UserAvatar,
UserButton,
UserProfile,
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -38,6 +38,7 @@ exports[`root public exports > should not change unexpectedly 1`] = `
"SignedIn",
"SignedOut",
"TaskChooseOrganization",
"TaskResetPassword",
"UserAvatar",
"UserButton",
"UserProfile",
Expand Down
1 change: 1 addition & 0 deletions packages/react/src/components/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@ export {
SignIn,
SignUp,
TaskChooseOrganization,
TaskResetPassword,
UserAvatar,
UserButton,
UserProfile,
Expand Down
29 changes: 29 additions & 0 deletions packages/react/src/components/uiComponents.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@ import type {
SignInProps,
SignUpProps,
TaskChooseOrganizationProps,
TaskResetPasswordProps,
UserAvatarProps,
UserButtonProps,
UserProfileProps,
Expand DownExpand Up@@ -696,3 +697,31 @@ export const TaskChooseOrganization = withClerk(
},
{ component: 'TaskChooseOrganization', renderWhileLoading: true },
);

export const TaskResetPassword = withClerk(
({ clerk, component, fallback, ...props }: WithClerkProp<TaskResetPasswordProps & FallbackProp>) => {
const mountingStatus = useWaitForComponentMount(component);
const shouldShowFallback = mountingStatus === 'rendering' || !clerk.loaded;

const rendererRootProps = {
...(shouldShowFallback && fallback && { style: { display: 'none' } }),
};

return (
<>
{shouldShowFallback && fallback}
{clerk.loaded && (
<ClerkHostRenderer
component={component}
mount={clerk.mountTaskResetPassword}
unmount={clerk.unmountTaskResetPassword}
updateProps={(clerk as any).__unstable__updateProps}
props={props}
rootProps={rendererRootProps}
/>
)}
</>
);
},
{ component: 'TaskResetPassword', renderWhileLoading: true },
);
23 changes: 22 additions & 1 deletion packages/react/src/isomorphicClerk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -48,6 +48,7 @@ import type {
SignUpResource,
State,
TaskChooseOrganizationProps,
TaskResetPasswordProps,
TasksRedirectOptions,
UnsubscribeCallback,
UserAvatarProps,
Expand DownExpand Up@@ -150,7 +151,7 @@ export class IsomorphicClerk implements IsomorphicLoadedClerk {
private premountAPIKeysNodes = new Map<HTMLDivElement, APIKeysProps | undefined>();
private premountOAuthConsentNodes = new Map<HTMLDivElement, __internal_OAuthConsentProps | undefined>();
private premountTaskChooseOrganizationNodes = new Map<HTMLDivElement, TaskChooseOrganizationProps | undefined>();

private premountTaskResetPasswordNodes = new Map<HTMLDivElement, TaskResetPasswordProps | undefined>();
// A separate Map of `addListener` method calls to handle multiple listeners.
private premountAddListenerCalls = new Map<
ListenerCallback,
Expand DownExpand Up@@ -676,6 +677,10 @@ export class IsomorphicClerk implements IsomorphicLoadedClerk {
clerkjs.mountTaskChooseOrganization(node, props);
});

this.premountTaskResetPasswordNodes.forEach((props, node) => {
clerkjs.mountTaskResetPassword(node, props);
});

/**
* Only update status in case `clerk.status` is missing. In any other case, `clerk-js` should be the orchestrator.
*/
Expand DownExpand Up@@ -1218,6 +1223,22 @@ export class IsomorphicClerk implements IsomorphicLoadedClerk {
}
};

mountTaskResetPassword = (node: HTMLDivElement, props?: TaskResetPasswordProps): void => {
if (this.clerkjs && this.loaded) {
this.clerkjs.mountTaskResetPassword(node, props);
} else {
this.premountTaskResetPasswordNodes.set(node, props);
}
};

unmountTaskResetPassword = (node: HTMLDivElement): void => {
if (this.clerkjs && this.loaded) {
this.clerkjs.unmountTaskResetPassword(node);
} else {
this.premountTaskResetPasswordNodes.delete(node);
}
};

addListener = (listener: ListenerCallback): UnsubscribeCallback => {
if (this.clerkjs) {
return this.clerkjs.addListener(listener);
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -32,6 +32,7 @@ exports[`root public exports > should not change unexpectedly 1`] = `
"SignedIn",
"SignedOut",
"TaskChooseOrganization",
"TaskResetPassword",
"UserAvatar",
"UserButton",
"UserProfile",
Expand Down
2 changes: 2 additions & 0 deletions packages/remix/src/__tests__/exports.test.ts
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
import { describe, expect, it } from 'vitest';

import * as publicExports from '../index';
import * as ssrExports from '../ssr/index';

Expand Down
4 changes: 4 additions & 0 deletions packages/shared/src/types/appearance.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -1125,6 +1125,10 @@ export type Appearance<T = Theme> = T &
* Theme overrides that only apply to the `<TaskChooseOrganization />` component
*/
taskChooseOrganization?: T;
/**
* Theme overrides that only apply to the `<TaskResetPassword />` component
*/
taskResetPassword?: T;
/**
* Theme overrides that only apply to the `<EnableOrganizations/>` component
*/
Expand Down
16 changes: 16 additions & 0 deletions packages/shared/src/types/clerk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -646,6 +646,22 @@ export interface Clerk {
*/
unmountTaskChooseOrganization: (targetNode: HTMLDivElement) => void;

/**
* Mounts a TaskResetPassword component at the target element.
*
* @param targetNode - Target node to mount the TaskResetPassword component.
* @param props - configuration parameters.
*/
mountTaskResetPassword: (targetNode: HTMLDivElement, props?: TaskResetPasswordProps) => void;

/**
* Unmount a TaskResetPassword component from the target element.
* If there is no component mounted at the target node, results in a noop.
*
* @param targetNode - Target node to unmount the TaskResetPassword component from.
*/
unmountTaskResetPassword: (targetNode: HTMLDivElement) => void;
Comment thread
octoper marked this conversation as resolved.

/**
* @internal
* Loads Stripe libraries for commerce functionality
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -43,6 +43,7 @@ exports[`root public exports > should not change unexpectedly 1`] = `
"SignedIn",
"SignedOut",
"TaskChooseOrganization",
"TaskResetPassword",
"UserAvatar",
"UserButton",
"UserProfile",
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
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
8 changes: 8 additions & 0 deletions .changeset/modern-coins-camp.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
---
"@clerk/clerk-js": minor
"@clerk/nextjs": minor
"@clerk/clerk-react": minor
"@clerk/shared": minor
---

Introduce new `<TaskResetPassword/>` session task component
10 changes: 10 additions & 0 deletions packages/clerk-js/sandbox/app.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -37,6 +37,7 @@ const AVAILABLE_COMPONENTS = [
'apiKeys',
'oauthConsent',
'taskChooseOrganization',
'taskResetPassword',
] as const;

const COMPONENT_PROPS_NAMESPACE = 'clerk-js-sandbox';
Expand DownExpand Up@@ -99,6 +100,7 @@ const componentControls: Record<(typeof AVAILABLE_COMPONENTS)[number], Component
apiKeys: buildComponentControls('apiKeys'),
oauthConsent: buildComponentControls('oauthConsent'),
taskChooseOrganization: buildComponentControls('taskChooseOrganization'),
taskResetPassword: buildComponentControls('taskResetPassword'),
};

declare global {
Expand DownExpand Up@@ -352,6 +354,14 @@ void (async () => {
},
);
},
'/task-reset-password': () => {
Clerk.mountTaskResetPassword(
app,
componentControls.taskResetPassword.getProps() ?? {
redirectUrlComplete: '/user-profile',
},
);
},
'/open-sign-in': () => {
mountOpenSignInButton(app, componentControls.signIn.getProps() ?? {});
},
Expand Down
21 changes: 21 additions & 0 deletions packages/clerk-js/src/core/clerk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -85,6 +85,7 @@ import type {
SignUpRedirectOptions,
SignUpResource,
TaskChooseOrganizationProps,
TaskResetPasswordProps,
TasksRedirectOptions,
UnsubscribeCallback,
UserAvatarProps,
Expand DownExpand Up@@ -1424,6 +1425,26 @@ export class Clerk implements ClerkInterface {
void this.#componentControls.ensureMounted().then(controls => controls.unmountComponent({ node }));
};

public mountTaskResetPassword = (node: HTMLDivElement, props?: TaskResetPasswordProps) => {
this.assertComponentsReady(this.#componentControls);

void this.#componentControls.ensureMounted({ preloadHint: 'TaskResetPassword' }).then(controls =>
controls.mountComponent({
name: 'TaskResetPassword',
appearanceKey: 'taskResetPassword',
node,
props,
}),
);

this.telemetry?.record(eventPrebuiltComponentMounted('TaskResetPassword', props));
};

public unmountTaskResetPassword = (node: HTMLDivElement) => {
this.assertComponentsReady(this.#componentControls);
void this.#componentControls.ensureMounted().then(controls => controls.unmountComponent({ node }));
};

/**
* `setActive` can be used to set the active session and/or organization.
*/
Expand Down
7 changes: 7 additions & 0 deletions packages/clerk-js/src/ui/lazyModules/components.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,8 @@ const componentImportPaths = {
SessionTasks: () => import(/* webpackChunkName: "sessionTasks" */ '../components/SessionTasks'),
TaskChooseOrganization: () =>
import(/* webpackChunkName: "taskChooseOrganization" */ '../components/SessionTasks/tasks/TaskChooseOrganization'),
TaskResetPassword: () =>
import(/* webpackChunkName: "taskResetPassword" */ '../components/SessionTasks/tasks/TaskResetPassword'),
PlanDetails: () => import(/* webpackChunkName: "planDetails" */ '../components/Plans/PlanDetails'),
SubscriptionDetails: () => import(/* webpackChunkName: "subscriptionDetails" */ '../components/SubscriptionDetails'),
APIKeys: () => import(/* webpackChunkName: "apiKeys" */ '../components/APIKeys/APIKeys'),
Expand DownExpand Up@@ -123,6 +125,10 @@ export const TaskChooseOrganization = lazy(() =>
componentImportPaths.TaskChooseOrganization().then(module => ({ default: module.TaskChooseOrganization })),
);

export const TaskResetPassword = lazy(() =>
componentImportPaths.TaskResetPassword().then(module => ({ default: module.TaskResetPassword })),
);

export const PlanDetails = lazy(() =>
componentImportPaths.PlanDetails().then(module => ({ default: module.PlanDetails })),
);
Expand DownExpand Up@@ -172,6 +178,7 @@ export const ClerkComponents = {
OAuthConsent,
SubscriptionDetails,
TaskChooseOrganization,
TaskResetPassword,
};

export type ClerkComponentName = keyof typeof ClerkComponents;
3 changes: 2 additions & 1 deletion packages/clerk-js/src/ui/types.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -59,7 +59,8 @@ export type AvailableComponentProps =
| __internal_SubscriptionDetailsProps
| __internal_PlanDetailsProps
| APIKeysProps
| TaskChooseOrganizationProps;
| TaskChooseOrganizationProps
| TaskResetPasswordProps;

type ComponentMode = 'modal' | 'mounted';
type SignInMode = 'modal' | 'redirect';
Expand Down
1 change: 1 addition & 0 deletions packages/nextjs/src/client-boundary/uiComponents.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,7 @@ export {
SignOutButton,
SignUpButton,
TaskChooseOrganization,
TaskResetPassword,
UserAvatar,
UserButton,
Waitlist,
Expand Down
1 change: 1 addition & 0 deletions packages/nextjs/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -35,6 +35,7 @@ export {
SignUp,
SignUpButton,
TaskChooseOrganization,
TaskResetPassword,
UserAvatar,
UserButton,
UserProfile,
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -38,6 +38,7 @@ exports[`root public exports > should not change unexpectedly 1`] = `
"SignedIn",
"SignedOut",
"TaskChooseOrganization",
"TaskResetPassword",
"UserAvatar",
"UserButton",
"UserProfile",
Expand Down
1 change: 1 addition & 0 deletions packages/react/src/components/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@ export {
SignIn,
SignUp,
TaskChooseOrganization,
TaskResetPassword,
UserAvatar,
UserButton,
UserProfile,
Expand Down
29 changes: 29 additions & 0 deletions packages/react/src/components/uiComponents.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@ import type {
SignInProps,
SignUpProps,
TaskChooseOrganizationProps,
TaskResetPasswordProps,
UserAvatarProps,
UserButtonProps,
UserProfileProps,
Expand DownExpand Up@@ -696,3 +697,31 @@ export const TaskChooseOrganization = withClerk(
},
{ component: 'TaskChooseOrganization', renderWhileLoading: true },
);

export const TaskResetPassword = withClerk(
({ clerk, component, fallback, ...props }: WithClerkProp<TaskResetPasswordProps & FallbackProp>) => {
const mountingStatus = useWaitForComponentMount(component);
const shouldShowFallback = mountingStatus === 'rendering' || !clerk.loaded;

const rendererRootProps = {
...(shouldShowFallback && fallback && { style: { display: 'none' } }),
};

return (
<>
{shouldShowFallback && fallback}
{clerk.loaded && (
<ClerkHostRenderer
component={component}
mount={clerk.mountTaskResetPassword}
unmount={clerk.unmountTaskResetPassword}
updateProps={(clerk as any).__unstable__updateProps}
props={props}
rootProps={rendererRootProps}
/>
)}
</>
);
},
{ component: 'TaskResetPassword', renderWhileLoading: true },
);
23 changes: 22 additions & 1 deletion packages/react/src/isomorphicClerk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -48,6 +48,7 @@ import type {
SignUpResource,
State,
TaskChooseOrganizationProps,
TaskResetPasswordProps,
TasksRedirectOptions,
UnsubscribeCallback,
UserAvatarProps,
Expand DownExpand Up@@ -150,7 +151,7 @@ export class IsomorphicClerk implements IsomorphicLoadedClerk {
private premountAPIKeysNodes = new Map<HTMLDivElement, APIKeysProps | undefined>();
private premountOAuthConsentNodes = new Map<HTMLDivElement, __internal_OAuthConsentProps | undefined>();
private premountTaskChooseOrganizationNodes = new Map<HTMLDivElement, TaskChooseOrganizationProps | undefined>();

private premountTaskResetPasswordNodes = new Map<HTMLDivElement, TaskResetPasswordProps | undefined>();
// A separate Map of `addListener` method calls to handle multiple listeners.
private premountAddListenerCalls = new Map<
ListenerCallback,
Expand DownExpand Up@@ -676,6 +677,10 @@ export class IsomorphicClerk implements IsomorphicLoadedClerk {
clerkjs.mountTaskChooseOrganization(node, props);
});

this.premountTaskResetPasswordNodes.forEach((props, node) => {
clerkjs.mountTaskResetPassword(node, props);
});

/**
* Only update status in case `clerk.status` is missing. In any other case, `clerk-js` should be the orchestrator.
*/
Expand DownExpand Up@@ -1218,6 +1223,22 @@ export class IsomorphicClerk implements IsomorphicLoadedClerk {
}
};

mountTaskResetPassword = (node: HTMLDivElement, props?: TaskResetPasswordProps): void => {
if (this.clerkjs && this.loaded) {
this.clerkjs.mountTaskResetPassword(node, props);
} else {
this.premountTaskResetPasswordNodes.set(node, props);
}
};

unmountTaskResetPassword = (node: HTMLDivElement): void => {
if (this.clerkjs && this.loaded) {
this.clerkjs.unmountTaskResetPassword(node);
} else {
this.premountTaskResetPasswordNodes.delete(node);
}
};

addListener = (listener: ListenerCallback): UnsubscribeCallback => {
if (this.clerkjs) {
return this.clerkjs.addListener(listener);
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -32,6 +32,7 @@ exports[`root public exports > should not change unexpectedly 1`] = `
"SignedIn",
"SignedOut",
"TaskChooseOrganization",
"TaskResetPassword",
"UserAvatar",
"UserButton",
"UserProfile",
Expand Down
2 changes: 2 additions & 0 deletions packages/remix/src/__tests__/exports.test.ts
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
import { describe, expect, it } from 'vitest';

import * as publicExports from '../index';
import * as ssrExports from '../ssr/index';

Expand Down
4 changes: 4 additions & 0 deletions packages/shared/src/types/appearance.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -1125,6 +1125,10 @@ export type Appearance<T = Theme> = T &
* Theme overrides that only apply to the `<TaskChooseOrganization />` component
*/
taskChooseOrganization?: T;
/**
* Theme overrides that only apply to the `<TaskResetPassword />` component
*/
taskResetPassword?: T;
/**
* Theme overrides that only apply to the `<EnableOrganizations/>` component
*/
Expand Down
16 changes: 16 additions & 0 deletions packages/shared/src/types/clerk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -646,6 +646,22 @@ export interface Clerk {
*/
unmountTaskChooseOrganization: (targetNode: HTMLDivElement) => void;

/**
* Mounts a TaskResetPassword component at the target element.
*
* @param targetNode - Target node to mount the TaskResetPassword component.
* @param props - configuration parameters.
*/
mountTaskResetPassword: (targetNode: HTMLDivElement, props?: TaskResetPasswordProps) => void;

/**
* Unmount a TaskResetPassword component from the target element.
* If there is no component mounted at the target node, results in a noop.
*
* @param targetNode - Target node to unmount the TaskResetPassword component from.
*/
unmountTaskResetPassword: (targetNode: HTMLDivElement) => void;
Comment thread
octoper marked this conversation as resolved.

/**
* @internal
* Loads Stripe libraries for commerce functionality
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -43,6 +43,7 @@ exports[`root public exports > should not change unexpectedly 1`] = `
"SignedIn",
"SignedOut",
"TaskChooseOrganization",
"TaskResetPassword",
"UserAvatar",
"UserButton",
"UserProfile",
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
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
8 changes: 8 additions & 0 deletions .changeset/modern-coins-camp.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
---
"@clerk/clerk-js": minor
"@clerk/nextjs": minor
"@clerk/clerk-react": minor
"@clerk/shared": minor
---

Introduce new `<TaskResetPassword/>` session task component
10 changes: 10 additions & 0 deletions packages/clerk-js/sandbox/app.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -37,6 +37,7 @@ const AVAILABLE_COMPONENTS = [
'apiKeys',
'oauthConsent',
'taskChooseOrganization',
'taskResetPassword',
] as const;

const COMPONENT_PROPS_NAMESPACE = 'clerk-js-sandbox';
Expand DownExpand Up@@ -99,6 +100,7 @@ const componentControls: Record<(typeof AVAILABLE_COMPONENTS)[number], Component
apiKeys: buildComponentControls('apiKeys'),
oauthConsent: buildComponentControls('oauthConsent'),
taskChooseOrganization: buildComponentControls('taskChooseOrganization'),
taskResetPassword: buildComponentControls('taskResetPassword'),
};

declare global {
Expand DownExpand Up@@ -352,6 +354,14 @@ void (async () => {
},
);
},
'/task-reset-password': () => {
Clerk.mountTaskResetPassword(
app,
componentControls.taskResetPassword.getProps() ?? {
redirectUrlComplete: '/user-profile',
},
);
},
'/open-sign-in': () => {
mountOpenSignInButton(app, componentControls.signIn.getProps() ?? {});
},
Expand Down
21 changes: 21 additions & 0 deletions packages/clerk-js/src/core/clerk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -85,6 +85,7 @@ import type {
SignUpRedirectOptions,
SignUpResource,
TaskChooseOrganizationProps,
TaskResetPasswordProps,
TasksRedirectOptions,
UnsubscribeCallback,
UserAvatarProps,
Expand DownExpand Up@@ -1424,6 +1425,26 @@ export class Clerk implements ClerkInterface {
void this.#componentControls.ensureMounted().then(controls => controls.unmountComponent({ node }));
};

public mountTaskResetPassword = (node: HTMLDivElement, props?: TaskResetPasswordProps) => {
this.assertComponentsReady(this.#componentControls);

void this.#componentControls.ensureMounted({ preloadHint: 'TaskResetPassword' }).then(controls =>
controls.mountComponent({
name: 'TaskResetPassword',
appearanceKey: 'taskResetPassword',
node,
props,
}),
);

this.telemetry?.record(eventPrebuiltComponentMounted('TaskResetPassword', props));
};

public unmountTaskResetPassword = (node: HTMLDivElement) => {
this.assertComponentsReady(this.#componentControls);
void this.#componentControls.ensureMounted().then(controls => controls.unmountComponent({ node }));
};

/**
* `setActive` can be used to set the active session and/or organization.
*/
Expand Down
7 changes: 7 additions & 0 deletions packages/clerk-js/src/ui/lazyModules/components.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,8 @@ const componentImportPaths = {
SessionTasks: () => import(/* webpackChunkName: "sessionTasks" */ '../components/SessionTasks'),
TaskChooseOrganization: () =>
import(/* webpackChunkName: "taskChooseOrganization" */ '../components/SessionTasks/tasks/TaskChooseOrganization'),
TaskResetPassword: () =>
import(/* webpackChunkName: "taskResetPassword" */ '../components/SessionTasks/tasks/TaskResetPassword'),
PlanDetails: () => import(/* webpackChunkName: "planDetails" */ '../components/Plans/PlanDetails'),
SubscriptionDetails: () => import(/* webpackChunkName: "subscriptionDetails" */ '../components/SubscriptionDetails'),
APIKeys: () => import(/* webpackChunkName: "apiKeys" */ '../components/APIKeys/APIKeys'),
Expand DownExpand Up@@ -123,6 +125,10 @@ export const TaskChooseOrganization = lazy(() =>
componentImportPaths.TaskChooseOrganization().then(module => ({ default: module.TaskChooseOrganization })),
);

export const TaskResetPassword = lazy(() =>
componentImportPaths.TaskResetPassword().then(module => ({ default: module.TaskResetPassword })),
);

export const PlanDetails = lazy(() =>
componentImportPaths.PlanDetails().then(module => ({ default: module.PlanDetails })),
);
Expand DownExpand Up@@ -172,6 +178,7 @@ export const ClerkComponents = {
OAuthConsent,
SubscriptionDetails,
TaskChooseOrganization,
TaskResetPassword,
};

export type ClerkComponentName = keyof typeof ClerkComponents;
3 changes: 2 additions & 1 deletion packages/clerk-js/src/ui/types.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -59,7 +59,8 @@ export type AvailableComponentProps =
| __internal_SubscriptionDetailsProps
| __internal_PlanDetailsProps
| APIKeysProps
| TaskChooseOrganizationProps;
| TaskChooseOrganizationProps
| TaskResetPasswordProps;

type ComponentMode = 'modal' | 'mounted';
type SignInMode = 'modal' | 'redirect';
Expand Down
1 change: 1 addition & 0 deletions packages/nextjs/src/client-boundary/uiComponents.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,7 @@ export {
SignOutButton,
SignUpButton,
TaskChooseOrganization,
TaskResetPassword,
UserAvatar,
UserButton,
Waitlist,
Expand Down
1 change: 1 addition & 0 deletions packages/nextjs/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -35,6 +35,7 @@ export {
SignUp,
SignUpButton,
TaskChooseOrganization,
TaskResetPassword,
UserAvatar,
UserButton,
UserProfile,
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -38,6 +38,7 @@ exports[`root public exports > should not change unexpectedly 1`] = `
"SignedIn",
"SignedOut",
"TaskChooseOrganization",
"TaskResetPassword",
"UserAvatar",
"UserButton",
"UserProfile",
Expand Down
1 change: 1 addition & 0 deletions packages/react/src/components/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@ export {
SignIn,
SignUp,
TaskChooseOrganization,
TaskResetPassword,
UserAvatar,
UserButton,
UserProfile,
Expand Down
29 changes: 29 additions & 0 deletions packages/react/src/components/uiComponents.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@ import type {
SignInProps,
SignUpProps,
TaskChooseOrganizationProps,
TaskResetPasswordProps,
UserAvatarProps,
UserButtonProps,
UserProfileProps,
Expand DownExpand Up@@ -696,3 +697,31 @@ export const TaskChooseOrganization = withClerk(
},
{ component: 'TaskChooseOrganization', renderWhileLoading: true },
);

export const TaskResetPassword = withClerk(
({ clerk, component, fallback, ...props }: WithClerkProp<TaskResetPasswordProps & FallbackProp>) => {
const mountingStatus = useWaitForComponentMount(component);
const shouldShowFallback = mountingStatus === 'rendering' || !clerk.loaded;

const rendererRootProps = {
...(shouldShowFallback && fallback && { style: { display: 'none' } }),
};

return (
<>
{shouldShowFallback && fallback}
{clerk.loaded && (
<ClerkHostRenderer
component={component}
mount={clerk.mountTaskResetPassword}
unmount={clerk.unmountTaskResetPassword}
updateProps={(clerk as any).__unstable__updateProps}
props={props}
rootProps={rendererRootProps}
/>
)}
</>
);
},
{ component: 'TaskResetPassword', renderWhileLoading: true },
);
23 changes: 22 additions & 1 deletion packages/react/src/isomorphicClerk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -48,6 +48,7 @@ import type {
SignUpResource,
State,
TaskChooseOrganizationProps,
TaskResetPasswordProps,
TasksRedirectOptions,
UnsubscribeCallback,
UserAvatarProps,
Expand DownExpand Up@@ -150,7 +151,7 @@ export class IsomorphicClerk implements IsomorphicLoadedClerk {
private premountAPIKeysNodes = new Map<HTMLDivElement, APIKeysProps | undefined>();
private premountOAuthConsentNodes = new Map<HTMLDivElement, __internal_OAuthConsentProps | undefined>();
private premountTaskChooseOrganizationNodes = new Map<HTMLDivElement, TaskChooseOrganizationProps | undefined>();

private premountTaskResetPasswordNodes = new Map<HTMLDivElement, TaskResetPasswordProps | undefined>();
// A separate Map of `addListener` method calls to handle multiple listeners.
private premountAddListenerCalls = new Map<
ListenerCallback,
Expand DownExpand Up@@ -676,6 +677,10 @@ export class IsomorphicClerk implements IsomorphicLoadedClerk {
clerkjs.mountTaskChooseOrganization(node, props);
});

this.premountTaskResetPasswordNodes.forEach((props, node) => {
clerkjs.mountTaskResetPassword(node, props);
});

/**
* Only update status in case `clerk.status` is missing. In any other case, `clerk-js` should be the orchestrator.
*/
Expand DownExpand Up@@ -1218,6 +1223,22 @@ export class IsomorphicClerk implements IsomorphicLoadedClerk {
}
};

mountTaskResetPassword = (node: HTMLDivElement, props?: TaskResetPasswordProps): void => {
if (this.clerkjs && this.loaded) {
this.clerkjs.mountTaskResetPassword(node, props);
} else {
this.premountTaskResetPasswordNodes.set(node, props);
}
};

unmountTaskResetPassword = (node: HTMLDivElement): void => {
if (this.clerkjs && this.loaded) {
this.clerkjs.unmountTaskResetPassword(node);
} else {
this.premountTaskResetPasswordNodes.delete(node);
}
};

addListener = (listener: ListenerCallback): UnsubscribeCallback => {
if (this.clerkjs) {
return this.clerkjs.addListener(listener);
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -32,6 +32,7 @@ exports[`root public exports > should not change unexpectedly 1`] = `
"SignedIn",
"SignedOut",
"TaskChooseOrganization",
"TaskResetPassword",
"UserAvatar",
"UserButton",
"UserProfile",
Expand Down
2 changes: 2 additions & 0 deletions packages/remix/src/__tests__/exports.test.ts
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
import { describe, expect, it } from 'vitest';

import * as publicExports from '../index';
import * as ssrExports from '../ssr/index';

Expand Down
4 changes: 4 additions & 0 deletions packages/shared/src/types/appearance.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -1125,6 +1125,10 @@ export type Appearance<T = Theme> = T &
* Theme overrides that only apply to the `<TaskChooseOrganization />` component
*/
taskChooseOrganization?: T;
/**
* Theme overrides that only apply to the `<TaskResetPassword />` component
*/
taskResetPassword?: T;
/**
* Theme overrides that only apply to the `<EnableOrganizations/>` component
*/
Expand Down
16 changes: 16 additions & 0 deletions packages/shared/src/types/clerk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -646,6 +646,22 @@ export interface Clerk {
*/
unmountTaskChooseOrganization: (targetNode: HTMLDivElement) => void;

/**
* Mounts a TaskResetPassword component at the target element.
*
* @param targetNode - Target node to mount the TaskResetPassword component.
* @param props - configuration parameters.
*/
mountTaskResetPassword: (targetNode: HTMLDivElement, props?: TaskResetPasswordProps) => void;

/**
* Unmount a TaskResetPassword component from the target element.
* If there is no component mounted at the target node, results in a noop.
*
* @param targetNode - Target node to unmount the TaskResetPassword component from.
*/
unmountTaskResetPassword: (targetNode: HTMLDivElement) => void;
Comment thread
octoper marked this conversation as resolved.

/**
* @internal
* Loads Stripe libraries for commerce functionality
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -43,6 +43,7 @@ exports[`root public exports > should not change unexpectedly 1`] = `
"SignedIn",
"SignedOut",
"TaskChooseOrganization",
"TaskResetPassword",
"UserAvatar",
"UserButton",
"UserProfile",
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
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
8 changes: 8 additions & 0 deletions .changeset/modern-coins-camp.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
---
"@clerk/clerk-js": minor
"@clerk/nextjs": minor
"@clerk/clerk-react": minor
"@clerk/shared": minor
---

Introduce new `<TaskResetPassword/>` session task component
10 changes: 10 additions & 0 deletions packages/clerk-js/sandbox/app.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -37,6 +37,7 @@ const AVAILABLE_COMPONENTS = [
'apiKeys',
'oauthConsent',
'taskChooseOrganization',
'taskResetPassword',
] as const;

const COMPONENT_PROPS_NAMESPACE = 'clerk-js-sandbox';
Expand DownExpand Up@@ -99,6 +100,7 @@ const componentControls: Record<(typeof AVAILABLE_COMPONENTS)[number], Component
apiKeys: buildComponentControls('apiKeys'),
oauthConsent: buildComponentControls('oauthConsent'),
taskChooseOrganization: buildComponentControls('taskChooseOrganization'),
taskResetPassword: buildComponentControls('taskResetPassword'),
};

declare global {
Expand DownExpand Up@@ -352,6 +354,14 @@ void (async () => {
},
);
},
'/task-reset-password': () => {
Clerk.mountTaskResetPassword(
app,
componentControls.taskResetPassword.getProps() ?? {
redirectUrlComplete: '/user-profile',
},
);
},
'/open-sign-in': () => {
mountOpenSignInButton(app, componentControls.signIn.getProps() ?? {});
},
Expand Down
21 changes: 21 additions & 0 deletions packages/clerk-js/src/core/clerk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -85,6 +85,7 @@ import type {
SignUpRedirectOptions,
SignUpResource,
TaskChooseOrganizationProps,
TaskResetPasswordProps,
TasksRedirectOptions,
UnsubscribeCallback,
UserAvatarProps,
Expand DownExpand Up@@ -1424,6 +1425,26 @@ export class Clerk implements ClerkInterface {
void this.#componentControls.ensureMounted().then(controls => controls.unmountComponent({ node }));
};

public mountTaskResetPassword = (node: HTMLDivElement, props?: TaskResetPasswordProps) => {
this.assertComponentsReady(this.#componentControls);

void this.#componentControls.ensureMounted({ preloadHint: 'TaskResetPassword' }).then(controls =>
controls.mountComponent({
name: 'TaskResetPassword',
appearanceKey: 'taskResetPassword',
node,
props,
}),
);

this.telemetry?.record(eventPrebuiltComponentMounted('TaskResetPassword', props));
};

public unmountTaskResetPassword = (node: HTMLDivElement) => {
this.assertComponentsReady(this.#componentControls);
void this.#componentControls.ensureMounted().then(controls => controls.unmountComponent({ node }));
};

/**
* `setActive` can be used to set the active session and/or organization.
*/
Expand Down
7 changes: 7 additions & 0 deletions packages/clerk-js/src/ui/lazyModules/components.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,8 @@ const componentImportPaths = {
SessionTasks: () => import(/* webpackChunkName: "sessionTasks" */ '../components/SessionTasks'),
TaskChooseOrganization: () =>
import(/* webpackChunkName: "taskChooseOrganization" */ '../components/SessionTasks/tasks/TaskChooseOrganization'),
TaskResetPassword: () =>
import(/* webpackChunkName: "taskResetPassword" */ '../components/SessionTasks/tasks/TaskResetPassword'),
PlanDetails: () => import(/* webpackChunkName: "planDetails" */ '../components/Plans/PlanDetails'),
SubscriptionDetails: () => import(/* webpackChunkName: "subscriptionDetails" */ '../components/SubscriptionDetails'),
APIKeys: () => import(/* webpackChunkName: "apiKeys" */ '../components/APIKeys/APIKeys'),
Expand DownExpand Up@@ -123,6 +125,10 @@ export const TaskChooseOrganization = lazy(() =>
componentImportPaths.TaskChooseOrganization().then(module => ({ default: module.TaskChooseOrganization })),
);

export const TaskResetPassword = lazy(() =>
componentImportPaths.TaskResetPassword().then(module => ({ default: module.TaskResetPassword })),
);

export const PlanDetails = lazy(() =>
componentImportPaths.PlanDetails().then(module => ({ default: module.PlanDetails })),
);
Expand DownExpand Up@@ -172,6 +178,7 @@ export const ClerkComponents = {
OAuthConsent,
SubscriptionDetails,
TaskChooseOrganization,
TaskResetPassword,
};

export type ClerkComponentName = keyof typeof ClerkComponents;
3 changes: 2 additions & 1 deletion packages/clerk-js/src/ui/types.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -59,7 +59,8 @@ export type AvailableComponentProps =
| __internal_SubscriptionDetailsProps
| __internal_PlanDetailsProps
| APIKeysProps
| TaskChooseOrganizationProps;
| TaskChooseOrganizationProps
| TaskResetPasswordProps;

type ComponentMode = 'modal' | 'mounted';
type SignInMode = 'modal' | 'redirect';
Expand Down
1 change: 1 addition & 0 deletions packages/nextjs/src/client-boundary/uiComponents.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,7 @@ export {
SignOutButton,
SignUpButton,
TaskChooseOrganization,
TaskResetPassword,
UserAvatar,
UserButton,
Waitlist,
Expand Down
1 change: 1 addition & 0 deletions packages/nextjs/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -35,6 +35,7 @@ export {
SignUp,
SignUpButton,
TaskChooseOrganization,
TaskResetPassword,
UserAvatar,
UserButton,
UserProfile,
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -38,6 +38,7 @@ exports[`root public exports > should not change unexpectedly 1`] = `
"SignedIn",
"SignedOut",
"TaskChooseOrganization",
"TaskResetPassword",
"UserAvatar",
"UserButton",
"UserProfile",
Expand Down
1 change: 1 addition & 0 deletions packages/react/src/components/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@ export {
SignIn,
SignUp,
TaskChooseOrganization,
TaskResetPassword,
UserAvatar,
UserButton,
UserProfile,
Expand Down
29 changes: 29 additions & 0 deletions packages/react/src/components/uiComponents.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@ import type {
SignInProps,
SignUpProps,
TaskChooseOrganizationProps,
TaskResetPasswordProps,
UserAvatarProps,
UserButtonProps,
UserProfileProps,
Expand DownExpand Up@@ -696,3 +697,31 @@ export const TaskChooseOrganization = withClerk(
},
{ component: 'TaskChooseOrganization', renderWhileLoading: true },
);

export const TaskResetPassword = withClerk(
({ clerk, component, fallback, ...props }: WithClerkProp<TaskResetPasswordProps & FallbackProp>) => {
const mountingStatus = useWaitForComponentMount(component);
const shouldShowFallback = mountingStatus === 'rendering' || !clerk.loaded;

const rendererRootProps = {
...(shouldShowFallback && fallback && { style: { display: 'none' } }),
};

return (
<>
{shouldShowFallback && fallback}
{clerk.loaded && (
<ClerkHostRenderer
component={component}
mount={clerk.mountTaskResetPassword}
unmount={clerk.unmountTaskResetPassword}
updateProps={(clerk as any).__unstable__updateProps}
props={props}
rootProps={rendererRootProps}
/>
)}
</>
);
},
{ component: 'TaskResetPassword', renderWhileLoading: true },
);
23 changes: 22 additions & 1 deletion packages/react/src/isomorphicClerk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -48,6 +48,7 @@ import type {
SignUpResource,
State,
TaskChooseOrganizationProps,
TaskResetPasswordProps,
TasksRedirectOptions,
UnsubscribeCallback,
UserAvatarProps,
Expand DownExpand Up@@ -150,7 +151,7 @@ export class IsomorphicClerk implements IsomorphicLoadedClerk {
private premountAPIKeysNodes = new Map<HTMLDivElement, APIKeysProps | undefined>();
private premountOAuthConsentNodes = new Map<HTMLDivElement, __internal_OAuthConsentProps | undefined>();
private premountTaskChooseOrganizationNodes = new Map<HTMLDivElement, TaskChooseOrganizationProps | undefined>();

private premountTaskResetPasswordNodes = new Map<HTMLDivElement, TaskResetPasswordProps | undefined>();
// A separate Map of `addListener` method calls to handle multiple listeners.
private premountAddListenerCalls = new Map<
ListenerCallback,
Expand DownExpand Up@@ -676,6 +677,10 @@ export class IsomorphicClerk implements IsomorphicLoadedClerk {
clerkjs.mountTaskChooseOrganization(node, props);
});

this.premountTaskResetPasswordNodes.forEach((props, node) => {
clerkjs.mountTaskResetPassword(node, props);
});

/**
* Only update status in case `clerk.status` is missing. In any other case, `clerk-js` should be the orchestrator.
*/
Expand DownExpand Up@@ -1218,6 +1223,22 @@ export class IsomorphicClerk implements IsomorphicLoadedClerk {
}
};

mountTaskResetPassword = (node: HTMLDivElement, props?: TaskResetPasswordProps): void => {
if (this.clerkjs && this.loaded) {
this.clerkjs.mountTaskResetPassword(node, props);
} else {
this.premountTaskResetPasswordNodes.set(node, props);
}
};

unmountTaskResetPassword = (node: HTMLDivElement): void => {
if (this.clerkjs && this.loaded) {
this.clerkjs.unmountTaskResetPassword(node);
} else {
this.premountTaskResetPasswordNodes.delete(node);
}
};

addListener = (listener: ListenerCallback): UnsubscribeCallback => {
if (this.clerkjs) {
return this.clerkjs.addListener(listener);
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -32,6 +32,7 @@ exports[`root public exports > should not change unexpectedly 1`] = `
"SignedIn",
"SignedOut",
"TaskChooseOrganization",
"TaskResetPassword",
"UserAvatar",
"UserButton",
"UserProfile",
Expand Down
2 changes: 2 additions & 0 deletions packages/remix/src/__tests__/exports.test.ts
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
import { describe, expect, it } from 'vitest';

import * as publicExports from '../index';
import * as ssrExports from '../ssr/index';

Expand Down
4 changes: 4 additions & 0 deletions packages/shared/src/types/appearance.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -1125,6 +1125,10 @@ export type Appearance<T = Theme> = T &
* Theme overrides that only apply to the `<TaskChooseOrganization />` component
*/
taskChooseOrganization?: T;
/**
* Theme overrides that only apply to the `<TaskResetPassword />` component
*/
taskResetPassword?: T;
/**
* Theme overrides that only apply to the `<EnableOrganizations/>` component
*/
Expand Down
16 changes: 16 additions & 0 deletions packages/shared/src/types/clerk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -646,6 +646,22 @@ export interface Clerk {
*/
unmountTaskChooseOrganization: (targetNode: HTMLDivElement) => void;

/**
* Mounts a TaskResetPassword component at the target element.
*
* @param targetNode - Target node to mount the TaskResetPassword component.
* @param props - configuration parameters.
*/
mountTaskResetPassword: (targetNode: HTMLDivElement, props?: TaskResetPasswordProps) => void;

/**
* Unmount a TaskResetPassword component from the target element.
* If there is no component mounted at the target node, results in a noop.
*
* @param targetNode - Target node to unmount the TaskResetPassword component from.
*/
unmountTaskResetPassword: (targetNode: HTMLDivElement) => void;
Comment thread
octoper marked this conversation as resolved.

/**
* @internal
* Loads Stripe libraries for commerce functionality
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -43,6 +43,7 @@ exports[`root public exports > should not change unexpectedly 1`] = `
"SignedIn",
"SignedOut",
"TaskChooseOrganization",
"TaskResetPassword",
"UserAvatar",
"UserButton",
"UserProfile",
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
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
8 changes: 8 additions & 0 deletions .changeset/modern-coins-camp.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
---
"@clerk/clerk-js": minor
"@clerk/nextjs": minor
"@clerk/clerk-react": minor
"@clerk/shared": minor
---

Introduce new `<TaskResetPassword/>` session task component
10 changes: 10 additions & 0 deletions packages/clerk-js/sandbox/app.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -37,6 +37,7 @@ const AVAILABLE_COMPONENTS = [
'apiKeys',
'oauthConsent',
'taskChooseOrganization',
'taskResetPassword',
] as const;

const COMPONENT_PROPS_NAMESPACE = 'clerk-js-sandbox';
Expand DownExpand Up@@ -99,6 +100,7 @@ const componentControls: Record<(typeof AVAILABLE_COMPONENTS)[number], Component
apiKeys: buildComponentControls('apiKeys'),
oauthConsent: buildComponentControls('oauthConsent'),
taskChooseOrganization: buildComponentControls('taskChooseOrganization'),
taskResetPassword: buildComponentControls('taskResetPassword'),
};

declare global {
Expand DownExpand Up@@ -352,6 +354,14 @@ void (async () => {
},
);
},
'/task-reset-password': () => {
Clerk.mountTaskResetPassword(
app,
componentControls.taskResetPassword.getProps() ?? {
redirectUrlComplete: '/user-profile',
},
);
},
'/open-sign-in': () => {
mountOpenSignInButton(app, componentControls.signIn.getProps() ?? {});
},
Expand Down
21 changes: 21 additions & 0 deletions packages/clerk-js/src/core/clerk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -85,6 +85,7 @@ import type {
SignUpRedirectOptions,
SignUpResource,
TaskChooseOrganizationProps,
TaskResetPasswordProps,
TasksRedirectOptions,
UnsubscribeCallback,
UserAvatarProps,
Expand DownExpand Up@@ -1424,6 +1425,26 @@ export class Clerk implements ClerkInterface {
void this.#componentControls.ensureMounted().then(controls => controls.unmountComponent({ node }));
};

public mountTaskResetPassword = (node: HTMLDivElement, props?: TaskResetPasswordProps) => {
this.assertComponentsReady(this.#componentControls);

void this.#componentControls.ensureMounted({ preloadHint: 'TaskResetPassword' }).then(controls =>
controls.mountComponent({
name: 'TaskResetPassword',
appearanceKey: 'taskResetPassword',
node,
props,
}),
);

this.telemetry?.record(eventPrebuiltComponentMounted('TaskResetPassword', props));
};

public unmountTaskResetPassword = (node: HTMLDivElement) => {
this.assertComponentsReady(this.#componentControls);
void this.#componentControls.ensureMounted().then(controls => controls.unmountComponent({ node }));
};

/**
* `setActive` can be used to set the active session and/or organization.
*/
Expand Down
7 changes: 7 additions & 0 deletions packages/clerk-js/src/ui/lazyModules/components.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,8 @@ const componentImportPaths = {
SessionTasks: () => import(/* webpackChunkName: "sessionTasks" */ '../components/SessionTasks'),
TaskChooseOrganization: () =>
import(/* webpackChunkName: "taskChooseOrganization" */ '../components/SessionTasks/tasks/TaskChooseOrganization'),
TaskResetPassword: () =>
import(/* webpackChunkName: "taskResetPassword" */ '../components/SessionTasks/tasks/TaskResetPassword'),
PlanDetails: () => import(/* webpackChunkName: "planDetails" */ '../components/Plans/PlanDetails'),
SubscriptionDetails: () => import(/* webpackChunkName: "subscriptionDetails" */ '../components/SubscriptionDetails'),
APIKeys: () => import(/* webpackChunkName: "apiKeys" */ '../components/APIKeys/APIKeys'),
Expand DownExpand Up@@ -123,6 +125,10 @@ export const TaskChooseOrganization = lazy(() =>
componentImportPaths.TaskChooseOrganization().then(module => ({ default: module.TaskChooseOrganization })),
);

export const TaskResetPassword = lazy(() =>
componentImportPaths.TaskResetPassword().then(module => ({ default: module.TaskResetPassword })),
);

export const PlanDetails = lazy(() =>
componentImportPaths.PlanDetails().then(module => ({ default: module.PlanDetails })),
);
Expand DownExpand Up@@ -172,6 +178,7 @@ export const ClerkComponents = {
OAuthConsent,
SubscriptionDetails,
TaskChooseOrganization,
TaskResetPassword,
};

export type ClerkComponentName = keyof typeof ClerkComponents;
3 changes: 2 additions & 1 deletion packages/clerk-js/src/ui/types.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -59,7 +59,8 @@ export type AvailableComponentProps =
| __internal_SubscriptionDetailsProps
| __internal_PlanDetailsProps
| APIKeysProps
| TaskChooseOrganizationProps;
| TaskChooseOrganizationProps
| TaskResetPasswordProps;

type ComponentMode = 'modal' | 'mounted';
type SignInMode = 'modal' | 'redirect';
Expand Down
1 change: 1 addition & 0 deletions packages/nextjs/src/client-boundary/uiComponents.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,7 @@ export {
SignOutButton,
SignUpButton,
TaskChooseOrganization,
TaskResetPassword,
UserAvatar,
UserButton,
Waitlist,
Expand Down
1 change: 1 addition & 0 deletions packages/nextjs/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -35,6 +35,7 @@ export {
SignUp,
SignUpButton,
TaskChooseOrganization,
TaskResetPassword,
UserAvatar,
UserButton,
UserProfile,
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -38,6 +38,7 @@ exports[`root public exports > should not change unexpectedly 1`] = `
"SignedIn",
"SignedOut",
"TaskChooseOrganization",
"TaskResetPassword",
"UserAvatar",
"UserButton",
"UserProfile",
Expand Down
1 change: 1 addition & 0 deletions packages/react/src/components/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@ export {
SignIn,
SignUp,
TaskChooseOrganization,
TaskResetPassword,
UserAvatar,
UserButton,
UserProfile,
Expand Down
29 changes: 29 additions & 0 deletions packages/react/src/components/uiComponents.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@ import type {
SignInProps,
SignUpProps,
TaskChooseOrganizationProps,
TaskResetPasswordProps,
UserAvatarProps,
UserButtonProps,
UserProfileProps,
Expand DownExpand Up@@ -696,3 +697,31 @@ export const TaskChooseOrganization = withClerk(
},
{ component: 'TaskChooseOrganization', renderWhileLoading: true },
);

export const TaskResetPassword = withClerk(
({ clerk, component, fallback, ...props }: WithClerkProp<TaskResetPasswordProps & FallbackProp>) => {
const mountingStatus = useWaitForComponentMount(component);
const shouldShowFallback = mountingStatus === 'rendering' || !clerk.loaded;

const rendererRootProps = {
...(shouldShowFallback && fallback && { style: { display: 'none' } }),
};

return (
<>
{shouldShowFallback && fallback}
{clerk.loaded && (
<ClerkHostRenderer
component={component}
mount={clerk.mountTaskResetPassword}
unmount={clerk.unmountTaskResetPassword}
updateProps={(clerk as any).__unstable__updateProps}
props={props}
rootProps={rendererRootProps}
/>
)}
</>
);
},
{ component: 'TaskResetPassword', renderWhileLoading: true },
);
23 changes: 22 additions & 1 deletion packages/react/src/isomorphicClerk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -48,6 +48,7 @@ import type {
SignUpResource,
State,
TaskChooseOrganizationProps,
TaskResetPasswordProps,
TasksRedirectOptions,
UnsubscribeCallback,
UserAvatarProps,
Expand DownExpand Up@@ -150,7 +151,7 @@ export class IsomorphicClerk implements IsomorphicLoadedClerk {
private premountAPIKeysNodes = new Map<HTMLDivElement, APIKeysProps | undefined>();
private premountOAuthConsentNodes = new Map<HTMLDivElement, __internal_OAuthConsentProps | undefined>();
private premountTaskChooseOrganizationNodes = new Map<HTMLDivElement, TaskChooseOrganizationProps | undefined>();

private premountTaskResetPasswordNodes = new Map<HTMLDivElement, TaskResetPasswordProps | undefined>();
// A separate Map of `addListener` method calls to handle multiple listeners.
private premountAddListenerCalls = new Map<
ListenerCallback,
Expand DownExpand Up@@ -676,6 +677,10 @@ export class IsomorphicClerk implements IsomorphicLoadedClerk {
clerkjs.mountTaskChooseOrganization(node, props);
});

this.premountTaskResetPasswordNodes.forEach((props, node) => {
clerkjs.mountTaskResetPassword(node, props);
});

/**
* Only update status in case `clerk.status` is missing. In any other case, `clerk-js` should be the orchestrator.
*/
Expand DownExpand Up@@ -1218,6 +1223,22 @@ export class IsomorphicClerk implements IsomorphicLoadedClerk {
}
};

mountTaskResetPassword = (node: HTMLDivElement, props?: TaskResetPasswordProps): void => {
if (this.clerkjs && this.loaded) {
this.clerkjs.mountTaskResetPassword(node, props);
} else {
this.premountTaskResetPasswordNodes.set(node, props);
}
};

unmountTaskResetPassword = (node: HTMLDivElement): void => {
if (this.clerkjs && this.loaded) {
this.clerkjs.unmountTaskResetPassword(node);
} else {
this.premountTaskResetPasswordNodes.delete(node);
}
};

addListener = (listener: ListenerCallback): UnsubscribeCallback => {
if (this.clerkjs) {
return this.clerkjs.addListener(listener);
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -32,6 +32,7 @@ exports[`root public exports > should not change unexpectedly 1`] = `
"SignedIn",
"SignedOut",
"TaskChooseOrganization",
"TaskResetPassword",
"UserAvatar",
"UserButton",
"UserProfile",
Expand Down
2 changes: 2 additions & 0 deletions packages/remix/src/__tests__/exports.test.ts
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
import { describe, expect, it } from 'vitest';

import * as publicExports from '../index';
import * as ssrExports from '../ssr/index';

Expand Down
4 changes: 4 additions & 0 deletions packages/shared/src/types/appearance.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -1125,6 +1125,10 @@ export type Appearance<T = Theme> = T &
* Theme overrides that only apply to the `<TaskChooseOrganization />` component
*/
taskChooseOrganization?: T;
/**
* Theme overrides that only apply to the `<TaskResetPassword />` component
*/
taskResetPassword?: T;
/**
* Theme overrides that only apply to the `<EnableOrganizations/>` component
*/
Expand Down
16 changes: 16 additions & 0 deletions packages/shared/src/types/clerk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -646,6 +646,22 @@ export interface Clerk {
*/
unmountTaskChooseOrganization: (targetNode: HTMLDivElement) => void;

/**
* Mounts a TaskResetPassword component at the target element.
*
* @param targetNode - Target node to mount the TaskResetPassword component.
* @param props - configuration parameters.
*/
mountTaskResetPassword: (targetNode: HTMLDivElement, props?: TaskResetPasswordProps) => void;

/**
* Unmount a TaskResetPassword component from the target element.
* If there is no component mounted at the target node, results in a noop.
*
* @param targetNode - Target node to unmount the TaskResetPassword component from.
*/
unmountTaskResetPassword: (targetNode: HTMLDivElement) => void;
Comment thread
octoper marked this conversation as resolved.

/**
* @internal
* Loads Stripe libraries for commerce functionality
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -43,6 +43,7 @@ exports[`root public exports > should not change unexpectedly 1`] = `
"SignedIn",
"SignedOut",
"TaskChooseOrganization",
"TaskResetPassword",
"UserAvatar",
"UserButton",
"UserProfile",
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
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
8 changes: 8 additions & 0 deletions .changeset/modern-coins-camp.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
---
"@clerk/clerk-js": minor
"@clerk/nextjs": minor
"@clerk/clerk-react": minor
"@clerk/shared": minor
---

Introduce new `<TaskResetPassword/>` session task component
10 changes: 10 additions & 0 deletions packages/clerk-js/sandbox/app.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -37,6 +37,7 @@ const AVAILABLE_COMPONENTS = [
'apiKeys',
'oauthConsent',
'taskChooseOrganization',
'taskResetPassword',
] as const;

const COMPONENT_PROPS_NAMESPACE = 'clerk-js-sandbox';
Expand DownExpand Up@@ -99,6 +100,7 @@ const componentControls: Record<(typeof AVAILABLE_COMPONENTS)[number], Component
apiKeys: buildComponentControls('apiKeys'),
oauthConsent: buildComponentControls('oauthConsent'),
taskChooseOrganization: buildComponentControls('taskChooseOrganization'),
taskResetPassword: buildComponentControls('taskResetPassword'),
};

declare global {
Expand DownExpand Up@@ -352,6 +354,14 @@ void (async () => {
},
);
},
'/task-reset-password': () => {
Clerk.mountTaskResetPassword(
app,
componentControls.taskResetPassword.getProps() ?? {
redirectUrlComplete: '/user-profile',
},
);
},
'/open-sign-in': () => {
mountOpenSignInButton(app, componentControls.signIn.getProps() ?? {});
},
Expand Down
21 changes: 21 additions & 0 deletions packages/clerk-js/src/core/clerk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -85,6 +85,7 @@ import type {
SignUpRedirectOptions,
SignUpResource,
TaskChooseOrganizationProps,
TaskResetPasswordProps,
TasksRedirectOptions,
UnsubscribeCallback,
UserAvatarProps,
Expand DownExpand Up@@ -1424,6 +1425,26 @@ export class Clerk implements ClerkInterface {
void this.#componentControls.ensureMounted().then(controls => controls.unmountComponent({ node }));
};

public mountTaskResetPassword = (node: HTMLDivElement, props?: TaskResetPasswordProps) => {
this.assertComponentsReady(this.#componentControls);

void this.#componentControls.ensureMounted({ preloadHint: 'TaskResetPassword' }).then(controls =>
controls.mountComponent({
name: 'TaskResetPassword',
appearanceKey: 'taskResetPassword',
node,
props,
}),
);

this.telemetry?.record(eventPrebuiltComponentMounted('TaskResetPassword', props));
};

public unmountTaskResetPassword = (node: HTMLDivElement) => {
this.assertComponentsReady(this.#componentControls);
void this.#componentControls.ensureMounted().then(controls => controls.unmountComponent({ node }));
};

/**
* `setActive` can be used to set the active session and/or organization.
*/
Expand Down
7 changes: 7 additions & 0 deletions packages/clerk-js/src/ui/lazyModules/components.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,8 @@ const componentImportPaths = {
SessionTasks: () => import(/* webpackChunkName: "sessionTasks" */ '../components/SessionTasks'),
TaskChooseOrganization: () =>
import(/* webpackChunkName: "taskChooseOrganization" */ '../components/SessionTasks/tasks/TaskChooseOrganization'),
TaskResetPassword: () =>
import(/* webpackChunkName: "taskResetPassword" */ '../components/SessionTasks/tasks/TaskResetPassword'),
PlanDetails: () => import(/* webpackChunkName: "planDetails" */ '../components/Plans/PlanDetails'),
SubscriptionDetails: () => import(/* webpackChunkName: "subscriptionDetails" */ '../components/SubscriptionDetails'),
APIKeys: () => import(/* webpackChunkName: "apiKeys" */ '../components/APIKeys/APIKeys'),
Expand DownExpand Up@@ -123,6 +125,10 @@ export const TaskChooseOrganization = lazy(() =>
componentImportPaths.TaskChooseOrganization().then(module => ({ default: module.TaskChooseOrganization })),
);

export const TaskResetPassword = lazy(() =>
componentImportPaths.TaskResetPassword().then(module => ({ default: module.TaskResetPassword })),
);

export const PlanDetails = lazy(() =>
componentImportPaths.PlanDetails().then(module => ({ default: module.PlanDetails })),
);
Expand DownExpand Up@@ -172,6 +178,7 @@ export const ClerkComponents = {
OAuthConsent,
SubscriptionDetails,
TaskChooseOrganization,
TaskResetPassword,
};

export type ClerkComponentName = keyof typeof ClerkComponents;
3 changes: 2 additions & 1 deletion packages/clerk-js/src/ui/types.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -59,7 +59,8 @@ export type AvailableComponentProps =
| __internal_SubscriptionDetailsProps
| __internal_PlanDetailsProps
| APIKeysProps
| TaskChooseOrganizationProps;
| TaskChooseOrganizationProps
| TaskResetPasswordProps;

type ComponentMode = 'modal' | 'mounted';
type SignInMode = 'modal' | 'redirect';
Expand Down
1 change: 1 addition & 0 deletions packages/nextjs/src/client-boundary/uiComponents.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,7 @@ export {
SignOutButton,
SignUpButton,
TaskChooseOrganization,
TaskResetPassword,
UserAvatar,
UserButton,
Waitlist,
Expand Down
1 change: 1 addition & 0 deletions packages/nextjs/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -35,6 +35,7 @@ export {
SignUp,
SignUpButton,
TaskChooseOrganization,
TaskResetPassword,
UserAvatar,
UserButton,
UserProfile,
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -38,6 +38,7 @@ exports[`root public exports > should not change unexpectedly 1`] = `
"SignedIn",
"SignedOut",
"TaskChooseOrganization",
"TaskResetPassword",
"UserAvatar",
"UserButton",
"UserProfile",
Expand Down
1 change: 1 addition & 0 deletions packages/react/src/components/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@ export {
SignIn,
SignUp,
TaskChooseOrganization,
TaskResetPassword,
UserAvatar,
UserButton,
UserProfile,
Expand Down
29 changes: 29 additions & 0 deletions packages/react/src/components/uiComponents.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@ import type {
SignInProps,
SignUpProps,
TaskChooseOrganizationProps,
TaskResetPasswordProps,
UserAvatarProps,
UserButtonProps,
UserProfileProps,
Expand DownExpand Up@@ -696,3 +697,31 @@ export const TaskChooseOrganization = withClerk(
},
{ component: 'TaskChooseOrganization', renderWhileLoading: true },
);

export const TaskResetPassword = withClerk(
({ clerk, component, fallback, ...props }: WithClerkProp<TaskResetPasswordProps & FallbackProp>) => {
const mountingStatus = useWaitForComponentMount(component);
const shouldShowFallback = mountingStatus === 'rendering' || !clerk.loaded;

const rendererRootProps = {
...(shouldShowFallback && fallback && { style: { display: 'none' } }),
};

return (
<>
{shouldShowFallback && fallback}
{clerk.loaded && (
<ClerkHostRenderer
component={component}
mount={clerk.mountTaskResetPassword}
unmount={clerk.unmountTaskResetPassword}
updateProps={(clerk as any).__unstable__updateProps}
props={props}
rootProps={rendererRootProps}
/>
)}
</>
);
},
{ component: 'TaskResetPassword', renderWhileLoading: true },
);
23 changes: 22 additions & 1 deletion packages/react/src/isomorphicClerk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -48,6 +48,7 @@ import type {
SignUpResource,
State,
TaskChooseOrganizationProps,
TaskResetPasswordProps,
TasksRedirectOptions,
UnsubscribeCallback,
UserAvatarProps,
Expand DownExpand Up@@ -150,7 +151,7 @@ export class IsomorphicClerk implements IsomorphicLoadedClerk {
private premountAPIKeysNodes = new Map<HTMLDivElement, APIKeysProps | undefined>();
private premountOAuthConsentNodes = new Map<HTMLDivElement, __internal_OAuthConsentProps | undefined>();
private premountTaskChooseOrganizationNodes = new Map<HTMLDivElement, TaskChooseOrganizationProps | undefined>();

private premountTaskResetPasswordNodes = new Map<HTMLDivElement, TaskResetPasswordProps | undefined>();
// A separate Map of `addListener` method calls to handle multiple listeners.
private premountAddListenerCalls = new Map<
ListenerCallback,
Expand DownExpand Up@@ -676,6 +677,10 @@ export class IsomorphicClerk implements IsomorphicLoadedClerk {
clerkjs.mountTaskChooseOrganization(node, props);
});

this.premountTaskResetPasswordNodes.forEach((props, node) => {
clerkjs.mountTaskResetPassword(node, props);
});

/**
* Only update status in case `clerk.status` is missing. In any other case, `clerk-js` should be the orchestrator.
*/
Expand DownExpand Up@@ -1218,6 +1223,22 @@ export class IsomorphicClerk implements IsomorphicLoadedClerk {
}
};

mountTaskResetPassword = (node: HTMLDivElement, props?: TaskResetPasswordProps): void => {
if (this.clerkjs && this.loaded) {
this.clerkjs.mountTaskResetPassword(node, props);
} else {
this.premountTaskResetPasswordNodes.set(node, props);
}
};

unmountTaskResetPassword = (node: HTMLDivElement): void => {
if (this.clerkjs && this.loaded) {
this.clerkjs.unmountTaskResetPassword(node);
} else {
this.premountTaskResetPasswordNodes.delete(node);
}
};

addListener = (listener: ListenerCallback): UnsubscribeCallback => {
if (this.clerkjs) {
return this.clerkjs.addListener(listener);
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -32,6 +32,7 @@ exports[`root public exports > should not change unexpectedly 1`] = `
"SignedIn",
"SignedOut",
"TaskChooseOrganization",
"TaskResetPassword",
"UserAvatar",
"UserButton",
"UserProfile",
Expand Down
2 changes: 2 additions & 0 deletions packages/remix/src/__tests__/exports.test.ts
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
import { describe, expect, it } from 'vitest';

import * as publicExports from '../index';
import * as ssrExports from '../ssr/index';

Expand Down
4 changes: 4 additions & 0 deletions packages/shared/src/types/appearance.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -1125,6 +1125,10 @@ export type Appearance<T = Theme> = T &
* Theme overrides that only apply to the `<TaskChooseOrganization />` component
*/
taskChooseOrganization?: T;
/**
* Theme overrides that only apply to the `<TaskResetPassword />` component
*/
taskResetPassword?: T;
/**
* Theme overrides that only apply to the `<EnableOrganizations/>` component
*/
Expand Down
16 changes: 16 additions & 0 deletions packages/shared/src/types/clerk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -646,6 +646,22 @@ export interface Clerk {
*/
unmountTaskChooseOrganization: (targetNode: HTMLDivElement) => void;

/**
* Mounts a TaskResetPassword component at the target element.
*
* @param targetNode - Target node to mount the TaskResetPassword component.
* @param props - configuration parameters.
*/
mountTaskResetPassword: (targetNode: HTMLDivElement, props?: TaskResetPasswordProps) => void;

/**
* Unmount a TaskResetPassword component from the target element.
* If there is no component mounted at the target node, results in a noop.
*
* @param targetNode - Target node to unmount the TaskResetPassword component from.
*/
unmountTaskResetPassword: (targetNode: HTMLDivElement) => void;
Comment thread
octoper marked this conversation as resolved.

/**
* @internal
* Loads Stripe libraries for commerce functionality
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -43,6 +43,7 @@ exports[`root public exports > should not change unexpectedly 1`] = `
"SignedIn",
"SignedOut",
"TaskChooseOrganization",
"TaskResetPassword",
"UserAvatar",
"UserButton",
"UserProfile",
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
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
8 changes: 8 additions & 0 deletions .changeset/modern-coins-camp.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
---
"@clerk/clerk-js": minor
"@clerk/nextjs": minor
"@clerk/clerk-react": minor
"@clerk/shared": minor
---

Introduce new `<TaskResetPassword/>` session task component
10 changes: 10 additions & 0 deletions packages/clerk-js/sandbox/app.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -37,6 +37,7 @@ const AVAILABLE_COMPONENTS = [
'apiKeys',
'oauthConsent',
'taskChooseOrganization',
'taskResetPassword',
] as const;

const COMPONENT_PROPS_NAMESPACE = 'clerk-js-sandbox';
Expand DownExpand Up@@ -99,6 +100,7 @@ const componentControls: Record<(typeof AVAILABLE_COMPONENTS)[number], Component
apiKeys: buildComponentControls('apiKeys'),
oauthConsent: buildComponentControls('oauthConsent'),
taskChooseOrganization: buildComponentControls('taskChooseOrganization'),
taskResetPassword: buildComponentControls('taskResetPassword'),
};

declare global {
Expand DownExpand Up@@ -352,6 +354,14 @@ void (async () => {
},
);
},
'/task-reset-password': () => {
Clerk.mountTaskResetPassword(
app,
componentControls.taskResetPassword.getProps() ?? {
redirectUrlComplete: '/user-profile',
},
);
},
'/open-sign-in': () => {
mountOpenSignInButton(app, componentControls.signIn.getProps() ?? {});
},
Expand Down
21 changes: 21 additions & 0 deletions packages/clerk-js/src/core/clerk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -85,6 +85,7 @@ import type {
SignUpRedirectOptions,
SignUpResource,
TaskChooseOrganizationProps,
TaskResetPasswordProps,
TasksRedirectOptions,
UnsubscribeCallback,
UserAvatarProps,
Expand DownExpand Up@@ -1424,6 +1425,26 @@ export class Clerk implements ClerkInterface {
void this.#componentControls.ensureMounted().then(controls => controls.unmountComponent({ node }));
};

public mountTaskResetPassword = (node: HTMLDivElement, props?: TaskResetPasswordProps) => {
this.assertComponentsReady(this.#componentControls);

void this.#componentControls.ensureMounted({ preloadHint: 'TaskResetPassword' }).then(controls =>
controls.mountComponent({
name: 'TaskResetPassword',
appearanceKey: 'taskResetPassword',
node,
props,
}),
);

this.telemetry?.record(eventPrebuiltComponentMounted('TaskResetPassword', props));
};

public unmountTaskResetPassword = (node: HTMLDivElement) => {
this.assertComponentsReady(this.#componentControls);
void this.#componentControls.ensureMounted().then(controls => controls.unmountComponent({ node }));
};

/**
* `setActive` can be used to set the active session and/or organization.
*/
Expand Down
7 changes: 7 additions & 0 deletions packages/clerk-js/src/ui/lazyModules/components.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,8 @@ const componentImportPaths = {
SessionTasks: () => import(/* webpackChunkName: "sessionTasks" */ '../components/SessionTasks'),
TaskChooseOrganization: () =>
import(/* webpackChunkName: "taskChooseOrganization" */ '../components/SessionTasks/tasks/TaskChooseOrganization'),
TaskResetPassword: () =>
import(/* webpackChunkName: "taskResetPassword" */ '../components/SessionTasks/tasks/TaskResetPassword'),
PlanDetails: () => import(/* webpackChunkName: "planDetails" */ '../components/Plans/PlanDetails'),
SubscriptionDetails: () => import(/* webpackChunkName: "subscriptionDetails" */ '../components/SubscriptionDetails'),
APIKeys: () => import(/* webpackChunkName: "apiKeys" */ '../components/APIKeys/APIKeys'),
Expand DownExpand Up@@ -123,6 +125,10 @@ export const TaskChooseOrganization = lazy(() =>
componentImportPaths.TaskChooseOrganization().then(module => ({ default: module.TaskChooseOrganization })),
);

export const TaskResetPassword = lazy(() =>
componentImportPaths.TaskResetPassword().then(module => ({ default: module.TaskResetPassword })),
);

export const PlanDetails = lazy(() =>
componentImportPaths.PlanDetails().then(module => ({ default: module.PlanDetails })),
);
Expand DownExpand Up@@ -172,6 +178,7 @@ export const ClerkComponents = {
OAuthConsent,
SubscriptionDetails,
TaskChooseOrganization,
TaskResetPassword,
};

export type ClerkComponentName = keyof typeof ClerkComponents;
3 changes: 2 additions & 1 deletion packages/clerk-js/src/ui/types.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -59,7 +59,8 @@ export type AvailableComponentProps =
| __internal_SubscriptionDetailsProps
| __internal_PlanDetailsProps
| APIKeysProps
| TaskChooseOrganizationProps;
| TaskChooseOrganizationProps
| TaskResetPasswordProps;

type ComponentMode = 'modal' | 'mounted';
type SignInMode = 'modal' | 'redirect';
Expand Down
1 change: 1 addition & 0 deletions packages/nextjs/src/client-boundary/uiComponents.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,7 @@ export {
SignOutButton,
SignUpButton,
TaskChooseOrganization,
TaskResetPassword,
UserAvatar,
UserButton,
Waitlist,
Expand Down
1 change: 1 addition & 0 deletions packages/nextjs/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -35,6 +35,7 @@ export {
SignUp,
SignUpButton,
TaskChooseOrganization,
TaskResetPassword,
UserAvatar,
UserButton,
UserProfile,
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -38,6 +38,7 @@ exports[`root public exports > should not change unexpectedly 1`] = `
"SignedIn",
"SignedOut",
"TaskChooseOrganization",
"TaskResetPassword",
"UserAvatar",
"UserButton",
"UserProfile",
Expand Down
1 change: 1 addition & 0 deletions packages/react/src/components/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@ export {
SignIn,
SignUp,
TaskChooseOrganization,
TaskResetPassword,
UserAvatar,
UserButton,
UserProfile,
Expand Down
29 changes: 29 additions & 0 deletions packages/react/src/components/uiComponents.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@ import type {
SignInProps,
SignUpProps,
TaskChooseOrganizationProps,
TaskResetPasswordProps,
UserAvatarProps,
UserButtonProps,
UserProfileProps,
Expand DownExpand Up@@ -696,3 +697,31 @@ export const TaskChooseOrganization = withClerk(
},
{ component: 'TaskChooseOrganization', renderWhileLoading: true },
);

export const TaskResetPassword = withClerk(
({ clerk, component, fallback, ...props }: WithClerkProp<TaskResetPasswordProps & FallbackProp>) => {
const mountingStatus = useWaitForComponentMount(component);
const shouldShowFallback = mountingStatus === 'rendering' || !clerk.loaded;

const rendererRootProps = {
...(shouldShowFallback && fallback && { style: { display: 'none' } }),
};

return (
<>
{shouldShowFallback && fallback}
{clerk.loaded && (
<ClerkHostRenderer
component={component}
mount={clerk.mountTaskResetPassword}
unmount={clerk.unmountTaskResetPassword}
updateProps={(clerk as any).__unstable__updateProps}
props={props}
rootProps={rendererRootProps}
/>
)}
</>
);
},
{ component: 'TaskResetPassword', renderWhileLoading: true },
);
23 changes: 22 additions & 1 deletion packages/react/src/isomorphicClerk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -48,6 +48,7 @@ import type {
SignUpResource,
State,
TaskChooseOrganizationProps,
TaskResetPasswordProps,
TasksRedirectOptions,
UnsubscribeCallback,
UserAvatarProps,
Expand DownExpand Up@@ -150,7 +151,7 @@ export class IsomorphicClerk implements IsomorphicLoadedClerk {
private premountAPIKeysNodes = new Map<HTMLDivElement, APIKeysProps | undefined>();
private premountOAuthConsentNodes = new Map<HTMLDivElement, __internal_OAuthConsentProps | undefined>();
private premountTaskChooseOrganizationNodes = new Map<HTMLDivElement, TaskChooseOrganizationProps | undefined>();

private premountTaskResetPasswordNodes = new Map<HTMLDivElement, TaskResetPasswordProps | undefined>();
// A separate Map of `addListener` method calls to handle multiple listeners.
private premountAddListenerCalls = new Map<
ListenerCallback,
Expand DownExpand Up@@ -676,6 +677,10 @@ export class IsomorphicClerk implements IsomorphicLoadedClerk {
clerkjs.mountTaskChooseOrganization(node, props);
});

this.premountTaskResetPasswordNodes.forEach((props, node) => {
clerkjs.mountTaskResetPassword(node, props);
});

/**
* Only update status in case `clerk.status` is missing. In any other case, `clerk-js` should be the orchestrator.
*/
Expand DownExpand Up@@ -1218,6 +1223,22 @@ export class IsomorphicClerk implements IsomorphicLoadedClerk {
}
};

mountTaskResetPassword = (node: HTMLDivElement, props?: TaskResetPasswordProps): void => {
if (this.clerkjs && this.loaded) {
this.clerkjs.mountTaskResetPassword(node, props);
} else {
this.premountTaskResetPasswordNodes.set(node, props);
}
};

unmountTaskResetPassword = (node: HTMLDivElement): void => {
if (this.clerkjs && this.loaded) {
this.clerkjs.unmountTaskResetPassword(node);
} else {
this.premountTaskResetPasswordNodes.delete(node);
}
};

addListener = (listener: ListenerCallback): UnsubscribeCallback => {
if (this.clerkjs) {
return this.clerkjs.addListener(listener);
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -32,6 +32,7 @@ exports[`root public exports > should not change unexpectedly 1`] = `
"SignedIn",
"SignedOut",
"TaskChooseOrganization",
"TaskResetPassword",
"UserAvatar",
"UserButton",
"UserProfile",
Expand Down
2 changes: 2 additions & 0 deletions packages/remix/src/__tests__/exports.test.ts
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
import { describe, expect, it } from 'vitest';

import * as publicExports from '../index';
import * as ssrExports from '../ssr/index';

Expand Down
4 changes: 4 additions & 0 deletions packages/shared/src/types/appearance.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -1125,6 +1125,10 @@ export type Appearance<T = Theme> = T &
* Theme overrides that only apply to the `<TaskChooseOrganization />` component
*/
taskChooseOrganization?: T;
/**
* Theme overrides that only apply to the `<TaskResetPassword />` component
*/
taskResetPassword?: T;
/**
* Theme overrides that only apply to the `<EnableOrganizations/>` component
*/
Expand Down
16 changes: 16 additions & 0 deletions packages/shared/src/types/clerk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -646,6 +646,22 @@ export interface Clerk {
*/
unmountTaskChooseOrganization: (targetNode: HTMLDivElement) => void;

/**
* Mounts a TaskResetPassword component at the target element.
*
* @param targetNode - Target node to mount the TaskResetPassword component.
* @param props - configuration parameters.
*/
mountTaskResetPassword: (targetNode: HTMLDivElement, props?: TaskResetPasswordProps) => void;

/**
* Unmount a TaskResetPassword component from the target element.
* If there is no component mounted at the target node, results in a noop.
*
* @param targetNode - Target node to unmount the TaskResetPassword component from.
*/
unmountTaskResetPassword: (targetNode: HTMLDivElement) => void;
Comment thread
octoper marked this conversation as resolved.

/**
* @internal
* Loads Stripe libraries for commerce functionality
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -43,6 +43,7 @@ exports[`root public exports > should not change unexpectedly 1`] = `
"SignedIn",
"SignedOut",
"TaskChooseOrganization",
"TaskResetPassword",
"UserAvatar",
"UserButton",
"UserProfile",
Expand Down