fix(clerk-js,types): Close modals when setActive({redirectUrl}) is called - #5092

Merged
panteliselef merged 20 commits into
mainfrom
elef/sdki-856-set-active-emitter
Feb 12, 2025
Merged

fix(clerk-js,types): Close modals when setActive({redirectUrl}) is called#5092
panteliselef merged 20 commits into
mainfrom
elef/sdki-856-set-active-emitter

Conversation

@panteliselef

@panteliselefpanteliselef commented Feb 6, 2025

Copy link
Copy Markdown
Contributor

Description

A simpler solution to #5077 which allows the e2e test of #5071 to pass 🟢.

General Problem

Since the deprecation of setActive({ beforeEmit }), our UI components have been using Clerk.navigate in order to navigate when setActive({ redirectUrl }) is set which does no handle closing the already open modals.

Specific use-case

This buggy behaviour is clearly visible, when you attempt to delete a user from UserProfile rendered in a modal. Upon deletion, setActive({redirectUrl}) was called, but when a soft navigation occurred (using framework router) the modal would not close, and the backdrop was clearly visible.

Solution

This solution in this PR fixes the above issues while maintaining setActive simple to use for developers. We also still discourage the explicit usage of setActive({beforeEmit})

Checklist

  • pnpm test runs as expected.
  • pnpm build runs as expected.
  • (If applicable) JSDoc comments have been added or updated for any package exports
  • (If applicable) Documentation has been updated

Type of change

  • 🐛 Bug fix
  • 🌟 New feature
  • 🔨 Breaking change
  • 📖 Refactoring / dependency upgrade / documentation
  • other:

@panteliselefpanteliselef self-assigned this Feb 6, 2025
@changeset-bot

changeset-botBot commented Feb 6, 2025

Copy link
Copy Markdown

🦋 Changeset detected

Latest commit: 8c66b98

The changes in this PR will be included in the next version bump.

This PR includes changesets to release 22 packages
NameType
@clerk/clerk-reactPatch
@clerk/typesMinor
@clerk/clerk-jsPatch
@clerk/chrome-extensionPatch
@clerk/elementsPatch
@clerk/clerk-expoPatch
@clerk/nextjsPatch
@clerk/react-routerPatch
@clerk/remixPatch
@clerk/tanstack-startPatch
@clerk/astroPatch
@clerk/backendPatch
@clerk/expo-passkeysPatch
@clerk/expressPatch
@clerk/fastifyPatch
@clerk/localizationsPatch
@clerk/nuxtPatch
@clerk/sharedPatch
@clerk/testingPatch
@clerk/themesPatch
@clerk/uiPatch
@clerk/vuePatch

Not sure what this means? Click here to learn what changesets are.

Click here if you're a maintainer who wants to add another changeset to this PR

@vercel

vercelBot commented Feb 6, 2025

Copy link
Copy Markdown

The latest updates on your projects. Learn more about Vercel for Git ↗︎

NameStatusPreviewCommentsUpdated (UTC)
clerk-js-sandbox✅ Ready (Inspect)Visit Preview💬 Add feedbackFeb 12, 2025 11:54am

@panteliselefpanteliselef changed the title Elef/sdki 856 set active emitterfix(clerk-js,types): Close modals when setActive({redirectUrl}) is calledFeb 6, 2025
}
};

#resetComponentsState = () => {

@LauraBeatrisLauraBeatrisFeb 7, 2025

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wouldn't we still need this for custom flows that mount SignIn/SignUp and call setActive without further navigation?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am a bit confused by the question, you can either have a custom flow, or mount SignIn/Up, right ? Can you give a n example when this is not the case ?

@LauraBeatrisLauraBeatrisFeb 7, 2025

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You're right, let me rephrase in another way then:

If I understood correctly, the modals get closed upon router navigation after setActive - but what happens if there's no navigation, you're just calling regular setActive - wouldn't we want to keep this current logic for closing SignIn / SignUp?

Also, setActive inner workings is still relately new to me as I'll be pushing some changes to it soon, so I'm mostly asking for my own understanding here 🫡

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  1. #resetComponentsState does not cover all modals which is weird on it's own.
  2. Having #resetComponentsState there, cause an open SignInModal to close if for whatever reason a setActive({session: null}) is called in a multi session app. Another weird side effect.

wouldn't we want to keep this current logic for closing SignIn / SignUp?
Our components will always redirect to afterSignIn or afterSignUp, which means we make a navigation outside the component so the modal will close.
The only modal component that exists today that does not navigate on setActive, is Reverification and it closes the modal manually (inside useAfterVerification).

Are we aligned that we care about closing the modal, only as long setActive is called within our components ? And as long as we always setActive({redirectUrl}) from within our component at the end of each flow the modals will close properly.

Removing #resetComponentsState might unblock afterAuth in a way, because now you can call setActive (without redirectUrl) from /sign-in/select-org/ and then internally navigate to /sign-in/subscribe and not having the modal close on you.

If you have scenarios that seem problematic with the changes that this PR proposes, please let us know as we might need to switch back to the more complex solution which allows for each component to close their own modal similarly to how we had setActive working prior to the deprecation of beforeEmit.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Makes sense to me! I'll make sure to consider that behavior when testing after-auth changes, and we also discuss further about that, thanks for handling those cases 🫡

@LauraBeatrisLauraBeatris left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just missing the changeset description. Other than that, changes look good to me! 🫡

Comment threadpackages/clerk-js/src/core/clerk.ts Outdated
expect(sessionCookieList.length).toBe(0);
});

test('closes the modal after delete', async ({ page, context }) => {

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you also add a test that covers the removed resetComponentState functionality? So closing a sign-in modal on sign in.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I added a bunch of tests in this commit

Comment threadpackages/clerk-js/src/ui/lazyModules/providers.tsx Outdated
return () => {
unsubscribe();
};
// We are not expecting `onExternalNavigate` to change

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I know we're not expecting it to change, but does providing it as a dependency break anything?

@panteliselefpanteliselefFeb 10, 2025

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

since we pass a non memoize function i think it will cause multiple subscriptions/unsubscribes

Comment threadpackages/types/src/clerk.ts Outdated

testAgainstRunningApps({ withEnv: [appConfigs.envs.withEmailCodes] })('sign up flow @generic @nextjs', ({ app }) => {
test.describe.configure({ mode: 'serial' });
test.describe.configure({ mode: 'parallel' });

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems to improve speed and does not cause tests to fail

Comment threadpackages/types/src/clerk.ts Outdated
Co-authored-by: Dylan Staley <88163+dstaley@users.noreply.github.com>
@panteliselef

Copy link
Copy Markdown
ContributorAuthor

!snapshot

@clerk-cookie

Copy link
Copy Markdown
Collaborator

Hey @panteliselef - the snapshot version command generated the following package versions:

PackageVersion
@clerk/astro2.2.0-snapshot.v20250212105537
@clerk/backend1.24.1-snapshot.v20250212105537
@clerk/chrome-extension2.2.9-snapshot.v20250212105537
@clerk/clerk-js5.52.3-snapshot.v20250212105537
@clerk/elements0.22.22-snapshot.v20250212105537
@clerk/clerk-expo2.7.7-snapshot.v20250212105537
@clerk/expo-passkeys0.1.20-snapshot.v20250212105537
@clerk/express1.3.48-snapshot.v20250212105537
@clerk/fastify2.1.21-snapshot.v20250212105537
@clerk/localizations3.10.6-snapshot.v20250212105537
@clerk/nextjs6.11.3-snapshot.v20250212105537
@clerk/nuxt1.1.4-snapshot.v20250212105537
@clerk/clerk-react5.22.13-snapshot.v20250212105537
@clerk/react-router1.0.8-snapshot.v20250212105537
@clerk/remix4.4.24-snapshot.v20250212105537
@clerk/shared2.21.1-snapshot.v20250212105537
@clerk/tanstack-start0.9.6-snapshot.v20250212105537
@clerk/testing1.4.22-snapshot.v20250212105537
@clerk/themes2.2.18-snapshot.v20250212105537
@clerk/types4.46.0-snapshot.v20250212105537
@clerk/ui0.3.23-snapshot.v20250212105537
@clerk/vue1.1.12-snapshot.v20250212105537

Tip: Use the snippet copy button below to quickly install the required packages.
@clerk/astro

npm i @clerk/astro@2.2.0-snapshot.v20250212105537 --save-exact

@clerk/backend

npm i @clerk/backend@1.24.1-snapshot.v20250212105537 --save-exact

@clerk/chrome-extension

npm i @clerk/chrome-extension@2.2.9-snapshot.v20250212105537 --save-exact

@clerk/clerk-js

npm i @clerk/clerk-js@5.52.3-snapshot.v20250212105537 --save-exact

@clerk/elements

npm i @clerk/elements@0.22.22-snapshot.v20250212105537 --save-exact

@clerk/clerk-expo

npm i @clerk/clerk-expo@2.7.7-snapshot.v20250212105537 --save-exact

@clerk/expo-passkeys

npm i @clerk/expo-passkeys@0.1.20-snapshot.v20250212105537 --save-exact

@clerk/express

npm i @clerk/express@1.3.48-snapshot.v20250212105537 --save-exact

@clerk/fastify

npm i @clerk/fastify@2.1.21-snapshot.v20250212105537 --save-exact

@clerk/localizations

npm i @clerk/localizations@3.10.6-snapshot.v20250212105537 --save-exact

@clerk/nextjs

npm i @clerk/nextjs@6.11.3-snapshot.v20250212105537 --save-exact

@clerk/nuxt

npm i @clerk/nuxt@1.1.4-snapshot.v20250212105537 --save-exact

@clerk/clerk-react

npm i @clerk/clerk-react@5.22.13-snapshot.v20250212105537 --save-exact

@clerk/react-router

npm i @clerk/react-router@1.0.8-snapshot.v20250212105537 --save-exact

@clerk/remix

npm i @clerk/remix@4.4.24-snapshot.v20250212105537 --save-exact

@clerk/shared

npm i @clerk/shared@2.21.1-snapshot.v20250212105537 --save-exact

@clerk/tanstack-start

npm i @clerk/tanstack-start@0.9.6-snapshot.v20250212105537 --save-exact

@clerk/testing

npm i @clerk/testing@1.4.22-snapshot.v20250212105537 --save-exact

@clerk/themes

npm i @clerk/themes@2.2.18-snapshot.v20250212105537 --save-exact

@clerk/types

npm i @clerk/types@4.46.0-snapshot.v20250212105537 --save-exact

@clerk/ui

npm i @clerk/ui@0.3.23-snapshot.v20250212105537 --save-exact

@clerk/vue

npm i @clerk/vue@1.1.12-snapshot.v20250212105537 --save-exact

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@panteliselef@clerk-cookie@dstaley@LauraBeatris
, '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

fix(clerk-js,types): Close modals when setActive({redirectUrl}) is called - #5092

Merged
panteliselef merged 20 commits into
mainfrom
elef/sdki-856-set-active-emitter
Feb 12, 2025
Merged

fix(clerk-js,types): Close modals when setActive({redirectUrl}) is called#5092
panteliselef merged 20 commits into
mainfrom
elef/sdki-856-set-active-emitter

Conversation

@panteliselef

@panteliselefpanteliselef commented Feb 6, 2025

Copy link
Copy Markdown
Contributor

Description

A simpler solution to #5077 which allows the e2e test of #5071 to pass 🟢.

General Problem

Since the deprecation of setActive({ beforeEmit }), our UI components have been using Clerk.navigate in order to navigate when setActive({ redirectUrl }) is set which does no handle closing the already open modals.

Specific use-case

This buggy behaviour is clearly visible, when you attempt to delete a user from UserProfile rendered in a modal. Upon deletion, setActive({redirectUrl}) was called, but when a soft navigation occurred (using framework router) the modal would not close, and the backdrop was clearly visible.

Solution

This solution in this PR fixes the above issues while maintaining setActive simple to use for developers. We also still discourage the explicit usage of setActive({beforeEmit})

Checklist

  • pnpm test runs as expected.
  • pnpm build runs as expected.
  • (If applicable) JSDoc comments have been added or updated for any package exports
  • (If applicable) Documentation has been updated

Type of change

  • 🐛 Bug fix
  • 🌟 New feature
  • 🔨 Breaking change
  • 📖 Refactoring / dependency upgrade / documentation
  • other:

@panteliselefpanteliselef self-assigned this Feb 6, 2025
@changeset-bot

changeset-botBot commented Feb 6, 2025

Copy link
Copy Markdown

🦋 Changeset detected

Latest commit: 8c66b98

The changes in this PR will be included in the next version bump.

This PR includes changesets to release 22 packages
NameType
@clerk/clerk-reactPatch
@clerk/typesMinor
@clerk/clerk-jsPatch
@clerk/chrome-extensionPatch
@clerk/elementsPatch
@clerk/clerk-expoPatch
@clerk/nextjsPatch
@clerk/react-routerPatch
@clerk/remixPatch
@clerk/tanstack-startPatch
@clerk/astroPatch
@clerk/backendPatch
@clerk/expo-passkeysPatch
@clerk/expressPatch
@clerk/fastifyPatch
@clerk/localizationsPatch
@clerk/nuxtPatch
@clerk/sharedPatch
@clerk/testingPatch
@clerk/themesPatch
@clerk/uiPatch
@clerk/vuePatch

Not sure what this means? Click here to learn what changesets are.

Click here if you're a maintainer who wants to add another changeset to this PR

@vercel

vercelBot commented Feb 6, 2025

Copy link
Copy Markdown

The latest updates on your projects. Learn more about Vercel for Git ↗︎

NameStatusPreviewCommentsUpdated (UTC)
clerk-js-sandbox✅ Ready (Inspect)Visit Preview💬 Add feedbackFeb 12, 2025 11:54am

@panteliselefpanteliselef changed the title Elef/sdki 856 set active emitterfix(clerk-js,types): Close modals when setActive({redirectUrl}) is calledFeb 6, 2025
}
};

#resetComponentsState = () => {

@LauraBeatrisLauraBeatrisFeb 7, 2025

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wouldn't we still need this for custom flows that mount SignIn/SignUp and call setActive without further navigation?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am a bit confused by the question, you can either have a custom flow, or mount SignIn/Up, right ? Can you give a n example when this is not the case ?

@LauraBeatrisLauraBeatrisFeb 7, 2025

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You're right, let me rephrase in another way then:

If I understood correctly, the modals get closed upon router navigation after setActive - but what happens if there's no navigation, you're just calling regular setActive - wouldn't we want to keep this current logic for closing SignIn / SignUp?

Also, setActive inner workings is still relately new to me as I'll be pushing some changes to it soon, so I'm mostly asking for my own understanding here 🫡

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  1. #resetComponentsState does not cover all modals which is weird on it's own.
  2. Having #resetComponentsState there, cause an open SignInModal to close if for whatever reason a setActive({session: null}) is called in a multi session app. Another weird side effect.

wouldn't we want to keep this current logic for closing SignIn / SignUp?
Our components will always redirect to afterSignIn or afterSignUp, which means we make a navigation outside the component so the modal will close.
The only modal component that exists today that does not navigate on setActive, is Reverification and it closes the modal manually (inside useAfterVerification).

Are we aligned that we care about closing the modal, only as long setActive is called within our components ? And as long as we always setActive({redirectUrl}) from within our component at the end of each flow the modals will close properly.

Removing #resetComponentsState might unblock afterAuth in a way, because now you can call setActive (without redirectUrl) from /sign-in/select-org/ and then internally navigate to /sign-in/subscribe and not having the modal close on you.

If you have scenarios that seem problematic with the changes that this PR proposes, please let us know as we might need to switch back to the more complex solution which allows for each component to close their own modal similarly to how we had setActive working prior to the deprecation of beforeEmit.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Makes sense to me! I'll make sure to consider that behavior when testing after-auth changes, and we also discuss further about that, thanks for handling those cases 🫡

@LauraBeatrisLauraBeatris left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just missing the changeset description. Other than that, changes look good to me! 🫡

Comment threadpackages/clerk-js/src/core/clerk.ts Outdated
expect(sessionCookieList.length).toBe(0);
});

test('closes the modal after delete', async ({ page, context }) => {

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you also add a test that covers the removed resetComponentState functionality? So closing a sign-in modal on sign in.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I added a bunch of tests in this commit

Comment threadpackages/clerk-js/src/ui/lazyModules/providers.tsx Outdated
return () => {
unsubscribe();
};
// We are not expecting `onExternalNavigate` to change

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I know we're not expecting it to change, but does providing it as a dependency break anything?

@panteliselefpanteliselefFeb 10, 2025

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

since we pass a non memoize function i think it will cause multiple subscriptions/unsubscribes

Comment threadpackages/types/src/clerk.ts Outdated

testAgainstRunningApps({ withEnv: [appConfigs.envs.withEmailCodes] })('sign up flow @generic @nextjs', ({ app }) => {
test.describe.configure({ mode: 'serial' });
test.describe.configure({ mode: 'parallel' });

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems to improve speed and does not cause tests to fail

Comment threadpackages/types/src/clerk.ts Outdated
Co-authored-by: Dylan Staley <88163+dstaley@users.noreply.github.com>
@panteliselef

Copy link
Copy Markdown
ContributorAuthor

!snapshot

@clerk-cookie

Copy link
Copy Markdown
Collaborator

Hey @panteliselef - the snapshot version command generated the following package versions:

PackageVersion
@clerk/astro2.2.0-snapshot.v20250212105537
@clerk/backend1.24.1-snapshot.v20250212105537
@clerk/chrome-extension2.2.9-snapshot.v20250212105537
@clerk/clerk-js5.52.3-snapshot.v20250212105537
@clerk/elements0.22.22-snapshot.v20250212105537
@clerk/clerk-expo2.7.7-snapshot.v20250212105537
@clerk/expo-passkeys0.1.20-snapshot.v20250212105537
@clerk/express1.3.48-snapshot.v20250212105537
@clerk/fastify2.1.21-snapshot.v20250212105537
@clerk/localizations3.10.6-snapshot.v20250212105537
@clerk/nextjs6.11.3-snapshot.v20250212105537
@clerk/nuxt1.1.4-snapshot.v20250212105537
@clerk/clerk-react5.22.13-snapshot.v20250212105537
@clerk/react-router1.0.8-snapshot.v20250212105537
@clerk/remix4.4.24-snapshot.v20250212105537
@clerk/shared2.21.1-snapshot.v20250212105537
@clerk/tanstack-start0.9.6-snapshot.v20250212105537
@clerk/testing1.4.22-snapshot.v20250212105537
@clerk/themes2.2.18-snapshot.v20250212105537
@clerk/types4.46.0-snapshot.v20250212105537
@clerk/ui0.3.23-snapshot.v20250212105537
@clerk/vue1.1.12-snapshot.v20250212105537

Tip: Use the snippet copy button below to quickly install the required packages.
@clerk/astro

npm i @clerk/astro@2.2.0-snapshot.v20250212105537 --save-exact

@clerk/backend

npm i @clerk/backend@1.24.1-snapshot.v20250212105537 --save-exact

@clerk/chrome-extension

npm i @clerk/chrome-extension@2.2.9-snapshot.v20250212105537 --save-exact

@clerk/clerk-js

npm i @clerk/clerk-js@5.52.3-snapshot.v20250212105537 --save-exact

@clerk/elements

npm i @clerk/elements@0.22.22-snapshot.v20250212105537 --save-exact

@clerk/clerk-expo

npm i @clerk/clerk-expo@2.7.7-snapshot.v20250212105537 --save-exact

@clerk/expo-passkeys

npm i @clerk/expo-passkeys@0.1.20-snapshot.v20250212105537 --save-exact

@clerk/express

npm i @clerk/express@1.3.48-snapshot.v20250212105537 --save-exact

@clerk/fastify

npm i @clerk/fastify@2.1.21-snapshot.v20250212105537 --save-exact

@clerk/localizations

npm i @clerk/localizations@3.10.6-snapshot.v20250212105537 --save-exact

@clerk/nextjs

npm i @clerk/nextjs@6.11.3-snapshot.v20250212105537 --save-exact

@clerk/nuxt

npm i @clerk/nuxt@1.1.4-snapshot.v20250212105537 --save-exact

@clerk/clerk-react

npm i @clerk/clerk-react@5.22.13-snapshot.v20250212105537 --save-exact

@clerk/react-router

npm i @clerk/react-router@1.0.8-snapshot.v20250212105537 --save-exact

@clerk/remix

npm i @clerk/remix@4.4.24-snapshot.v20250212105537 --save-exact

@clerk/shared

npm i @clerk/shared@2.21.1-snapshot.v20250212105537 --save-exact

@clerk/tanstack-start

npm i @clerk/tanstack-start@0.9.6-snapshot.v20250212105537 --save-exact

@clerk/testing

npm i @clerk/testing@1.4.22-snapshot.v20250212105537 --save-exact

@clerk/themes

npm i @clerk/themes@2.2.18-snapshot.v20250212105537 --save-exact

@clerk/types

npm i @clerk/types@4.46.0-snapshot.v20250212105537 --save-exact

@clerk/ui

npm i @clerk/ui@0.3.23-snapshot.v20250212105537 --save-exact

@clerk/vue

npm i @clerk/vue@1.1.12-snapshot.v20250212105537 --save-exact

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@panteliselef@clerk-cookie@dstaley@LauraBeatris
, '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

fix(clerk-js,types): Close modals when setActive({redirectUrl}) is called - #5092

Merged
panteliselef merged 20 commits into
mainfrom
elef/sdki-856-set-active-emitter
Feb 12, 2025
Merged

fix(clerk-js,types): Close modals when setActive({redirectUrl}) is called#5092
panteliselef merged 20 commits into
mainfrom
elef/sdki-856-set-active-emitter

Conversation

@panteliselef

@panteliselefpanteliselef commented Feb 6, 2025

Copy link
Copy Markdown
Contributor

Description

A simpler solution to #5077 which allows the e2e test of #5071 to pass 🟢.

General Problem

Since the deprecation of setActive({ beforeEmit }), our UI components have been using Clerk.navigate in order to navigate when setActive({ redirectUrl }) is set which does no handle closing the already open modals.

Specific use-case

This buggy behaviour is clearly visible, when you attempt to delete a user from UserProfile rendered in a modal. Upon deletion, setActive({redirectUrl}) was called, but when a soft navigation occurred (using framework router) the modal would not close, and the backdrop was clearly visible.

Solution

This solution in this PR fixes the above issues while maintaining setActive simple to use for developers. We also still discourage the explicit usage of setActive({beforeEmit})

Checklist

  • pnpm test runs as expected.
  • pnpm build runs as expected.
  • (If applicable) JSDoc comments have been added or updated for any package exports
  • (If applicable) Documentation has been updated

Type of change

  • 🐛 Bug fix
  • 🌟 New feature
  • 🔨 Breaking change
  • 📖 Refactoring / dependency upgrade / documentation
  • other:

@panteliselefpanteliselef self-assigned this Feb 6, 2025
@changeset-bot

changeset-botBot commented Feb 6, 2025

Copy link
Copy Markdown

🦋 Changeset detected

Latest commit: 8c66b98

The changes in this PR will be included in the next version bump.

This PR includes changesets to release 22 packages
NameType
@clerk/clerk-reactPatch
@clerk/typesMinor
@clerk/clerk-jsPatch
@clerk/chrome-extensionPatch
@clerk/elementsPatch
@clerk/clerk-expoPatch
@clerk/nextjsPatch
@clerk/react-routerPatch
@clerk/remixPatch
@clerk/tanstack-startPatch
@clerk/astroPatch
@clerk/backendPatch
@clerk/expo-passkeysPatch
@clerk/expressPatch
@clerk/fastifyPatch
@clerk/localizationsPatch
@clerk/nuxtPatch
@clerk/sharedPatch
@clerk/testingPatch
@clerk/themesPatch
@clerk/uiPatch
@clerk/vuePatch

Not sure what this means? Click here to learn what changesets are.

Click here if you're a maintainer who wants to add another changeset to this PR

@vercel

vercelBot commented Feb 6, 2025

Copy link
Copy Markdown

The latest updates on your projects. Learn more about Vercel for Git ↗︎

NameStatusPreviewCommentsUpdated (UTC)
clerk-js-sandbox✅ Ready (Inspect)Visit Preview💬 Add feedbackFeb 12, 2025 11:54am

@panteliselefpanteliselef changed the title Elef/sdki 856 set active emitterfix(clerk-js,types): Close modals when setActive({redirectUrl}) is calledFeb 6, 2025
}
};

#resetComponentsState = () => {

@LauraBeatrisLauraBeatrisFeb 7, 2025

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wouldn't we still need this for custom flows that mount SignIn/SignUp and call setActive without further navigation?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am a bit confused by the question, you can either have a custom flow, or mount SignIn/Up, right ? Can you give a n example when this is not the case ?

@LauraBeatrisLauraBeatrisFeb 7, 2025

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You're right, let me rephrase in another way then:

If I understood correctly, the modals get closed upon router navigation after setActive - but what happens if there's no navigation, you're just calling regular setActive - wouldn't we want to keep this current logic for closing SignIn / SignUp?

Also, setActive inner workings is still relately new to me as I'll be pushing some changes to it soon, so I'm mostly asking for my own understanding here 🫡

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  1. #resetComponentsState does not cover all modals which is weird on it's own.
  2. Having #resetComponentsState there, cause an open SignInModal to close if for whatever reason a setActive({session: null}) is called in a multi session app. Another weird side effect.

wouldn't we want to keep this current logic for closing SignIn / SignUp?
Our components will always redirect to afterSignIn or afterSignUp, which means we make a navigation outside the component so the modal will close.
The only modal component that exists today that does not navigate on setActive, is Reverification and it closes the modal manually (inside useAfterVerification).

Are we aligned that we care about closing the modal, only as long setActive is called within our components ? And as long as we always setActive({redirectUrl}) from within our component at the end of each flow the modals will close properly.

Removing #resetComponentsState might unblock afterAuth in a way, because now you can call setActive (without redirectUrl) from /sign-in/select-org/ and then internally navigate to /sign-in/subscribe and not having the modal close on you.

If you have scenarios that seem problematic with the changes that this PR proposes, please let us know as we might need to switch back to the more complex solution which allows for each component to close their own modal similarly to how we had setActive working prior to the deprecation of beforeEmit.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Makes sense to me! I'll make sure to consider that behavior when testing after-auth changes, and we also discuss further about that, thanks for handling those cases 🫡

@LauraBeatrisLauraBeatris left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just missing the changeset description. Other than that, changes look good to me! 🫡

Comment threadpackages/clerk-js/src/core/clerk.ts Outdated
expect(sessionCookieList.length).toBe(0);
});

