From ee6ee203a0c465683ec201f4a585a1105ff892df Mon Sep 17 00:00:00 2001
From: DAK <40970507+dakahn@users.noreply.github.com>
Date: Fri, 29 Oct 2021 21:12:48 -0500
Subject: [PATCH 1/2] fix(Modal): add closeButtonLabel prop, add default value
 (#9998)

Co-authored-by: Scott Strubberg <sstrubberg@protonmail.com>
Co-authored-by: Taylor Jones <tay1orjones@users.noreply.github.com>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
---
 .../__tests__/__snapshots__/PublicAPI-test.js.snap     |  3 +++
 packages/react/src/components/Modal/Modal.js           |  9 +++++++--
 .../__snapshots__/ModalWrapper-test.js.snap            | 10 +++-------
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/packages/react/__tests__/__snapshots__/PublicAPI-test.js.snap b/packages/react/__tests__/__snapshots__/PublicAPI-test.js.snap
index d5682bce1b43..2f5f25f97d82 100644
--- a/packages/react/__tests__/__snapshots__/PublicAPI-test.js.snap
+++ b/packages/react/__tests__/__snapshots__/PublicAPI-test.js.snap
@@ -3829,6 +3829,9 @@ Map {
       "className": Object {
         "type": "string",
       },
+      "closeButtonLabel": Object {
+        "type": "string",
+      },
       "danger": Object {
         "type": "bool",
       },
diff --git a/packages/react/src/components/Modal/Modal.js b/packages/react/src/components/Modal/Modal.js
index 66c61af0a479..0e29b0151e0d 100644
--- a/packages/react/src/components/Modal/Modal.js
+++ b/packages/react/src/components/Modal/Modal.js
@@ -49,6 +49,11 @@ export default class Modal extends Component {
      */
     className: PropTypes.string,
 
+    /**
+     * Specify an label for the close button of the modal; defaults to close
+     */
+    closeButtonLabel: PropTypes.string,
+
     /**
      * Specify whether the Modal is for dangerous actions
      */
@@ -384,6 +389,7 @@ export default class Modal extends Component {
       shouldSubmitOnEnter, // eslint-disable-line
       size,
       hasScrollingContent,
+      closeButtonLabel,
       preventCloseOnClickOutside, // eslint-disable-line
       ...other
     } = this.props;
@@ -420,11 +426,10 @@ export default class Modal extends Component {
         type="button"
         onClick={onRequestClose}
         title={ariaLabel ? ariaLabel : iconDescription}
-        aria-label={ariaLabel ? ariaLabel : iconDescription}
+        aria-label={closeButtonLabel ? closeButtonLabel : 'close'}
         ref={this.button}>
         <Close20
           aria-hidden="true"
-          aria-label="close"
           tabIndex="-1"
           className={`${this.modalCloseButtonClass}__icon`}
         />
diff --git a/packages/react/src/components/ModalWrapper/__snapshots__/ModalWrapper-test.js.snap b/packages/react/src/components/ModalWrapper/__snapshots__/ModalWrapper-test.js.snap
index c01fc67ed101..9554f7b53497 100644
--- a/packages/react/src/components/ModalWrapper/__snapshots__/ModalWrapper-test.js.snap
+++ b/packages/react/src/components/ModalWrapper/__snapshots__/ModalWrapper-test.js.snap
@@ -109,19 +109,18 @@ exports[`ModalWrapper should render 1`] = `
               Transactional Modal
             </h3>
             <button
+              aria-label="close"
               className="bx--modal-close"
               onClick={[Function]}
               type="button"
             >
               <ForwardRef(Close20)
                 aria-hidden="true"
-                aria-label="close"
                 className="bx--modal-close__icon"
                 tabIndex="-1"
               >
                 <Icon
                   aria-hidden="true"
-                  aria-label="close"
                   className="bx--modal-close__icon"
                   fill="currentColor"
                   height={20}
@@ -132,15 +131,12 @@ exports[`ModalWrapper should render 1`] = `
                   xmlns="http://www.w3.org/2000/svg"
                 >
                   <svg
-                    aria-hidden="true"
-                    aria-label="close"
+                    aria-hidden={true}
                     className="bx--modal-close__icon"
                     fill="currentColor"
-                    focusable="true"
+                    focusable="false"
                     height={20}
                     preserveAspectRatio="xMidYMid meet"
-                    role="img"
-                    tabIndex="-1"
                     viewBox="0 0 32 32"
                     width={20}
                     xmlns="http://www.w3.org/2000/svg"

From de5d85c5353e16005abfa4aea332bddab9f632d4 Mon Sep 17 00:00:00 2001
From: Taylor Jones <taylor.jones826@gmail.com>
Date: Mon, 1 Nov 2021 14:20:37 -0500
Subject: [PATCH 2/2] chore(release): v10.47.1

---
 packages/carbon-react/package.json | 4 ++--
 packages/react/package.json        | 2 +-
 yarn.lock                          | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/carbon-react/package.json b/packages/carbon-react/package.json
index b40614d6c588..75b0c1c04793 100644
--- a/packages/carbon-react/package.json
+++ b/packages/carbon-react/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@carbon/react",
   "description": "React components for the Carbon Design System",
-  "version": "0.8.0",
+  "version": "0.8.1",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -47,7 +47,7 @@
     "@carbon/styles": "^0.8.0",
     "@carbon/telemetry": "0.0.0-alpha.6",
     "carbon-components": "^10.47.0",
-    "carbon-components-react": "^7.47.0",
+    "carbon-components-react": "^7.47.1",
     "carbon-icons": "^7.0.7"
   },
   "devDependencies": {
diff --git a/packages/react/package.json b/packages/react/package.json
index 8291045ed7a0..b8c503012db6 100644
--- a/packages/react/package.json
+++ b/packages/react/package.json
@@ -1,7 +1,7 @@
 {
   "name": "carbon-components-react",
   "description": "The Carbon Design System is IBM’s open-source design system for products and experiences.",
-  "version": "7.47.0",
+  "version": "7.47.1",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "es/index.js",
diff --git a/yarn.lock b/yarn.lock
index d8378eab9bf9..d27d626678a9 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2014,7 +2014,7 @@ __metadata:
     babel-preset-carbon: ^0.1.0
     browserslist-config-carbon: ^10.6.1
     carbon-components: ^10.47.0
-    carbon-components-react: ^7.47.0
+    carbon-components-react: ^7.47.1
     carbon-icons: ^7.0.7
     css-loader: ^5.2.4
     fs-extra: ^10.0.0
@@ -10293,7 +10293,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"carbon-components-react@^7.47.0, carbon-components-react@workspace:packages/react":
+"carbon-components-react@^7.47.1, carbon-components-react@workspace:packages/react":
   version: 0.0.0-use.local
   resolution: "carbon-components-react@workspace:packages/react"
   dependencies: