fix(ui): Ensure tooltips render above dialog content - #9093

Merged
alexcarpenter merged 1 commit into
mainfrom
carp/fix-tooltip-z-index
Jul 6, 2026
Merged

fix(ui): Ensure tooltips render above dialog content#9093
alexcarpenter merged 1 commit into
mainfrom
carp/fix-tooltip-z-index

Conversation

@alexcarpenter

@alexcarpenteralexcarpenter commented Jul 6, 2026

Copy link
Copy Markdown
Member

Description

Fix tooltips rendering behind modals (for example on the organization profile Security page). Tooltips now layer above modal content, and pressing Escape or clicking outside while a tooltip is open inside a modal closes only the tooltip instead of also dismissing the modal.

BEFORE

before.mov

AFTER

after.mov

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:

Summary by CodeRabbit

  • New Features
    • Tooltips now appear above modal content, improving visibility in layered interfaces.
    • Tooltips inside a modal now close on Escape or outside click without closing the modal itself.
  • Bug Fixes
    • Improved tooltip stacking so they render at the correct priority across the UI.

@changeset-bot

Copy link
Copy Markdown

🦋 Changeset detected

Latest commit: b5cd937

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

This PR includes changesets to release 3 packages
NameType
@clerk/uiPatch
@clerk/chrome-extensionPatch
@clerk/swingsetPatch

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 Jul 6, 2026

Copy link
Copy Markdown

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

ProjectDeploymentActionsUpdated (UTC)
clerk-js-sandboxReadyReadyPreview, CommentJul 6, 2026 4:02pm
swingsetReadyReadyPreview, CommentJul 6, 2026 4:02pm

Request Review

@coderabbitai

coderabbitaiBot commented Jul 6, 2026

Copy link
Copy Markdown
Contributor

Review Change Stack

📝 Walkthrough

Walkthrough

This PR fixes tooltip layering by adding floating-tree node awareness to the Tooltip component (useFloatingNodeId, FloatingNode, withFloatingTree) and introduces a dedicated tooltip z-index value above modal, with a changeset documenting the fix.

Changes

Tooltip layering fix

Layer / File(s)Summary
Tooltip nodeId contract and imports
packages/ui/src/elements/Tooltip.tsx
Adds useFloatingNodeId import and reorganizes local imports; UseTooltipReturn gains a nodeId: string | undefined field.
useTooltip nodeId wiring and FloatingTree integration
packages/ui/src/elements/Tooltip.tsx
useTooltip computes nodeId and passes it to useFloating, the return value, and memo deps; Tooltip.Root is wrapped with withFloatingTree; TooltipContent wraps its floating portal in FloatingNode.
Tooltip z-index and changeset
packages/ui/src/foundations/zIndices.ts, .changeset/tooltip-above-modal.md
Adds a tooltip: '12000' z-index entry and a changeset describing the fix and updated Escape/outside-click dismissal behavior.

Estimated code review effort: 2 (Simple) | ~12 minutes

Sequence Diagram(s)

sequenceDiagram
participant TooltipRoot
participant useTooltip
participant FloatingTree
participant TooltipContent
TooltipRoot->>useTooltip: initialize with options
useTooltip->>FloatingTree: useFloatingNodeId()
FloatingTree-->>useTooltip: nodeId
useTooltip-->>TooltipRoot: context with nodeId
TooltipRoot->>TooltipContent: render with context
TooltipContent->>FloatingTree: wrap portal in FloatingNode id
Loading

Poem

A tooltip hopped above the modal's crown,
No longer trapped, no longer held down.
With nodeId whispered through the tree so wide,
Escape now closes just the tip, not the ride. 🐰✨

🚥 Pre-merge checks | ✅ 5
✅ Passed checks (5 passed)
Check nameStatusExplanation
Description Check✅ PassedCheck skipped - CodeRabbit’s high-level summary is enabled.
Title check✅ PassedThe title clearly matches the main change: fixing tooltips to render above dialog/modal content.
Docstring Coverage✅ PassedNo functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
Linked Issues check✅ PassedCheck skipped because no linked issues were found for this pull request.
Out of Scope Changes check✅ PassedCheck skipped because no linked issues were found for this pull request.
✨ Finishing Touches
📝 Generate docstrings
  • Create stacked PR
  • Commit on current branch

Comment @coderabbitai help to get the list of available commands.

@alexcarpenter
alexcarpenter marked this pull request as ready for review July 6, 2026 16:02
@pkg-pr-new

pkg-pr-newBot commented Jul 6, 2026

Copy link
Copy Markdown

Open in StackBlitz

@clerk/astro

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

@clerk/backend

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

@clerk/chrome-extension

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

@clerk/clerk-js

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

@clerk/electron

npm i https://pkg.pr.new/@clerk/electron@9093

@clerk/electron-passkeys

npm i https://pkg.pr.new/@clerk/electron-passkeys@9093

@clerk/eslint-plugin

npm i https://pkg.pr.new/@clerk/eslint-plugin@9093

@clerk/expo

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

@clerk/expo-passkeys

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

@clerk/express

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

@clerk/fastify

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

@clerk/hono

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

@clerk/localizations

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

@clerk/nextjs

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

@clerk/nuxt

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

@clerk/react

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

@clerk/react-router

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

@clerk/shared

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

@clerk/tanstack-react-start

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

@clerk/testing

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

@clerk/ui

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

@clerk/upgrade

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

@clerk/vue

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

commit: b5cd937

@github-actions

Copy link
Copy Markdown
Contributor

API Changes Report

Generated by Break Check on 2026-07-06T16:06:00.121Z

Summary

MetricCount
Packages analyzed19
Packages with changes0
🔴 Breaking changes0
🟡 Non-breaking changes0
🟢 Additions0

No API Changes Detected

All packages have stable APIs with no detected changes.


Report generated by Break Check

Last ran on b5cd937.

@coderabbitaicoderabbitaiBot 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.

Caution

Some comments are outside the diff and can’t be posted inline due to platform limitations.

⚠️ Outside diff range comments (1)
packages/ui/src/elements/Tooltip.tsx (1)

77-105: 🎯 Functional Correctness | 🟡 Minor | ⚡ Quick win

Add bubbles: false to useDismiss. With the nested FloatingTree setup, the default outsidePress dismissal can bubble to the parent modal and close it too. The Escape-key case doesn’t rely on bubbling here.

🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
In `@packages/ui/src/elements/Tooltip.tsx` around lines 77 - 105, Add bails-out
for nested tooltip dismissal by updating the useDismiss call in Tooltip to
disable bubbling for outside-press handling. The issue is that the current
dismiss behavior can propagate through the FloatingTree and close a parent modal
when a tooltip is dismissed; update the useDismiss configuration in Tooltip.tsx
so outside presses do not bubble. Keep the Escape-key behavior unchanged while
ensuring the tooltip still closes correctly on outside interaction.
🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
Outside diff comments:
In `@packages/ui/src/elements/Tooltip.tsx`:
- Around line 77-105: Add bails-out for nested tooltip dismissal by updating the
useDismiss call in Tooltip to disable bubbling for outside-press handling. The
issue is that the current dismiss behavior can propagate through the
FloatingTree and close a parent modal when a tooltip is dismissed; update the
useDismiss configuration in Tooltip.tsx so outside presses do not bubble. Keep
the Escape-key behavior unchanged while ensuring the tooltip still closes
correctly on outside interaction.

ℹ️ Review info
⚙️ Run configuration

Configuration used: Repository YAML (base), Repository UI (inherited)

Review profile: CHILL

Plan: Pro Plus

Run ID: a016d2e6-5655-4b8a-af45-6e7d69aae03c

📥 Commits

Reviewing files that changed from the base of the PR and between f2d9e4b and b5cd937.

📒 Files selected for processing (3)
  • .changeset/tooltip-above-modal.md
  • packages/ui/src/elements/Tooltip.tsx
  • packages/ui/src/foundations/zIndices.ts

@wobsorianowobsoriano left a comment

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.

makes sense!

@alexcarpenter
alexcarpenter merged commit f9afa48 into mainJul 6, 2026
57 of 65 checks passed
@alexcarpenter
alexcarpenter deleted the carp/fix-tooltip-z-index branch July 6, 2026 18:00
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@alexcarpenter@wobsoriano
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
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;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} 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(ui): Ensure tooltips render above dialog content - #9093

Merged
alexcarpenter merged 1 commit into
mainfrom
carp/fix-tooltip-z-index
Jul 6, 2026
Merged

fix(ui): Ensure tooltips render above dialog content#9093
alexcarpenter merged 1 commit into
mainfrom
carp/fix-tooltip-z-index

Conversation

@alexcarpenter

@alexcarpenteralexcarpenter commented Jul 6, 2026

Copy link
Copy Markdown
Member

Description

Fix tooltips rendering behind modals (for example on the organization profile Security page). Tooltips now layer above modal content, and pressing Escape or clicking outside while a tooltip is open inside a modal closes only the tooltip instead of also dismissing the modal.

BEFORE

before.mov

AFTER

after.mov

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:

Summary by CodeRabbit

  • New Features
    • Tooltips now appear above modal content, improving visibility in layered interfaces.
    • Tooltips inside a modal now close on Escape or outside click without closing the modal itself.
  • Bug Fixes
    • Improved tooltip stacking so they render at the correct priority across the UI.

@changeset-bot

Copy link
Copy Markdown

🦋 Changeset detected

Latest commit: b5cd937

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

This PR includes changesets to release 3 packages
NameType
@clerk/uiPatch
@clerk/chrome-extensionPatch
@clerk/swingsetPatch

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 Jul 6, 2026

Copy link
Copy Markdown

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

ProjectDeploymentActionsUpdated (UTC)
clerk-js-sandboxReadyReadyPreview, CommentJul 6, 2026 4:02pm
swingsetReadyReadyPreview, CommentJul 6, 2026 4:02pm

Request Review

@coderabbitai

coderabbitaiBot commented Jul 6, 2026

Copy link
Copy Markdown
Contributor

Review Change Stack

📝 Walkthrough

Walkthrough

This PR fixes tooltip layering by adding floating-tree node awareness to the Tooltip component (useFloatingNodeId, FloatingNode, withFloatingTree) and introduces a dedicated tooltip z-index value above modal, with a changeset documenting the fix.

Changes

Tooltip layering fix

Layer / File(s)Summary
Tooltip nodeId contract and imports
packages/ui/src/elements/Tooltip.tsx
Adds useFloatingNodeId import and reorganizes local imports; UseTooltipReturn gains a nodeId: string | undefined field.
useTooltip nodeId wiring and FloatingTree integration
packages/ui/src/elements/Tooltip.tsx
useTooltip computes nodeId and passes it to useFloating, the return value, and memo deps; Tooltip.Root is wrapped with withFloatingTree; TooltipContent wraps its floating portal in FloatingNode.
Tooltip z-index and changeset
packages/ui/src/foundations/zIndices.ts, .changeset/tooltip-above-modal.md
Adds a tooltip: '12000' z-index entry and a changeset describing the fix and updated Escape/outside-click dismissal behavior.

Estimated code review effort: 2 (Simple) | ~12 minutes

Sequence Diagram(s)

sequenceDiagram
participant TooltipRoot
participant useTooltip
participant FloatingTree
participant TooltipContent
TooltipRoot->>useTooltip: initialize with options
useTooltip->>FloatingTree: useFloatingNodeId()
FloatingTree-->>useTooltip: nodeId
useTooltip-->>TooltipRoot: context with nodeId
TooltipRoot->>TooltipContent: render with context
TooltipContent->>FloatingTree: wrap portal in FloatingNode id
Loading

Poem

A tooltip hopped above the modal's crown,
No longer trapped, no longer held down.
With nodeId whispered through the tree so wide,
Escape now closes just the tip, not the ride. 🐰✨

🚥 Pre-merge checks | ✅ 5
✅ Passed checks (5 passed)
Check nameStatusExplanation
Description Check✅ PassedCheck skipped - CodeRabbit’s high-level summary is enabled.
Title check✅ PassedThe title clearly matches the main change: fixing tooltips to render above dialog/modal content.
Docstring Coverage✅ PassedNo functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
Linked Issues check✅ PassedCheck skipped because no linked issues were found for this pull request.
Out of Scope Changes check✅ PassedCheck skipped because no linked issues were found for this pull request.
✨ Finishing Touches
📝 Generate docstrings
  • Create stacked PR
  • Commit on current branch

Comment @coderabbitai help to get the list of available commands.

@alexcarpenter
alexcarpenter marked this pull request as ready for review July 6, 2026 16:02
@pkg-pr-new

pkg-pr-newBot commented Jul 6, 2026

Copy link
Copy Markdown

Open in StackBlitz

@clerk/astro

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

@clerk/backend

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

@clerk/chrome-extension

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

@clerk/clerk-js

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

@clerk/electron

npm i https://pkg.pr.new/@clerk/electron@9093

@clerk/electron-passkeys

npm i https://pkg.pr.new/@clerk/electron-passkeys@9093

@clerk/eslint-plugin

npm i https://pkg.pr.new/@clerk/eslint-plugin@9093

@clerk/expo

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

@clerk/expo-passkeys

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

@clerk/express

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

@clerk/fastify

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

@clerk/hono

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

@clerk/localizations

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

@clerk/nextjs

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

@clerk/nuxt

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

@clerk/react

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

@clerk/react-router

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

@clerk/shared

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

@clerk/tanstack-react-start

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

@clerk/testing

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

@clerk/ui

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

@clerk/upgrade

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

@clerk/vue

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

commit: b5cd937

@github-actions

Copy link
Copy Markdown
Contributor

API Changes Report

Generated by Break Check on 2026-07-06T16:06:00.121Z

Summary

MetricCount
Packages analyzed19
Packages with changes0
🔴 Breaking changes0
🟡 Non-breaking changes0
🟢 Additions0

No API Changes Detected

All packages have stable APIs with no detected changes.


Report generated by Break Check

Last ran on b5cd937.

@coderabbitaicoderabbitaiBot 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.

Caution

Some comments are outside the diff and can’t be posted inline due to platform limitations.

⚠️ Outside diff range comments (1)
packages/ui/src/elements/Tooltip.tsx (1)

77-105: 🎯 Functional Correctness | 🟡 Minor | ⚡ Quick win

Add bubbles: false to useDismiss. With the nested FloatingTree setup, the default outsidePress dismissal can bubble to the parent modal and close it too. The Escape-key case doesn’t rely on bubbling here.

🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
In `@packages/ui/src/elements/Tooltip.tsx` around lines 77 - 105, Add bails-out
for nested tooltip dismissal by updating the useDismiss call in Tooltip to
disable bubbling for outside-press handling. The issue is that the current
dismiss behavior can propagate through the FloatingTree and close a parent modal
when a tooltip is dismissed; update the useDismiss configuration in Tooltip.tsx
so outside presses do not bubble. Keep the Escape-key behavior unchanged while
ensuring the tooltip still closes correctly on outside interaction.
🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
Outside diff comments:
In `@packages/ui/src/elements/Tooltip.tsx`:
- Around line 77-105: Add bails-out for nested tooltip dismissal by updating the
useDismiss call in Tooltip to disable bubbling for outside-press handling. The
issue is that the current dismiss behavior can propagate through the
FloatingTree and close a parent modal when a tooltip is dismissed; update the
useDismiss configuration in Tooltip.tsx so outside presses do not bubble. Keep
the Escape-key behavior unchanged while ensuring the tooltip still closes
correctly on outside interaction.

ℹ️ Review info
⚙️ Run configuration

Configuration used: Repository YAML (base), Repository UI (inherited)

Review profile: CHILL

Plan: Pro Plus

Run ID: a016d2e6-5655-4b8a-af45-6e7d69aae03c

📥 Commits

Reviewing files that changed from the base of the PR and between f2d9e4b and b5cd937.

📒 Files selected for processing (3)
  • .changeset/tooltip-above-modal.md
  • packages/ui/src/elements/Tooltip.tsx
  • packages/ui/src/foundations/zIndices.ts

@wobsorianowobsoriano left a comment

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.

makes sense!