test('closes the modal after delete', async ({ page, context }) => {

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you also add a test that covers the removed resetComponentState functionality? So closing a sign-in modal on sign in.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I added a bunch of tests in this commit

Comment threadpackages/clerk-js/src/ui/lazyModules/providers.tsx Outdated
return () => {
unsubscribe();
};
// We are not expecting `onExternalNavigate` to change

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I know we're not expecting it to change, but does providing it as a dependency break anything?

@panteliselefpanteliselefFeb 10, 2025

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

since we pass a non memoize function i think it will cause multiple subscriptions/unsubscribes

Comment threadpackages/types/src/clerk.ts Outdated

testAgainstRunningApps({ withEnv: [appConfigs.envs.withEmailCodes] })('sign up flow @generic @nextjs', ({ app }) => {
test.describe.configure({ mode: 'serial' });
test.describe.configure({ mode: 'parallel' });

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems to improve speed and does not cause tests to fail

Comment threadpackages/types/src/clerk.ts Outdated
Co-authored-by: Dylan Staley <88163+dstaley@users.noreply.github.com>
@panteliselef

Copy link
Copy Markdown
ContributorAuthor

!snapshot

@clerk-cookie

Copy link
Copy Markdown
Collaborator

Hey @panteliselef - the snapshot version command generated the following package versions:

PackageVersion
@clerk/astro2.2.0-snapshot.v20250212105537
@clerk/backend1.24.1-snapshot.v20250212105537
@clerk/chrome-extension2.2.9-snapshot.v20250212105537
@clerk/clerk-js5.52.3-snapshot.v20250212105537
@clerk/elements0.22.22-snapshot.v20250212105537
@clerk/clerk-expo2.7.7-snapshot.v20250212105537
@clerk/expo-passkeys0.1.20-snapshot.v20250212105537
@clerk/express1.3.48-snapshot.v20250212105537
@clerk/fastify2.1.21-snapshot.v20250212105537
@clerk/localizations3.10.6-snapshot.v20250212105537
@clerk/nextjs6.11.3-snapshot.v20250212105537
@clerk/nuxt1.1.4-snapshot.v20250212105537
@clerk/clerk-react5.22.13-snapshot.v20250212105537
@clerk/react-router1.0.8-snapshot.v20250212105537
@clerk/remix4.4.24-snapshot.v20250212105537
@clerk/shared2.21.1-snapshot.v20250212105537
@clerk/tanstack-start0.9.6-snapshot.v20250212105537
@clerk/testing1.4.22-snapshot.v20250212105537
@clerk/themes2.2.18-snapshot.v20250212105537
@clerk/types4.46.0-snapshot.v20250212105537
@clerk/ui0.3.23-snapshot.v20250212105537
@clerk/vue1.1.12-snapshot.v20250212105537

Tip: Use the snippet copy button below to quickly install the required packages.
@clerk/astro

npm i @clerk/astro@2.2.0-snapshot.v20250212105537 --save-exact

@clerk/backend

npm i @clerk/backend@1.24.1-snapshot.v20250212105537 --save-exact

@clerk/chrome-extension

npm i @clerk/chrome-extension@2.2.9-snapshot.v20250212105537 --save-exact

@clerk/clerk-js

npm i @clerk/clerk-js@5.52.3-snapshot.v20250212105537 --save-exact

@clerk/elements

npm i @clerk/elements@0.22.22-snapshot.v20250212105537 --save-exact

@clerk/clerk-expo

npm i @clerk/clerk-expo@2.7.7-snapshot.v20250212105537 --save-exact

@clerk/expo-passkeys

npm i @clerk/expo-passkeys@0.1.20-snapshot.v20250212105537 --save-exact

@clerk/express

npm i @clerk/express@1.3.48-snapshot.v20250212105537 --save-exact

@clerk/fastify

npm i @clerk/fastify@2.1.21-snapshot.v20250212105537 --save-exact

@clerk/localizations

npm i @clerk/localizations@3.10.6-snapshot.v20250212105537 --save-exact

@clerk/nextjs

npm i @clerk/nextjs@6.11.3-snapshot.v20250212105537 --save-exact

@clerk/nuxt

npm i @clerk/nuxt@1.1.4-snapshot.v20250212105537 --save-exact

@clerk/clerk-react

npm i @clerk/clerk-react@5.22.13-snapshot.v20250212105537 --save-exact

@clerk/react-router

npm i @clerk/react-router@1.0.8-snapshot.v20250212105537 --save-exact

@clerk/remix

npm i @clerk/remix@4.4.24-snapshot.v20250212105537 --save-exact

@clerk/shared

npm i @clerk/shared@2.21.1-snapshot.v20250212105537 --save-exact

@clerk/tanstack-start

npm i @clerk/tanstack-start@0.9.6-snapshot.v20250212105537 --save-exact

@clerk/testing

npm i @clerk/testing@1.4.22-snapshot.v20250212105537 --save-exact

@clerk/themes

npm i @clerk/themes@2.2.18-snapshot.v20250212105537 --save-exact

@clerk/types

npm i @clerk/types@4.46.0-snapshot.v20250212105537 --save-exact

@clerk/ui

npm i @clerk/ui@0.3.23-snapshot.v20250212105537 --save-exact

@clerk/vue

npm i @clerk/vue@1.1.12-snapshot.v20250212105537 --save-exact

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@panteliselef@clerk-cookie@dstaley@LauraBeatris
, '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

fix(clerk-js,types): Close modals when setActive({redirectUrl}) is called - #5092

Merged
panteliselef merged 20 commits into
mainfrom
elef/sdki-856-set-active-emitter
Feb 12, 2025
Merged

fix(clerk-js,types): Close modals when setActive({redirectUrl}) is called#5092
panteliselef merged 20 commits into
mainfrom
elef/sdki-856-set-active-emitter

Conversation

@panteliselef

@panteliselefpanteliselef commented Feb 6, 2025

Copy link
Copy Markdown
Contributor

Description

A simpler solution to #5077 which allows the e2e test of #5071 to pass 🟢.

General Problem

Since the deprecation of setActive({ beforeEmit }), our UI components have been using Clerk.navigate in order to navigate when setActive({ redirectUrl }) is set which does no handle closing the already open modals.

Specific use-case

This buggy behaviour is clearly visible, when you attempt to delete a user from UserProfile rendered in a modal. Upon deletion, setActive({redirectUrl}) was called, but when a soft navigation occurred (using framework router) the modal would not close, and the backdrop was clearly visible.

Solution

This solution in this PR fixes the above issues while maintaining setActive simple to use for developers. We also still discourage the explicit usage of setActive({beforeEmit})

Checklist

  • pnpm test runs as expected.
  • pnpm build runs as expected.
  • (If applicable) JSDoc comments have been added or updated for any package exports
  • (If applicable) Documentation has been updated

Type of change

  • 🐛 Bug fix
  • 🌟 New feature
  • 🔨 Breaking change
  • 📖 Refactoring / dependency upgrade / documentation
  • other:

@panteliselefpanteliselef self-assigned this Feb 6, 2025
@changeset-bot

changeset-botBot commented Feb 6, 2025

Copy link
Copy Markdown

🦋 Changeset detected

Latest commit: 8c66b98

The changes in this PR will be included in the next version bump.

This PR includes changesets to release 22 packages
NameType
@clerk/clerk-reactPatch
@clerk/typesMinor
@clerk/clerk-jsPatch
@clerk/chrome-extensionPatch
@clerk/elementsPatch
@clerk/clerk-expoPatch
@clerk/nextjsPatch
@clerk/react-routerPatch
@clerk/remixPatch
@clerk/tanstack-startPatch
@clerk/astroPatch
@clerk/backendPatch
@clerk/expo-passkeysPatch
@clerk/expressPatch
@clerk/fastifyPatch
@clerk/localizationsPatch
@clerk/nuxtPatch
@clerk/sharedPatch
@clerk/testingPatch
@clerk/themesPatch
@clerk/uiPatch
@clerk/vuePatch

Not sure what this means? Click here to learn what changesets are.

Click here if you're a maintainer who wants to add another changeset to this PR

@vercel

vercelBot commented Feb 6, 2025

Copy link
Copy Markdown

The latest updates on your projects. Learn more about Vercel for Git ↗︎

NameStatusPreviewCommentsUpdated (UTC)
clerk-js-sandbox✅ Ready (Inspect)Visit Preview💬 Add feedbackFeb 12, 2025 11:54am

@panteliselefpanteliselef changed the title Elef/sdki 856 set active emitterfix(clerk-js,types): Close modals when setActive({redirectUrl}) is calledFeb 6, 2025
}
};

#resetComponentsState = () => {

@LauraBeatrisLauraBeatrisFeb 7, 2025

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wouldn't we still need this for custom flows that mount SignIn/SignUp and call setActive without further navigation?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am a bit confused by the question, you can either have a custom flow, or mount SignIn/Up, right ? Can you give a n example when this is not the case ?

@LauraBeatrisLauraBeatrisFeb 7, 2025

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You're right, let me rephrase in another way then:

If I understood correctly, the modals get closed upon router navigation after setActive - but what happens if there's no navigation, you're just calling regular setActive - wouldn't we want to keep this current logic for closing SignIn / SignUp?

Also, setActive inner workings is still relately new to me as I'll be pushing some changes to it soon, so I'm mostly asking for my own understanding here 🫡

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  1. #resetComponentsState does not cover all modals which is weird on it's own.
  2. Having #resetComponentsState there, cause an open SignInModal to close if for whatever reason a setActive({session: null}) is called in a multi session app. Another weird side effect.

wouldn't we want to keep this current logic for closing SignIn / SignUp?
Our components will always redirect to afterSignIn or afterSignUp, which means we make a navigation outside the component so the modal will close.
The only modal component that exists today that does not navigate on setActive, is Reverification and it closes the modal manually (inside useAfterVerification).

Are we aligned that we care about closing the modal, only as long setActive is called within our components ? And as long as we always setActive({redirectUrl}) from within our component at the end of each flow the modals will close properly.

Removing #resetComponentsState might unblock afterAuth in a way, because now you can call setActive (without redirectUrl) from /sign-in/select-org/ and then internally navigate to /sign-in/subscribe and not having the modal close on you.

If you have scenarios that seem problematic with the changes that this PR proposes, please let us know as we might need to switch back to the more complex solution which allows for each component to close their own modal similarly to how we had setActive working prior to the deprecation of beforeEmit.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Makes sense to me! I'll make sure to consider that behavior when testing after-auth changes, and we also discuss further about that, thanks for handling those cases 🫡

@LauraBeatrisLauraBeatris left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just missing the changeset description. Other than that, changes look good to me! 🫡

Comment threadpackages/clerk-js/src/core/clerk.ts Outdated
expect(sessionCookieList.length).toBe(0);
});

