From 79e27f284b14ebaa220e8844022058a01387fd3d Mon Sep 17 00:00:00 2001
From: kat <kat.chen@ticketmaster.com>
Date: Mon, 14 Mar 2022 17:12:59 -0700
Subject: [PATCH] perf(Modal): CO-6277: add accessibility attributes

---
 catalog/pages/adaptive_modal/index.md         |  6 +++
 catalog/pages/buttons/index.md                |  4 ++
 .../__snapshots__/index.spec.js.snap          | 18 ++++-----
 src/components/Button/Base.tsx                |  9 +++--
 .../__snapshots__/index.spec.js.snap          | 16 ++++++++
 src/components/Modal/index.js                 | 40 ++++++++++++++++---
 6 files changed, 76 insertions(+), 17 deletions(-)

diff --git a/catalog/pages/adaptive_modal/index.md b/catalog/pages/adaptive_modal/index.md
index de9ae1867..4adba1226 100644
--- a/catalog/pages/adaptive_modal/index.md
+++ b/catalog/pages/adaptive_modal/index.md
@@ -48,6 +48,12 @@ rows:
   - Prop: onScroll
     Type: func(Event)
     Notes: Optional. Callback is fired when the user scrolls modal's content
+  - Prop: focusElement
+    Type: React ref
+    Notes: Optional. Focuses on referenced element when modal is opened.
+  - Prop: modalId
+    Type: string
+    Notes: Optional. Sets ids of modal's title and content elements as modalId followed by '-title' and '-content' respectively.
 ```
 
 ```react
diff --git a/catalog/pages/buttons/index.md b/catalog/pages/buttons/index.md
index d50ff5980..804416a78 100644
--- a/catalog/pages/buttons/index.md
+++ b/catalog/pages/buttons/index.md
@@ -30,6 +30,10 @@ rows:
     Type: any
     Default:
     Notes: Passes through any other props to underlying button, or in the case of an href prop being passed, anchor, element
+  - Prop: forwardedRef
+    Type: any
+    Default: null
+    Notes: React ref forwarded to button element.
 ```
 
 ### Standard button
diff --git a/src/components/Banner/__tests__/__snapshots__/index.spec.js.snap b/src/components/Banner/__tests__/__snapshots__/index.spec.js.snap
index fa8f5f544..f187b3567 100644
--- a/src/components/Banner/__tests__/__snapshots__/index.spec.js.snap
+++ b/src/components/Banner/__tests__/__snapshots__/index.spec.js.snap
@@ -107,7 +107,7 @@ exports[`<Banner /> renders correctly when open 1`] = `
         This is your primary message text.
       </span>
       <div
-        style="max-height: 0px;"
+        style="transition: max-height 0.3s cubic-bezier(0.455, 0.03, 0.515, 0.955) 0s; max-height: 0px;"
       >
         <div
           class="c4 text text--dark text--primary c5"
@@ -253,7 +253,7 @@ exports[`<Banner /> renders correctly when variant is set 1`] = `
         This is your primary message text.
       </span>
       <div
-        style="max-height: 0px;"
+        style="transition: max-height 0.3s cubic-bezier(0.455, 0.03, 0.515, 0.955) 0s; max-height: 0px;"
       >
         <div
           class="c4 text text--dark text--primary c5"
@@ -434,7 +434,7 @@ exports[`<Banner /> renders correctly with close button 1`] = `
         This is your primary message text.
       </span>
       <div
-        style="max-height: 0px;"
+        style="transition: max-height 0.3s cubic-bezier(0.455, 0.03, 0.515, 0.955) 0s; max-height: 0px;"
       >
         <div
           class="c4 text text--dark text--primary c5"
@@ -611,7 +611,7 @@ exports[`<Banner /> renders correctly with close button hidden 1`] = `
         This is your primary message text.
       </span>
       <div
-        style="max-height: 0px;"
+        style="transition: max-height 0.3s cubic-bezier(0.455, 0.03, 0.515, 0.955) 0s; max-height: 0px;"
       >
         <div
           class="c4 text text--dark text--primary c5"
@@ -729,7 +729,7 @@ exports[`<Banner /> renders correctly with content 1`] = `
         This is your primary message text.
       </span>
       <div
-        style="max-height: 0px;"
+        style="transition: max-height 0.3s cubic-bezier(0.455, 0.03, 0.515, 0.955) 0s; max-height: 0px;"
       >
         <div
           class="c4 text text--dark text--primary c5"
