fix(shared): Correct useOrganizationList/useOrganization loading state

[jacekradko]

It's been flagged that after upgrading from @clerk/nextjs 6.32 to 7.0.12, consumers of useOrganizationList briefly see isLoaded: true alongside userMemberships.isLoading: false and data: [] before any fetch actually runs. The documented loading gate (!isLoaded || userMemberships.isLoading) can't catch this window, so the UI flashes an empty state on the cold path.

Root cause

isLoaded flips to true as soon as clerk.loaded && user that's independent of when the React Query client actually attaches. On slower bootstraps (prod/staging, not local dev) those two signals desync for a render.

In that gap, useBaseQuery short-circuits to a dummy result while it waits for the client, and that dummy used to return isLoading: false for everyone. usePagesOrInfinite then coerces the missing data to [], and the two signals together read as "loaded, no data."

The fix: while the client is still attaching, report isLoading: true when the query is enabled. Disabled queries (e.g. useOrganizationList() with no opt-in params) keep returning isLoading: false, so existing behavior there is preserved. useOrganization shares the same hook stack, so it gets the fix for free.

This regressed in #7568 (SWR → React Query). Both useClerkQuery and useClerkInfiniteQuery route through useBaseQuery, so the single change covers both paths.

Test plan

• New useBaseQuery.spec.tsx exercising enabled / disabled / omitted enabled in the pre-client window, plus the infinite-query path
• pnpm --filter=@clerk/shared test — 1041 tests passing
• pnpm --filter=@clerk/ui test — 1677 tests passing (existing useCoreOrganizationList fixture tests still green)
• pnpm --filter=@clerk/shared build passes

[changeset-bot]

🦋 Changeset detected

Latest commit: 826ca60

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

This PR includes changesets to release 20 packages

Name	Type
@clerk/shared	Patch
@clerk/astro	Patch
@clerk/backend	Patch
@clerk/chrome-extension	Patch
@clerk/clerk-js	Patch
@clerk/expo-passkeys	Patch
@clerk/expo	Patch
@clerk/express	Patch
@clerk/fastify	Patch
@clerk/hono	Patch
@clerk/localizations	Patch
@clerk/msw	Patch
@clerk/nextjs	Patch
@clerk/nuxt	Patch
@clerk/react-router	Patch
@clerk/react	Patch
@clerk/tanstack-react-start	Patch
@clerk/testing	Patch
@clerk/ui	Patch
@clerk/vue	Patch

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]

The latest updates on your projects. Learn more about Vercel for GitHub.

Project	Deployment	Actions	Updated (UTC)
clerk-js-sandbox	Ready	Preview, Comment	Apr 23, 2026 5:04pm

[coderabbitai]

📝 Walkthrough

Walkthrough

A patch changeset for @clerk/shared and updates to the Clerk React Query integration change useBaseQuery so that when the Clerk Query Client is not yet attached it returns a pending result whose isLoading is derived from options.enabled (true unless explicitly false). Data remains undefined and status stays pending. A new test file exercises useBaseQuery and useClerkInfiniteQuery behavior both when the query client is unset and when a mock query client is attached. The changeset file documents the fix for organization-list hooks briefly reporting isLoading: false.

Estimated code review effort

🎯 3 (Moderate) | ⏱️ ~25 minutes

🚥 Pre-merge checks | ✅ 5

✅ Passed checks (5 passed)

Check name	Status	Explanation
Title check	✅ Passed	The title clearly and directly describes the main fix: correcting the loading state for useOrganizationList and useOrganization hooks.
Docstring Coverage	✅ Passed	No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
Linked Issues check	✅ Passed	Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check	✅ Passed	Check skipped because no linked issues were found for this pull request.
Description check	✅ Passed	The PR description is directly related to the changeset, clearly explaining the root cause of the loading state bug, the fix applied, and test coverage.

_{✏️ Tip: You can configure your own custom pre-merge checks in the settings.}

Warning

Review ran into problems

🔥 Problems

Timed out fetching pipeline failures after 30000ms

---

_{Comment @coderabbitai help to get the list of available commands and usage tips.}

[pkg-pr-new]

Open in StackBlitz

@clerk/astro

npm i https://pkg.pr.new/@clerk/astro@8395

@clerk/backend

npm i https://pkg.pr.new/@clerk/backend@8395

@clerk/chrome-extension

npm i https://pkg.pr.new/@clerk/chrome-extension@8395

@clerk/clerk-js

npm i https://pkg.pr.new/@clerk/clerk-js@8395

@clerk/dev-cli

npm i https://pkg.pr.new/@clerk/dev-cli@8395

@clerk/expo

npm i https://pkg.pr.new/@clerk/expo@8395

@clerk/expo-passkeys

npm i https://pkg.pr.new/@clerk/expo-passkeys@8395

@clerk/express

npm i https://pkg.pr.new/@clerk/express@8395

@clerk/fastify

npm i https://pkg.pr.new/@clerk/fastify@8395

@clerk/hono

npm i https://pkg.pr.new/@clerk/hono@8395

@clerk/localizations

npm i https://pkg.pr.new/@clerk/localizations@8395

@clerk/nextjs

npm i https://pkg.pr.new/@clerk/nextjs@8395

@clerk/nuxt

npm i https://pkg.pr.new/@clerk/nuxt@8395

@clerk/react

npm i https://pkg.pr.new/@clerk/react@8395

@clerk/react-router

npm i https://pkg.pr.new/@clerk/react-router@8395

@clerk/shared

npm i https://pkg.pr.new/@clerk/shared@8395

@clerk/tanstack-react-start

npm i https://pkg.pr.new/@clerk/tanstack-react-start@8395

@clerk/testing

npm i https://pkg.pr.new/@clerk/testing@8395

@clerk/ui

npm i https://pkg.pr.new/@clerk/ui@8395

@clerk/upgrade

npm i https://pkg.pr.new/@clerk/upgrade@8395

@clerk/vue

npm i https://pkg.pr.new/@clerk/vue@8395

commit: 826ca60

[wobsoriano]

this makes sense