test('closes the modal after delete', async ({ page, context }) => {

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you also add a test that covers the removed resetComponentState functionality? So closing a sign-in modal on sign in.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I added a bunch of tests in this commit

Comment threadpackages/clerk-js/src/ui/lazyModules/providers.tsx Outdated
return () => {
unsubscribe();
};
// We are not expecting `onExternalNavigate` to change

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I know we're not expecting it to change, but does providing it as a dependency break anything?

@panteliselefpanteliselefFeb 10, 2025

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

since we pass a non memoize function i think it will cause multiple subscriptions/unsubscribes

Comment threadpackages/types/src/clerk.ts Outdated

testAgainstRunningApps({ withEnv: [appConfigs.envs.withEmailCodes] })('sign up flow @generic @nextjs', ({ app }) => {
test.describe.configure({ mode: 'serial' });
test.describe.configure({ mode: 'parallel' });

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems to improve speed and does not cause tests to fail

Comment threadpackages/types/src/clerk.ts Outdated
Co-authored-by: Dylan Staley <88163+dstaley@users.noreply.github.com>
@panteliselef

Copy link
Copy Markdown
ContributorAuthor

!snapshot

@clerk-cookie

Copy link
Copy Markdown
Collaborator

Hey @panteliselef - the snapshot version command generated the following package versions:

PackageVersion
@clerk/astro2.2.0-snapshot.v20250212105537
@clerk/backend1.24.1-snapshot.v20250212105537
@clerk/chrome-extension2.2.9-snapshot.v20250212105537
@clerk/clerk-js5.52.3-snapshot.v20250212105537
@clerk/elements0.22.22-snapshot.v20250212105537
@clerk/clerk-expo2.7.7-snapshot.v20250212105537
@clerk/expo-passkeys0.1.20-snapshot.v20250212105537
@clerk/express1.3.48-snapshot.v20250212105537
@clerk/fastify2.1.21-snapshot.v20250212105537
@clerk/localizations3.10.6-snapshot.v20250212105537
@clerk/nextjs6.11.3-snapshot.v20250212105537
@clerk/nuxt1.1.4-snapshot.v20250212105537
@clerk/clerk-react5.22.13-snapshot.v20250212105537
@clerk/react-router1.0.8-snapshot.v20250212105537
@clerk/remix4.4.24-snapshot.v20250212105537
@clerk/shared2.21.1-snapshot.v20250212105537
@clerk/tanstack-start0.9.6-snapshot.v20250212105537
@clerk/testing1.4.22-snapshot.v20250212105537
@clerk/themes2.2.18-snapshot.v20250212105537
@clerk/types4.46.0-snapshot.v20250212105537
@clerk/ui0.3.23-snapshot.v20250212105537
@clerk/vue1.1.12-snapshot.v20250212105537

Tip: Use the snippet copy button below to quickly install the required packages.
@clerk/astro

npm i @clerk/astro@2.2.0-snapshot.v20250212105537 --save-exact

@clerk/backend

npm i @clerk/backend@1.24.1-snapshot.v20250212105537 --save-exact

@clerk/chrome-extension

npm i @clerk/chrome-extension@2.2.9-snapshot.v20250212105537 --save-exact

@clerk/clerk-js

npm i @clerk/clerk-js@5.52.3-snapshot.v20250212105537 --save-exact

@clerk/elements

npm i @clerk/elements@0.22.22-snapshot.v20250212105537 --save-exact

@clerk/clerk-expo

npm i @clerk/clerk-expo@2.7.7-snapshot.v20250212105537 --save-exact

@clerk/expo-passkeys

npm i @clerk/expo-passkeys@0.1.20-snapshot.v20250212105537 --save-exact

@clerk/express

npm i @clerk/express@1.3.48-snapshot.v20250212105537 --save-exact

@clerk/fastify

npm i @clerk/fastify@2.1.21-snapshot.v20250212105537 --save-exact

@clerk/localizations

npm i @clerk/localizations@3.10.6-snapshot.v20250212105537 --save-exact

@clerk/nextjs

npm i @clerk/nextjs@6.11.3-snapshot.v20250212105537 --save-exact

@clerk/nuxt

npm i @clerk/nuxt@1.1.4-snapshot.v20250212105537 --save-exact

@clerk/clerk-react

npm i @clerk/clerk-react@5.22.13-snapshot.v20250212105537 --save-exact

@clerk/react-router

npm i @clerk/react-router@1.0.8-snapshot.v20250212105537 --save-exact

@clerk/remix

npm i @clerk/remix@4.4.24-snapshot.v20250212105537 --save-exact

@clerk/shared

npm i @clerk/shared@2.21.1-snapshot.v20250212105537 --save-exact

@clerk/tanstack-start

npm i @clerk/tanstack-start@0.9.6-snapshot.v20250212105537 --save-exact

@clerk/testing

npm i @clerk/testing@1.4.22-snapshot.v20250212105537 --save-exact

@clerk/themes

npm i @clerk/themes@2.2.18-snapshot.v20250212105537 --save-exact

@clerk/types

npm i @clerk/types@4.46.0-snapshot.v20250212105537 --save-exact

@clerk/ui

npm i @clerk/ui@0.3.23-snapshot.v20250212105537 --save-exact

@clerk/vue

npm i @clerk/vue@1.1.12-snapshot.v20250212105537 --save-exact

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@panteliselef@clerk-cookie@dstaley@LauraBeatris
, '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

fix(clerk-js,types): Close modals when setActive({redirectUrl}) is called - #5092

Merged
panteliselef merged 20 commits into
mainfrom
elef/sdki-856-set-active-emitter
Feb 12, 2025
Merged

fix(clerk-js,types): Close modals when setActive({redirectUrl}) is called#5092
panteliselef merged 20 commits into
mainfrom
elef/sdki-856-set-active-emitter

Conversation

@panteliselef

@panteliselefpanteliselef commented Feb 6, 2025

Copy link
Copy Markdown
Contributor

Description

A simpler solution to #5077 which allows the e2e test of #5071 to pass 🟢.

General Problem

Since the deprecation of setActive({ beforeEmit }), our UI components have been using Clerk.navigate in order to navigate when setActive({ redirectUrl }) is set which does no handle closing the already open modals.

Specific use-case

This buggy behaviour is clearly visible, when you attempt to delete a user from UserProfile rendered in a modal. Upon deletion, setActive({redirectUrl}) was called, but when a soft navigation occurred (using framework router) the modal would not close, and the backdrop was clearly visible.

Solution

This solution in this PR fixes the above issues while maintaining setActive simple to use for developers. We also still discourage the explicit usage of setActive({beforeEmit})

Checklist

  • pnpm test runs as expected.
  • pnpm build runs as expected.
  • (If applicable) JSDoc comments have been added or updated for any package exports
  • (If applicable) Documentation has been updated

Type of change

  • 🐛 Bug fix
  • 🌟 New feature
  • 🔨 Breaking change
  • 📖 Refactoring / dependency upgrade / documentation
  • other:

@panteliselefpanteliselef self-assigned this Feb 6, 2025
@changeset-bot

changeset-botBot commented Feb 6, 2025

Copy link
Copy Markdown

🦋 Changeset detected

Latest commit: 8c66b98

The changes in this PR will be included in the next version bump.

This PR includes changesets to release 22 packages
NameType
@clerk/clerk-reactPatch
@clerk/typesMinor
@clerk/clerk-jsPatch
@clerk/chrome-extensionPatch
@clerk/elementsPatch
@clerk/clerk-expoPatch
@clerk/nextjsPatch
@clerk/react-routerPatch
@clerk/remixPatch
@clerk/tanstack-startPatch
@clerk/astroPatch
@clerk/backendPatch
@clerk/expo-passkeysPatch
@clerk/expressPatch
@clerk/fastifyPatch
@clerk/localizationsPatch
@clerk/nuxtPatch
@clerk/sharedPatch
@clerk/testingPatch
@clerk/themesPatch
@clerk/uiPatch
@clerk/vuePatch

Not sure what this means? Click here to learn what changesets are.

Click here if you're a maintainer who wants to add another changeset to this PR

@vercel

vercelBot commented Feb 6, 2025

Copy link
Copy Markdown

The latest updates on your projects. Learn more about Vercel for Git ↗︎

NameStatusPreviewCommentsUpdated (UTC)
clerk-js-sandbox✅ Ready (Inspect)Visit Preview💬 Add feedbackFeb 12, 2025 11:54am

@panteliselefpanteliselef changed the title Elef/sdki 856 set active emitterfix(clerk-js,types): Close modals when setActive({redirectUrl}) is calledFeb 6, 2025
}
};

#resetComponentsState = () => {

@LauraBeatrisLauraBeatrisFeb 7, 2025

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wouldn't we still need this for custom flows that mount SignIn/SignUp and call setActive without further navigation?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am a bit confused by the question, you can either have a custom flow, or mount SignIn/Up, right ? Can you give a n example when this is not the case ?

@LauraBeatrisLauraBeatrisFeb 7, 2025

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You're right, let me rephrase in another way then:

If I understood correctly, the modals get closed upon router navigation after setActive - but what happens if there's no navigation, you're just calling regular setActive - wouldn't we want to keep this current logic for closing SignIn / SignUp?

Also, setActive inner workings is still relately new to me as I'll be pushing some changes to it soon, so I'm mostly asking for my own understanding here 🫡

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  1. #resetComponentsState does not cover all modals which is weird on it's own.
  2. Having #resetComponentsState there, cause an open SignInModal to close if for whatever reason a setActive({session: null}) is called in a multi session app. Another weird side effect.

wouldn't we want to keep this current logic for closing SignIn / SignUp?
Our components will always redirect to afterSignIn or afterSignUp, which means we make a navigation outside the component so the modal will close.
The only modal component that exists today that does not navigate on setActive, is Reverification and it closes the modal manually (inside useAfterVerification).

Are we aligned that we care about closing the modal, only as long setActive is called within our components ? And as long as we always setActive({redirectUrl}) from within our component at the end of each flow the modals will close properly.

Removing #resetComponentsState might unblock afterAuth in a way, because now you can call setActive (without redirectUrl) from /sign-in/select-org/ and then internally navigate to /sign-in/subscribe and not having the modal close on you.

If you have scenarios that seem problematic with the changes that this PR proposes, please let us know as we might need to switch back to the more complex solution which allows for each component to close their own modal similarly to how we had setActive working prior to the deprecation of beforeEmit.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Makes sense to me! I'll make sure to consider that behavior when testing after-auth changes, and we also discuss further about that, thanks for handling those cases 🫡

@LauraBeatrisLauraBeatris left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just missing the changeset description. Other than that, changes look good to me! 🫡

Comment threadpackages/clerk-js/src/core/clerk.ts Outdated
expect(sessionCookieList.length).toBe(0);
});

