Repository navigation
fix(desktop): harden Tip tooltip decoration against block-level children #62139
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Closed
alelpoan
wants to merge
2
commits into
NousResearch:main
from
alelpoan:fix/tooltip-decoration-inline-flex
Closed
Changes from 1 commit
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,56 +1,46 @@ | ||
| import { cleanup, fireEvent, render, screen, waitFor } from '@testing-library/react' | ||
| import { cleanup, fireEvent, render, screen } from '@testing-library/react' | ||
| import { afterEach, describe, expect, it } from 'vitest' | ||
|
|
||
| import { Tip } from './tooltip' | ||
| import { Tip, TipHintLabel } from './tooltip' | ||
|
|
||
| describe('Tip', () => { | ||
| describe('TooltipContent', () => { | ||
| afterEach(() => { | ||
| cleanup() | ||
| }) | ||
|
|
||
| it('shows on pointer enter and dismisses on pointer leave', async () => { | ||
| it('forces a block-level label child back to inline-flex so it cannot break the decoration geometry', async () => { | ||
| render( | ||
| <Tip label="Layout editor — ⌘-click resets the layout"> | ||
| <button type="button">layout</button> | ||
| <Tip label={<span className="flex items-center gap-2">broken label</span>}> | ||
| <button type="button">trigger</button> | ||
| </Tip> | ||
| ) | ||
|
|
||
| const trigger = screen.getByRole('button', { name: 'layout' }) | ||
| fireEvent.pointerMove(screen.getByRole('button', { name: 'trigger' }), { pointerType: 'mouse' }) | ||
| await screen.findByRole('tooltip') | ||
|
|
||
| fireEvent.pointerMove(trigger, { pointerType: 'mouse' }) | ||
| expect((await screen.findByRole('tooltip')).textContent).toContain( | ||
| 'Layout editor — ⌘-click resets the layout' | ||
| ) | ||
| const content = document.querySelector<HTMLElement>('[data-slot="tooltip-content"]') | ||
| const decoration = content?.firstElementChild | ||
| const label = decoration?.firstElementChild as HTMLElement | null | undefined | ||
|
|
||
| fireEvent.pointerLeave(trigger) | ||
| await waitFor(() => { | ||
| expect(screen.queryByRole('tooltip')).toBeNull() | ||
| }) | ||
| expect(label).not.toBeNull() | ||
| expect(label && getComputedStyle(label).display).toBe('inline') | ||
| }) | ||
|
|
||
| it('never captures pointer events on the tip surface', async () => { | ||
| it('keeps TipHintLabel inline by default when a hint is present', async () => { | ||
| render( | ||
| <Tip label="Blocked?"> | ||
| <button type="button">target</button> | ||
| <Tip label={<TipHintLabel hint="Ctrl+`" text="PowerShell" />}> | ||
| <button type="button">trigger</button> | ||
| </Tip> | ||
| ) | ||
|
|
||
| fireEvent.pointerMove(screen.getByRole('button', { name: 'target' }), { pointerType: 'mouse' }) | ||
| const tip = await screen.findByRole('tooltip') | ||
| // Role lives on the visually-hidden a11y node; the portaled content root | ||
| // is the data-slot wrapper that must stay click-through. | ||
| const content = tip.closest('[data-slot="tooltip-content"]') ?? tip.parentElement | ||
| expect(content?.className).toMatch(/pointer-events-none/) | ||
| }) | ||
| fireEvent.pointerMove(screen.getByRole('button', { name: 'trigger' }), { pointerType: 'mouse' }) | ||
| await screen.findByRole('tooltip') | ||
|
|
||
| it('renders the child alone when label is empty', () => { | ||
| render( | ||
| <Tip label=""> | ||
| <button type="button">bare</button> | ||
| </Tip> | ||
| ) | ||
| const content = document.querySelector<HTMLElement>('[data-slot="tooltip-content"]') | ||
| const decoration = content?.firstElementChild | ||
| const label = decoration?.firstElementChild | ||
|
|
||
| expect(screen.getByRole('button', { name: 'bare' })).toBeTruthy() | ||
| expect(screen.queryByRole('tooltip')).toBeNull() | ||
| expect(label?.classList.contains('inline-flex')).toBe(true) | ||
| expect(label?.classList.contains('flex')).toBe(false) | ||
| }) | ||
| }) | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This expects
inline, so it can pass without the newinline-flexselector taking effect. Please replace it with coverage that observes the effectiveinline-flexrule (or use a browser-level style test).