Skip to content

fix: Dialog is a labelled modal with a named close button #87

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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rahulnsanand merged 1 commit into from
Sep 27, 2026
Merged

fix: Dialog is a labelled modal with a named close button #87

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
5 changes: 4 additions & 1 deletion packages/luthor/src/core/toolbar.custom-items.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,10 @@ describe("toolbar custom items", () => {

fireEvent.click(screen.getByRole("button", { name: "Web page" }));
expect(onSelect).not.toHaveBeenCalled();
expect(screen.getByText("Embed a web page")).toBeInTheDocument();
// A labelled modal dialog with a named close button.
const dialog = screen.getByRole("dialog", { name: "Embed a web page" });
expect(dialog.getAttribute("aria-modal")).toBe("true");
expect(screen.getByRole("button", { name: "Close" })).toBeInTheDocument();

const submit = screen.getByRole("button", { name: "Embed" }) as HTMLButtonElement;
expect(submit.disabled).toBe(true);
Expand Down
9 changes: 5 additions & 4 deletions packages/luthor/src/core/ui.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* Build freely. Credit kindly.
*/

import { useEffect, useLayoutEffect, useRef, useState, type CSSProperties, type ReactNode } from "react";
import { useEffect, useId, useLayoutEffect, useRef, useState, type CSSProperties, type ReactNode } from "react";
import { createPortal } from "react-dom";
import { ChevronDownIcon, CloseIcon } from "./icons";
import { getOverlayThemeStyleFromElement } from "./overlay-theme";
Expand Down Expand Up @@ -353,6 +353,7 @@ export function Dialog({
children: ReactNode;
}) {
const dialogRef = useRef<HTMLDivElement>(null);
const titleId = useId();

useEffect(() => {
function handleClickOutside(event: MouseEvent) {
Expand Down Expand Up @@ -382,10 +383,10 @@ export function Dialog({

return (
<div className="luthor-dialog-overlay">
<div className="luthor-dialog" ref={dialogRef}>
<div className="luthor-dialog" ref={dialogRef} role="dialog" aria-modal="true" aria-labelledby={titleId}>
<div className="luthor-dialog-header">
<h3 className="luthor-dialog-title">{title}</h3>
<button className="luthor-dialog-close" onClick={onClose} type="button">
<h3 className="luthor-dialog-title" id={titleId}>{title}</h3>
<button className="luthor-dialog-close" onClick={onClose} type="button" aria-label="Close">
<CloseIcon size={16} />
</button>
</div>
Expand Down
Loading