test('closes the modal after delete', async ({ page, context }) => {

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you also add a test that covers the removed resetComponentState functionality? So closing a sign-in modal on sign in.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I added a bunch of tests in this commit

Comment threadpackages/clerk-js/src/ui/lazyModules/providers.tsx Outdated
return () => {
unsubscribe();
};
// We are not expecting `onExternalNavigate` to change

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I know we're not expecting it to change, but does providing it as a dependency break anything?

@panteliselefpanteliselefFeb 10, 2025

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

since we pass a non memoize function i think it will cause multiple subscriptions/unsubscribes

Comment threadpackages/types/src/clerk.ts Outdated

testAgainstRunningApps({ withEnv: [appConfigs.envs.withEmailCodes] })('sign up flow @generic @nextjs', ({ app }) => {
test.describe.configure({ mode: 'serial' });
test.describe.configure({ mode: 'parallel' });

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems to improve speed and does not cause tests to fail

Comment threadpackages/types/src/clerk.ts Outdated
Co-authored-by: Dylan Staley <88163+dstaley@users.noreply.github.com>
@panteliselef

Copy link
Copy Markdown
ContributorAuthor

!snapshot

@clerk-cookie

Copy link
Copy Markdown
Collaborator

Hey @panteliselef - the snapshot version command generated the following package versions:

PackageVersion
@clerk/astro2.2.0-snapshot.v20250212105537
@clerk/backend1.24.1-snapshot.v20250212105537
@clerk/chrome-extension2.2.9-snapshot.v20250212105537
@clerk/clerk-js5.52.3-snapshot.v20250212105537
@clerk/elements0.22.22-snapshot.v20250212105537
@clerk/clerk-expo2.7.7-snapshot.v20250212105537
@clerk/expo-passkeys0.1.20-snapshot.v20250212105537
@clerk/express1.3.48-snapshot.v20250212105537
@clerk/fastify2.1.21-snapshot.v20250212105537
@clerk/localizations3.10.6-snapshot.v20250212105537
@clerk/nextjs6.11.3-snapshot.v20250212105537
@clerk/nuxt1.1.4-snapshot.v20250212105537
@clerk/clerk-react5.22.13-snapshot.v20250212105537
@clerk/react-router1.0.8-snapshot.v20250212105537
@clerk/remix4.4.24-snapshot.v20250212105537
@clerk/shared2.21.1-snapshot.v20250212105537
@clerk/tanstack-start0.9.6-snapshot.v20250212105537
@clerk/testing1.4.22-snapshot.v20250212105537
@clerk/themes2.2.18-snapshot.v20250212105537
@clerk/types4.46.0-snapshot.v20250212105537
@clerk/ui0.3.23-snapshot.v20250212105537
@clerk/vue1.1.12-snapshot.v20250212105537

Tip: Use the snippet copy button below to quickly install the required packages.
@clerk/astro

npm i @clerk/astro@2.2.0-snapshot.v20250212105537 --save-exact

@clerk/backend

npm i @clerk/backend@1.24.1-snapshot.v20250212105537 --save-exact

@clerk/chrome-extension

npm i @clerk/chrome-extension@2.2.9-snapshot.v20250212105537 --save-exact

@clerk/clerk-js

npm i @clerk/clerk-js@5.52.3-snapshot.v20250212105537 --save-exact

@clerk/elements

npm i @clerk/elements@0.22.22-snapshot.v20250212105537 --save-exact

@clerk/clerk-expo

npm i @clerk/clerk-expo@2.7.7-snapshot.v20250212105537 --save-exact

@clerk/expo-passkeys

npm i @clerk/expo-passkeys@0.1.20-snapshot.v20250212105537 --save-exact

@clerk/express

npm i @clerk/express@1.3.48-snapshot.v20250212105537 --save-exact

@clerk/fastify

npm i @clerk/fastify@2.1.21-snapshot.v20250212105537 --save-exact

@clerk/localizations

npm i @clerk/localizations@3.10.6-snapshot.v20250212105537 --save-exact

@clerk/nextjs

npm i @clerk/nextjs@6.11.3-snapshot.v20250212105537 --save-exact

@clerk/nuxt

npm i @clerk/nuxt@1.1.4-snapshot.v20250212105537 --save-exact

@clerk/clerk-react

npm i @clerk/clerk-react@5.22.13-snapshot.v20250212105537 --save-exact

@clerk/react-router

npm i @clerk/react-router@1.0.8-snapshot.v20250212105537 --save-exact

@clerk/remix

npm i @clerk/remix@4.4.24-snapshot.v20250212105537 --save-exact

@clerk/shared

npm i @clerk/shared@2.21.1-snapshot.v20250212105537 --save-exact

@clerk/tanstack-start

npm i @clerk/tanstack-start@0.9.6-snapshot.v20250212105537 --save-exact

@clerk/testing

npm i @clerk/testing@1.4.22-snapshot.v20250212105537 --save-exact

@clerk/themes

npm i @clerk/themes@2.2.18-snapshot.v20250212105537 --save-exact

@clerk/types

npm i @clerk/types@4.46.0-snapshot.v20250212105537 --save-exact

@clerk/ui

npm i @clerk/ui@0.3.23-snapshot.v20250212105537 --save-exact

@clerk/vue

npm i @clerk/vue@1.1.12-snapshot.v20250212105537 --save-exact

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@panteliselef@clerk-cookie@dstaley@LauraBeatris
, '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

fix(clerk-js,types): Close modals when setActive({redirectUrl}) is called - #5092

Merged
panteliselef merged 20 commits into
mainfrom
elef/sdki-856-set-active-emitter
Feb 12, 2025
Merged

fix(clerk-js,types): Close modals when setActive({redirectUrl}) is called#5092
panteliselef merged 20 commits into
mainfrom
elef/sdki-856-set-active-emitter

Conversation

@panteliselef

@panteliselefpanteliselef commented Feb 6, 2025

Copy link
Copy Markdown
Contributor

Description

A simpler solution to #5077 which allows the e2e test of #5071 to pass 🟢.

General Problem

Since the deprecation of setActive({ beforeEmit }), our UI components have been using Clerk.navigate in order to navigate when setActive({ redirectUrl }) is set which does no handle closing the already open modals.

Specific use-case

This buggy behaviour is clearly visible, when you attempt to delete a user from UserProfile rendered in a modal. Upon deletion, setActive({redirectUrl}) was called, but when a soft navigation occurred (using framework router) the modal would not close, and the backdrop was clearly visible.

Solution

This solution in this PR fixes the above issues while maintaining setActive simple to use for developers. We also still discourage the explicit usage of setActive({beforeEmit})

Checklist

  • pnpm test runs as expected.
  • pnpm build runs as expected.
  • (If applicable) JSDoc comments have been added or updated for any package exports
  • (If applicable) Documentation has been updated

Type of change

  • 🐛 Bug fix
  • 🌟 New feature
  • 🔨 Breaking change
  • 📖 Refactoring / dependency upgrade / documentation
  • other:

@panteliselefpanteliselef self-assigned this Feb 6, 2025
@changeset-bot

changeset-botBot commented Feb 6, 2025

Copy link
Copy Markdown

🦋 Changeset detected

Latest commit: 8c66b98

The changes in this PR will be included in the next version bump.

This PR includes changesets to release 22 packages
NameType
@clerk/clerk-reactPatch
@clerk/typesMinor
@clerk/clerk-jsPatch
@clerk/chrome-extensionPatch
@clerk/elementsPatch
@clerk/clerk-expoPatch
@clerk/nextjsPatch
@clerk/react-routerPatch
@clerk/remixPatch
@clerk/tanstack-startPatch
@clerk/astroPatch
@clerk/backendPatch
@clerk/expo-passkeysPatch
@clerk/expressPatch
@clerk/fastifyPatch
@clerk/localizationsPatch
@clerk/nuxtPatch
@clerk/sharedPatch
@clerk/testingPatch
@clerk/themesPatch
@clerk/uiPatch
@clerk/vuePatch

Not sure what this means? Click here to learn what changesets are.

Click here if you're a maintainer who wants to add another changeset to this PR

@vercel

vercelBot commented Feb 6, 2025

Copy link
Copy Markdown

The latest updates on your projects. Learn more about Vercel for Git ↗︎

NameStatusPreviewCommentsUpdated (UTC)
clerk-js-sandbox✅ Ready (Inspect)Visit Preview💬 Add feedbackFeb 12, 2025 11:54am

@panteliselefpanteliselef changed the title Elef/sdki 856 set active emitterfix(clerk-js,types): Close modals when setActive({redirectUrl}) is calledFeb 6, 2025
}
};

#resetComponentsState = () => {

@LauraBeatrisLauraBeatrisFeb 7, 2025

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wouldn't we still need this for custom flows that mount SignIn/SignUp and call setActive without further navigation?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am a bit confused by the question, you can either have a custom flow, or mount SignIn/Up, right ? Can you give a n example when this is not the case ?

@LauraBeatrisLauraBeatrisFeb 7, 2025

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You're right, let me rephrase in another way then:

If I understood correctly, the modals get closed upon router navigation after setActive - but what happens if there's no navigation, you're just calling regular setActive - wouldn't we want to keep this current logic for closing SignIn / SignUp?

Also, setActive inner workings is still relately new to me as I'll be pushing some changes to it soon, so I'm mostly asking for my own understanding here 🫡

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  1. #resetComponentsState does not cover all modals which is weird on it's own.
  2. Having #resetComponentsState there, cause an open SignInModal to close if for whatever reason a setActive({session: null}) is called in a multi session app. Another weird side effect.

wouldn't we want to keep this current logic for closing SignIn / SignUp?
Our components will always redirect to afterSignIn or afterSignUp, which means we make a navigation outside the component so the modal will close.
The only modal component that exists today that does not navigate on setActive, is Reverification and it closes the modal manually (inside useAfterVerification).

Are we aligned that we care about closing the modal, only as long setActive is called within our components ? And as long as we always setActive({redirectUrl}) from within our component at the end of each flow the modals will close properly.

Removing #resetComponentsState might unblock afterAuth in a way, because now you can call setActive (without redirectUrl) from /sign-in/select-org/ and then internally navigate to /sign-in/subscribe and not having the modal close on you.

If you have scenarios that seem problematic with the changes that this PR proposes, please let us know as we might need to switch back to the more complex solution which allows for each component to close their own modal similarly to how we had setActive working prior to the deprecation of beforeEmit.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Makes sense to me! I'll make sure to consider that behavior when testing after-auth changes, and we also discuss further about that, thanks for handling those cases 🫡

@LauraBeatrisLauraBeatris left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just missing the changeset description. Other than that, changes look good to me! 🫡

Comment threadpackages/clerk-js/src/core/clerk.ts Outdated
expect(sessionCookieList.length).toBe(0);
});

