From 51750ea88450d587066127d0bf7592494234bca4 Mon Sep 17 00:00:00 2001
From: Chisom Chima <87203527+Chisomchima@users.noreply.github.com>
Date: Mon, 3 Jun 2024 11:15:55 +0100
Subject: [PATCH] feat: accessibility on dropdown button (#1460)

feat: accessibility on dropdown button

chore: test dropdown-button in modal

chore: update the test for dropdown button in modal

chore: accessibilty fix
---
 .../__tests__/dropdown-button.test.js         | 59 +++++++++++++++++++
 .../src/dropdown-button/dropdown-button.js    | 17 ++++++
 2 files changed, 76 insertions(+)

diff --git a/components/button/src/dropdown-button/__tests__/dropdown-button.test.js b/components/button/src/dropdown-button/__tests__/dropdown-button.test.js
index c926ef5aaa..a38e8e167a 100644
--- a/components/button/src/dropdown-button/__tests__/dropdown-button.test.js
+++ b/components/button/src/dropdown-button/__tests__/dropdown-button.test.js
@@ -1,8 +1,10 @@
 import { Layer } from '@dhis2-ui/layer'
 import { Popper } from '@dhis2-ui/popper'
+import { render, fireEvent, waitFor } from '@testing-library/react'
 import { mount } from 'enzyme'
 import React from 'react'
 import { act } from 'react-dom/test-utils'
+import { Modal } from '../../../../modal/src/modal/modal.js'
 import { Button } from '../../index.js'
 import { DropdownButton } from '../dropdown-button.js'
 
@@ -43,7 +45,64 @@ describe('<DropdownButton>', () => {
                     })
                 )
             })
+            it('closes dropdown when escape key is pressed', async () => {
+                const componentText = 'Dropdown Content'
+
+                const { getByTestId, queryByText } = render(
+                    <DropdownButton component={componentText} />
+                )
+
+                const toggleButton = getByTestId(
+                    'dhis2-uicore-dropdownbutton-toggle'
+                )
+                fireEvent.click(toggleButton)
+
+                await waitFor(() => {
+                    expect(queryByText(componentText)).toBeInTheDocument()
+                })
+
+                fireEvent.keyDown(document, { key: 'Escape' })
+
+                await waitFor(() => {
+                    expect(queryByText(componentText)).not.toBeInTheDocument()
+                })
+            })
+            test('modal remains open when dropdown button is closed on escape click', async () => {
+                const dropdownButtonText = 'Dropdown Content'
+                const headingText = 'Heading Text'
+                const modalContent = (
+                    <div>
+                        <h1>{headingText}</h1>
+                        <DropdownButton component={dropdownButtonText} />
+                    </div>
+                )
+
+                const { getByTestId, queryByText } = render(
+                    <Modal hide={false} onClose={() => {}}>
+                        {modalContent}
+                    </Modal>
+                )
+
+                const toggleButton = getByTestId(
+                    'dhis2-uicore-dropdownbutton-toggle'
+                )
+                fireEvent.click(toggleButton)
+
+                await waitFor(() => {
+                    expect(queryByText(dropdownButtonText)).toBeInTheDocument()
+                })
+
+                fireEvent.keyDown(document, { key: 'Escape' })
+
+                await waitFor(() => {
+                    expect(
+                        queryByText(dropdownButtonText)
+                    ).not.toBeInTheDocument()
+                    expect(queryByText(headingText)).toBeInTheDocument()
+                })
+            })
         })
+
         describe('closed state', () => {
             const onClick = jest.fn()
             const wrapper = mount(
diff --git a/components/button/src/dropdown-button/dropdown-button.js b/components/button/src/dropdown-button/dropdown-button.js
index f225206c9d..4fd4aa65ab 100644
--- a/components/button/src/dropdown-button/dropdown-button.js
+++ b/components/button/src/dropdown-button/dropdown-button.js
@@ -69,6 +69,22 @@ class DropdownButton extends Component {
 
     anchorRef = React.createRef()
 
+    componentDidMount() {
+        document.addEventListener('keydown', this.handleKeyDown)
+    }
+
+    componentWillUnmount() {
+        document.removeEventListener('keydown', this.handleKeyDown)
+    }
+
+    handleKeyDown = (event) => {
+        event.preventDefault()
+        if (event.key === 'Escape' && this.state.open) {
+            event.stopPropagation()
+            this.setState({ open: false })
+        }
+    }
+
     onClickHandler = ({ name, value }, event) => {
         const handleClick = (open) => {
             if (this.props.onClick) {
@@ -133,6 +149,7 @@ class DropdownButton extends Component {
                     tabIndex={tabIndex}
                     type={type}
                     initialFocus={initialFocus}
+                    data-test="dhis2-uicore-dropdownbutton-toggle"
                 >
                     {children}
                     <ArrowIconComponent className={arrow.className} />