From 435d6e8a68a7bf135bbaa7ea0bd963564a7084fe Mon Sep 17 00:00:00 2001
From: Andreas Schultz <as.c@mailbox.org>
Date: Wed, 4 Nov 2026 14:17:30 +0100
Subject: [PATCH 01/10] Support accessible names for titleless activity error
 reports

- Forward aria-label and aria-labelledby through SilkActivityControl to ActivityExecutionErrorReportModal and its dialog
- Add regression coverage for titleless error reports.
---
 CHANGELOG.md                                  |  5 ++
 ...ActivityExecutionErrorReportModal.test.tsx | 46 +++++++++++++++++++
 .../ActivityExecutionErrorReportModal.tsx     |  6 ++-
 .../ActivityControl/SilkActivityControl.tsx   |  4 +-
 4 files changed, 59 insertions(+), 2 deletions(-)
 create mode 100644 src/cmem/ActivityControl/ActivityExecutionErrorReportModal.test.tsx

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 303eee5d1..c10f18632 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,11 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
 
 ## [Unreleased]
 
+### Added
+
+- `<SilkActivityControl />`, `<ActivityExecutionErrorReportModal />`
+    - support `aria-label` and `aria-labelledby` for naming activity error report dialogs without a visible title
+
 ## [26.2.0] - 2026-10-05
 
 ### Added
diff --git a/src/cmem/ActivityControl/ActivityExecutionErrorReportModal.test.tsx b/src/cmem/ActivityControl/ActivityExecutionErrorReportModal.test.tsx
new file mode 100644
index 000000000..18728771e
--- /dev/null
+++ b/src/cmem/ActivityControl/ActivityExecutionErrorReportModal.test.tsx
@@ -0,0 +1,46 @@
+import React from "react";
+import "@testing-library/jest-dom";
+import { fireEvent, render, screen, waitFor } from "@testing-library/react";
+import { SilkActivityControl, SilkActivityControlProps } from "./SilkActivityControl";
+
+it("forwards the accessible name to a titleless activity error report", async () => {
+    const failureReportAction = {
+        title: "",
+        "aria-label": "Activity execution error report",
+        renderReport: () => <p>Error details</p>,
+        renderMarkdown: true,
+        fetchErrorReport: async () => "Error details",
+        downloadButtonValue: "Download",
+        closeButtonValue: "Close",
+    };
+    const props: SilkActivityControlProps = {
+        label: "Execution",
+        initialStatus: {
+            activity: "execute",
+            activityLabel: "Execution",
+            isRunning: false,
+            failed: true,
+            statusName: "Finished",
+            progress: 100,
+            lastUpdateTime: 0,
+            message: "Failed",
+            cancelled: false,
+            concreteStatus: "Failed",
+        },
+        registerForUpdates: jest.fn(),
+        unregisterFromUpdates: jest.fn(),
+        showStartAction: false,
+        showStopAction: false,
+        showReloadAction: false,
+        executeActivityAction: jest.fn(),
+        translate: (key) => key,
+        failureReportAction,
+    };
+    render(<SilkActivityControl {...props} />);
+    fireEvent.click(screen.getByRole("button"));
+    const dialog = await screen.findByRole("dialog", { name: "Activity execution error report" });
+    expect(dialog).toHaveAttribute("aria-modal", "true");
+    expect(dialog.querySelector(".eccgui-card__title")).toBeEmptyDOMElement();
+    fireEvent.click(screen.getByRole("button", { name: "Close" }));
+    await waitFor(() => expect(screen.queryByRole("dialog")).not.toBeInTheDocument());
+});
diff --git a/src/cmem/ActivityControl/ActivityExecutionErrorReportModal.tsx b/src/cmem/ActivityControl/ActivityExecutionErrorReportModal.tsx
index be2e7a932..879812c3d 100644
--- a/src/cmem/ActivityControl/ActivityExecutionErrorReportModal.tsx
+++ b/src/cmem/ActivityControl/ActivityExecutionErrorReportModal.tsx
@@ -5,7 +5,7 @@ import SimpleDialog from "../../components/Dialog/SimpleDialog";
 import IconButton from "../../components/Icon/IconButton";
 import HtmlContentBlock from "../../components/Typography/HtmlContentBlock";
 
-interface ActivityExecutionErrorReportModalProps {
+interface ActivityExecutionErrorReportModalProps extends Pick<React.AriaAttributes, "aria-label" | "aria-labelledby"> {
     // Title of the modal
     title?: string;
     // Called when the close button is clicked
@@ -23,6 +23,8 @@ interface ActivityExecutionErrorReportModalProps {
 /** Shows the execution error report to the user and offers to download the report. */
 export const ActivityExecutionErrorReportModal = ({
     title,
+    "aria-label": ariaLabel,
+    "aria-labelledby": ariaLabelledby,
     onDiscard,
     report,
     downloadButtonValue,
@@ -51,6 +53,8 @@ export const ActivityExecutionErrorReportModal = ({
     return (
         <SimpleDialog
             title={title}
+            aria-label={ariaLabel}
+            aria-labelledby={ariaLabelledby}
             isOpen={true}
             size={displayFullscreen ? "fullscreen" : "large"}
             onClose={onDiscard}
diff --git a/src/cmem/ActivityControl/SilkActivityControl.tsx b/src/cmem/ActivityControl/SilkActivityControl.tsx
index 3f9e54ce0..c66d3df29 100644
--- a/src/cmem/ActivityControl/SilkActivityControl.tsx
+++ b/src/cmem/ActivityControl/SilkActivityControl.tsx
@@ -90,7 +90,7 @@ const defaultLayout: SilkActivityControlLayoutProps = {
     visualization: "spinner",
 };
 
-interface IErrorReportAction {
+interface IErrorReportAction extends Pick<React.AriaAttributes, "aria-label" | "aria-labelledby"> {
     // The title of the error report modal
     title?: string;
     // The element that will be rendered in the modal, either as Markdown or object
@@ -362,6 +362,8 @@ export function useSilkActivityControl({
             {errorReport && failureReportAction && (
                 <ActivityExecutionErrorReportModal
                     title={failureReportAction.title}
+                    aria-label={failureReportAction["aria-label"]}
+                    aria-labelledby={failureReportAction["aria-labelledby"]}
                     key={"error-report-modal"}
                     closeButtonValue={failureReportAction.closeButtonValue}
                     downloadButtonValue={failureReportAction.downloadButtonValue}

From 965caf82a6395c3e3b747bce7f2e361f50e8b2f3 Mon Sep 17 00:00:00 2001
From: Michael Haschke <michael.haschke@eccenca.com>
Date: Thu, 5 Nov 2026 16:19:31 +0100
Subject: [PATCH 02/10] fetch Attributes from Modal, so they have descriptions
 in the storybook docs/ide, incl the note to be enforced at a later major

---
 src/cmem/ActivityControl/ActivityExecutionErrorReportModal.tsx | 3 ++-
 src/cmem/ActivityControl/SilkActivityControl.tsx               | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/cmem/ActivityControl/ActivityExecutionErrorReportModal.tsx b/src/cmem/ActivityControl/ActivityExecutionErrorReportModal.tsx
index 879812c3d..943950cdb 100644
--- a/src/cmem/ActivityControl/ActivityExecutionErrorReportModal.tsx
+++ b/src/cmem/ActivityControl/ActivityExecutionErrorReportModal.tsx
@@ -1,11 +1,12 @@
 import React, { useState } from "react";
 
 import Button from "../../components/Button/Button";
+import { ModalProps } from "../../components/Dialog/Modal";
 import SimpleDialog from "../../components/Dialog/SimpleDialog";
 import IconButton from "../../components/Icon/IconButton";
 import HtmlContentBlock from "../../components/Typography/HtmlContentBlock";
 
-interface ActivityExecutionErrorReportModalProps extends Pick<React.AriaAttributes, "aria-label" | "aria-labelledby"> {
+interface ActivityExecutionErrorReportModalProps extends Pick<ModalProps, "aria-label" | "aria-labelledby"> {
     // Title of the modal
     title?: string;
     // Called when the close button is clicked
diff --git a/src/cmem/ActivityControl/SilkActivityControl.tsx b/src/cmem/ActivityControl/SilkActivityControl.tsx
index c66d3df29..a9d414342 100644
--- a/src/cmem/ActivityControl/SilkActivityControl.tsx
+++ b/src/cmem/ActivityControl/SilkActivityControl.tsx
@@ -3,6 +3,7 @@ import { Intent } from "@blueprintjs/core/src/common/intent";
 
 import { Icon, Spacing } from "../../";
 import { IntentTypes } from "../../common/Intent";
+import { ModalProps } from "../../components/Dialog/Modal";
 import { TestableComponent } from "../../components/interfaces";
 import { ElapsedDateTimeDisplay, ElapsedDateTimeDisplayUnits } from "../DateTimeDisplay/ElapsedDateTimeDisplay";
 
@@ -90,7 +91,7 @@ const defaultLayout: SilkActivityControlLayoutProps = {
     visualization: "spinner",
 };
 
-interface IErrorReportAction extends Pick<React.AriaAttributes, "aria-label" | "aria-labelledby"> {
+interface IErrorReportAction extends Pick<ModalProps, "aria-label" | "aria-labelledby"> {
     // The title of the error report modal
     title?: string;
     // The element that will be rendered in the modal, either as Markdown or object

From 7d059ea3e850442a4fd7db72fc131efef8eb8668 Mon Sep 17 00:00:00 2001
From: Michael Haschke <michael.haschke@eccenca.com>
Date: Thu, 5 Nov 2026 16:28:23 +0100
Subject: [PATCH 03/10] Remove dulicated functionality and add a label to the
 button

---
 .../ActivityExecutionErrorReportModal.tsx           | 13 +++----------
 src/components/Dialog/SimpleDialog.tsx              |  2 ++
 src/components/Dialog/tests/SimpleDialog.test.tsx   |  7 +++++++
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/cmem/ActivityControl/ActivityExecutionErrorReportModal.tsx b/src/cmem/ActivityControl/ActivityExecutionErrorReportModal.tsx
index 943950cdb..fe48ad49e 100644
--- a/src/cmem/ActivityControl/ActivityExecutionErrorReportModal.tsx
+++ b/src/cmem/ActivityControl/ActivityExecutionErrorReportModal.tsx
@@ -1,9 +1,8 @@
-import React, { useState } from "react";
+import React from "react";
 
 import Button from "../../components/Button/Button";
 import { ModalProps } from "../../components/Dialog/Modal";
 import SimpleDialog from "../../components/Dialog/SimpleDialog";
-import IconButton from "../../components/Icon/IconButton";
 import HtmlContentBlock from "../../components/Typography/HtmlContentBlock";
 
 interface ActivityExecutionErrorReportModalProps extends Pick<ModalProps, "aria-label" | "aria-labelledby"> {
@@ -32,7 +31,6 @@ export const ActivityExecutionErrorReportModal = ({
     closeButtonValue,
     fetchErrorReport,
 }: ActivityExecutionErrorReportModalProps) => {
-    const [displayFullscreen, setDisplayFullscreen] = useState<boolean>(false);
     const fileName =
         "Activity execution report from " +
         new Date().toISOString().replace(/T/, " ").replace(/:/g, "-").substr(0, 19) +
@@ -57,14 +55,9 @@ export const ActivityExecutionErrorReportModal = ({
             aria-label={ariaLabel}
             aria-labelledby={ariaLabelledby}
             isOpen={true}
-            size={displayFullscreen ? "fullscreen" : "large"}
+            size="large"
+            showFullScreenToggler
             onClose={onDiscard}
-            headerOptions={
-                <IconButton
-                    name={displayFullscreen ? "toggler-minimize" : "toggler-maximize"}
-                    onClick={() => setDisplayFullscreen(!displayFullscreen)}
-                />
-            }
             actions={[
                 <Button data-test-id={"error-report-download-btn"} affirmative onClick={handleDownload} key="download">
                     {downloadButtonValue}
diff --git a/src/components/Dialog/SimpleDialog.tsx b/src/components/Dialog/SimpleDialog.tsx
index c118c2377..879bb0925 100644
--- a/src/components/Dialog/SimpleDialog.tsx
+++ b/src/components/Dialog/SimpleDialog.tsx
@@ -80,6 +80,7 @@ export const SimpleDialog = ({
     const dialogUniqueId = React.useId().replace(/[^a-zA-Z0-9_-]/g, "");
     const [displayFullscreen, setDisplayFullscreen] = React.useState<boolean>(startInFullScreenMode);
     const showToggler = startInFullScreenMode || showFullScreenToggler;
+    const togglerText = displayFullscreen ? "Exit full screen" : "Show in full screen";
     const intentClassName = intent ? `${eccgui}-intent--${intent}` : "";
     const wrapperDivProps = {
         ...modalPreventEvents,
@@ -116,6 +117,7 @@ export const SimpleDialog = ({
                                 {showToggler && (
                                     <IconButton
                                         name={displayFullscreen ? "toggler-minimize" : "toggler-maximize"}
+                                        text={togglerText}
                                         onClick={() => setDisplayFullscreen(!displayFullscreen)}
                                     />
                                 )}
diff --git a/src/components/Dialog/tests/SimpleDialog.test.tsx b/src/components/Dialog/tests/SimpleDialog.test.tsx
index f75d800d4..40def616b 100644
--- a/src/components/Dialog/tests/SimpleDialog.test.tsx
+++ b/src/components/Dialog/tests/SimpleDialog.test.tsx
@@ -217,6 +217,13 @@ describe("SimpleDialog", () => {
             fireEvent.click(toggler);
             expect(dialog).toHaveClass(`${dialogWrapper}--small`);
         });
+        it("should give the toggler an accessible name that reflects its state", () => {
+            const { toggler } = renderDialog({ showFullScreenToggler: true });
+            expect(toggler).toHaveAccessibleName("Show in full screen");
+
+            fireEvent.click(toggler);
+            expect(toggler).toHaveAccessibleName("Exit full screen");
+        });
         it("should start in full screen mode and enable the toggler", () => {
             const { dialog, toggler } = renderDialog({ startInFullScreenMode: true, size: "small" });
             expect(dialog).toHaveClass(`${dialogWrapper}--fullscreen`);

From b6e4c3c9fb62bf3c5aad28689b47b3a62bcdcfc8 Mon Sep 17 00:00:00 2001
From: Michael Haschke <michael.haschke@eccenca.com>
Date: Thu, 5 Nov 2026 16:35:52 +0100
Subject: [PATCH 04/10] improve property description

---
 .../ActivityControl/ActivityExecutionErrorReportModal.tsx  | 7 ++++++-
 src/cmem/ActivityControl/SilkActivityControl.tsx           | 7 ++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/cmem/ActivityControl/ActivityExecutionErrorReportModal.tsx b/src/cmem/ActivityControl/ActivityExecutionErrorReportModal.tsx
index fe48ad49e..ff8cda1a6 100644
--- a/src/cmem/ActivityControl/ActivityExecutionErrorReportModal.tsx
+++ b/src/cmem/ActivityControl/ActivityExecutionErrorReportModal.tsx
@@ -6,7 +6,12 @@ import SimpleDialog from "../../components/Dialog/SimpleDialog";
 import HtmlContentBlock from "../../components/Typography/HtmlContentBlock";
 
 interface ActivityExecutionErrorReportModalProps extends Pick<ModalProps, "aria-label" | "aria-labelledby"> {
-    // Title of the modal
+    /**
+     * Title of the modal.
+     * If set, it is used as the accessible name of the dialog via `aria-labelledby`
+     * (unless `aria-labelledby` is given explicitly), so `aria-label` is ignored.
+     * Use `aria-label` only for modals without title.
+     */
     title?: string;
     // Called when the close button is clicked
     onDiscard: () => any;
diff --git a/src/cmem/ActivityControl/SilkActivityControl.tsx b/src/cmem/ActivityControl/SilkActivityControl.tsx
index a9d414342..b752dc8de 100644
--- a/src/cmem/ActivityControl/SilkActivityControl.tsx
+++ b/src/cmem/ActivityControl/SilkActivityControl.tsx
@@ -92,7 +92,12 @@ const defaultLayout: SilkActivityControlLayoutProps = {
 };
 
 interface IErrorReportAction extends Pick<ModalProps, "aria-label" | "aria-labelledby"> {
-    // The title of the error report modal
+    /**
+     * The title of the error report modal.
+     * If set, it is used as the accessible name of the dialog via `aria-labelledby`
+     * (unless `aria-labelledby` is given explicitly), so `aria-label` is ignored.
+     * Use `aria-label` only for modals without title.
+     */
     title?: string;
     // The element that will be rendered in the modal, either as Markdown or object
     renderReport: (report: string | SilkActivityExecutionReportProps) => React.JSX.Element;

From 02303c474a78f24bd736cd9d15417ca6face0e5c Mon Sep 17 00:00:00 2001
From: Michael Haschke <michael.haschke@eccenca.com>
Date: Thu, 5 Nov 2026 16:47:52 +0100
Subject: [PATCH 05/10] improve tests

---
 ...ActivityExecutionErrorReportModal.test.tsx | 46 ----------
 .../tests/SilkActivityControl.test.tsx        | 84 +++++++++++++++++++
 2 files changed, 84 insertions(+), 46 deletions(-)
 delete mode 100644 src/cmem/ActivityControl/ActivityExecutionErrorReportModal.test.tsx
 create mode 100644 src/cmem/ActivityControl/tests/SilkActivityControl.test.tsx

diff --git a/src/cmem/ActivityControl/ActivityExecutionErrorReportModal.test.tsx b/src/cmem/ActivityControl/ActivityExecutionErrorReportModal.test.tsx
deleted file mode 100644
index 18728771e..000000000
--- a/src/cmem/ActivityControl/ActivityExecutionErrorReportModal.test.tsx
+++ /dev/null
@@ -1,46 +0,0 @@
-import React from "react";
-import "@testing-library/jest-dom";
-import { fireEvent, render, screen, waitFor } from "@testing-library/react";
-import { SilkActivityControl, SilkActivityControlProps } from "./SilkActivityControl";
-
-it("forwards the accessible name to a titleless activity error report", async () => {
-    const failureReportAction = {
-        title: "",
-        "aria-label": "Activity execution error report",
-        renderReport: () => <p>Error details</p>,
-        renderMarkdown: true,
-        fetchErrorReport: async () => "Error details",
-        downloadButtonValue: "Download",
-        closeButtonValue: "Close",
-    };
-    const props: SilkActivityControlProps = {
-        label: "Execution",
-        initialStatus: {
-            activity: "execute",
-            activityLabel: "Execution",
-            isRunning: false,
-            failed: true,
-            statusName: "Finished",
-            progress: 100,
-            lastUpdateTime: 0,
-            message: "Failed",
-            cancelled: false,
-            concreteStatus: "Failed",
-        },
-        registerForUpdates: jest.fn(),
-        unregisterFromUpdates: jest.fn(),
-        showStartAction: false,
-        showStopAction: false,
-        showReloadAction: false,
-        executeActivityAction: jest.fn(),
-        translate: (key) => key,
-        failureReportAction,
-    };
-    render(<SilkActivityControl {...props} />);
-    fireEvent.click(screen.getByRole("button"));
-    const dialog = await screen.findByRole("dialog", { name: "Activity execution error report" });
-    expect(dialog).toHaveAttribute("aria-modal", "true");
-    expect(dialog.querySelector(".eccgui-card__title")).toBeEmptyDOMElement();
-    fireEvent.click(screen.getByRole("button", { name: "Close" }));
-    await waitFor(() => expect(screen.queryByRole("dialog")).not.toBeInTheDocument());
-});
diff --git a/src/cmem/ActivityControl/tests/SilkActivityControl.test.tsx b/src/cmem/ActivityControl/tests/SilkActivityControl.test.tsx
new file mode 100644
index 000000000..8b2596588
--- /dev/null
+++ b/src/cmem/ActivityControl/tests/SilkActivityControl.test.tsx
@@ -0,0 +1,84 @@
+import React from "react";
+import { fireEvent, render, screen, waitFor } from "@testing-library/react";
+
+import "@testing-library/jest-dom";
+
+import { SilkActivityControl, SilkActivityControlProps } from "../SilkActivityControl";
+
+type FailureReportAction = NonNullable<SilkActivityControlProps["failureReportAction"]>;
+
+const renderFailedActivity = (
+    failureReportAction: Partial<FailureReportAction>,
+    additionalContent?: React.ReactNode,
+) => {
+    const props: SilkActivityControlProps = {
+        label: "Execution",
+        initialStatus: {
+            activity: "execute",
+            activityLabel: "Execution",
+            isRunning: false,
+            failed: true,
+            statusName: "Finished",
+            progress: 100,
+            lastUpdateTime: 0,
+            message: "Failed",
+            cancelled: false,
+            concreteStatus: "Failed",
+        },
+        registerForUpdates: jest.fn(),
+        unregisterFromUpdates: jest.fn(),
+        showStartAction: false,
+        showStopAction: false,
+        showReloadAction: false,
+        executeActivityAction: jest.fn(),
+        translate: (key) => key,
+        failureReportAction: {
+            renderReport: () => <p>Error details</p>,
+            renderMarkdown: true,
+            fetchErrorReport: async () => "Error details",
+            downloadButtonValue: "Download",
+            closeButtonValue: "Close",
+            ...failureReportAction,
+        },
+    };
+    const utils = render(
+        <>
+            {additionalContent}
+            <SilkActivityControl {...props} />
+        </>,
+    );
+    const openErrorReport = () =>
+        fireEvent.click(utils.container.querySelector("[data-test-id='activity-show-error-report']") as HTMLElement);
+    return { ...utils, openErrorReport };
+};
+
+describe("SilkActivityControl error report", () => {
+    it("uses the title as accessible name of the error report dialog", async () => {
+        const { openErrorReport } = renderFailedActivity({ title: "Error report" });
+        openErrorReport();
+        expect(await screen.findByRole("dialog", { name: "Error report" })).toHaveAttribute("aria-modal", "true");
+    });
+
+    it("forwards `aria-label` to a titleless error report dialog", async () => {
+        const { openErrorReport } = renderFailedActivity({
+            title: "",
+            "aria-label": "Activity execution error report",
+        });
+        openErrorReport();
+        const dialog = await screen.findByRole("dialog", { name: "Activity execution error report" });
+        expect(dialog).toHaveAttribute("aria-modal", "true");
+
+        fireEvent.click(screen.getByRole("button", { name: "Close" }));
+        await waitFor(() => expect(screen.queryByRole("dialog")).not.toBeInTheDocument());
+    });
+
+    it("forwards `aria-labelledby` to a titleless error report dialog", async () => {
+        const { openErrorReport } = renderFailedActivity(
+            { "aria-labelledby": "external-report-label" },
+            <span id="external-report-label">Referenced error report label</span>,
+        );
+        openErrorReport();
+        const dialog = await screen.findByRole("dialog", { name: "Referenced error report label" });
+        expect(dialog).toHaveAttribute("aria-labelledby", "external-report-label");
+    });
+});

From cebbd3e849b792de063df2030c7f49960fb6d88c Mon Sep 17 00:00:00 2001
From: Michael Haschke <michael.haschke@eccenca.com>
Date: Thu, 5 Nov 2026 16:59:23 +0100
Subject: [PATCH 06/10] add fallback for aria-label if nothing else is given

---
 .../ActivityExecutionErrorReportModal.tsx     |  3 ++-
 .../ActivityControl/SilkActivityControl.tsx   |  8 +++++-
 .../tests/SilkActivityControl.test.tsx        | 25 +++++++++++++++++++
 3 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/src/cmem/ActivityControl/ActivityExecutionErrorReportModal.tsx b/src/cmem/ActivityControl/ActivityExecutionErrorReportModal.tsx
index ff8cda1a6..bc00e2c08 100644
--- a/src/cmem/ActivityControl/ActivityExecutionErrorReportModal.tsx
+++ b/src/cmem/ActivityControl/ActivityExecutionErrorReportModal.tsx
@@ -11,6 +11,7 @@ interface ActivityExecutionErrorReportModalProps extends Pick<ModalProps, "aria-
      * If set, it is used as the accessible name of the dialog via `aria-labelledby`
      * (unless `aria-labelledby` is given explicitly), so `aria-label` is ignored.
      * Use `aria-label` only for modals without title.
+     * If neither `title`, `aria-label` nor `aria-labelledby` is set, then "Activity execution error report" is used as `aria-label`.
      */
     title?: string;
     // Called when the close button is clicked
@@ -57,7 +58,7 @@ export const ActivityExecutionErrorReportModal = ({
     return (
         <SimpleDialog
             title={title}
-            aria-label={ariaLabel}
+            aria-label={ariaLabel ?? (!title && !ariaLabelledby ? "Activity execution error report" : undefined)}
             aria-labelledby={ariaLabelledby}
             isOpen={true}
             size="large"
diff --git a/src/cmem/ActivityControl/SilkActivityControl.tsx b/src/cmem/ActivityControl/SilkActivityControl.tsx
index b752dc8de..179157f89 100644
--- a/src/cmem/ActivityControl/SilkActivityControl.tsx
+++ b/src/cmem/ActivityControl/SilkActivityControl.tsx
@@ -97,6 +97,7 @@ interface IErrorReportAction extends Pick<ModalProps, "aria-label" | "aria-label
      * If set, it is used as the accessible name of the dialog via `aria-labelledby`
      * (unless `aria-labelledby` is given explicitly), so `aria-label` is ignored.
      * Use `aria-label` only for modals without title.
+     * If neither `title`, `aria-label` nor `aria-labelledby` is set, then `translate("showErrorReport")` is used as `aria-label`.
      */
     title?: string;
     // The element that will be rendered in the modal, either as Markdown or object
@@ -368,7 +369,12 @@ export function useSilkActivityControl({
             {errorReport && failureReportAction && (
                 <ActivityExecutionErrorReportModal
                     title={failureReportAction.title}
-                    aria-label={failureReportAction["aria-label"]}
+                    aria-label={
+                        failureReportAction["aria-label"] ??
+                        (!failureReportAction.title && !failureReportAction["aria-labelledby"]
+                            ? translate("showErrorReport")
+                            : undefined)
+                    }
                     aria-labelledby={failureReportAction["aria-labelledby"]}
                     key={"error-report-modal"}
                     closeButtonValue={failureReportAction.closeButtonValue}
diff --git a/src/cmem/ActivityControl/tests/SilkActivityControl.test.tsx b/src/cmem/ActivityControl/tests/SilkActivityControl.test.tsx
index 8b2596588..8d29c63a6 100644
--- a/src/cmem/ActivityControl/tests/SilkActivityControl.test.tsx
+++ b/src/cmem/ActivityControl/tests/SilkActivityControl.test.tsx
@@ -3,6 +3,7 @@ import { fireEvent, render, screen, waitFor } from "@testing-library/react";
 
 import "@testing-library/jest-dom";
 
+import { ActivityExecutionErrorReportModal } from "../ActivityExecutionErrorReportModal";
 import { SilkActivityControl, SilkActivityControlProps } from "../SilkActivityControl";
 
 type FailureReportAction = NonNullable<SilkActivityControlProps["failureReportAction"]>;
@@ -72,6 +73,15 @@ describe("SilkActivityControl error report", () => {
         await waitFor(() => expect(screen.queryByRole("dialog")).not.toBeInTheDocument());
     });
 
+    it("uses the translated `showErrorReport` text as fallback name for a titleless error report dialog", async () => {
+        const warnSpy = jest.spyOn(console, "warn").mockImplementation(() => undefined);
+        const { openErrorReport } = renderFailedActivity({ title: "" });
+        openErrorReport();
+        expect(await screen.findByRole("dialog", { name: "showErrorReport" })).toHaveAttribute("aria-modal", "true");
+        expect(warnSpy).not.toHaveBeenCalled();
+        warnSpy.mockRestore();
+    });
+
     it("forwards `aria-labelledby` to a titleless error report dialog", async () => {
         const { openErrorReport } = renderFailedActivity(
             { "aria-labelledby": "external-report-label" },
@@ -82,3 +92,18 @@ describe("SilkActivityControl error report", () => {
         expect(dialog).toHaveAttribute("aria-labelledby", "external-report-label");
     });
 });
+
+describe("ActivityExecutionErrorReportModal", () => {
+    it("uses an english fallback name if neither title nor aria attributes are given", () => {
+        render(
+            <ActivityExecutionErrorReportModal
+                onDiscard={jest.fn()}
+                report={<p>Error details</p>}
+                downloadButtonValue="Download"
+                closeButtonValue="Close"
+                fetchErrorReport={async () => "Error details"}
+            />,
+        );
+        expect(screen.getByRole("dialog", { name: "Activity execution error report" })).toBeInTheDocument();
+    });
+});

From da446da1ca055e15c7416c452711c7819f9d337b Mon Sep 17 00:00:00 2001
From: Michael Haschke <michael.haschke@eccenca.com>
Date: Thu, 5 Nov 2026 17:18:10 +0100
Subject: [PATCH 07/10] add option to translate fullscreen toggler

---
 .../ActivityExecutionErrorReportModal.tsx         | 10 +++++++---
 src/cmem/ActivityControl/SilkActivityControl.tsx  |  8 ++++++--
 .../tests/SilkActivityControl.test.tsx            | 15 ++++++++++++++-
 src/components/Dialog/SimpleDialog.tsx            | 15 ++++++++++++++-
 src/components/Dialog/tests/SimpleDialog.test.tsx | 10 ++++++++++
 5 files changed, 51 insertions(+), 7 deletions(-)

diff --git a/src/cmem/ActivityControl/ActivityExecutionErrorReportModal.tsx b/src/cmem/ActivityControl/ActivityExecutionErrorReportModal.tsx
index bc00e2c08..5f9ae0966 100644
--- a/src/cmem/ActivityControl/ActivityExecutionErrorReportModal.tsx
+++ b/src/cmem/ActivityControl/ActivityExecutionErrorReportModal.tsx
@@ -1,11 +1,13 @@
 import React from "react";
 
 import Button from "../../components/Button/Button";
-import { ModalProps } from "../../components/Dialog/Modal";
-import SimpleDialog from "../../components/Dialog/SimpleDialog";
+import SimpleDialog, { SimpleDialogProps } from "../../components/Dialog/SimpleDialog";
 import HtmlContentBlock from "../../components/Typography/HtmlContentBlock";
 
-interface ActivityExecutionErrorReportModalProps extends Pick<ModalProps, "aria-label" | "aria-labelledby"> {
+interface ActivityExecutionErrorReportModalProps extends Pick<
+    SimpleDialogProps,
+    "aria-label" | "aria-labelledby" | "fullScreenTogglerTexts"
+> {
     /**
      * Title of the modal.
      * If set, it is used as the accessible name of the dialog via `aria-labelledby`
@@ -35,6 +37,7 @@ export const ActivityExecutionErrorReportModal = ({
     report,
     downloadButtonValue,
     closeButtonValue,
+    fullScreenTogglerTexts,
     fetchErrorReport,
 }: ActivityExecutionErrorReportModalProps) => {
     const fileName =
@@ -63,6 +66,7 @@ export const ActivityExecutionErrorReportModal = ({
             isOpen={true}
             size="large"
             showFullScreenToggler
+            fullScreenTogglerTexts={fullScreenTogglerTexts}
             onClose={onDiscard}
             actions={[
                 <Button data-test-id={"error-report-download-btn"} affirmative onClick={handleDownload} key="download">
diff --git a/src/cmem/ActivityControl/SilkActivityControl.tsx b/src/cmem/ActivityControl/SilkActivityControl.tsx
index 179157f89..6776460c2 100644
--- a/src/cmem/ActivityControl/SilkActivityControl.tsx
+++ b/src/cmem/ActivityControl/SilkActivityControl.tsx
@@ -3,7 +3,7 @@ import { Intent } from "@blueprintjs/core/src/common/intent";
 
 import { Icon, Spacing } from "../../";
 import { IntentTypes } from "../../common/Intent";
-import { ModalProps } from "../../components/Dialog/Modal";
+import { SimpleDialogProps } from "../../components/Dialog/SimpleDialog";
 import { TestableComponent } from "../../components/interfaces";
 import { ElapsedDateTimeDisplay, ElapsedDateTimeDisplayUnits } from "../DateTimeDisplay/ElapsedDateTimeDisplay";
 
@@ -91,7 +91,10 @@ const defaultLayout: SilkActivityControlLayoutProps = {
     visualization: "spinner",
 };
 
-interface IErrorReportAction extends Pick<ModalProps, "aria-label" | "aria-labelledby"> {
+interface IErrorReportAction extends Pick<
+    SimpleDialogProps,
+    "aria-label" | "aria-labelledby" | "fullScreenTogglerTexts"
+> {
     /**
      * The title of the error report modal.
      * If set, it is used as the accessible name of the dialog via `aria-labelledby`
@@ -379,6 +382,7 @@ export function useSilkActivityControl({
                     key={"error-report-modal"}
                     closeButtonValue={failureReportAction.closeButtonValue}
                     downloadButtonValue={failureReportAction.downloadButtonValue}
+                    fullScreenTogglerTexts={failureReportAction.fullScreenTogglerTexts}
                     fetchErrorReport={async () => {
                         return (await failureReportAction.fetchErrorReport(true)) as string | undefined;
                     }}
diff --git a/src/cmem/ActivityControl/tests/SilkActivityControl.test.tsx b/src/cmem/ActivityControl/tests/SilkActivityControl.test.tsx
index 8d29c63a6..2f36330b8 100644
--- a/src/cmem/ActivityControl/tests/SilkActivityControl.test.tsx
+++ b/src/cmem/ActivityControl/tests/SilkActivityControl.test.tsx
@@ -1,5 +1,5 @@
 import React from "react";
-import { fireEvent, render, screen, waitFor } from "@testing-library/react";
+import { fireEvent, render, screen, waitFor, within } from "@testing-library/react";
 
 import "@testing-library/jest-dom";
 
@@ -82,6 +82,19 @@ describe("SilkActivityControl error report", () => {
         warnSpy.mockRestore();
     });
 
+    it("forwards the full screen toggler texts to the error report dialog", async () => {
+        const { openErrorReport } = renderFailedActivity({
+            title: "Error report",
+            fullScreenTogglerTexts: { maximize: "Vollbild anzeigen", minimize: "Vollbild verlassen" },
+        });
+        openErrorReport();
+        const dialog = await screen.findByRole("dialog", { name: "Error report" });
+        const toggler = within(dialog).getByRole("button", { name: "Vollbild anzeigen" });
+
+        fireEvent.click(toggler);
+        expect(toggler).toHaveAccessibleName("Vollbild verlassen");
+    });
+
     it("forwards `aria-labelledby` to a titleless error report dialog", async () => {
         const { openErrorReport } = renderFailedActivity(
             { "aria-labelledby": "external-report-label" },
diff --git a/src/components/Dialog/SimpleDialog.tsx b/src/components/Dialog/SimpleDialog.tsx
index 879bb0925..4c0cdd997 100644
--- a/src/components/Dialog/SimpleDialog.tsx
+++ b/src/components/Dialog/SimpleDialog.tsx
@@ -45,6 +45,15 @@ export interface SimpleDialogProps extends ModalProps, TestableComponent {
     showFullScreenToggler?: boolean;
     /** Starts the modal in full screen mode. The show full screen toggler will be automatically enabled. */
     startInFullScreenMode?: boolean;
+    /**
+     * Texts for the full screen toggler, used as tooltip and accessible name of the button.
+     * `maximize` is shown while the dialog is in its normal size, `minimize` while it is in full screen mode.
+     * Defaults to "Show in full screen" and "Exit full screen".
+     */
+    fullScreenTogglerTexts?: {
+        maximize?: string;
+        minimize?: string;
+    };
     /** Forward properties to the actions footer component. */
     actionsProps?: Omit<CardActionsProps, "inverseDirection">;
 }
@@ -69,6 +78,7 @@ export const SimpleDialog = ({
     headerOptions,
     showFullScreenToggler = false,
     startInFullScreenMode = false,
+    fullScreenTogglerTexts,
     size,
     role,
     "aria-labelledby": ariaLabelledby,
@@ -80,7 +90,9 @@ export const SimpleDialog = ({
     const dialogUniqueId = React.useId().replace(/[^a-zA-Z0-9_-]/g, "");
     const [displayFullscreen, setDisplayFullscreen] = React.useState<boolean>(startInFullScreenMode);
     const showToggler = startInFullScreenMode || showFullScreenToggler;
-    const togglerText = displayFullscreen ? "Exit full screen" : "Show in full screen";
+    const togglerText = displayFullscreen
+        ? (fullScreenTogglerTexts?.minimize ?? "Exit full screen")
+        : (fullScreenTogglerTexts?.maximize ?? "Show in full screen");
     const intentClassName = intent ? `${eccgui}-intent--${intent}` : "";
     const wrapperDivProps = {
         ...modalPreventEvents,
@@ -118,6 +130,7 @@ export const SimpleDialog = ({
                                     <IconButton
                                         name={displayFullscreen ? "toggler-minimize" : "toggler-maximize"}
                                         text={togglerText}
+                                        aria-label={togglerText}
                                         onClick={() => setDisplayFullscreen(!displayFullscreen)}
                                     />
                                 )}
diff --git a/src/components/Dialog/tests/SimpleDialog.test.tsx b/src/components/Dialog/tests/SimpleDialog.test.tsx
index 40def616b..50647197b 100644
--- a/src/components/Dialog/tests/SimpleDialog.test.tsx
+++ b/src/components/Dialog/tests/SimpleDialog.test.tsx
@@ -224,6 +224,16 @@ describe("SimpleDialog", () => {
             fireEvent.click(toggler);
             expect(toggler).toHaveAccessibleName("Exit full screen");
         });
+        it("should use custom toggler texts if given", () => {
+            const { toggler } = renderDialog({
+                showFullScreenToggler: true,
+                fullScreenTogglerTexts: { maximize: "Vollbild anzeigen", minimize: "Vollbild verlassen" },
+            });
+            expect(toggler).toHaveAccessibleName("Vollbild anzeigen");
+
+            fireEvent.click(toggler);
+            expect(toggler).toHaveAccessibleName("Vollbild verlassen");
+        });
         it("should start in full screen mode and enable the toggler", () => {
             const { dialog, toggler } = renderDialog({ startInFullScreenMode: true, size: "small" });
             expect(dialog).toHaveClass(`${dialogWrapper}--fullscreen`);

From e4550cfecb12d04e9d2c468a0c80c01736d507eb Mon Sep 17 00:00:00 2001
From: Michael Haschke <michael.haschke@eccenca.com>
Date: Fri, 6 Nov 2026 09:57:26 +0100
Subject: [PATCH 08/10] smaller fixes for a11y

---
 .../ActivityExecutionErrorReportModal.tsx     |  4 +--
 .../ActivityControl/SilkActivityControl.tsx   |  9 ++----
 .../tests/SilkActivityControl.test.tsx        | 30 +++++++++++--------
 src/components/Dialog/SimpleDialog.tsx        |  1 +
 .../Dialog/tests/SimpleDialog.test.tsx        |  9 ++++++
 5 files changed, 31 insertions(+), 22 deletions(-)

diff --git a/src/cmem/ActivityControl/ActivityExecutionErrorReportModal.tsx b/src/cmem/ActivityControl/ActivityExecutionErrorReportModal.tsx
index 5f9ae0966..d986ee2d4 100644
--- a/src/cmem/ActivityControl/ActivityExecutionErrorReportModal.tsx
+++ b/src/cmem/ActivityControl/ActivityExecutionErrorReportModal.tsx
@@ -13,7 +13,7 @@ interface ActivityExecutionErrorReportModalProps extends Pick<
      * If set, it is used as the accessible name of the dialog via `aria-labelledby`
      * (unless `aria-labelledby` is given explicitly), so `aria-label` is ignored.
      * Use `aria-label` only for modals without title.
-     * If neither `title`, `aria-label` nor `aria-labelledby` is set, then "Activity execution error report" is used as `aria-label`.
+     * If neither `title`, a non-empty `aria-label` nor `aria-labelledby` is set, then "Activity execution error report" is used as `aria-label`.
      */
     title?: string;
     // Called when the close button is clicked
@@ -61,7 +61,7 @@ export const ActivityExecutionErrorReportModal = ({
     return (
         <SimpleDialog
             title={title}
-            aria-label={ariaLabel ?? (!title && !ariaLabelledby ? "Activity execution error report" : undefined)}
+            aria-label={ariaLabel || "Activity execution error report"}
             aria-labelledby={ariaLabelledby}
             isOpen={true}
             size="large"
diff --git a/src/cmem/ActivityControl/SilkActivityControl.tsx b/src/cmem/ActivityControl/SilkActivityControl.tsx
index 6776460c2..29588f735 100644
--- a/src/cmem/ActivityControl/SilkActivityControl.tsx
+++ b/src/cmem/ActivityControl/SilkActivityControl.tsx
@@ -100,7 +100,7 @@ interface IErrorReportAction extends Pick<
      * If set, it is used as the accessible name of the dialog via `aria-labelledby`
      * (unless `aria-labelledby` is given explicitly), so `aria-label` is ignored.
      * Use `aria-label` only for modals without title.
-     * If neither `title`, `aria-label` nor `aria-labelledby` is set, then `translate("showErrorReport")` is used as `aria-label`.
+     * If neither `title`, a non-empty `aria-label` nor `aria-labelledby` is set, then `translate("showErrorReport")` is used as `aria-label`.
      */
     title?: string;
     // The element that will be rendered in the modal, either as Markdown or object
@@ -372,12 +372,7 @@ export function useSilkActivityControl({
             {errorReport && failureReportAction && (
                 <ActivityExecutionErrorReportModal
                     title={failureReportAction.title}
-                    aria-label={
-                        failureReportAction["aria-label"] ??
-                        (!failureReportAction.title && !failureReportAction["aria-labelledby"]
-                            ? translate("showErrorReport")
-                            : undefined)
-                    }
+                    aria-label={failureReportAction["aria-label"] || translate("showErrorReport")}
                     aria-labelledby={failureReportAction["aria-labelledby"]}
                     key={"error-report-modal"}
                     closeButtonValue={failureReportAction.closeButtonValue}
diff --git a/src/cmem/ActivityControl/tests/SilkActivityControl.test.tsx b/src/cmem/ActivityControl/tests/SilkActivityControl.test.tsx
index 2f36330b8..060644218 100644
--- a/src/cmem/ActivityControl/tests/SilkActivityControl.test.tsx
+++ b/src/cmem/ActivityControl/tests/SilkActivityControl.test.tsx
@@ -75,7 +75,7 @@ describe("SilkActivityControl error report", () => {
 
     it("uses the translated `showErrorReport` text as fallback name for a titleless error report dialog", async () => {
         const warnSpy = jest.spyOn(console, "warn").mockImplementation(() => undefined);
-        const { openErrorReport } = renderFailedActivity({ title: "" });
+        const { openErrorReport } = renderFailedActivity({ title: "", "aria-label": "" });
         openErrorReport();
         expect(await screen.findByRole("dialog", { name: "showErrorReport" })).toHaveAttribute("aria-modal", "true");
         expect(warnSpy).not.toHaveBeenCalled();
@@ -107,16 +107,20 @@ describe("SilkActivityControl error report", () => {
 });
 
 describe("ActivityExecutionErrorReportModal", () => {
-    it("uses an english fallback name if neither title nor aria attributes are given", () => {
-        render(
-            <ActivityExecutionErrorReportModal
-                onDiscard={jest.fn()}
-                report={<p>Error details</p>}
-                downloadButtonValue="Download"
-                closeButtonValue="Close"
-                fetchErrorReport={async () => "Error details"}
-            />,
-        );
-        expect(screen.getByRole("dialog", { name: "Activity execution error report" })).toBeInTheDocument();
-    });
+    it.each([undefined, ""])(
+        "uses an english fallback name if neither title nor aria attributes are given (aria-label: %p)",
+        (ariaLabel) => {
+            render(
+                <ActivityExecutionErrorReportModal
+                    aria-label={ariaLabel}
+                    onDiscard={jest.fn()}
+                    report={<p>Error details</p>}
+                    downloadButtonValue="Download"
+                    closeButtonValue="Close"
+                    fetchErrorReport={async () => "Error details"}
+                />,
+            );
+            expect(screen.getByRole("dialog", { name: "Activity execution error report" })).toBeInTheDocument();
+        },
+    );
 });
diff --git a/src/components/Dialog/SimpleDialog.tsx b/src/components/Dialog/SimpleDialog.tsx
index 4c0cdd997..9aa13878f 100644
--- a/src/components/Dialog/SimpleDialog.tsx
+++ b/src/components/Dialog/SimpleDialog.tsx
@@ -130,6 +130,7 @@ export const SimpleDialog = ({
                                     <IconButton
                                         name={displayFullscreen ? "toggler-minimize" : "toggler-maximize"}
                                         text={togglerText}
+                                        tooltipAsTitle
                                         aria-label={togglerText}
                                         onClick={() => setDisplayFullscreen(!displayFullscreen)}
                                     />
diff --git a/src/components/Dialog/tests/SimpleDialog.test.tsx b/src/components/Dialog/tests/SimpleDialog.test.tsx
index 50647197b..a116cc900 100644
--- a/src/components/Dialog/tests/SimpleDialog.test.tsx
+++ b/src/components/Dialog/tests/SimpleDialog.test.tsx
@@ -224,6 +224,15 @@ describe("SimpleDialog", () => {
             fireEvent.click(toggler);
             expect(toggler).toHaveAccessibleName("Exit full screen");
         });
+        it("should keep the toggler button itself focusable and show its text as title", () => {
+            const { toggler } = renderDialog({ showFullScreenToggler: true });
+            expect(toggler).not.toHaveAttribute("tabindex", "-1");
+            expect(toggler).toHaveAttribute("title", "Show in full screen");
+            expect(toggler.querySelector("[tabindex]")).toBeNull();
+
+            toggler.focus();
+            expect(toggler).toHaveFocus();
+        });
         it("should use custom toggler texts if given", () => {
             const { toggler } = renderDialog({
                 showFullScreenToggler: true,

From 11bdacefc55303567f3b15982cc4c33eb22d2bb6 Mon Sep 17 00:00:00 2001
From: Michael Haschke <michael.haschke@eccenca.com>
Date: Fri, 6 Nov 2026 09:59:56 +0100
Subject: [PATCH 09/10] update changelog and improve test

---
 CHANGELOG.md                                     | 11 +++++++++++
 .../tests/SilkActivityControl.test.tsx           | 16 +++++++++++-----
 2 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9ae7a3329..ad3130400 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,17 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
 
 - `<SilkActivityControl />`, `<ActivityExecutionErrorReportModal />`
     - support `aria-label` and `aria-labelledby` for naming activity error report dialogs without a visible title
+    - support `fullScreenTogglerTexts` to set localized texts for the full screen toggler of the error report dialog
+- `<SimpleDialog />`
+    - `fullScreenTogglerTexts` property: sets the texts of the full screen toggler for the `maximize` and `minimize` state, used as `title` and accessible name of the button
+
+### Changed
+
+- `<SimpleDialog />`
+    - the full screen toggler has an accessible name and a `title` now, the default texts are "Show in full screen" and "Exit full screen", use `fullScreenTogglerTexts` to localize them
+- `<SilkActivityControl />`, `<ActivityExecutionErrorReportModal />`
+    - error report dialogs without title, `aria-label` and `aria-labelledby` get a fallback accessible name, `translate("showErrorReport")` in `<SilkActivityControl />` and "Activity execution error report" in `<ActivityExecutionErrorReportModal />`
+    - the error report dialog uses the full screen toggler of `<SimpleDialog />` instead of an own implementation
 
 ## [26.2.1] - 2026-11-02
 
diff --git a/src/cmem/ActivityControl/tests/SilkActivityControl.test.tsx b/src/cmem/ActivityControl/tests/SilkActivityControl.test.tsx
index 060644218..cf6f900f2 100644
--- a/src/cmem/ActivityControl/tests/SilkActivityControl.test.tsx
+++ b/src/cmem/ActivityControl/tests/SilkActivityControl.test.tsx
@@ -75,11 +75,17 @@ describe("SilkActivityControl error report", () => {
 
     it("uses the translated `showErrorReport` text as fallback name for a titleless error report dialog", async () => {
         const warnSpy = jest.spyOn(console, "warn").mockImplementation(() => undefined);
-        const { openErrorReport } = renderFailedActivity({ title: "", "aria-label": "" });
-        openErrorReport();
-        expect(await screen.findByRole("dialog", { name: "showErrorReport" })).toHaveAttribute("aria-modal", "true");
-        expect(warnSpy).not.toHaveBeenCalled();
-        warnSpy.mockRestore();
+        try {
+            const { openErrorReport } = renderFailedActivity({ title: "", "aria-label": "" });
+            openErrorReport();
+            expect(await screen.findByRole("dialog", { name: "showErrorReport" })).toHaveAttribute(
+                "aria-modal",
+                "true",
+            );
+            expect(warnSpy).not.toHaveBeenCalled();
+        } finally {
+            warnSpy.mockRestore();
+        }
     });
 
     it("forwards the full screen toggler texts to the error report dialog", async () => {

From dbd4b567b738348063fefed0b7313002ad25ae9c Mon Sep 17 00:00:00 2001
From: Michael Haschke <michael.haschke@eccenca.com>
Date: Fri, 6 Nov 2026 11:37:21 +0100
Subject: [PATCH 10/10] use aria-label as fallback if all aria-labelledby
 targets are invalid

---
 CHANGELOG.md                                  |   5 +
 src/components/Dialog/AlertDialog.tsx         |   3 +-
 src/components/Dialog/Modal.tsx               |  99 +++++++++-
 src/components/Dialog/SimpleDialog.tsx        |   6 +-
 .../Dialog/tests/AlertDialog.test.tsx         |  21 +-
 src/components/Dialog/tests/Modal.test.tsx    | 182 +++++++++++++++++-
 .../Dialog/tests/SimpleDialog.test.tsx        |  16 +-
 7 files changed, 323 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ad3130400..401bc19e5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -21,6 +21,11 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
 - `<SilkActivityControl />`, `<ActivityExecutionErrorReportModal />`
     - error report dialogs without title, `aria-label` and `aria-labelledby` get a fallback accessible name, `translate("showErrorReport")` in `<SilkActivityControl />` and "Activity execution error report" in `<ActivityExecutionErrorReportModal />`
     - the error report dialog uses the full screen toggler of `<SimpleDialog />` instead of an own implementation
+- `<Modal />`
+    - the elements referenced by `aria-labelledby` are checked for existence when the modal is opened, invalid references are reported as console warning and removed from `aria-labelledby`
+    - if none of the elements referenced by `aria-labelledby` exists then a given `aria-label` is used as fallback, without `aria-label` the `role` and `aria-modal` attributes are removed
+- `<SimpleDialog />`, `<AlertDialog />`
+    - the intent state is also used as `aria-label` fallback if none of the elements referenced by `aria-labelledby` exists
 
 ## [26.2.1] - 2026-11-02
 
diff --git a/src/components/Dialog/AlertDialog.tsx b/src/components/Dialog/AlertDialog.tsx
index 24adecbbf..f82a785de 100644
--- a/src/components/Dialog/AlertDialog.tsx
+++ b/src/components/Dialog/AlertDialog.tsx
@@ -22,7 +22,8 @@ export interface AlertDialogProps extends Omit<SimpleDialogProps, "intent" | "ro
 /**
  * Special element to display alert notification in modal dialogs.
  * Inherits all properties from `SimpleDialog`, except `intent` and `role`.
- * If `title`, `aria-label` nor a `aria-labelledby` is given then the alert level automatically used as fallback for `aria-label`.
+ * If no `aria-label` is given then the alert level is automatically used as fallback for `aria-label`.
+ * It is only used if there is no `title` and no valid `aria-labelledby` reference.
  */
 export const AlertDialog = ({
     children,
diff --git a/src/components/Dialog/Modal.tsx b/src/components/Dialog/Modal.tsx
index 5c6160f74..f64dcc8d5 100644
--- a/src/components/Dialog/Modal.tsx
+++ b/src/components/Dialog/Modal.tsx
@@ -70,6 +70,64 @@ export interface ModalProps
 
 export type ModalSize = "tiny" | "small" | "regular" | "large" | "xlarge" | "fullscreen";
 
+/**
+ * Checks if the elements referenced by `aria-labelledby` exist.
+ * Invalid references are reported in the console and removed from `aria-labelledby`.
+ * If none of them exists then `aria-label` is used as fallback, if it was given.
+ * Changes are applied directly to the DOM element to prevent an additional re-rendering.
+ * React does not touch these attributes again as long as their properties do not change.
+ * Returns `false` if the modal has no accessible name, then its role need to be removed.
+ */
+const validateAriaLabelledby = (
+    modalElement: HTMLElement,
+    role: string,
+    ariaLabelledby?: string,
+    ariaLabel?: string,
+): boolean => {
+    if (!ariaLabelledby) {
+        return true;
+    }
+    const rootNode = modalElement.getRootNode();
+    // targets can also be located inside a shadow DOM
+    const lookupRoot: Pick<Document, "getElementById"> =
+        "getElementById" in rootNode ? (rootNode as Document | ShadowRoot) : modalElement.ownerDocument;
+    const referencedIds = ariaLabelledby.split(/\s+/).filter((id) => !!id);
+    const invalidIds = referencedIds.filter((id) => !lookupRoot.getElementById(id));
+    const validIds = referencedIds.filter((id) => !invalidIds.includes(id));
+    const hasValidTarget = validIds.length > 0;
+
+    if (hasValidTarget) {
+        // invalid references are removed, so screen readers cannot stumble over them
+        if (invalidIds.length > 0) {
+            modalElement.setAttribute("aria-labelledby", validIds.join(" "));
+        }
+        // `aria-label` is never rendered together with `aria-labelledby`, so it can only be a former fallback
+        modalElement.removeAttribute("aria-label");
+    } else {
+        modalElement.removeAttribute("aria-labelledby");
+        if (ariaLabel) {
+            modalElement.setAttribute("aria-label", ariaLabel);
+        }
+    }
+
+    if (invalidIds.length === 0 && hasValidTarget) {
+        return true;
+    }
+
+    const invalidTargets = invalidIds.length > 0 ? invalidIds.map((id) => `#${id}`).join(", ") : `"${ariaLabelledby}"`;
+    let fallbackInfo: string;
+    if (hasValidTarget) {
+        fallbackInfo = "They were removed, fallback to aria-label not necessary because other targets are valid.";
+    } else if (ariaLabel) {
+        fallbackInfo = `aria-labelledby was removed, fallback to aria-label="${ariaLabel}" was used.`;
+    } else {
+        fallbackInfo = `aria-labelledby was removed, fallback to aria-label not possible because it is not given, modal has no accessible name and role=${role} was removed.`;
+    }
+    // eslint-disable-next-line no-console
+    console.warn(`aria-labelledby of modal references invalid targets: ${invalidTargets}. ${fallbackInfo}`);
+    return hasValidTarget || !!ariaLabel;
+};
+
 /**
  * Displays contents on top of other elements, used to create dialogs.
  * For most situations the usage of `SimpleDialog` and `AlertDialog` should be sufficient.
@@ -111,11 +169,18 @@ export const Modal = ({
         };
     }, []);
 
+    const modalElementRef = React.useRef<HTMLElement>(null);
+    // prevents that the same element is validated multiple times with unchanged properties
+    const lastLabelValidation = React.useRef<{ element?: HTMLElement; key?: string }>({});
+    // set if none of the `aria-labelledby` targets exists and no `aria-label` is given as fallback
+    const hasNoValidLabelTarget = React.useRef<boolean>(false);
+
+    const hasLabelProperty = !!(ariaLabel || ariaLabelledby);
     // always remove the role if there is no explanation
-    const modalRole = ariaLabel || ariaLabelledby ? role : undefined;
+    const modalRole = hasLabelProperty && !hasNoValidLabelTarget.current ? role : undefined;
 
     React.useEffect(() => {
-        if (!modalRole && otherProps.isOpen) {
+        if (!hasLabelProperty && otherProps.isOpen) {
             // eslint-disable-next-line no-console
             console.warn(
                 `role=${role} removed from modal because neither aria-label nor aria-labelledby is available.`,
@@ -155,6 +220,8 @@ export const Modal = ({
             // call the original event handler
             onOpening(modalElement);
         }
+        // content of the modal is available now, so targets inside of it can be found
+        checkLabelTargets();
         if (usePortal && forceTopPosition) {
             const parentalPortal = modalElement.closest(`.${BlueprintClassNames.PORTAL}`) as HTMLElement;
             const highestTopIndex = (utils.getGlobalVar("highestModalTopIndex") as unknown as number) ?? 0;
@@ -184,6 +251,33 @@ export const Modal = ({
         "aria-modal": modalRole ? isTopMostModal : undefined,
     };
 
+    const checkLabelTargets = () => {
+        const element = modalElementRef.current;
+        const key = `${ariaLabelledby}|${ariaLabel}`;
+        if (!element || (lastLabelValidation.current.element === element && lastLabelValidation.current.key === key)) {
+            return;
+        }
+        lastLabelValidation.current = { element, key };
+        const hasAccessibleName = validateAriaLabelledby(element, role, ariaLabelledby, ariaLabel);
+        hasNoValidLabelTarget.current = !hasAccessibleName;
+        // role and modality are changed directly on the DOM element, following renderings respect the flag
+        if (!hasAccessibleName) {
+            element.removeAttribute("role");
+            element.removeAttribute("aria-modal");
+        } else if (hasLabelProperty && !element.hasAttribute("role")) {
+            // restore them if they were removed by a former check
+            element.setAttribute("role", role);
+            element.setAttribute("aria-modal", `${isTopMostModal}`);
+        }
+    };
+
+    React.useEffect(() => {
+        // only for changes while the modal is open, initial check is done when it is opening
+        if (otherProps.isOpen) {
+            checkLabelTargets();
+        }
+    }, [ariaLabelledby, ariaLabel]);
+
     return (
         <BlueprintOverlay
             {...otherProps}
@@ -212,6 +306,7 @@ export const Modal = ({
                         (className ? " " + className : "")
                     }
                     {...modalAriaAttributes}
+                    ref={modalElementRef}
                 >
                     {alteredChildren}
                 </section>
diff --git a/src/components/Dialog/SimpleDialog.tsx b/src/components/Dialog/SimpleDialog.tsx
index 9aa13878f..24d02876d 100644
--- a/src/components/Dialog/SimpleDialog.tsx
+++ b/src/components/Dialog/SimpleDialog.tsx
@@ -62,6 +62,8 @@ export interface SimpleDialogProps extends ModalProps, TestableComponent {
  * Simplifies the dialog display by providing a direct `Card` template for the `Modal` element.
  * If not given then aria attributes like `role` and `aria-labelledby` are set automatically.
  * `aria-describedby` is only automatically when an `intent` state is set.
+ * With an `intent` state the intent is also used as fallback for `aria-label`,
+ * if no `aria-label` is given and there is no title or the elements referenced by `aria-labelledby` do not exist.
  * Inherits all properties from `Modal`.
  */
 export const SimpleDialog = ({
@@ -100,7 +102,9 @@ export const SimpleDialog = ({
     };
 
     const hasSemanticIntent = intent && ["success", "warning", "danger", "info"].includes(intent);
-    const labelFallback = hasSemanticIntent && !title && !ariaLabel && !ariaLabelledby ? intent : undefined;
+    // the fallback is also given when there is a title or `aria-labelledby` because `Modal` ignores it then,
+    // but uses it if none of the elements referenced by `aria-labelledby` exists
+    const labelFallback = hasSemanticIntent && !ariaLabel ? intent : undefined;
 
     return (
         <Modal
diff --git a/src/components/Dialog/tests/AlertDialog.test.tsx b/src/components/Dialog/tests/AlertDialog.test.tsx
index d73a116c9..6332b9b4b 100644
--- a/src/components/Dialog/tests/AlertDialog.test.tsx
+++ b/src/components/Dialog/tests/AlertDialog.test.tsx
@@ -95,10 +95,29 @@ describe("AlertDialog", () => {
             expect(dialog).toHaveAttribute("aria-label", "Alert label");
         });
         it("should not use the fallback label if `aria-labelledby` is given", () => {
-            const { dialog } = renderAlert({ "aria-labelledby": "externaltitle" });
+            const { dialog } = renderAlert({
+                "aria-labelledby": "externaltitle",
+                children: <h3 id="externaltitle">External title</h3>,
+            });
             expect(dialog).not.toHaveAttribute("aria-label");
             expect(dialog).toHaveAttribute("aria-labelledby", "externaltitle");
         });
+        it("should use the alert level as `aria-label` fallback if no `aria-labelledby` target exists", () => {
+            const consoleWarnSpy = jest.spyOn(console, "warn").mockImplementation(() => undefined);
+            const { dialog } = renderAlert({ warning: true, "aria-labelledby": "missing" });
+            expect(dialog).toHaveAttribute("aria-label", "warning");
+            expect(dialog).not.toHaveAttribute("aria-labelledby");
+            expect(dialog).toHaveAttribute("role", "alertdialog");
+            expect(dialog).toHaveAttribute("aria-modal", "true");
+            expect(consoleWarnSpy).toHaveBeenCalledWith(expect.stringContaining('aria-label="warning" was used'));
+            consoleWarnSpy.mockRestore();
+        });
+        it("should prefer a given `aria-label` over the alert level if no `aria-labelledby` target exists", () => {
+            const consoleWarnSpy = jest.spyOn(console, "warn").mockImplementation(() => undefined);
+            const { dialog } = renderAlert({ "aria-label": "Alert label", "aria-labelledby": "missing" });
+            expect(dialog).toHaveAttribute("aria-label", "Alert label");
+            consoleWarnSpy.mockRestore();
+        });
         it("should always have an accessible name, so the role is never removed", () => {
             const consoleWarnSpy = jest.spyOn(console, "warn").mockImplementation(() => undefined);
             expect(renderAlert().dialog).toHaveAttribute("role", "alertdialog");
diff --git a/src/components/Dialog/tests/Modal.test.tsx b/src/components/Dialog/tests/Modal.test.tsx
index 557baa1a3..89394ef77 100644
--- a/src/components/Dialog/tests/Modal.test.tsx
+++ b/src/components/Dialog/tests/Modal.test.tsx
@@ -9,6 +9,7 @@ import Modal, { ModalProps } from "../Modal";
 import { ModalContext, ModalContextProps, useModalContext } from "../ModalContext";
 
 const dialogWrapper = `${eccgui}-dialog__wrapper`;
+const customTitle = <h2 id="customtitle">Custom title</h2>;
 
 const renderModal = (props: Partial<ModalProps> = {}) => {
     const { children, ...otherProps } = props;
@@ -127,6 +128,7 @@ describe("Modal", () => {
             const { modal } = renderModal({
                 "aria-labelledby": "customtitle",
                 "aria-describedby": "customdescription",
+                children: customTitle,
             });
             expect(modal).toHaveAttribute("aria-labelledby", "customtitle");
             expect(modal).toHaveAttribute("aria-describedby", "customdescription");
@@ -138,13 +140,21 @@ describe("Modal", () => {
         });
         it("should ignore `aria-label` if `aria-labelledby` is given", () => {
             // `aria-labelledby` wins over `aria-label`, so the label would never be used
-            const { modal } = renderModal({ "aria-label": "Modal label", "aria-labelledby": "customtitle" });
+            const { modal } = renderModal({
+                "aria-label": "Modal label",
+                "aria-labelledby": "customtitle",
+                children: customTitle,
+            });
             expect(modal).not.toHaveAttribute("aria-label");
             expect(modal).toHaveAttribute("aria-labelledby", "customtitle");
         });
         it("should keep the role if only `aria-labelledby` is given", () => {
             // the ignored `aria-label` must not affect the accessible name detection
-            const { modal } = renderModal({ "aria-label": "Modal label", "aria-labelledby": "customtitle" });
+            const { modal } = renderModal({
+                "aria-label": "Modal label",
+                "aria-labelledby": "customtitle",
+                children: customTitle,
+            });
             expect(modal).toHaveAttribute("role", "dialog");
             expect(consoleWarnSpy).not.toHaveBeenCalled();
         });
@@ -158,7 +168,10 @@ describe("Modal", () => {
         });
         it("should keep the role if the modal has an accessible name", () => {
             expect(renderModal({ "aria-label": "Modal label" }).modal).toHaveAttribute("role", "dialog");
-            expect(renderModal({ "aria-labelledby": "customtitle" }).modal).toHaveAttribute("role", "dialog");
+            expect(renderModal({ "aria-labelledby": "customtitle", children: customTitle }).modal).toHaveAttribute(
+                "role",
+                "dialog",
+            );
         });
         it("should remove the role if there is only a description but no name", () => {
             // a description alone does not make the dialog identifiable for screen readers
@@ -177,6 +190,169 @@ describe("Modal", () => {
         });
     });
 
+    describe("aria-labelledby targets", () => {
+        it("should not warn if all targets exist", () => {
+            renderModal({
+                "aria-labelledby": "customtitle othertitle",
+                children: [
+                    customTitle,
+                    <p id="othertitle" key="other">
+                        Other title
+                    </p>,
+                ],
+            });
+            expect(consoleWarnSpy).not.toHaveBeenCalled();
+        });
+        it("should find targets outside of the modal", () => {
+            render(<h2 id="externaltitle">External title</h2>);
+            const { modal } = renderModal({ "aria-labelledby": "externaltitle", "aria-label": "Modal label" });
+            expect(modal).toHaveAttribute("aria-labelledby", "externaltitle");
+            expect(consoleWarnSpy).not.toHaveBeenCalled();
+        });
+        it("should warn about invalid targets and remove them if at least one target is valid", () => {
+            const { modal } = renderModal({
+                "aria-labelledby": "customtitle missing1 missing2",
+                "aria-label": "Modal label",
+                children: customTitle,
+            });
+            expect(modal).toHaveAttribute("aria-labelledby", "customtitle");
+            expect(modal).not.toHaveAttribute("aria-label");
+            expect(consoleWarnSpy).toHaveBeenCalledTimes(1);
+            expect(consoleWarnSpy).toHaveBeenCalledWith(expect.stringContaining("#missing1, #missing2"));
+            expect(consoleWarnSpy).toHaveBeenCalledWith(expect.stringContaining("not necessary"));
+            expect(consoleWarnSpy).not.toHaveBeenCalledWith(expect.stringContaining("#customtitle"));
+        });
+        it("should use `aria-label` as fallback if no target is valid", () => {
+            const { modal } = renderModal({ "aria-labelledby": "missing", "aria-label": "Modal label" });
+            expect(modal).toHaveAttribute("aria-label", "Modal label");
+            expect(modal).not.toHaveAttribute("aria-labelledby");
+            expect(modal).toHaveAttribute("role", "dialog");
+            expect(consoleWarnSpy).toHaveBeenCalledTimes(1);
+            expect(consoleWarnSpy).toHaveBeenCalledWith(expect.stringContaining("#missing"));
+            expect(consoleWarnSpy).toHaveBeenCalledWith(expect.stringContaining('aria-label="Modal label" was used'));
+        });
+        it("should warn that no fallback is possible if no target is valid and `aria-label` is missing", () => {
+            const { modal } = renderModal({ "aria-labelledby": "missing" });
+            expect(modal).not.toHaveAttribute("aria-labelledby");
+            expect(modal).not.toHaveAttribute("aria-label");
+            expect(consoleWarnSpy).toHaveBeenCalledTimes(1);
+            expect(consoleWarnSpy).toHaveBeenCalledWith(expect.stringContaining("#missing"));
+            expect(consoleWarnSpy).toHaveBeenCalledWith(expect.stringContaining("not possible"));
+            expect(consoleWarnSpy).toHaveBeenCalledWith(expect.stringContaining("role=dialog was removed"));
+        });
+        it("should remove role and modality if no target is valid and `aria-label` is missing", () => {
+            const { modal } = renderModal({ "aria-labelledby": "missing", role: "alertdialog" });
+            expect(modal).not.toHaveAttribute("role");
+            expect(modal).not.toHaveAttribute("aria-modal");
+            expect(consoleWarnSpy).toHaveBeenCalledWith(expect.stringContaining("role=alertdialog was removed"));
+        });
+        it("should keep role and modality removed on re-renderings if no target is valid", () => {
+            const TrackedModals = ({ children }: { children: React.ReactNode }) => {
+                const modalContext = useModalContext();
+                return <ModalContext.Provider value={modalContext}>{children}</ModalContext.Provider>;
+            };
+            const modalStack = (secondOpen: boolean) => (
+                <TrackedModals>
+                    <Modal isOpen usePortal={false} modalId="nameless" aria-labelledby="missing">
+                        nameless content
+                    </Modal>
+                    <Modal isOpen={secondOpen} usePortal={false} modalId="ontop" aria-label="ontop">
+                        content on top
+                    </Modal>
+                </TrackedModals>
+            );
+            const { container, rerender } = render(modalStack(false));
+            const modal = container.querySelector(`.${dialogWrapper}:not([aria-label])`) as HTMLElement;
+            expect(modal).toHaveTextContent("nameless content");
+            expect(modal).not.toHaveAttribute("role");
+            expect(modal).not.toHaveAttribute("aria-modal");
+            // modality of the nameless modal changes, React must not render it again
+            rerender(modalStack(true));
+            expect(modal).not.toHaveAttribute("role");
+            expect(modal).not.toHaveAttribute("aria-modal");
+        });
+        it("should restore role and modality if `aria-labelledby` becomes valid while the modal is open", () => {
+            const { modal, rerender } = renderModal({ "aria-labelledby": "missing" });
+            expect(modal).not.toHaveAttribute("role");
+            rerender(
+                <Modal isOpen usePortal={false} aria-labelledby="customtitle">
+                    {customTitle}
+                </Modal>,
+            );
+            expect(modal).toHaveAttribute("role", "dialog");
+            expect(modal).toHaveAttribute("aria-modal", "true");
+            expect(modal).toHaveAttribute("aria-labelledby", "customtitle");
+        });
+        it("should not warn twice about a removed role", () => {
+            renderModal({ "aria-labelledby": "missing" });
+            expect(consoleWarnSpy).toHaveBeenCalledTimes(1);
+            expect(consoleWarnSpy).not.toHaveBeenCalledWith(expect.stringContaining("neither aria-label"));
+        });
+        it("should keep removed invalid targets out on re-renderings with unchanged properties", () => {
+            const props = { "aria-labelledby": "customtitle missing", children: customTitle };
+            const { modal, rerender } = renderModal(props);
+            expect(modal).toHaveAttribute("aria-labelledby", "customtitle");
+            rerender(
+                <Modal isOpen usePortal={false} {...props} className="changed">
+                    {customTitle}
+                </Modal>,
+            );
+            expect(modal).toHaveClass("changed");
+            expect(modal).toHaveAttribute("aria-labelledby", "customtitle");
+            expect(consoleWarnSpy).toHaveBeenCalledTimes(1);
+        });
+        it("should remove invalid targets again if `aria-labelledby` changes while the modal is open", () => {
+            const { modal, rerender } = renderModal({
+                "aria-labelledby": "customtitle missing",
+                children: customTitle,
+            });
+            rerender(
+                <Modal isOpen usePortal={false} aria-labelledby="othermissing customtitle">
+                    {customTitle}
+                </Modal>,
+            );
+            expect(modal).toHaveAttribute("aria-labelledby", "customtitle");
+            expect(consoleWarnSpy).toHaveBeenCalledTimes(2);
+            expect(consoleWarnSpy).toHaveBeenLastCalledWith(expect.stringContaining("#othermissing."));
+        });
+        it("should keep the fallback on re-renderings with unchanged properties", () => {
+            const { modal, rerender } = renderModal({ "aria-labelledby": "missing", "aria-label": "Modal label" });
+            rerender(
+                <Modal isOpen usePortal={false} aria-labelledby="missing" aria-label="Modal label" className="changed">
+                    modal content
+                </Modal>,
+            );
+            expect(modal).toHaveClass("changed");
+            expect(modal).toHaveAttribute("aria-label", "Modal label");
+            expect(modal).not.toHaveAttribute("aria-labelledby");
+            expect(consoleWarnSpy).toHaveBeenCalledTimes(1);
+        });
+        it("should check the targets again if `aria-labelledby` changes while the modal is open", () => {
+            const { modal, rerender } = renderModal({ "aria-labelledby": "missing", "aria-label": "Modal label" });
+            expect(modal).toHaveAttribute("aria-label", "Modal label");
+            rerender(
+                <Modal isOpen usePortal={false} aria-labelledby="customtitle" aria-label="Modal label">
+                    {customTitle}
+                </Modal>,
+            );
+            expect(modal).toHaveAttribute("aria-labelledby", "customtitle");
+            // the former fallback must be removed
+            expect(modal).not.toHaveAttribute("aria-label");
+            expect(consoleWarnSpy).toHaveBeenCalledTimes(1);
+        });
+        it("should check the targets inside a portal", () => {
+            render(
+                <Modal isOpen aria-labelledby="portaltitle missing" aria-label="Modal label">
+                    <h2 id="portaltitle">Portal title</h2>
+                </Modal>,
+            );
+            const modal = document.getElementsByClassName(dialogWrapper)[0] as HTMLElement;
+            expect(modal).toHaveAttribute("aria-labelledby", "portaltitle");
+            expect(consoleWarnSpy).toHaveBeenCalledTimes(1);
+            expect(consoleWarnSpy).toHaveBeenCalledWith(expect.stringContaining("#missing."));
+        });
+    });
+
     describe("focus and closing behaviour", () => {
         it("should be focusable by default", () => {
             const { container } = renderModal();
diff --git a/src/components/Dialog/tests/SimpleDialog.test.tsx b/src/components/Dialog/tests/SimpleDialog.test.tsx
index a116cc900..c58e23b2e 100644
--- a/src/components/Dialog/tests/SimpleDialog.test.tsx
+++ b/src/components/Dialog/tests/SimpleDialog.test.tsx
@@ -146,7 +146,11 @@ describe("SimpleDialog", () => {
             expect(content.id).toBe("");
         });
         it("should use a given `aria-labelledby`", () => {
-            const { dialog } = renderDialog({ title: "My title", "aria-labelledby": "customtitle" });
+            const { dialog } = renderDialog({
+                title: "My title",
+                "aria-labelledby": "customtitle",
+                children: <h3 id="customtitle">Custom title</h3>,
+            });
             expect(dialog).toHaveAttribute("aria-labelledby", "customtitle");
         });
         it("should connect the content to the dialog via `aria-describedby` if an intent state is set", () => {
@@ -167,6 +171,16 @@ describe("SimpleDialog", () => {
             const { dialog } = renderDialog({ "aria-label": "Dialog label" });
             expect(dialog).toHaveAttribute("aria-label", "Dialog label");
         });
+        it("should use the intent as `aria-label` fallback if no `aria-labelledby` target exists", () => {
+            const { dialog } = renderDialog({ intent: "danger", "aria-labelledby": "missing" });
+            expect(dialog).toHaveAttribute("aria-label", "danger");
+            expect(dialog).toHaveAttribute("role", "alertdialog");
+        });
+        it("should not use an intent fallback if there is no alert intent state", () => {
+            const { dialog } = renderDialog({ "aria-labelledby": "missing" });
+            expect(dialog).not.toHaveAttribute("aria-label");
+            expect(dialog).not.toHaveAttribute("role");
+        });
         it("should use alert semantics for each alert intent state", () => {
             (["success", "warning", "danger", "info"] as IntentTypes[]).forEach((intent) => {
                 const { dialog, content } = renderDialog({ intent, title: "My title" });