test('closes the modal after delete', async ({ page, context }) => {

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you also add a test that covers the removed resetComponentState functionality? So closing a sign-in modal on sign in.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I added a bunch of tests in this commit

Comment threadpackages/clerk-js/src/ui/lazyModules/providers.tsx Outdated
return () => {
unsubscribe();
};
// We are not expecting `onExternalNavigate` to change

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I know we're not expecting it to change, but does providing it as a dependency break anything?

@panteliselefpanteliselefFeb 10, 2025

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

since we pass a non memoize function i think it will cause multiple subscriptions/unsubscribes

Comment threadpackages/types/src/clerk.ts Outdated

testAgainstRunningApps({ withEnv: [appConfigs.envs.withEmailCodes] })('sign up flow @generic @nextjs', ({ app }) => {
test.describe.configure({ mode: 'serial' });
test.describe.configure({ mode: 'parallel' });

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems to improve speed and does not cause tests to fail

Comment threadpackages/types/src/clerk.ts Outdated
Co-authored-by: Dylan Staley <88163+dstaley@users.noreply.github.com>
@panteliselef

Copy link
Copy Markdown
ContributorAuthor

!snapshot

@clerk-cookie

Copy link
Copy Markdown
Collaborator

Hey @panteliselef - the snapshot version command generated the following package versions:

PackageVersion
@clerk/astro2.2.0-snapshot.v20250212105537
@clerk/backend1.24.1-snapshot.v20250212105537
@clerk/chrome-extension2.2.9-snapshot.v20250212105537
@clerk/clerk-js5.52.3-snapshot.v20250212105537
@clerk/elements0.22.22-snapshot.v20250212105537
@clerk/clerk-expo2.7.7-snapshot.v20250212105537
@clerk/expo-passkeys0.1.20-snapshot.v20250212105537
@clerk/express1.3.48-snapshot.v20250212105537
@clerk/fastify2.1.21-snapshot.v20250212105537
@clerk/localizations3.10.6-snapshot.v20250212105537
@clerk/nextjs6.11.3-snapshot.v20250212105537
@clerk/nuxt1.1.4-snapshot.v20250212105537
@clerk/clerk-react5.22.13-snapshot.v20250212105537
@clerk/react-router1.0.8-snapshot.v20250212105537
@clerk/remix4.4.24-snapshot.v20250212105537
@clerk/shared2.21.1-snapshot.v20250212105537
@clerk/tanstack-start0.9.6-snapshot.v20250212105537
@clerk/testing1.4.22-snapshot.v20250212105537
@clerk/themes2.2.18-snapshot.v20250212105537
@clerk/types4.46.0-snapshot.v20250212105537
@clerk/ui0.3.23-snapshot.v20250212105537
@clerk/vue1.1.12-snapshot.v20250212105537

Tip: Use the snippet copy button below to quickly install the required packages.
@clerk/astro

npm i @clerk/astro@2.2.0-snapshot.v20250212105537 --save-exact

@clerk/backend

npm i @clerk/backend@1.24.1-snapshot.v20250212105537 --save-exact

@clerk/chrome-extension

npm i @clerk/chrome-extension@2.2.9-snapshot.v20250212105537 --save-exact

@clerk/clerk-js

npm i @clerk/clerk-js@5.52.3-snapshot.v20250212105537 --save-exact

@clerk/elements

npm i @clerk/elements@0.22.22-snapshot.v20250212105537 --save-exact

@clerk/clerk-expo

npm i @clerk/clerk-expo@2.7.7-snapshot.v20250212105537 --save-exact

@clerk/expo-passkeys

npm i @clerk/expo-passkeys@0.1.20-snapshot.v20250212105537 --save-exact

@clerk/express

npm i @clerk/express@1.3.48-snapshot.v20250212105537 --save-exact

@clerk/fastify

npm i @clerk/fastify@2.1.21-snapshot.v20250212105537 --save-exact

@clerk/localizations

npm i @clerk/localizations@3.10.6-snapshot.v20250212105537 --save-exact

@clerk/nextjs

npm i @clerk/nextjs@6.11.3-snapshot.v20250212105537 --save-exact

@clerk/nuxt

npm i @clerk/nuxt@1.1.4-snapshot.v20250212105537 --save-exact

@clerk/clerk-react

npm i @clerk/clerk-react@5.22.13-snapshot.v20250212105537 --save-exact

@clerk/react-router

npm i @clerk/react-router@1.0.8-snapshot.v20250212105537 --save-exact

@clerk/remix

npm i @clerk/remix@4.4.24-snapshot.v20250212105537 --save-exact

@clerk/shared

npm i @clerk/shared@2.21.1-snapshot.v20250212105537 --save-exact

@clerk/tanstack-start

npm i @clerk/tanstack-start@0.9.6-snapshot.v20250212105537 --save-exact

@clerk/testing

npm i @clerk/testing@1.4.22-snapshot.v20250212105537 --save-exact

@clerk/themes

npm i @clerk/themes@2.2.18-snapshot.v20250212105537 --save-exact

@clerk/types

npm i @clerk/types@4.46.0-snapshot.v20250212105537 --save-exact

@clerk/ui

npm i @clerk/ui@0.3.23-snapshot.v20250212105537 --save-exact

@clerk/vue

npm i @clerk/vue@1.1.12-snapshot.v20250212105537 --save-exact

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@panteliselef@clerk-cookie@dstaley@LauraBeatris
, '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

fix(clerk-js,types): Close modals when setActive({redirectUrl}) is called - #5092

Merged
panteliselef merged 20 commits into
mainfrom
elef/sdki-856-set-active-emitter
Feb 12, 2025
Merged

fix(clerk-js,types): Close modals when setActive({redirectUrl}) is called#5092
panteliselef merged 20 commits into
mainfrom
elef/sdki-856-set-active-emitter

Conversation

@panteliselef

@panteliselefpanteliselef commented Feb 6, 2025

Copy link
Copy Markdown
Contributor

Description

A simpler solution to #5077 which allows the e2e test of #5071 to pass 🟢.

General Problem

Since the deprecation of setActive({ beforeEmit }), our UI components have been using Clerk.navigate in order to navigate when setActive({ redirectUrl }) is set which does no handle closing the already open modals.

Specific use-case

This buggy behaviour is clearly visible, when you attempt to delete a user from UserProfile rendered in a modal. Upon deletion, setActive({redirectUrl}) was called, but when a soft navigation occurred (using framework router) the modal would not close, and the backdrop was clearly visible.

Solution

This solution in this PR fixes the above issues while maintaining setActive simple to use for developers. We also still discourage the explicit usage of setActive({beforeEmit})

Checklist

  • pnpm test runs as expected.
  • pnpm build runs as expected.
  • (If applicable) JSDoc comments have been added or updated for any package exports
  • (If applicable) Documentation has been updated

Type of change

  • 🐛 Bug fix
  • 🌟 New feature
  • 🔨 Breaking change
  • 📖 Refactoring / dependency upgrade / documentation
  • other:

@panteliselefpanteliselef self-assigned this Feb 6, 2025
@changeset-bot

changeset-botBot commented Feb 6, 2025

Copy link
Copy Markdown

🦋 Changeset detected

Latest commit: 8c66b98

The changes in this PR will be included in the next version bump.

This PR includes changesets to release 22 packages
NameType
@clerk/clerk-reactPatch
@clerk/typesMinor
@clerk/clerk-jsPatch
@clerk/chrome-extensionPatch
@clerk/elementsPatch
@clerk/clerk-expoPatch
@clerk/nextjsPatch
@clerk/react-routerPatch
@clerk/remixPatch
@clerk/tanstack-startPatch
@clerk/astroPatch
@clerk/backendPatch
@clerk/expo-passkeysPatch
@clerk/expressPatch
@clerk/fastifyPatch
@clerk/localizationsPatch
@clerk/nuxtPatch
@clerk/sharedPatch
@clerk/testingPatch
@clerk/themesPatch
@clerk/uiPatch
@clerk/vuePatch

Not sure what this means? Click here to learn what changesets are.

Click here if you're a maintainer who wants to add another changeset to this PR

@vercel

vercelBot commented Feb 6, 2025

Copy link
Copy Markdown

The latest updates on your projects. Learn more about Vercel for Git ↗︎

NameStatusPreviewCommentsUpdated (UTC)
clerk-js-sandbox✅ Ready (Inspect)Visit Preview💬 Add feedbackFeb 12, 2025 11:54am

@panteliselefpanteliselef changed the title Elef/sdki 856 set active emitterfix(clerk-js,types): Close modals when setActive({redirectUrl}) is calledFeb 6, 2025
}
};

#resetComponentsState = () => {

@LauraBeatrisLauraBeatrisFeb 7, 2025

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wouldn't we still need this for custom flows that mount SignIn/SignUp and call setActive without further navigation?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am a bit confused by the question, you can either have a custom flow, or mount SignIn/Up, right ? Can you give a n example when this is not the case ?

@LauraBeatrisLauraBeatrisFeb 7, 2025

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You're right, let me rephrase in another way then:

If I understood correctly, the modals get closed upon router navigation after setActive - but what happens if there's no navigation, you're just calling regular setActive - wouldn't we want to keep this current logic for closing SignIn / SignUp?

Also, setActive inner workings is still relately new to me as I'll be pushing some changes to it soon, so I'm mostly asking for my own understanding here 🫡

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  1. #resetComponentsState does not cover all modals which is weird on it's own.
  2. Having #resetComponentsState there, cause an open SignInModal to close if for whatever reason a setActive({session: null}) is called in a multi session app. Another weird side effect.

wouldn't we want to keep this current logic for closing SignIn / SignUp?
Our components will always redirect to afterSignIn or afterSignUp, which means we make a navigation outside the component so the modal will close.
The only modal component that exists today that does not navigate on setActive, is Reverification and it closes the modal manually (inside useAfterVerification).

Are we aligned that we care about closing the modal, only as long setActive is called within our components ? And as long as we always setActive({redirectUrl}) from within our component at the end of each flow the modals will close properly.

Removing #resetComponentsState might unblock afterAuth in a way, because now you can call setActive (without redirectUrl) from /sign-in/select-org/ and then internally navigate to /sign-in/subscribe and not having the modal close on you.

If you have scenarios that seem problematic with the changes that this PR proposes, please let us know as we might need to switch back to the more complex solution which allows for each component to close their own modal similarly to how we had setActive working prior to the deprecation of beforeEmit.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Makes sense to me! I'll make sure to consider that behavior when testing after-auth changes, and we also discuss further about that, thanks for handling those cases 🫡

@LauraBeatrisLauraBeatris left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just missing the changeset description. Other than that, changes look good to me! 🫡

Comment threadpackages/clerk-js/src/core/clerk.ts Outdated
expect(sessionCookieList.length).toBe(0);
});

