π OpenHands: AI-Driven Development
fix: close skill tag popover before modal on Escape (#17967)
pei7112c0a77065271
diff --git a/.pr/bugs/skill-modal-pill-escape-after.png b/.pr/bugs/skill-modal-pill-escape-after.pngnew file mode 100644index 0000000000..a33778a936Binary files /dev/null and b/.pr/bugs/skill-modal-pill-escape-after.png differdiff --git a/.pr/bugs/skill-modal-pill-escape-before.png b/.pr/bugs/skill-modal-pill-escape-before.pngnew file mode 100644index 0000000000..52154dbee2Binary files /dev/null and b/.pr/bugs/skill-modal-pill-escape-before.png differdiff --git a/__tests__/components/features/skills/skill-card-pill-row.test.tsx b/__tests__/components/features/skills/skill-card-pill-row.test.tsxindex 45862f1a46..4c3ca0e313 100644--- a/__tests__/components/features/skills/skill-card-pill-row.test.tsx+++ b/__tests__/components/features/skills/skill-card-pill-row.test.tsx@@ -60,18 +60,17 @@ describe("SkillCardPillRow", () => {});}+ const eventTriggerText = "pull_request_review_comment.created (github)";+ const modelText = "review-fast";+const pills = [{id: "event-trigger",- node: (- <span className={SKILL_CARD_PILL_CLASS}>- pull_request_review_comment.created (github)- </span>- ),+ node: <span className={SKILL_CARD_PILL_CLASS}>{eventTriggerText}</span>,},{id: "model",- node: <span className={SKILL_CARD_PILL_CLASS}>review-fast</span>,+ node: <span className={SKILL_CARD_PILL_CLASS}>{modelText}</span>,},];@@ -102,10 +101,10 @@ describe("SkillCardPillRow", () => {});expect(screen.getByTestId("skill-triggers-test")).toHaveTextContent(- "pull_request_review_comment.created (github)",+ eventTriggerText,);expect(screen.getByTestId("skill-triggers-test")).not.toHaveTextContent(- "review-fast",+ modelText,);const overflow = screen.getByTestId("skill-triggers-test-overflow");@@ -156,6 +155,53 @@ describe("SkillCardPillRow", () => {expect(onActivate).not.toHaveBeenCalled();});+ it("uses Escape for the overflow popover and keeps card activation scoped", async () => {+ const user = userEvent.setup();+ const onActivate = vi.fn();++ renderWithProviders(+ <div+ role="link"+ tabIndex={0}+ onClick={onActivate}+ onKeyDown={(event) => {+ if (event.key === "Enter" || event.key === " ") onActivate();+ }}+ >+ <SkillCardPillRow testId="skill-triggers-test" pills={pills} />+ </div>,+ );++ stubWidths(130, 80);+ await waitFor(() => {+ expect(+ screen.getByTestId("skill-triggers-test-overflow"),+ ).toBeInTheDocument();+ });++ const trigger = screen.getByTestId("skill-triggers-test-overflow");+ await user.click(trigger);+ await user.keyboard("{Escape}");++ expect(+ screen.queryByTestId("skill-triggers-test-overflow-popover"),+ ).not.toBeInTheDocument();+ expect(onActivate).not.toHaveBeenCalled();++ await user.keyboard("{Enter}");+ expect(+ screen.getByTestId("skill-triggers-test-overflow-popover"),+ ).toBeInTheDocument();+ expect(onActivate).not.toHaveBeenCalled();++ await user.keyboard("{Escape}");+ await user.keyboard(" ");+ expect(+ screen.getByTestId("skill-triggers-test-overflow-popover"),+ ).toBeInTheDocument();+ expect(onActivate).not.toHaveBeenCalled();+ });+it("anchors the overflow popover below the +N pill", async () => {const user = userEvent.setup();renderWithProviders(diff --git a/__tests__/components/features/skills/skill-detail-modal.test.tsx b/__tests__/components/features/skills/skill-detail-modal.test.tsxindex ea5b03ab1a..58c232b504 100644--- a/__tests__/components/features/skills/skill-detail-modal.test.tsx+++ b/__tests__/components/features/skills/skill-detail-modal.test.tsx@@ -107,6 +107,43 @@ describe("SkillDetailModal", () => {expect(onClose).toHaveBeenCalledTimes(1);});+ it("closes the tag popover before closing the detail modal on Escape", async () => {+ const user = userEvent.setup();+ const onClose = vi.fn();+ const skill = buildSkill({+ name: "overflow-test",+ triggers: ["one", "two", "three", "four", "five"],+ });++ render(+ <SkillDetailModal+ skill={skill}+ enabled+ onToggle={vi.fn()}+ onClose={onClose}+ />,+ );++ const trigger = screen.getByTestId(+ `skill-modal-pills-${skill.name}-overflow`,+ );+ await user.click(trigger);+ expect(+ screen.getByTestId(`skill-modal-pills-${skill.name}-overflow-popover`),+ ).toBeInTheDocument();++ await user.keyboard("{Escape}");++ expect(+ screen.queryByTestId(`skill-modal-pills-${skill.name}-overflow-popover`),+ ).not.toBeInTheDocument();+ expect(screen.getByTestId("skill-detail-modal")).toBeInTheDocument();+ expect(onClose).not.toHaveBeenCalled();++ await user.keyboard("{Escape}");+ expect(onClose).toHaveBeenCalledTimes(1);+ });+it("opens a new chat with the add-skill command from the detail modal", async () => {const user = userEvent.setup();const onClose = vi.fn();diff --git a/src/components/features/skills/skill-card-pill-row.tsx b/src/components/features/skills/skill-card-pill-row.tsxindex 410f4b85c7..c502c58e88 100644--- a/src/components/features/skills/skill-card-pill-row.tsx+++ b/src/components/features/skills/skill-card-pill-row.tsx@@ -156,6 +156,9 @@ export function SkillCardPillRow({ pills, testId }: SkillCardPillRowProps) {};const onKeyDown = (event: KeyboardEvent) => {if (event.key === "Escape") {+ // The modal also listens for Escape on window. Keep this key press+ // scoped to the open popover so it does not close both at once.+ event.stopPropagation();setIsOverflowOpen(false);}};@@ -178,6 +181,14 @@ export function SkillCardPillRow({ pills, testId }: SkillCardPillRowProps) {event.stopPropagation();};+ const stopCardActivationForKeyboard = (+ event: React.KeyboardEvent<HTMLButtonElement>,+ ) => {+ if (event.key === "Enter" || event.key === " ") {+ event.stopPropagation();+ }+ };+const activateOverflow = (event: React.MouseEvent<HTMLButtonElement>) => {event.preventDefault();event.stopPropagation();@@ -219,7 +230,7 @@ export function SkillCardPillRow({ pills, testId }: SkillCardPillRowProps) {})}onMouseDown={stopCardActivation}onClick={activateOverflow}- onKeyDown={stopCardActivation}+ onKeyDown={stopCardActivationForKeyboard}className={cn(extensionModuleCardPillClassName,"cursor-pointer font-medium text-tertiary-alt hover:text-contrast",