@@ -869,7 +869,7 @@ exports[`<Banner /> renders correctly with custom icon 1`] = `
         This is your primary message text.
       </span>
       <div
-        style="max-height: 0px;"
+        style="transition: max-height 0.3s cubic-bezier(0.455, 0.03, 0.515, 0.955) 0s; max-height: 0px;"
       >
         <div
           class="c4 text text--dark text--primary c5"
@@ -1061,7 +1061,7 @@ exports[`<Banner /> renders correctly with custom title for the close button 1`]
         test link text
       </span>
       <div
-        style="max-height: 0px;"
+        style="transition: max-height 0.3s cubic-bezier(0.455, 0.03, 0.515, 0.955) 0s; max-height: 0px;"
       >
         <div
           class="c5 text text--dark text--primary c6"
@@ -1279,7 +1279,7 @@ exports[`<Banner /> renders correctly with expand/collapse button 1`] = `
         collapsedText
       </span>
       <div
-        style="max-height: 0px;"
+        style="transition: max-height 0.3s cubic-bezier(0.455, 0.03, 0.515, 0.955) 0s; max-height: 0px;"
       >
         <div
           class="c5 text text--dark text--primary c6"
@@ -1500,7 +1500,7 @@ exports[`<Banner /> renders correctly with link 1`] = `
         test link text
       </span>
       <div
-        style="max-height: 0px;"
+        style="transition: max-height 0.3s cubic-bezier(0.455, 0.03, 0.515, 0.955) 0s; max-height: 0px;"
       >
         <div
           class="c5 text text--dark text--primary c6"
diff --git a/src/components/Button/Base.tsx b/src/components/Button/Base.tsx
index 71edd7998..4cc095f92 100644
--- a/src/components/Button/Base.tsx
+++ b/src/components/Button/Base.tsx
@@ -20,6 +20,7 @@ export interface ButtonProps {
   readonly icon: any;
   disabled?: boolean;
   type?: "button" | "submit" | "reset";
+  forwardedRef?: any;
 }
 
 export interface ButtonLinkProps extends ButtonProps {
@@ -39,13 +40,15 @@ class Button extends Component<ButtonProps> {
     variant: PropTypes.oneOf(BUTTON_VARIANTS),
     size: PropTypes.oneOf(SIZES),
     icon: PropTypes.node,
-    children: PropTypes.node.isRequired
+    children: PropTypes.node.isRequired,
+    forwardedRef: PropTypes.objectOf(PropTypes.any)
   };
 
   static defaultProps: ButtonProps = {
     size: REGULAR,
     variant: STANDARD,
-    icon: null
+    icon: null,
+    forwardedRef: null
   };
 
   componentDidMount() {
@@ -78,7 +81,7 @@ class Button extends Component<ButtonProps> {
     }
   };
 
-  button = React.createRef<HTMLButtonElement>();
+  button = this.props.forwardedRef || React.createRef<HTMLButtonElement>();
 
   render() {
     const { variant, size, icon, children, ...rest } = this.props;
diff --git a/src/components/Modal/__tests__/__snapshots__/index.spec.js.snap b/src/components/Modal/__tests__/__snapshots__/index.spec.js.snap
index 236f6a3f2..4f779ed75 100644
--- a/src/components/Modal/__tests__/__snapshots__/index.spec.js.snap
+++ b/src/components/Modal/__tests__/__snapshots__/index.spec.js.snap
@@ -182,7 +182,9 @@ exports[`<Modal /> closeModal should close the modal when the request was approv
     class="c0 container--overlay"
   >
     <div
+      aria-modal="true"
       class="c1"
+      role="dialog"
     >
       <div
         class="c2"