test('closes the modal after delete', async ({ page, context }) => {

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you also add a test that covers the removed resetComponentState functionality? So closing a sign-in modal on sign in.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I added a bunch of tests in this commit

Comment threadpackages/clerk-js/src/ui/lazyModules/providers.tsx Outdated
return () => {
unsubscribe();
};
// We are not expecting `onExternalNavigate` to change

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I know we're not expecting it to change, but does providing it as a dependency break anything?

@panteliselefpanteliselefFeb 10, 2025

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

since we pass a non memoize function i think it will cause multiple subscriptions/unsubscribes

Comment threadpackages/types/src/clerk.ts Outdated

testAgainstRunningApps({ withEnv: [appConfigs.envs.withEmailCodes] })('sign up flow @generic @nextjs', ({ app }) => {
test.describe.configure({ mode: 'serial' });
test.describe.configure({ mode: 'parallel' });

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems to improve speed and does not cause tests to fail

Comment threadpackages/types/src/clerk.ts Outdated
Co-authored-by: Dylan Staley <88163+dstaley@users.noreply.github.com>
@panteliselef

Copy link
Copy Markdown
ContributorAuthor

!snapshot

@clerk-cookie

Copy link
Copy Markdown
Collaborator

Hey @panteliselef - the snapshot version command generated the following package versions:

PackageVersion
@clerk/astro2.2.0-snapshot.v20250212105537
@clerk/backend1.24.1-snapshot.v20250212105537
@clerk/chrome-extension2.2.9-snapshot.v20250212105537
@clerk/clerk-js5.52.3-snapshot.v20250212105537
@clerk/elements0.22.22-snapshot.v20250212105537
@clerk/clerk-expo2.7.7-snapshot.v20250212105537
@clerk/expo-passkeys0.1.20-snapshot.v20250212105537
@clerk/express1.3.48-snapshot.v20250212105537
@clerk/fastify2.1.21-snapshot.v20250212105537
@clerk/localizations3.10.6-snapshot.v20250212105537
@clerk/nextjs6.11.3-snapshot.v20250212105537
@clerk/nuxt1.1.4-snapshot.v20250212105537
@clerk/clerk-react5.22.13-snapshot.v20250212105537
@clerk/react-router1.0.8-snapshot.v20250212105537
@clerk/remix4.4.24-snapshot.v20250212105537
@clerk/shared2.21.1-snapshot.v20250212105537
@clerk/tanstack-start0.9.6-snapshot.v20250212105537
@clerk/testing1.4.22-snapshot.v20250212105537
@clerk/themes2.2.18-snapshot.v20250212105537
@clerk/types4.46.0-snapshot.v20250212105537
@clerk/ui0.3.23-snapshot.v20250212105537
@clerk/vue1.1.12-snapshot.v20250212105537

Tip: Use the snippet copy button below to quickly install the required packages.
@clerk/astro

npm i @clerk/astro@2.2.0-snapshot.v20250212105537 --save-exact

@clerk/backend

npm i @clerk/backend@1.24.1-snapshot.v20250212105537 --save-exact

@clerk/chrome-extension

npm i @clerk/chrome-extension@2.2.9-snapshot.v20250212105537 --save-exact

@clerk/clerk-js

npm i @clerk/clerk-js@5.52.3-snapshot.v20250212105537 --save-exact

@clerk/elements

npm i @clerk/elements@0.22.22-snapshot.v20250212105537 --save-exact

@clerk/clerk-expo

npm i @clerk/clerk-expo@2.7.7-snapshot.v20250212105537 --save-exact

@clerk/expo-passkeys

npm i @clerk/expo-passkeys@0.1.20-snapshot.v20250212105537 --save-exact

@clerk/express

npm i @clerk/express@1.3.48-snapshot.v20250212105537 --save-exact

@clerk/fastify

npm i @clerk/fastify@2.1.21-snapshot.v20250212105537 --save-exact

@clerk/localizations

npm i @clerk/localizations@3.10.6-snapshot.v20250212105537 --save-exact

@clerk/nextjs

npm i @clerk/nextjs@6.11.3-snapshot.v20250212105537 --save-exact

@clerk/nuxt

npm i @clerk/nuxt@1.1.4-snapshot.v20250212105537 --save-exact

@clerk/clerk-react

npm i @clerk/clerk-react@5.22.13-snapshot.v20250212105537 --save-exact

@clerk/react-router

npm i @clerk/react-router@1.0.8-snapshot.v20250212105537 --save-exact

@clerk/remix

npm i @clerk/remix@4.4.24-snapshot.v20250212105537 --save-exact

@clerk/shared

npm i @clerk/shared@2.21.1-snapshot.v20250212105537 --save-exact

@clerk/tanstack-start

npm i @clerk/tanstack-start@0.9.6-snapshot.v20250212105537 --save-exact

@clerk/testing

npm i @clerk/testing@1.4.22-snapshot.v20250212105537 --save-exact

@clerk/themes

npm i @clerk/themes@2.2.18-snapshot.v20250212105537 --save-exact

@clerk/types

npm i @clerk/types@4.46.0-snapshot.v20250212105537 --save-exact

@clerk/ui

npm i @clerk/ui@0.3.23-snapshot.v20250212105537 --save-exact

@clerk/vue

npm i @clerk/vue@1.1.12-snapshot.v20250212105537 --save-exact

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@panteliselef@clerk-cookie@dstaley@LauraBeatris
, '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

fix(clerk-js,types): Close modals when setActive({redirectUrl}) is called - #5092

Merged
panteliselef merged 20 commits into
mainfrom
elef/sdki-856-set-active-emitter
Feb 12, 2025
Merged

fix(clerk-js,types): Close modals when setActive({redirectUrl}) is called#5092
panteliselef merged 20 commits into
mainfrom
elef/sdki-856-set-active-emitter

Conversation

@panteliselef

@panteliselefpanteliselef commented Feb 6, 2025

Copy link
Copy Markdown
Contributor

Description

A simpler solution to #5077 which allows the e2e test of #5071 to pass 🟢.

General Problem

Since the deprecation of setActive({ beforeEmit }), our UI components have been using Clerk.navigate in order to navigate when setActive({ redirectUrl }) is set which does no handle closing the already open modals.

Specific use-case

This buggy behaviour is clearly visible, when you attempt to delete a user from UserProfile rendered in a modal. Upon deletion, setActive({redirectUrl}) was called, but when a soft navigation occurred (using framework router) the modal would not close, and the backdrop was clearly visible.

Solution

This solution in this PR fixes the above issues while maintaining setActive simple to use for developers. We also still discourage the explicit usage of setActive({beforeEmit})

Checklist

  • pnpm test runs as expected.
  • pnpm build runs as expected.
  • (If applicable) JSDoc comments have been added or updated for any package exports
  • (If applicable) Documentation has been updated

Type of change

  • 🐛 Bug fix
  • 🌟 New feature
  • 🔨 Breaking change
  • 📖 Refactoring / dependency upgrade / documentation
  • other:

@panteliselefpanteliselef self-assigned this Feb 6, 2025
@changeset-bot

changeset-botBot commented Feb 6, 2025

Copy link
Copy Markdown

🦋 Changeset detected

Latest commit: 8c66b98

The changes in this PR will be included in the next version bump.

This PR includes changesets to release 22 packages
NameType
@clerk/clerk-reactPatch
@clerk/typesMinor
@clerk/clerk-jsPatch
@clerk/chrome-extensionPatch
@clerk/elementsPatch
@clerk/clerk-expoPatch
@clerk/nextjsPatch
@clerk/react-routerPatch
@clerk/remixPatch
@clerk/tanstack-startPatch
@clerk/astroPatch
@clerk/backendPatch
@clerk/expo-passkeysPatch
@clerk/expressPatch
@clerk/fastifyPatch
@clerk/localizationsPatch
@clerk/nuxtPatch
@clerk/sharedPatch
@clerk/testingPatch
@clerk/themesPatch
@clerk/uiPatch
@clerk/vuePatch

Not sure what this means? Click here to learn what changesets are.

Click here if you're a maintainer who wants to add another changeset to this PR

@vercel

vercelBot commented Feb 6, 2025

Copy link
Copy Markdown

The latest updates on your projects. Learn more about Vercel for Git ↗︎

NameStatusPreviewCommentsUpdated (UTC)
clerk-js-sandbox✅ Ready (Inspect)Visit Preview💬 Add feedbackFeb 12, 2025 11:54am

@panteliselefpanteliselef changed the title Elef/sdki 856 set active emitterfix(clerk-js,types): Close modals when setActive({redirectUrl}) is calledFeb 6, 2025
}
};

#resetComponentsState = () => {

@LauraBeatrisLauraBeatrisFeb 7, 2025

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wouldn't we still need this for custom flows that mount SignIn/SignUp and call setActive without further navigation?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am a bit confused by the question, you can either have a custom flow, or mount SignIn/Up, right ? Can you give a n example when this is not the case ?

@LauraBeatrisLauraBeatrisFeb 7, 2025

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You're right, let me rephrase in another way then:

If I understood correctly, the modals get closed upon router navigation after setActive - but what happens if there's no navigation, you're just calling regular setActive - wouldn't we want to keep this current logic for closing SignIn / SignUp?

Also, setActive inner workings is still relately new to me as I'll be pushing some changes to it soon, so I'm mostly asking for my own understanding here 🫡

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  1. #resetComponentsState does not cover all modals which is weird on it's own.
  2. Having #resetComponentsState there, cause an open SignInModal to close if for whatever reason a setActive({session: null}) is called in a multi session app. Another weird side effect.

wouldn't we want to keep this current logic for closing SignIn / SignUp?
Our components will always redirect to afterSignIn or afterSignUp, which means we make a navigation outside the component so the modal will close.
The only modal component that exists today that does not navigate on setActive, is Reverification and it closes the modal manually (inside useAfterVerification).

Are we aligned that we care about closing the modal, only as long setActive is called within our components ? And as long as we always setActive({redirectUrl}) from within our component at the end of each flow the modals will close properly.

Removing #resetComponentsState might unblock afterAuth in a way, because now you can call setActive (without redirectUrl) from /sign-in/select-org/ and then internally navigate to /sign-in/subscribe and not having the modal close on you.

If you have scenarios that seem problematic with the changes that this PR proposes, please let us know as we might need to switch back to the more complex solution which allows for each component to close their own modal similarly to how we had setActive working prior to the deprecation of beforeEmit.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Makes sense to me! I'll make sure to consider that behavior when testing after-auth changes, and we also discuss further about that, thanks for handling those cases 🫡

@LauraBeatrisLauraBeatris left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just missing the changeset description. Other than that, changes look good to me! 🫡

Comment threadpackages/clerk-js/src/core/clerk.ts Outdated
expect(sessionCookieList.length).toBe(0);
});

test('closes the modal after delete', async ({ page, context }) => {

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you also add a test that covers the removed resetComponentState functionality? So closing a sign-in modal on sign in.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I added a bunch of tests in this commit

Comment threadpackages/clerk-js/src/ui/lazyModules/providers.tsx Outdated
return () => {
unsubscribe();
};
// We are not expecting `onExternalNavigate` to change

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I know we're not expecting it to change, but does providing it as a dependency break anything?

@panteliselefpanteliselefFeb 10, 2025

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

since we pass a non memoize function i think it will cause multiple subscriptions/unsubscribes

Comment threadpackages/types/src/clerk.ts Outdated

testAgainstRunningApps({ withEnv: [appConfigs.envs.withEmailCodes] })('sign up flow @generic @nextjs', ({ app }) => {
test.describe.configure({ mode: 'serial' });
test.describe.configure({ mode: 'parallel' });

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems to improve speed and does not cause tests to fail

Comment threadpackages/types/src/clerk.ts Outdated
Co-authored-by: Dylan Staley <88163+dstaley@users.noreply.github.com>
@panteliselef

Copy link
Copy Markdown
ContributorAuthor

!snapshot

@clerk-cookie

Copy link
Copy Markdown
Collaborator

Hey @panteliselef - the snapshot version command generated the following package versions:

PackageVersion
@clerk/astro2.2.0-snapshot.v20250212105537
@clerk/backend1.24.1-snapshot.v20250212105537
@clerk/chrome-extension2.2.9-snapshot.v20250212105537
@clerk/clerk-js5.52.3-snapshot.v20250212105537
@clerk/elements0.22.22-snapshot.v20250212105537
@clerk/clerk-expo2.7.7-snapshot.v20250212105537
@clerk/expo-passkeys0.1.20-snapshot.v20250212105537
@clerk/express1.3.48-snapshot.v20250212105537
@clerk/fastify2.1.21-snapshot.v20250212105537
@clerk/localizations3.10.6-snapshot.v20250212105537
@clerk/nextjs6.11.3-snapshot.v20250212105537
@clerk/nuxt1.1.4-snapshot.v20250212105537
@clerk/clerk-react5.22.13-snapshot.v20250212105537
@clerk/react-router1.0.8-snapshot.v20250212105537
@clerk/remix4.4.24-snapshot.v20250212105537
@clerk/shared2.21.1-snapshot.v20250212105537
@clerk/tanstack-start0.9.6-snapshot.v20250212105537
@clerk/testing1.4.22-snapshot.v20250212105537
@clerk/themes2.2.18-snapshot.v20250212105537
@clerk/types4.46.0-snapshot.v20250212105537
@clerk/ui0.3.23-snapshot.v20250212105537
@clerk/vue1.1.12-snapshot.v20250212105537

Tip: Use the snippet copy button below to quickly install the required packages.
@clerk/astro

npm i @clerk/astro@2.2.0-snapshot.v20250212105537 --save-exact

@clerk/backend

npm i @clerk/backend@1.24.1-snapshot.v20250212105537 --save-exact

@clerk/chrome-extension

npm i @clerk/chrome-extension@2.2.9-snapshot.v20250212105537 --save-exact

@clerk/clerk-js

npm i @clerk/clerk-js@5.52.3-snapshot.v20250212105537 --save-exact

@clerk/elements

npm i @clerk/elements@0.22.22-snapshot.v20250212105537 --save-exact

@clerk/clerk-expo

npm i @clerk/clerk-expo@2.7.7-snapshot.v20250212105537 --save-exact

@clerk/expo-passkeys

npm i @clerk/expo-passkeys@0.1.20-snapshot.v20250212105537 --save-exact

@clerk/express

npm i @clerk/express@1.3.48-snapshot.v20250212105537 --save-exact

@clerk/fastify

npm i @clerk/fastify@2.1.21-snapshot.v20250212105537 --save-exact

@clerk/localizations

npm i @clerk/localizations@3.10.6-snapshot.v20250212105537 --save-exact

@clerk/nextjs

npm i @clerk/nextjs@6.11.3-snapshot.v20250212105537 --save-exact

@clerk/nuxt

npm i @clerk/nuxt@1.1.4-snapshot.v20250212105537 --save-exact

@clerk/clerk-react

npm i @clerk/clerk-react@5.22.13-snapshot.v20250212105537 --save-exact

@clerk/react-router

npm i @clerk/react-router@1.0.8-snapshot.v20250212105537 --save-exact

@clerk/remix

npm i @clerk/remix@4.4.24-snapshot.v20250212105537 --save-exact

@clerk/shared

npm i @clerk/shared@2.21.1-snapshot.v20250212105537 --save-exact

@clerk/tanstack-start

npm i @clerk/tanstack-start@0.9.6-snapshot.v20250212105537 --save-exact

@clerk/testing

npm i @clerk/testing@1.4.22-snapshot.v20250212105537 --save-exact

@clerk/themes

npm i @clerk/themes@2.2.18-snapshot.v20250212105537 --save-exact

@clerk/types

npm i @clerk/types@4.46.0-snapshot.v20250212105537 --save-exact

@clerk/ui

npm i @clerk/ui@0.3.23-snapshot.v20250212105537 --save-exact

@clerk/vue

npm i @clerk/vue@1.1.12-snapshot.v20250212105537 --save-exact

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@panteliselef@clerk-cookie@dstaley@LauraBeatris