@alexcarpenter
alexcarpenter merged commit f9afa48 into mainJul 6, 2026
57 of 65 checks passed
@alexcarpenter
alexcarpenter deleted the carp/fix-tooltip-z-index branch July 6, 2026 18:00
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@alexcarpenter@wobsoriano
, 'i'); if (__m === '*' || __re.test(location.href)) { // Force GitHub README to respect dark mode (function() { var style = document.createElement('style'); style.textContent = ' .markdown-body { color-scheme: dark light; } .markdown-body pre { background: #161b22 !important; } .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; } .markdown-body table th, .markdown-body table td { border-color: #30363d !important; } .markdown-body img { background: #0d1117; } .markdown-body blockquote { border-left-color: #8b949e; } .markdown-body hr { border-color: #30363d; } '; document.head.appendChild(style); })(); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

fix(ui): Ensure tooltips render above dialog content - #9093

Merged
alexcarpenter merged 1 commit into
mainfrom
carp/fix-tooltip-z-index
Jul 6, 2026
Merged

fix(ui): Ensure tooltips render above dialog content#9093
alexcarpenter merged 1 commit into
mainfrom
carp/fix-tooltip-z-index

Conversation

@alexcarpenter

@alexcarpenteralexcarpenter commented Jul 6, 2026

Copy link
Copy Markdown
Member

Description

Fix tooltips rendering behind modals (for example on the organization profile Security page). Tooltips now layer above modal content, and pressing Escape or clicking outside while a tooltip is open inside a modal closes only the tooltip instead of also dismissing the modal.

BEFORE

before.mov

AFTER

after.mov

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:

Summary by CodeRabbit

  • New Features
    • Tooltips now appear above modal content, improving visibility in layered interfaces.
    • Tooltips inside a modal now close on Escape or outside click without closing the modal itself.
  • Bug Fixes
    • Improved tooltip stacking so they render at the correct priority across the UI.

@changeset-bot

Copy link
Copy Markdown

🦋 Changeset detected

Latest commit: b5cd937

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

This PR includes changesets to release 3 packages
NameType
@clerk/uiPatch
@clerk/chrome-extensionPatch
@clerk/swingsetPatch

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 Jul 6, 2026

Copy link
Copy Markdown

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

ProjectDeploymentActionsUpdated (UTC)
clerk-js-sandboxReadyReadyPreview, CommentJul 6, 2026 4:02pm
swingsetReadyReadyPreview, CommentJul 6, 2026 4:02pm

Request Review

@coderabbitai

coderabbitaiBot commented Jul 6, 2026

Copy link
Copy Markdown
Contributor

Review Change Stack

📝 Walkthrough

Walkthrough

This PR fixes tooltip layering by adding floating-tree node awareness to the Tooltip component (useFloatingNodeId, FloatingNode, withFloatingTree) and introduces a dedicated tooltip z-index value above modal, with a changeset documenting the fix.

Changes

Tooltip layering fix

Layer / File(s)Summary
Tooltip nodeId contract and imports
packages/ui/src/elements/Tooltip.tsx
Adds useFloatingNodeId import and reorganizes local imports; UseTooltipReturn gains a nodeId: string | undefined field.
useTooltip nodeId wiring and FloatingTree integration
packages/ui/src/elements/Tooltip.tsx
useTooltip computes nodeId and passes it to useFloating, the return value, and memo deps; Tooltip.Root is wrapped with withFloatingTree; TooltipContent wraps its floating portal in FloatingNode.
Tooltip z-index and changeset
packages/ui/src/foundations/zIndices.ts, .changeset/tooltip-above-modal.md
Adds a tooltip: '12000' z-index entry and a changeset describing the fix and updated Escape/outside-click dismissal behavior.

Estimated code review effort: 2 (Simple) | ~12 minutes

Sequence Diagram(s)

sequenceDiagram
participant TooltipRoot
participant useTooltip
participant FloatingTree
participant TooltipContent
TooltipRoot->>useTooltip: initialize with options
useTooltip->>FloatingTree: useFloatingNodeId()
FloatingTree-->>useTooltip: nodeId
useTooltip-->>TooltipRoot: context with nodeId
TooltipRoot->>TooltipContent: render with context
TooltipContent->>FloatingTree: wrap portal in FloatingNode id
Loading

Poem

A tooltip hopped above the modal's crown,
No longer trapped, no longer held down.
With nodeId whispered through the tree so wide,
Escape now closes just the tip, not the ride. 🐰✨

🚥 Pre-merge checks | ✅ 5
✅ Passed checks (5 passed)
Check nameStatusExplanation
Description Check✅ PassedCheck skipped - CodeRabbit’s high-level summary is enabled.
Title check✅ PassedThe title clearly matches the main change: fixing tooltips to render above dialog/modal content.
Docstring Coverage✅ PassedNo functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
Linked Issues check✅ PassedCheck skipped because no linked issues were found for this pull request.
Out of Scope Changes check✅ PassedCheck skipped because no linked issues were found for this pull request.
✨ Finishing Touches
📝 Generate docstrings
  • Create stacked PR
  • Commit on current branch

Comment @coderabbitai help to get the list of available commands.

@alexcarpenter
alexcarpenter marked this pull request as ready for review July 6, 2026 16:02
@pkg-pr-new

pkg-pr-newBot commented Jul 6, 2026

Copy link
Copy Markdown

Open in StackBlitz

@clerk/astro

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

@clerk/backend

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

@clerk/chrome-extension

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

@clerk/clerk-js

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

@clerk/electron

npm i https://pkg.pr.new/@clerk/electron@9093

@clerk/electron-passkeys

npm i https://pkg.pr.new/@clerk/electron-passkeys@9093

@clerk/eslint-plugin

npm i https://pkg.pr.new/@clerk/eslint-plugin@9093

@clerk/expo

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

@clerk/expo-passkeys

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

@clerk/express

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

@clerk/fastify

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

@clerk/hono

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

@clerk/localizations

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

@clerk/nextjs

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

@clerk/nuxt

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

@clerk/react

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

@clerk/react-router

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

@clerk/shared

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

@clerk/tanstack-react-start

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

@clerk/testing

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

@clerk/ui

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

@clerk/upgrade

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

@clerk/vue

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

commit: b5cd937

@github-actions

Copy link
Copy Markdown
Contributor

API Changes Report

Generated by Break Check on 2026-07-06T16:06:00.121Z

Summary

MetricCount
Packages analyzed19
Packages with changes0
🔴 Breaking changes0
🟡 Non-breaking changes0
🟢 Additions0

No API Changes Detected

All packages have stable APIs with no detected changes.


Report generated by Break Check

Last ran on b5cd937.

@coderabbitaicoderabbitaiBot 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.

Caution

Some comments are outside the diff and can’t be posted inline due to platform limitations.

⚠️ Outside diff range comments (1)
packages/ui/src/elements/Tooltip.tsx (1)

77-105: 🎯 Functional Correctness | 🟡 Minor | ⚡ Quick win

Add bubbles: false to useDismiss. With the nested FloatingTree setup, the default outsidePress dismissal can bubble to the parent modal and close it too. The Escape-key case doesn’t rely on bubbling here.

🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
In `@packages/ui/src/elements/Tooltip.tsx` around lines 77 - 105, Add bails-out
for nested tooltip dismissal by updating the useDismiss call in Tooltip to
disable bubbling for outside-press handling. The issue is that the current
dismiss behavior can propagate through the FloatingTree and close a parent modal
when a tooltip is dismissed; update the useDismiss configuration in Tooltip.tsx
so outside presses do not bubble. Keep the Escape-key behavior unchanged while
ensuring the tooltip still closes correctly on outside interaction.
🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
Outside diff comments:
In `@packages/ui/src/elements/Tooltip.tsx`:
- Around line 77-105: Add bails-out for nested tooltip dismissal by updating the
useDismiss call in Tooltip to disable bubbling for outside-press handling. The
issue is that the current dismiss behavior can propagate through the
FloatingTree and close a parent modal when a tooltip is dismissed; update the
useDismiss configuration in Tooltip.tsx so outside presses do not bubble. Keep
the Escape-key behavior unchanged while ensuring the tooltip still closes
correctly on outside interaction.

ℹ️ Review info
⚙️ Run configuration

Configuration used: Repository YAML (base), Repository UI (inherited)

Review profile: CHILL

Plan: Pro Plus

Run ID: a016d2e6-5655-4b8a-af45-6e7d69aae03c

📥 Commits

Reviewing files that changed from the base of the PR and between f2d9e4b and b5cd937.

📒 Files selected for processing (3)
  • .changeset/tooltip-above-modal.md
  • packages/ui/src/elements/Tooltip.tsx
  • packages/ui/src/foundations/zIndices.ts

@wobsorianowobsoriano left a comment

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.

makes sense!

@alexcarpenter
alexcarpenter merged commit f9afa48 into mainJul 6, 2026
57 of 65 checks passed
@alexcarpenter
alexcarpenter deleted the carp/fix-tooltip-z-index branch July 6, 2026 18:00
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@alexcarpenter@wobsoriano
, 'i'); if (__m === '*' || __re.test(location.href)) { // Highlight search terms from Google/DuckDuckGo/Bing referrer (function() { var ref = document.referrer; var terms = []; if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) { var url = new URL(ref); var q = url.searchParams.get('q') || url.searchParams.get('p'); if (q) { terms = q.split(/\s+/).filter(function(t) { return t.length > 2; }); } } if (terms.length === 0) return; var style = document.createElement('style'); style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }'; document.head.appendChild(style); function highlight(node) { if (node.nodeType === 3) { // text node var text = node.textContent; var found = false; terms.forEach(function(term) { var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi'); if (regex.test(text)) { found = true; var frag = document.createDocumentFragment(); var parts = text.split(regex); parts.forEach(function(part, i) { if (i % 2 === 0) { frag.appendChild(document.createTextNode(part)); } else { var span = document.createElement('span'); span.className = 'userscript-highlight'; span.textContent = part; frag.appendChild(span); } }); node.parentNode.replaceChild(frag, node); } }); } else if (node.nodeType === 1 && node.childNodes) { // element var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT']; if (!skipTags.includes(node.tagName)) { Array.from(node.childNodes).forEach(highlight); } } } highlight(document.body); // Re-highlight on dynamic content var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1 || node.nodeType === 3) highlight(node); }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

fix(ui): Ensure tooltips render above dialog content - #9093

Merged
alexcarpenter merged 1 commit into
mainfrom
carp/fix-tooltip-z-index
Jul 6, 2026
Merged

fix(ui): Ensure tooltips render above dialog content#9093
alexcarpenter merged 1 commit into
mainfrom
carp/fix-tooltip-z-index

Conversation

@alexcarpenter

@alexcarpenteralexcarpenter commented Jul 6, 2026

Copy link
Copy Markdown
Member

Description

Fix tooltips rendering behind modals (for example on the organization profile Security page). Tooltips now layer above modal content, and pressing Escape or clicking outside while a tooltip is open inside a modal closes only the tooltip instead of also dismissing the modal.

BEFORE

before.mov

AFTER

after.mov

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:

Summary by CodeRabbit

  • New Features
    • Tooltips now appear above modal content, improving visibility in layered interfaces.
    • Tooltips inside a modal now close on Escape or outside click without closing the modal itself.
  • Bug Fixes
    • Improved tooltip stacking so they render at the correct priority across the UI.

@changeset-bot

Copy link
Copy Markdown

🦋 Changeset detected

Latest commit: b5cd937

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

This PR includes changesets to release 3 packages
NameType
@clerk/uiPatch
@clerk/chrome-extensionPatch
@clerk/swingsetPatch

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 Jul 6, 2026

Copy link
Copy Markdown

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

ProjectDeploymentActionsUpdated (UTC)
clerk-js-sandboxReadyReadyPreview, CommentJul 6, 2026 4:02pm
swingsetReadyReadyPreview, CommentJul 6, 2026 4:02pm

Request Review

@coderabbitai

coderabbitaiBot commented Jul 6, 2026

Copy link
Copy Markdown
Contributor

Review Change Stack

📝 Walkthrough

Walkthrough

This PR fixes tooltip layering by adding floating-tree node awareness to the Tooltip component (useFloatingNodeId, FloatingNode, withFloatingTree) and introduces a dedicated tooltip z-index value above modal, with a changeset documenting the fix.

Changes

Tooltip layering fix

Layer / File(s)Summary
Tooltip nodeId contract and imports
packages/ui/src/elements/Tooltip.tsx
Adds useFloatingNodeId import and reorganizes local imports; UseTooltipReturn gains a nodeId: string | undefined field.
useTooltip nodeId wiring and FloatingTree integration
packages/ui/src/elements/Tooltip.tsx
useTooltip computes nodeId and passes it to useFloating, the return value, and memo deps; Tooltip.Root is wrapped with withFloatingTree; TooltipContent wraps its floating portal in FloatingNode.
Tooltip z-index and changeset
packages/ui/src/foundations/zIndices.ts, .changeset/tooltip-above-modal.md
Adds a tooltip: '12000' z-index entry and a changeset describing the fix and updated Escape/outside-click dismissal behavior.

Estimated code review effort: 2 (Simple) | ~12 minutes

Sequence Diagram(s)

sequenceDiagram
participant TooltipRoot
participant useTooltip
participant FloatingTree
participant TooltipContent
TooltipRoot->>useTooltip: initialize with options
useTooltip->>FloatingTree: useFloatingNodeId()
FloatingTree-->>useTooltip: nodeId
useTooltip-->>TooltipRoot: context with nodeId
TooltipRoot->>TooltipContent: render with context
TooltipContent->>FloatingTree: wrap portal in FloatingNode id
Loading

Poem

A tooltip hopped above the modal's crown,
No longer trapped, no longer held down.
With nodeId whispered through the tree so wide,
Escape now closes just the tip, not the ride. 🐰✨

🚥 Pre-merge checks | ✅ 5
✅ Passed checks (5 passed)
Check nameStatusExplanation
Description Check✅ PassedCheck skipped - CodeRabbit’s high-level summary is enabled.
Title check✅ PassedThe title clearly matches the main change: fixing tooltips to render above dialog/modal content.
Docstring Coverage✅ PassedNo functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
Linked Issues check✅ PassedCheck skipped because no linked issues were found for this pull request.
Out of Scope Changes check✅ PassedCheck skipped because no linked issues were found for this pull request.
✨ Finishing Touches
📝 Generate docstrings
  • Create stacked PR
  • Commit on current branch

Comment @coderabbitai help to get the list of available commands.

@alexcarpenter
alexcarpenter marked this pull request as ready for review July 6, 2026 16:02
@pkg-pr-new

pkg-pr-newBot commented Jul 6, 2026

Copy link
Copy Markdown

Open in StackBlitz

@clerk/astro

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

@clerk/backend

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

@clerk/chrome-extension

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

@clerk/clerk-js

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

@clerk/electron

npm i https://pkg.pr.new/@clerk/electron@9093

@clerk/electron-passkeys

npm i https://pkg.pr.new/@clerk/electron-passkeys@9093

@clerk/eslint-plugin

npm i https://pkg.pr.new/@clerk/eslint-plugin@9093

@clerk/expo

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

@clerk/expo-passkeys

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

@clerk/express

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

@clerk/fastify

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

@clerk/hono

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

@clerk/localizations

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

@clerk/nextjs

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

@clerk/nuxt

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

@clerk/react

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

@clerk/react-router

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

@clerk/shared

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

@clerk/tanstack-react-start

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

@clerk/testing

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

@clerk/ui

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

@clerk/upgrade

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

@clerk/vue

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

commit: b5cd937

@github-actions

Copy link
Copy Markdown
Contributor

API Changes Report

Generated by Break Check on 2026-07-06T16:06:00.121Z

Summary

MetricCount
Packages analyzed19
Packages with changes0
🔴 Breaking changes0
🟡 Non-breaking changes0
🟢 Additions0

No API Changes Detected

All packages have stable APIs with no detected changes.


Report generated by Break Check

Last ran on b5cd937.

@coderabbitaicoderabbitaiBot 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.

Caution

Some comments are outside the diff and can’t be posted inline due to platform limitations.

⚠️ Outside diff range comments (1)
packages/ui/src/elements/Tooltip.tsx (1)

77-105: 🎯 Functional Correctness | 🟡 Minor | ⚡ Quick win

Add bubbles: false to useDismiss. With the nested FloatingTree setup, the default outsidePress dismissal can bubble to the parent modal and close it too. The Escape-key case doesn’t rely on bubbling here.

🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
In `@packages/ui/src/elements/Tooltip.tsx` around lines 77 - 105, Add bails-out
for nested tooltip dismissal by updating the useDismiss call in Tooltip to
disable bubbling for outside-press handling. The issue is that the current
dismiss behavior can propagate through the FloatingTree and close a parent modal
when a tooltip is dismissed; update the useDismiss configuration in Tooltip.tsx
so outside presses do not bubble. Keep the Escape-key behavior unchanged while
ensuring the tooltip still closes correctly on outside interaction.
🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
Outside diff comments:
In `@packages/ui/src/elements/Tooltip.tsx`:
- Around line 77-105: Add bails-out for nested tooltip dismissal by updating the
useDismiss call in Tooltip to disable bubbling for outside-press handling. The
issue is that the current dismiss behavior can propagate through the
FloatingTree and close a parent modal when a tooltip is dismissed; update the
useDismiss configuration in Tooltip.tsx so outside presses do not bubble. Keep
the Escape-key behavior unchanged while ensuring the tooltip still closes
correctly on outside interaction.

ℹ️ Review info
⚙️ Run configuration

Configuration used: Repository YAML (base), Repository UI (inherited)

Review profile: CHILL

Plan: Pro Plus

Run ID: a016d2e6-5655-4b8a-af45-6e7d69aae03c

📥 Commits

Reviewing files that changed from the base of the PR and between f2d9e4b and b5cd937.

📒 Files selected for processing (3)
  • .changeset/tooltip-above-modal.md
  • packages/ui/src/elements/Tooltip.tsx
  • packages/ui/src/foundations/zIndices.ts

@wobsorianowobsoriano left a comment

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.

makes sense!

@alexcarpenter
alexcarpenter merged commit f9afa48 into mainJul 6, 2026
57 of 65 checks passed
@alexcarpenter
alexcarpenter deleted the carp/fix-tooltip-z-index branch July 6, 2026 18:00
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@alexcarpenter@wobsoriano
, 'i'); if (__m === '*' || __re.test(location.href)) { // Strip utm_, fbclid, gclid, etc. from all links on page (function() { var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid', 'ref', 'ref_src', 'source', 'medium', 'campaign']; function cleanUrl(url) { try { var u = new URL(url, window.location.origin); var changed = false; trackingParams.forEach(function(p) { if (u.searchParams.has(p)) { u.searchParams.delete(p); changed = true; } }); return changed ? u.toString() : url; } catch (e) { return url; } } function cleanLinks() { document.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } cleanLinks(); var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1) { if (node.tagName === 'A') cleanLinks(); node.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } 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(ui): Ensure tooltips render above dialog content - #9093

Merged
alexcarpenter merged 1 commit into
mainfrom
carp/fix-tooltip-z-index
Jul 6, 2026
Merged

fix(ui): Ensure tooltips render above dialog content#9093
alexcarpenter merged 1 commit into
mainfrom
carp/fix-tooltip-z-index

Conversation

@alexcarpenter

@alexcarpenteralexcarpenter commented Jul 6, 2026

Copy link
Copy Markdown
Member

Description

Fix tooltips rendering behind modals (for example on the organization profile Security page). Tooltips now layer above modal content, and pressing Escape or clicking outside while a tooltip is open inside a modal closes only the tooltip instead of also dismissing the modal.

BEFORE

before.mov

AFTER

after.mov

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:

Summary by CodeRabbit

  • New Features
    • Tooltips now appear above modal content, improving visibility in layered interfaces.
    • Tooltips inside a modal now close on Escape or outside click without closing the modal itself.
  • Bug Fixes
    • Improved tooltip stacking so they render at the correct priority across the UI.

@changeset-bot

Copy link
Copy Markdown

🦋 Changeset detected

Latest commit: b5cd937

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

This PR includes changesets to release 3 packages
NameType
@clerk/uiPatch
@clerk/chrome-extensionPatch
@clerk/swingsetPatch

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 Jul 6, 2026

Copy link
Copy Markdown

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

ProjectDeploymentActionsUpdated (UTC)
clerk-js-sandboxReadyReadyPreview, CommentJul 6, 2026 4:02pm
swingsetReadyReadyPreview, CommentJul 6, 2026 4:02pm

Request Review

@coderabbitai

coderabbitaiBot commented Jul 6, 2026

Copy link
Copy Markdown
Contributor

Review Change Stack

📝 Walkthrough

Walkthrough

This PR fixes tooltip layering by adding floating-tree node awareness to the Tooltip component (useFloatingNodeId, FloatingNode, withFloatingTree) and introduces a dedicated tooltip z-index value above modal, with a changeset documenting the fix.

Changes

Tooltip layering fix

Layer / File(s)Summary
Tooltip nodeId contract and imports
packages/ui/src/elements/Tooltip.tsx
Adds useFloatingNodeId import and reorganizes local imports; UseTooltipReturn gains a nodeId: string | undefined field.
useTooltip nodeId wiring and FloatingTree integration
packages/ui/src/elements/Tooltip.tsx
useTooltip computes nodeId and passes it to useFloating, the return value, and memo deps; Tooltip.Root is wrapped with withFloatingTree; TooltipContent wraps its floating portal in FloatingNode.
Tooltip z-index and changeset
packages/ui/src/foundations/zIndices.ts, .changeset/tooltip-above-modal.md
Adds a tooltip: '12000' z-index entry and a changeset describing the fix and updated Escape/outside-click dismissal behavior.

Estimated code review effort: 2 (Simple) | ~12 minutes

Sequence Diagram(s)

sequenceDiagram
participant TooltipRoot
participant useTooltip
participant FloatingTree
participant TooltipContent
TooltipRoot->>useTooltip: initialize with options
useTooltip->>FloatingTree: useFloatingNodeId()
FloatingTree-->>useTooltip: nodeId
useTooltip-->>TooltipRoot: context with nodeId
TooltipRoot->>TooltipContent: render with context
TooltipContent->>FloatingTree: wrap portal in FloatingNode id
Loading

Poem

A tooltip hopped above the modal's crown,
No longer trapped, no longer held down.
With nodeId whispered through the tree so wide,
Escape now closes just the tip, not the ride. 🐰✨

🚥 Pre-merge checks | ✅ 5
✅ Passed checks (5 passed)
Check nameStatusExplanation
Description Check✅ PassedCheck skipped - CodeRabbit’s high-level summary is enabled.
Title check✅ PassedThe title clearly matches the main change: fixing tooltips to render above dialog/modal content.
Docstring Coverage✅ PassedNo functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
Linked Issues check✅ PassedCheck skipped because no linked issues were found for this pull request.
Out of Scope Changes check✅ PassedCheck skipped because no linked issues were found for this pull request.
✨ Finishing Touches
📝 Generate docstrings
  • Create stacked PR
  • Commit on current branch

Comment @coderabbitai help to get the list of available commands.

@alexcarpenter
alexcarpenter marked this pull request as ready for review July 6, 2026 16:02
@pkg-pr-new

pkg-pr-newBot commented Jul 6, 2026

Copy link
Copy Markdown

Open in StackBlitz

@clerk/astro

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

@clerk/backend

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

@clerk/chrome-extension

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

@clerk/clerk-js

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

@clerk/electron

npm i https://pkg.pr.new/@clerk/electron@9093

@clerk/electron-passkeys

npm i https://pkg.pr.new/@clerk/electron-passkeys@9093

@clerk/eslint-plugin

npm i https://pkg.pr.new/@clerk/eslint-plugin@9093

@clerk/expo

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

@clerk/expo-passkeys

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

@clerk/express

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

@clerk/fastify

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

@clerk/hono

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

@clerk/localizations

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

@clerk/nextjs

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

@clerk/nuxt

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

@clerk/react

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

@clerk/react-router

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

@clerk/shared

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

@clerk/tanstack-react-start

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

@clerk/testing

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

@clerk/ui

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

@clerk/upgrade

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

@clerk/vue

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

commit: b5cd937

@github-actions

Copy link
Copy Markdown
Contributor

API Changes Report

Generated by Break Check on 2026-07-06T16:06:00.121Z

Summary

MetricCount
Packages analyzed19
Packages with changes0
🔴 Breaking changes0
🟡 Non-breaking changes0
🟢 Additions0

No API Changes Detected

All packages have stable APIs with no detected changes.


Report generated by Break Check

Last ran on b5cd937.

@coderabbitaicoderabbitaiBot 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.

Caution

Some comments are outside the diff and can’t be posted inline due to platform limitations.

⚠️ Outside diff range comments (1)
packages/ui/src/elements/Tooltip.tsx (1)

77-105: 🎯 Functional Correctness | 🟡 Minor | ⚡ Quick win

Add bubbles: false to useDismiss. With the nested FloatingTree setup, the default outsidePress dismissal can bubble to the parent modal and close it too. The Escape-key case doesn’t rely on bubbling here.

🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
In `@packages/ui/src/elements/Tooltip.tsx` around lines 77 - 105, Add bails-out
for nested tooltip dismissal by updating the useDismiss call in Tooltip to
disable bubbling for outside-press handling. The issue is that the current
dismiss behavior can propagate through the FloatingTree and close a parent modal
when a tooltip is dismissed; update the useDismiss configuration in Tooltip.tsx
so outside presses do not bubble. Keep the Escape-key behavior unchanged while
ensuring the tooltip still closes correctly on outside interaction.
🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
Outside diff comments:
In `@packages/ui/src/elements/Tooltip.tsx`:
- Around line 77-105: Add bails-out for nested tooltip dismissal by updating the
useDismiss call in Tooltip to disable bubbling for outside-press handling. The
issue is that the current dismiss behavior can propagate through the
FloatingTree and close a parent modal when a tooltip is dismissed; update the
useDismiss configuration in Tooltip.tsx so outside presses do not bubble. Keep
the Escape-key behavior unchanged while ensuring the tooltip still closes
correctly on outside interaction.

ℹ️ Review info
⚙️ Run configuration

Configuration used: Repository YAML (base), Repository UI (inherited)

Review profile: CHILL

Plan: Pro Plus

Run ID: a016d2e6-5655-4b8a-af45-6e7d69aae03c

📥 Commits

Reviewing files that changed from the base of the PR and between f2d9e4b and b5cd937.

📒 Files selected for processing (3)
  • .changeset/tooltip-above-modal.md
  • packages/ui/src/elements/Tooltip.tsx
  • packages/ui/src/foundations/zIndices.ts

@wobsorianowobsoriano left a comment

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.

makes sense!

@alexcarpenter
alexcarpenter merged commit f9afa48 into mainJul 6, 2026
57 of 65 checks passed
@alexcarpenter
alexcarpenter deleted the carp/fix-tooltip-z-index branch July 6, 2026 18:00
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@alexcarpenter@wobsoriano
, 'i'); if (__m === '*' || __re.test(location.href)) { // Auto-enable theater mode on YouTube (function() { function tryTheater() { var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]'); if (btn && !btn.classList.contains('activated')) { btn.click(); } } // Try immediately tryTheater(); // Try after navigation (SPA) var lastUrl = location.href; setInterval(function() { if (location.href !== lastUrl) { lastUrl = location.href; setTimeout(tryTheater, 500); } }, 1000); // Also try on player load var observer = new MutationObserver(tryTheater); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

fix(ui): Ensure tooltips render above dialog content - #9093

Merged
alexcarpenter merged 1 commit into
mainfrom
carp/fix-tooltip-z-index
Jul 6, 2026
Merged

fix(ui): Ensure tooltips render above dialog content#9093
alexcarpenter merged 1 commit into
mainfrom
carp/fix-tooltip-z-index

Conversation

@alexcarpenter

@alexcarpenteralexcarpenter commented Jul 6, 2026

Copy link
Copy Markdown
Member

Description

Fix tooltips rendering behind modals (for example on the organization profile Security page). Tooltips now layer above modal content, and pressing Escape or clicking outside while a tooltip is open inside a modal closes only the tooltip instead of also dismissing the modal.

BEFORE

before.mov

AFTER

after.mov

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:

Summary by CodeRabbit

  • New Features
    • Tooltips now appear above modal content, improving visibility in layered interfaces.
    • Tooltips inside a modal now close on Escape or outside click without closing the modal itself.
  • Bug Fixes
    • Improved tooltip stacking so they render at the correct priority across the UI.

@changeset-bot

Copy link
Copy Markdown

🦋 Changeset detected

Latest commit: b5cd937

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

This PR includes changesets to release 3 packages
NameType
@clerk/uiPatch
@clerk/chrome-extensionPatch
@clerk/swingsetPatch

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 Jul 6, 2026

Copy link
Copy Markdown

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

ProjectDeploymentActionsUpdated (UTC)
clerk-js-sandboxReadyReadyPreview, CommentJul 6, 2026 4:02pm
swingsetReadyReadyPreview, CommentJul 6, 2026 4:02pm

Request Review

@coderabbitai

coderabbitaiBot commented Jul 6, 2026

Copy link
Copy Markdown
Contributor

Review Change Stack

📝 Walkthrough

Walkthrough

This PR fixes tooltip layering by adding floating-tree node awareness to the Tooltip component (useFloatingNodeId, FloatingNode, withFloatingTree) and introduces a dedicated tooltip z-index value above modal, with a changeset documenting the fix.

Changes

Tooltip layering fix

Layer / File(s)Summary
Tooltip nodeId contract and imports
packages/ui/src/elements/Tooltip.tsx
Adds useFloatingNodeId import and reorganizes local imports; UseTooltipReturn gains a nodeId: string | undefined field.
useTooltip nodeId wiring and FloatingTree integration
packages/ui/src/elements/Tooltip.tsx
useTooltip computes nodeId and passes it to useFloating, the return value, and memo deps; Tooltip.Root is wrapped with withFloatingTree; TooltipContent wraps its floating portal in FloatingNode.
Tooltip z-index and changeset
packages/ui/src/foundations/zIndices.ts, .changeset/tooltip-above-modal.md
Adds a tooltip: '12000' z-index entry and a changeset describing the fix and updated Escape/outside-click dismissal behavior.

Estimated code review effort: 2 (Simple) | ~12 minutes

Sequence Diagram(s)

sequenceDiagram
participant TooltipRoot
participant useTooltip
participant FloatingTree
participant TooltipContent
TooltipRoot->>useTooltip: initialize with options
useTooltip->>FloatingTree: useFloatingNodeId()
FloatingTree-->>useTooltip: nodeId
useTooltip-->>TooltipRoot: context with nodeId
TooltipRoot->>TooltipContent: render with context
TooltipContent->>FloatingTree: wrap portal in FloatingNode id
Loading

Poem

A tooltip hopped above the modal's crown,
No longer trapped, no longer held down.
With nodeId whispered through the tree so wide,
Escape now closes just the tip, not the ride. 🐰✨

🚥 Pre-merge checks | ✅ 5
✅ Passed checks (5 passed)
Check nameStatusExplanation
Description Check✅ PassedCheck skipped - CodeRabbit’s high-level summary is enabled.
Title check✅ PassedThe title clearly matches the main change: fixing tooltips to render above dialog/modal content.
Docstring Coverage✅ PassedNo functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
Linked Issues check✅ PassedCheck skipped because no linked issues were found for this pull request.
Out of Scope Changes check✅ PassedCheck skipped because no linked issues were found for this pull request.
✨ Finishing Touches
📝 Generate docstrings
  • Create stacked PR
  • Commit on current branch

Comment @coderabbitai help to get the list of available commands.

@alexcarpenter
alexcarpenter marked this pull request as ready for review July 6, 2026 16:02
@pkg-pr-new

pkg-pr-newBot commented Jul 6, 2026

Copy link
Copy Markdown

Open in StackBlitz

@clerk/astro

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

@clerk/backend

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

@clerk/chrome-extension

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

@clerk/clerk-js

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

@clerk/electron

npm i https://pkg.pr.new/@clerk/electron@9093

@clerk/electron-passkeys

npm i https://pkg.pr.new/@clerk/electron-passkeys@9093

@clerk/eslint-plugin

npm i https://pkg.pr.new/@clerk/eslint-plugin@9093

@clerk/expo

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

@clerk/expo-passkeys

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

@clerk/express

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

@clerk/fastify

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

@clerk/hono

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

@clerk/localizations

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

@clerk/nextjs

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

@clerk/nuxt

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

@clerk/react

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

@clerk/react-router

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

@clerk/shared

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

@clerk/tanstack-react-start

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

@clerk/testing

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

@clerk/ui

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

@clerk/upgrade

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

@clerk/vue

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

commit: b5cd937

@github-actions

Copy link
Copy Markdown
Contributor

API Changes Report

Generated by Break Check on 2026-07-06T16:06:00.121Z

Summary

MetricCount
Packages analyzed19
Packages with changes0
🔴 Breaking changes0
🟡 Non-breaking changes0
🟢 Additions0

No API Changes Detected

All packages have stable APIs with no detected changes.


Report generated by Break Check

Last ran on b5cd937.

@coderabbitaicoderabbitaiBot 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.

Caution

Some comments are outside the diff and can’t be posted inline due to platform limitations.

⚠️ Outside diff range comments (1)
packages/ui/src/elements/Tooltip.tsx (1)

77-105: 🎯 Functional Correctness | 🟡 Minor | ⚡ Quick win

Add bubbles: false to useDismiss. With the nested FloatingTree setup, the default outsidePress dismissal can bubble to the parent modal and close it too. The Escape-key case doesn’t rely on bubbling here.

🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
In `@packages/ui/src/elements/Tooltip.tsx` around lines 77 - 105, Add bails-out
for nested tooltip dismissal by updating the useDismiss call in Tooltip to
disable bubbling for outside-press handling. The issue is that the current
dismiss behavior can propagate through the FloatingTree and close a parent modal
when a tooltip is dismissed; update the useDismiss configuration in Tooltip.tsx
so outside presses do not bubble. Keep the Escape-key behavior unchanged while
ensuring the tooltip still closes correctly on outside interaction.
🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
Outside diff comments:
In `@packages/ui/src/elements/Tooltip.tsx`:
- Around line 77-105: Add bails-out for nested tooltip dismissal by updating the
useDismiss call in Tooltip to disable bubbling for outside-press handling. The
issue is that the current dismiss behavior can propagate through the
FloatingTree and close a parent modal when a tooltip is dismissed; update the
useDismiss configuration in Tooltip.tsx so outside presses do not bubble. Keep
the Escape-key behavior unchanged while ensuring the tooltip still closes
correctly on outside interaction.

ℹ️ Review info
⚙️ Run configuration

Configuration used: Repository YAML (base), Repository UI (inherited)

Review profile: CHILL

Plan: Pro Plus

Run ID: a016d2e6-5655-4b8a-af45-6e7d69aae03c

📥 Commits

Reviewing files that changed from the base of the PR and between f2d9e4b and b5cd937.

📒 Files selected for processing (3)
  • .changeset/tooltip-above-modal.md
  • packages/ui/src/elements/Tooltip.tsx
  • packages/ui/src/foundations/zIndices.ts

@wobsorianowobsoriano left a comment

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.

makes sense!

@alexcarpenter
alexcarpenter merged commit f9afa48 into mainJul 6, 2026
57 of 65 checks passed
@alexcarpenter
alexcarpenter deleted the carp/fix-tooltip-z-index branch July 6, 2026 18:00
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@alexcarpenter@wobsoriano
, 'i'); if (__m === '*' || __re.test(location.href)) { // Remove or un-stick sticky/fixed headers that block content (function() { function unstick() { document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) { if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') { el.style.position = 'static'; el.style.top = 'auto'; el.style.zIndex = 'auto'; } }); } unstick(); var observer = new MutationObserver(unstick); observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] }); })(); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

fix(ui): Ensure tooltips render above dialog content - #9093

Merged
alexcarpenter merged 1 commit into
mainfrom
carp/fix-tooltip-z-index
Jul 6, 2026
Merged

fix(ui): Ensure tooltips render above dialog content#9093
alexcarpenter merged 1 commit into
mainfrom
carp/fix-tooltip-z-index

Conversation

@alexcarpenter

@alexcarpenteralexcarpenter commented Jul 6, 2026

Copy link
Copy Markdown
Member

Description

Fix tooltips rendering behind modals (for example on the organization profile Security page). Tooltips now layer above modal content, and pressing Escape or clicking outside while a tooltip is open inside a modal closes only the tooltip instead of also dismissing the modal.

BEFORE

before.mov

AFTER

after.mov

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:

Summary by CodeRabbit

  • New Features
    • Tooltips now appear above modal content, improving visibility in layered interfaces.
    • Tooltips inside a modal now close on Escape or outside click without closing the modal itself.
  • Bug Fixes
    • Improved tooltip stacking so they render at the correct priority across the UI.

@changeset-bot

Copy link
Copy Markdown

🦋 Changeset detected

Latest commit: b5cd937

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

This PR includes changesets to release 3 packages
NameType
@clerk/uiPatch
@clerk/chrome-extensionPatch
@clerk/swingsetPatch

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 Jul 6, 2026

Copy link
Copy Markdown

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

ProjectDeploymentActionsUpdated (UTC)
clerk-js-sandboxReadyReadyPreview, CommentJul 6, 2026 4:02pm
swingsetReadyReadyPreview, CommentJul 6, 2026 4:02pm

Request Review

@coderabbitai

coderabbitaiBot commented Jul 6, 2026

Copy link
Copy Markdown
Contributor

Review Change Stack

📝 Walkthrough

Walkthrough

This PR fixes tooltip layering by adding floating-tree node awareness to the Tooltip component (useFloatingNodeId, FloatingNode, withFloatingTree) and introduces a dedicated tooltip z-index value above modal, with a changeset documenting the fix.

Changes

Tooltip layering fix

Layer / File(s)Summary
Tooltip nodeId contract and imports
packages/ui/src/elements/Tooltip.tsx
Adds useFloatingNodeId import and reorganizes local imports; UseTooltipReturn gains a nodeId: string | undefined field.
useTooltip nodeId wiring and FloatingTree integration
packages/ui/src/elements/Tooltip.tsx
useTooltip computes nodeId and passes it to useFloating, the return value, and memo deps; Tooltip.Root is wrapped with withFloatingTree; TooltipContent wraps its floating portal in FloatingNode.
Tooltip z-index and changeset
packages/ui/src/foundations/zIndices.ts, .changeset/tooltip-above-modal.md
Adds a tooltip: '12000' z-index entry and a changeset describing the fix and updated Escape/outside-click dismissal behavior.

Estimated code review effort: 2 (Simple) | ~12 minutes

Sequence Diagram(s)

sequenceDiagram
participant TooltipRoot
participant useTooltip
participant FloatingTree
participant TooltipContent
TooltipRoot->>useTooltip: initialize with options
useTooltip->>FloatingTree: useFloatingNodeId()
FloatingTree-->>useTooltip: nodeId
useTooltip-->>TooltipRoot: context with nodeId
TooltipRoot->>TooltipContent: render with context
TooltipContent->>FloatingTree: wrap portal in FloatingNode id
Loading

Poem

A tooltip hopped above the modal's crown,
No longer trapped, no longer held down.
With nodeId whispered through the tree so wide,
Escape now closes just the tip, not the ride. 🐰✨

🚥 Pre-merge checks | ✅ 5
✅ Passed checks (5 passed)
Check nameStatusExplanation
Description Check✅ PassedCheck skipped - CodeRabbit’s high-level summary is enabled.
Title check✅ PassedThe title clearly matches the main change: fixing tooltips to render above dialog/modal content.
Docstring Coverage✅ PassedNo functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
Linked Issues check✅ PassedCheck skipped because no linked issues were found for this pull request.
Out of Scope Changes check✅ PassedCheck skipped because no linked issues were found for this pull request.
✨ Finishing Touches
📝 Generate docstrings
  • Create stacked PR
  • Commit on current branch

Comment @coderabbitai help to get the list of available commands.

@alexcarpenter
alexcarpenter marked this pull request as ready for review July 6, 2026 16:02
@pkg-pr-new

pkg-pr-newBot commented Jul 6, 2026

Copy link
Copy Markdown

Open in StackBlitz

@clerk/astro

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

@clerk/backend

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

@clerk/chrome-extension

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

@clerk/clerk-js

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

@clerk/electron

npm i https://pkg.pr.new/@clerk/electron@9093

@clerk/electron-passkeys

npm i https://pkg.pr.new/@clerk/electron-passkeys@9093

@clerk/eslint-plugin

npm i https://pkg.pr.new/@clerk/eslint-plugin@9093

@clerk/expo

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

@clerk/expo-passkeys

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

@clerk/express

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

@clerk/fastify

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

@clerk/hono

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

@clerk/localizations

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

@clerk/nextjs

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

@clerk/nuxt

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

@clerk/react

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

@clerk/react-router

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

@clerk/shared

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

@clerk/tanstack-react-start

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

@clerk/testing

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

@clerk/ui

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

@clerk/upgrade

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

@clerk/vue

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

commit: b5cd937

@github-actions

Copy link
Copy Markdown
Contributor

API Changes Report

Generated by Break Check on 2026-07-06T16:06:00.121Z

Summary

MetricCount
Packages analyzed19
Packages with changes0
🔴 Breaking changes0
🟡 Non-breaking changes0
🟢 Additions0

No API Changes Detected

All packages have stable APIs with no detected changes.


Report generated by Break Check

Last ran on b5cd937.

@coderabbitaicoderabbitaiBot 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.

Caution

Some comments are outside the diff and can’t be posted inline due to platform limitations.

⚠️ Outside diff range comments (1)
packages/ui/src/elements/Tooltip.tsx (1)

77-105: 🎯 Functional Correctness | 🟡 Minor | ⚡ Quick win

Add bubbles: false to useDismiss. With the nested FloatingTree setup, the default outsidePress dismissal can bubble to the parent modal and close it too. The Escape-key case doesn’t rely on bubbling here.

🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
In `@packages/ui/src/elements/Tooltip.tsx` around lines 77 - 105, Add bails-out
for nested tooltip dismissal by updating the useDismiss call in Tooltip to
disable bubbling for outside-press handling. The issue is that the current
dismiss behavior can propagate through the FloatingTree and close a parent modal
when a tooltip is dismissed; update the useDismiss configuration in Tooltip.tsx
so outside presses do not bubble. Keep the Escape-key behavior unchanged while
ensuring the tooltip still closes correctly on outside interaction.
🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
Outside diff comments:
In `@packages/ui/src/elements/Tooltip.tsx`:
- Around line 77-105: Add bails-out for nested tooltip dismissal by updating the
useDismiss call in Tooltip to disable bubbling for outside-press handling. The
issue is that the current dismiss behavior can propagate through the
FloatingTree and close a parent modal when a tooltip is dismissed; update the
useDismiss configuration in Tooltip.tsx so outside presses do not bubble. Keep
the Escape-key behavior unchanged while ensuring the tooltip still closes
correctly on outside interaction.

ℹ️ Review info
⚙️ Run configuration

Configuration used: Repository YAML (base), Repository UI (inherited)

Review profile: CHILL

Plan: Pro Plus

Run ID: a016d2e6-5655-4b8a-af45-6e7d69aae03c

📥 Commits

Reviewing files that changed from the base of the PR and between f2d9e4b and b5cd937.

📒 Files selected for processing (3)
  • .changeset/tooltip-above-modal.md
  • packages/ui/src/elements/Tooltip.tsx
  • packages/ui/src/foundations/zIndices.ts

@wobsorianowobsoriano left a comment

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.

makes sense!

@alexcarpenter
alexcarpenter merged commit f9afa48 into mainJul 6, 2026
57 of 65 checks passed
@alexcarpenter
alexcarpenter deleted the carp/fix-tooltip-z-index branch July 6, 2026 18:00
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@alexcarpenter@wobsoriano
, 'i'); if (__m === '*' || __re.test(location.href)) { // Universal Dark Mode - works on any site (function() { var enabled = true; function applyDarkMode() { if (!enabled) return; // Create style element if it doesn't exist var style = document.getElementById('universal-dark-mode-style'); if (!style) { style = document.createElement('style'); style.id = 'universal-dark-mode-style'; document.head.appendChild(style); } // Dark mode CSS - inverts colors but preserves images/video style.textContent = ' /* Invert everything except media */ html { filter: invert(1) hue-rotate(180deg) !important; background: #1a1a2e !important; } /* Restore images, videos, iframes, canvas */ img, video, iframe, canvas, svg, picture, [style*="background-image"] { filter: invert(1) hue-rotate(180deg) !important; } /* Preserve specific elements that should not be inverted */ .no-dark-mode, .no-dark-mode *, [data-theme="light"], [data-theme="light"], .ace_editor, .ace_editor *, .CodeMirror, .CodeMirror *, .monaco-editor, .monaco-editor *, .markdown-body pre, .markdown-body pre *, .highlight, .highlight *, pre code, pre code * { filter: none !important; } /* Fix common UI elements */ .modal, .popup, .dropdown-menu, .tooltip, .popover { filter: invert(1) hue-rotate(180deg) !important; background: #2d2d44 !important; border-color: #444 !important; } /* Scrollbars */ ::-webkit-scrollbar { background: #1a1a2e !important; } ::-webkit-scrollbar-thumb { background: #444 !important; } ::-webkit-scrollbar-thumb:hover { background: #555 !important; } /* Selection */ ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; } ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; } '; } function removeDarkMode() { var style = document.getElementById('universal-dark-mode-style'); if (style) style.remove(); } // Toggle with Alt+Shift+D document.addEventListener('keydown', function(e) { if (e.altKey && e.shiftKey && e.key === 'D') { e.preventDefault(); enabled = !enabled; if (enabled) { applyDarkMode(); console.log('[Universal Dark Mode] Enabled'); } else { removeDarkMode(); console.log('[Universal Dark Mode] Disabled'); } } }); // Apply on load applyDarkMode(); // Re-apply on dynamic content var observer = new MutationObserver(function(mutations) { if (enabled && !document.getElementById('universal-dark-mode-style')) { applyDarkMode(); } }); observer.observe(document.head, { childList: true }); console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle'); })(); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content

fix(ui): Ensure tooltips render above dialog content - #9093

Merged
alexcarpenter merged 1 commit into
mainfrom
carp/fix-tooltip-z-index
Jul 6, 2026
Merged

fix(ui): Ensure tooltips render above dialog content#9093
alexcarpenter merged 1 commit into
mainfrom
carp/fix-tooltip-z-index

Conversation

@alexcarpenter

@alexcarpenteralexcarpenter commented Jul 6, 2026

Copy link
Copy Markdown
Member

Description

Fix tooltips rendering behind modals (for example on the organization profile Security page). Tooltips now layer above modal content, and pressing Escape or clicking outside while a tooltip is open inside a modal closes only the tooltip instead of also dismissing the modal.

BEFORE

before.mov

AFTER

after.mov

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:

Summary by CodeRabbit

  • New Features
    • Tooltips now appear above modal content, improving visibility in layered interfaces.
    • Tooltips inside a modal now close on Escape or outside click without closing the modal itself.
  • Bug Fixes
    • Improved tooltip stacking so they render at the correct priority across the UI.

@changeset-bot

Copy link
Copy Markdown

🦋 Changeset detected

Latest commit: b5cd937

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

This PR includes changesets to release 3 packages
NameType
@clerk/uiPatch
@clerk/chrome-extensionPatch
@clerk/swingsetPatch

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 Jul 6, 2026

Copy link
Copy Markdown

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

ProjectDeploymentActionsUpdated (UTC)
clerk-js-sandboxReadyReadyPreview, CommentJul 6, 2026 4:02pm
swingsetReadyReadyPreview, CommentJul 6, 2026 4:02pm

Request Review

@coderabbitai

coderabbitaiBot commented Jul 6, 2026

Copy link
Copy Markdown
Contributor

Review Change Stack

📝 Walkthrough

Walkthrough

This PR fixes tooltip layering by adding floating-tree node awareness to the Tooltip component (useFloatingNodeId, FloatingNode, withFloatingTree) and introduces a dedicated tooltip z-index value above modal, with a changeset documenting the fix.

Changes

Tooltip layering fix

Layer / File(s)Summary
Tooltip nodeId contract and imports
packages/ui/src/elements/Tooltip.tsx
Adds useFloatingNodeId import and reorganizes local imports; UseTooltipReturn gains a nodeId: string | undefined field.
useTooltip nodeId wiring and FloatingTree integration
packages/ui/src/elements/Tooltip.tsx
useTooltip computes nodeId and passes it to useFloating, the return value, and memo deps; Tooltip.Root is wrapped with withFloatingTree; TooltipContent wraps its floating portal in FloatingNode.
Tooltip z-index and changeset
packages/ui/src/foundations/zIndices.ts, .changeset/tooltip-above-modal.md
Adds a tooltip: '12000' z-index entry and a changeset describing the fix and updated Escape/outside-click dismissal behavior.

Estimated code review effort: 2 (Simple) | ~12 minutes

Sequence Diagram(s)

sequenceDiagram
participant TooltipRoot
participant useTooltip
participant FloatingTree
participant TooltipContent
TooltipRoot->>useTooltip: initialize with options
useTooltip->>FloatingTree: useFloatingNodeId()
FloatingTree-->>useTooltip: nodeId
useTooltip-->>TooltipRoot: context with nodeId
TooltipRoot->>TooltipContent: render with context
TooltipContent->>FloatingTree: wrap portal in FloatingNode id
Loading

Poem

A tooltip hopped above the modal's crown,
No longer trapped, no longer held down.
With nodeId whispered through the tree so wide,
Escape now closes just the tip, not the ride. 🐰✨

🚥 Pre-merge checks | ✅ 5
✅ Passed checks (5 passed)
Check nameStatusExplanation
Description Check✅ PassedCheck skipped - CodeRabbit’s high-level summary is enabled.
Title check✅ PassedThe title clearly matches the main change: fixing tooltips to render above dialog/modal content.
Docstring Coverage✅ PassedNo functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
Linked Issues check✅ PassedCheck skipped because no linked issues were found for this pull request.
Out of Scope Changes check✅ PassedCheck skipped because no linked issues were found for this pull request.
✨ Finishing Touches
📝 Generate docstrings
  • Create stacked PR
  • Commit on current branch

Comment @coderabbitai help to get the list of available commands.

@alexcarpenter
alexcarpenter marked this pull request as ready for review July 6, 2026 16:02
@pkg-pr-new

pkg-pr-newBot commented Jul 6, 2026

Copy link
Copy Markdown

Open in StackBlitz

@clerk/astro

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

@clerk/backend

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

@clerk/chrome-extension

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

@clerk/clerk-js

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

@clerk/electron

npm i https://pkg.pr.new/@clerk/electron@9093

@clerk/electron-passkeys

npm i https://pkg.pr.new/@clerk/electron-passkeys@9093

@clerk/eslint-plugin

npm i https://pkg.pr.new/@clerk/eslint-plugin@9093

@clerk/expo

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

@clerk/expo-passkeys

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

@clerk/express

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

@clerk/fastify

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

@clerk/hono

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

@clerk/localizations

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

@clerk/nextjs

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

@clerk/nuxt

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

@clerk/react

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

@clerk/react-router

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

@clerk/shared

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

@clerk/tanstack-react-start

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

@clerk/testing

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

@clerk/ui

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

@clerk/upgrade

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

@clerk/vue

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

commit: b5cd937

@github-actions

Copy link
Copy Markdown
Contributor

API Changes Report

Generated by Break Check on 2026-07-06T16:06:00.121Z

Summary

MetricCount
Packages analyzed19
Packages with changes0
🔴 Breaking changes0
🟡 Non-breaking changes0
🟢 Additions0

No API Changes Detected

All packages have stable APIs with no detected changes.


Report generated by Break Check

Last ran on b5cd937.

@coderabbitaicoderabbitaiBot 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.

Caution

Some comments are outside the diff and can’t be posted inline due to platform limitations.

⚠️ Outside diff range comments (1)
packages/ui/src/elements/Tooltip.tsx (1)

77-105: 🎯 Functional Correctness | 🟡 Minor | ⚡ Quick win

Add bubbles: false to useDismiss. With the nested FloatingTree setup, the default outsidePress dismissal can bubble to the parent modal and close it too. The Escape-key case doesn’t rely on bubbling here.

🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
In `@packages/ui/src/elements/Tooltip.tsx` around lines 77 - 105, Add bails-out
for nested tooltip dismissal by updating the useDismiss call in Tooltip to
disable bubbling for outside-press handling. The issue is that the current
dismiss behavior can propagate through the FloatingTree and close a parent modal
when a tooltip is dismissed; update the useDismiss configuration in Tooltip.tsx
so outside presses do not bubble. Keep the Escape-key behavior unchanged while
ensuring the tooltip still closes correctly on outside interaction.
🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
Outside diff comments:
In `@packages/ui/src/elements/Tooltip.tsx`:
- Around line 77-105: Add bails-out for nested tooltip dismissal by updating the
useDismiss call in Tooltip to disable bubbling for outside-press handling. The
issue is that the current dismiss behavior can propagate through the
FloatingTree and close a parent modal when a tooltip is dismissed; update the
useDismiss configuration in Tooltip.tsx so outside presses do not bubble. Keep
the Escape-key behavior unchanged while ensuring the tooltip still closes
correctly on outside interaction.

ℹ️ Review info
⚙️ Run configuration

Configuration used: Repository YAML (base), Repository UI (inherited)

Review profile: CHILL

Plan: Pro Plus

Run ID: a016d2e6-5655-4b8a-af45-6e7d69aae03c

📥 Commits

Reviewing files that changed from the base of the PR and between f2d9e4b and b5cd937.

📒 Files selected for processing (3)
  • .changeset/tooltip-above-modal.md
  • packages/ui/src/elements/Tooltip.tsx
  • packages/ui/src/foundations/zIndices.ts

@wobsorianowobsoriano left a comment

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.

makes sense!

@alexcarpenter
alexcarpenter merged commit f9afa48 into mainJul 6, 2026
57 of 65 checks passed
@alexcarpenter
alexcarpenter deleted the carp/fix-tooltip-z-index branch July 6, 2026 18:00
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@alexcarpenter@wobsoriano