@@ -379,7 +381,9 @@ exports[`<Modal /> closeModal should close the modal when there is no onRequestC
     class="c0 container--overlay"
   >
     <div
+      aria-modal="true"
       class="c1"
+      role="dialog"
     >
       <div
         class="c2"
@@ -576,7 +580,9 @@ exports[`<Modal /> render should not render the modal if it is closed 1`] = `
     class="c0 container--overlay"
   >
     <div
+      aria-modal="true"
       class="c1"
+      role="dialog"
     >
       <div
         class="c2"
@@ -862,7 +868,9 @@ exports[`<Modal /> render should render fullscreen modal with action bars 1`] =
     class="c0 container--overlay"
   >
     <div
+      aria-modal="true"
       class="c1 fullscreen"
+      role="dialog"
     >
       <div
         class="c2"
@@ -1162,7 +1170,9 @@ exports[`<Modal /> render should render with actionBar and bottomActionBar 1`] =
     class="c0 container--overlay"
   >
     <div
+      aria-modal="true"
       class="c1"
+      role="dialog"
     >
       <div
         class="c2"
@@ -1372,7 +1382,9 @@ exports[`<Modal /> render should render without errors and pass extra props 1`]
     class="c0 container--overlay"
   >
     <div
+      aria-modal="true"
       class="c1"
+      role="dialog"
       style="width: 210px;"
     >
       <div
@@ -1581,7 +1593,9 @@ exports[`<Modal /> should recalculate shadows and content height on props change
     class="c0 container--overlay open-enter open-enter-active"
   >
     <div
+      aria-modal="true"
       class="c1 open-enter open-enter-active"
+      role="dialog"
     >
       <div
         class="c2"
@@ -1825,7 +1839,9 @@ exports[`<Modal /> should set bottom action bar shadow when the content was scro
     class="c0 container--overlay"
   >
     <div
+      aria-modal="true"
       class="c1"
+      role="dialog"
     >
       <div
         class="c2"
diff --git a/src/components/Modal/index.js b/src/components/Modal/index.js
index 19d433723..0f5be091f 100644
--- a/src/components/Modal/index.js
+++ b/src/components/Modal/index.js
@@ -61,8 +61,10 @@ export class Modal extends React.Component {
     containerProps: PropTypes.object,
     actionBarProps: PropTypes.object,
     contentProps: PropTypes.object,
-    bottomActionBarProps: PropTypes.object
+    bottomActionBarProps: PropTypes.object,
     /* eslint-enable react/forbid-prop-types */
+    focusElement: PropTypes.objectOf(PropTypes.any),
+    modalId: PropTypes.string
   };
 
   static defaultProps = {
@@ -79,7 +81,9 @@ export class Modal extends React.Component {
     containerProps: {},
     actionBarProps: {},
     contentProps: {},
-    bottomActionBarProps: {}
+    bottomActionBarProps: {},
+    focusElement: null,
+    modalId: null
   };
 
   static throttleTimout = 100;
@@ -101,15 +105,31 @@ export class Modal extends React.Component {
   }
 
   componentDidMount() {
-    if (this.props.isOpened) {
+    const { focusElement, isOpened } = this.props;
+    if (isOpened) {
       this.updateHeightAndShadows();
+      if (
+        focusElement &&
+        focusElement.current &&
+        typeof focusElement.current.focus === "function"
+      ) {
+        focusElement.current.focus();
+      }
     }
     window.addEventListener("resize", this.throttledUpdateHeightAndShadows); // eslint-disable-line
   }
 
   componentDidUpdate(prevProps) {
-    if (this.props.isOpened && !prevProps.isOpened) {
+    const { focusElement, isOpened } = this.props;
+    if (isOpened && !prevProps.isOpened) {
       this.updateHeightAndShadows();
+      if (
+        focusElement &&
+        focusElement.current &&
+        typeof focusElement.current.focus === "function"
+      ) {
+        focusElement.current.focus();
+      }
     }
   }
 
@@ -217,11 +237,15 @@ export class Modal extends React.Component {
       contentProps,
       bottomActionBarProps,
       displayTop,
-      isFullscreen
+      isFullscreen,
+      modalId
     } = this.props;
     const { isOpened, actionBarShadow, bottomActionBarShadow } = this.state;
     const { closeModal } = this;
 
+    const contentId = modalId && `${modalId}-content`;
+    const titleId = modalId && `${modalId}-title`;
+
     return (
       <ModalProvider value={{ closeModal }}>
         <CSSTransition
@@ -248,6 +272,10 @@ export class Modal extends React.Component {
                 size={size}
                 displayTop={displayTop}
                 isFullscreen={isFullscreen}
+                aria-describedby={contentId}
+                aria-labelledby={titleId}
+                aria-modal
+                role="dialog"
                 {...containerProps}
               >
                 {actionBar && (
@@ -255,6 +283,7 @@ export class Modal extends React.Component {
                     shadow={actionBarShadow}
                     ref={this.actionBarRef}
                     gutters={gutters}
+                    id={titleId}
                     {...actionBarProps}
                   >
                     {actionBar}
@@ -264,6 +293,7 @@ export class Modal extends React.Component {
                   ref={this.contentRef}
                   onScroll={this.handleScroll}
                   gutters={gutters}
+                  id={contentId}
                   {...contentProps}
                 >
                   {children}