Merge branch 'main' into UXPLATFORM-10398

cerner · May 14, 2024 · 167a0cf · 167a0cf
2 parents 3a8521c + 9fe1737
commit 167a0cf
Show file tree

Hide file tree

Showing 64 changed files with 1,478 additions and 1,911 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/terra-abstract-modal/CHANGELOG.md b/packages/terra-abstract-modal/CHANGELOG.md
@@ -2,6 +2,11 @@
 
 ## Unreleased
 
+## 3.50.0 - (May 14, 2024)
+
+* Changed
+  * Changes to announce title of modal.
+
 ## 3.49.0 - (March 8, 2024)
 
 * Changes

diff --git a/packages/terra-abstract-modal/package.json b/packages/terra-abstract-modal/package.json
@@ -1,6 +1,6 @@
 {
   "name": "terra-abstract-modal",
-  "version": "3.49.0",
+  "version": "3.50.0",
   "description": "The abstract modal is a structural component that provides the ability to display portal'd content in a layer above the app.",
   "author": "Cerner Corporation",
   "repository": {

diff --git a/packages/terra-abstract-modal/src/_ModalContent.jsx b/packages/terra-abstract-modal/src/_ModalContent.jsx
@@ -143,6 +143,8 @@ const ModalContent = forwardRef((props, ref) => {
   // Delete the closePortal prop that comes from react-portal.
   delete customProps.closePortal;
   delete customProps.fallbackFocus;
+  const beginLabelId = ariaLabel === 'Modal' ? 'Terra.AbstractModal.BeginModalDialog' : 'Terra.AbstractModal.BeginModalDialogTitle';
+  const endLabelId = ariaLabel === 'Modal' ? 'Terra.AbstractModal.EndModalDialog' : 'Terra.AbstractModal.EndModalDialogTitle';
 
   const modalContent = (
     <div
@@ -156,7 +158,7 @@ const ModalContent = forwardRef((props, ref) => {
     >
       <div className={modalContainerClassName} ref={setModalFocusElementRef} data-terra-abstract-modal-begin tabIndex="-1">
         {(!isCalledFromNotificationDialog) && (
-        <FormattedMessage id="Terra.AbstractModal.BeginModalDialog">
+        <FormattedMessage id={beginLabelId} values={{ title: ariaLabel }}>
           {text => {
             // In the latest version of react-intl this param is an array, when previous versions it was a string.
             let useText = text;
@@ -171,7 +173,7 @@ const ModalContent = forwardRef((props, ref) => {
         )}
         {children}
         {(!isCalledFromNotificationDialog) && (
-        <FormattedMessage id="Terra.AbstractModal.EndModalDialog">
+        <FormattedMessage id={endLabelId} values={{ title: ariaLabel }}>
           {text => {
             // In the latest version of react-intl this param is an array, when previous versions it was a string.
             let useText = text;