Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import { fireEvent, render, screen } from '@shared/tests';
import { createPassThroughPropsTest } from '@shared/tests/utils';
import '@ui5/webcomponents-icons/dist/add.js';
import { Icon } from '@ui5/webcomponents-react/dist/Icon';
import { MessageBox } from '@ui5/webcomponents-react/dist/MessageBox';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
exports[`MessageBox Confirm - Cancel 1`] = `
<DocumentFragment>
<ui5-dialog
accessible-name="Confirmation Confirm"
class="MessageBox-messageBox"
opened=""
style="z-index: 128; display: flex; top: 384px; left: 512px;"
Expand Down Expand Up @@ -60,6 +61,7 @@ exports[`MessageBox Confirm - Cancel 1`] = `
exports[`MessageBox Confirm 1`] = `
<DocumentFragment>
<ui5-dialog
accessible-name="Confirmation My Message Box Content"
class="MessageBox-messageBox"
opened=""
style="z-index: 104; display: flex; top: 384px; left: 512px;"
Expand Down Expand Up @@ -117,6 +119,7 @@ exports[`MessageBox Confirm 1`] = `
exports[`MessageBox Custom Action Text 1`] = `
<DocumentFragment>
<ui5-dialog
accessible-name="Confirmation My Message Box Content"
class="MessageBox-messageBox"
ui5-dialog=""
>
Expand Down Expand Up @@ -172,6 +175,7 @@ exports[`MessageBox Custom Action Text 1`] = `
exports[`MessageBox Don't crash on unknown type 1`] = `
<DocumentFragment>
<ui5-dialog
accessible-name=" Unknown Type!"
class="MessageBox-messageBox"
opened=""
style="z-index: 144; display: flex; top: 384px; left: 512px;"
Expand Down Expand Up @@ -212,6 +216,7 @@ exports[`MessageBox Don't crash on unknown type 1`] = `
exports[`MessageBox Error 1`] = `
<DocumentFragment>
<ui5-dialog
accessible-name="Error My Message Box Content"
class="MessageBox-messageBox"
opened=""
style="z-index: 116; display: flex; top: 384px; left: 512px;"
Expand Down Expand Up @@ -261,6 +266,7 @@ exports[`MessageBox Error 1`] = `
exports[`MessageBox Highlight 1`] = `
<DocumentFragment>
<ui5-dialog
accessible-name="Highlight My Message Box Content"
class="MessageBox-messageBox"
opened=""
style="z-index: 124; display: flex; top: 384px; left: 512px;"
Expand Down Expand Up @@ -310,6 +316,7 @@ exports[`MessageBox Highlight 1`] = `
exports[`MessageBox Information 1`] = `
<DocumentFragment>
<ui5-dialog
accessible-name="Information My Message Box Content"
class="MessageBox-messageBox"
opened=""
style="z-index: 120; display: flex; top: 384px; left: 512px;"
Expand Down Expand Up @@ -359,6 +366,7 @@ exports[`MessageBox Information 1`] = `
exports[`MessageBox No Title 1`] = `
<DocumentFragment>
<ui5-dialog
accessible-name="Confirmation No Title"
class="MessageBox-messageBox"
opened=""
style="z-index: 140; display: flex; top: 384px; left: 512px;"
Expand Down Expand Up @@ -416,6 +424,7 @@ exports[`MessageBox No Title 1`] = `
exports[`MessageBox Not open 1`] = `
<DocumentFragment>
<ui5-dialog
accessible-name="Custom Success Custom Success"
class="MessageBox-messageBox"
ui5-dialog=""
>
Expand Down Expand Up @@ -463,6 +472,7 @@ exports[`MessageBox Not open 1`] = `
exports[`MessageBox Show 1`] = `
<DocumentFragment>
<ui5-dialog
accessible-name="Custom Custom"
class="MessageBox-messageBox"
opened=""
style="z-index: 132; display: flex; top: 384px; left: 512px;"
Expand Down Expand Up @@ -520,6 +530,7 @@ exports[`MessageBox Show 1`] = `
exports[`MessageBox Success 1`] = `
<DocumentFragment>
<ui5-dialog
accessible-name="Success My Message Box Content"
class="MessageBox-messageBox"
opened=""
style="z-index: 108; display: flex; top: 384px; left: 512px;"
Expand Down Expand Up @@ -569,6 +580,7 @@ exports[`MessageBox Success 1`] = `
exports[`MessageBox Success w/ custom title 1`] = `
<DocumentFragment>
<ui5-dialog
accessible-name="Custom Success Custom Success"
class="MessageBox-messageBox"
opened=""
style="z-index: 136; display: flex; top: 384px; left: 512px;"
Expand Down Expand Up @@ -618,6 +630,7 @@ exports[`MessageBox Success w/ custom title 1`] = `
exports[`MessageBox Warning 1`] = `
<DocumentFragment>
<ui5-dialog
accessible-name="Warning My Message Box Content"
class="MessageBox-messageBox"
opened=""
style="z-index: 112; display: flex; top: 384px; left: 512px;"
Expand Down
4 changes: 3 additions & 1 deletion packages/main/src/components/MessageBox/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ export interface MessageBoxPropTypes
/**
* Defines the content of the `MessageBox`.
*
* **Note:** Although this prop accepts HTML Elements, it is strongly recommended that you only use text in order to preserve the intended design.
* **Note:** Although this prop accepts HTML Elements, it is strongly recommended that you only use text in order to preserve the intended design and a11y capabilities.
*/
children: ReactNode | ReactNodeArray;
/**
Expand Down Expand Up @@ -151,6 +151,7 @@ const MessageBox = forwardRef((props: MessageBoxPropTypes, ref: Ref<Ui5DialogDom
emphasizedAction,
onClose,
initialFocus,
accessibleName,
...rest
} = props;
const dialogRef = useConsolidatedRef<Ui5DialogDomRef>(ref);
Expand Down Expand Up @@ -349,6 +350,7 @@ const MessageBox = forwardRef((props: MessageBoxPropTypes, ref: Ref<Ui5DialogDom
className={messageBoxClassNames}
onAfterClose={open ? handleOnClose : stopPropagation}
{...restWithoutOmitted}
accessibleName={accessibleName ?? `${titleToRender() ?? ''} ${typeof children === 'string' ? children : ''}`}
initialFocus={getInitialFocus()}
>
{!props.header && (
Expand Down