Skip to content

fix(web): quote comment box stays in view for long code lines #22126

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.

Sign up for GitHub

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
fixfon wants to merge 1 commit into from
Closed

fix(web): quote comment box stays in view for long code lines #22126

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 22 additions & 0 deletions apps/web/src/components/chat/AssistantCitationChip.browser.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,3 +152,25 @@ describe("citation comment source disappearance", () => {
expect(textarea()).toBeNull();
});
});

describe("citation comment popup placement", () => {
it("opens inside the window when the cited line ends in a code block's horizontal overflow", async () => {
const pre = document.createElement("pre");
pre.style.cssText = "width: 120px; overflow-x: auto; white-space: pre; margin: 0";
pre.textContent = `${"x".repeat(400)}\ny`;
document.body.append(pre);
const range = document.createRange();
range.setStart(pre.firstChild!, 0);
range.setEnd(pre.firstChild!, 401);
sourceAnchor = { source: pre, range, viewport: document.body } as AssistantCitationSourceAnchor;
// The anchor is the selection's last rect: a narrow line-end rect past the window edge.
const rects = range.getClientRects();
expect(rects.item(rects.length - 1)!.left).toBeGreaterThan(window.innerWidth);

await mount();

const popup = document.querySelector('[data-slot="popover-popup"]')!.getBoundingClientRect();
expect(popup.left).toBeGreaterThanOrEqual(0);
expect(popup.right).toBeLessThanOrEqual(window.innerWidth);
});
});
4 changes: 4 additions & 0 deletions apps/web/src/components/chat/AssistantCitationChip.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,10 @@ export function AssistantCitationChip({
{...composerFloatingLayerProps}
side={activeSourceAnchor ? "bottom" : "top"}
align="end"
// The anchor is the quote's last line rect, which can lie past the window edge
// inside a code block's horizontal overflow. Without sticky, Base UI keeps the
// popup attached to that rect instead of shifting it into view.
sticky
anchor={popupAnchor}
initialFocus={() => {
commentInputRef.current?.focus({ preventScroll: true });
Expand Down
3 changes: 3 additions & 0 deletions apps/web/src/components/ui/popover.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ function PopoverPopup({
sideOffset = 4,
alignOffset = 0,
collisionAvoidance,
sticky,
tooltipStyle = false,
keepMounted = false,
anchor,
Expand All @@ -53,6 +54,7 @@ function PopoverPopup({
sideOffset?: PopoverPrimitive.Positioner.Props["sideOffset"];
alignOffset?: PopoverPrimitive.Positioner.Props["alignOffset"];
collisionAvoidance?: PopoverPrimitive.Positioner.Props["collisionAvoidance"];
sticky?: PopoverPrimitive.Positioner.Props["sticky"];
tooltipStyle?: boolean;
keepMounted?: PopoverPrimitive.Portal.Props["keepMounted"];
anchor?: PopoverPrimitive.Positioner.Props["anchor"];
Expand All @@ -78,6 +80,7 @@ function PopoverPopup({
alignOffset={alignOffset}
anchor={anchor}
collisionAvoidance={collisionAvoidance}
sticky={sticky}
collisionPadding={variant === "panel" ? 0 : undefined}
className={cn(
"h-(--positioner-height) w-(--positioner-width) max-w-(--available-width) transition-transform data-instant:transition-none",
Expand Down
Loading