From af2583c889d7d4b543bbbf77dac4673f4d19b2f4 Mon Sep 17 00:00:00 2001
From: Ashley Harrison <ashley.harrison@grafana.com>
Date: Wed, 10 Apr 2024 10:31:30 +0100
Subject: [PATCH] =?UTF-8?q?ConfirmModal:=20Pressing=20enter=20in=20confirm?=
 =?UTF-8?q?ation=20input=20now=20triggers=20prima=E2=80=A6=20(#85841)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* ConfirmModal: Pressing enter in confirmation input now triggers primary action (#85812)

wrap confirm modal in a form

* add missing imports
---
 .../ConfirmModal/ConfirmModal.test.tsx        | 30 +++++++-
 .../components/ConfirmModal/ConfirmModal.tsx  | 68 +++++++++++--------
 2 files changed, 67 insertions(+), 31 deletions(-)

diff --git a/packages/grafana-ui/src/components/ConfirmModal/ConfirmModal.test.tsx b/packages/grafana-ui/src/components/ConfirmModal/ConfirmModal.test.tsx
index 1bcdc6a4a81..0ffeb63acd1 100644
--- a/packages/grafana-ui/src/components/ConfirmModal/ConfirmModal.test.tsx
+++ b/packages/grafana-ui/src/components/ConfirmModal/ConfirmModal.test.tsx
@@ -105,6 +105,32 @@ describe('ConfirmModal', () => {
     expect(mockOnConfirm).toHaveBeenCalled();
   });
 
+  it('typing the confirmation text and pressing enter should trigger the primary action', async () => {
+    render(
+      <ConfirmModal
+        title="Some Title"
+        body="Some Body"
+        confirmText="Please Confirm"
+        alternativeText="Alternative Text"
+        dismissText="Dismiss Text"
+        isOpen={true}
+        confirmationText="My confirmation text"
+        onConfirm={mockOnConfirm}
+        onDismiss={() => {}}
+        onAlternative={() => {}}
+      />
+    );
+
+    expect(screen.getByRole('button', { name: 'Please Confirm' })).toBeInTheDocument();
+    expect(screen.getByRole('button', { name: 'Please Confirm' })).toBeDisabled();
+
+    await user.type(screen.getByPlaceholderText('Type "My confirmation text" to confirm'), 'mY CoNfIrMaTiOn TeXt');
+    expect(screen.getByRole('button', { name: 'Please Confirm' })).toBeEnabled();
+
+    await user.type(screen.getByPlaceholderText('Type "My confirmation text" to confirm'), '{enter}');
+    expect(mockOnConfirm).toHaveBeenCalled();
+  });
+
   it('returning a promise in the onConfirm callback disables the button whilst the callback is in progress', async () => {
     mockOnConfirm.mockImplementation(() => {
       return new Promise((resolve) => {
@@ -136,7 +162,9 @@ describe('ConfirmModal', () => {
 
     await user.click(screen.getByRole('button', { name: 'Please Confirm' }));
     expect(mockOnConfirm).toHaveBeenCalled();
-    expect(screen.getByRole('button', { name: 'Please Confirm' })).toBeDisabled();
+    await waitFor(() => {
+      expect(screen.getByRole('button', { name: 'Please Confirm' })).toBeDisabled();
+    });
 
     jest.runAllTimers();
     await waitFor(() => {
diff --git a/packages/grafana-ui/src/components/ConfirmModal/ConfirmModal.tsx b/packages/grafana-ui/src/components/ConfirmModal/ConfirmModal.tsx
index 52cccc03221..80c9b2f41c8 100644
--- a/packages/grafana-ui/src/components/ConfirmModal/ConfirmModal.tsx
+++ b/packages/grafana-ui/src/components/ConfirmModal/ConfirmModal.tsx
@@ -1,5 +1,6 @@
 import { css, cx } from '@emotion/css';
 import React, { useEffect, useRef, useState } from 'react';
+import { useForm } from 'react-hook-form';
 
 import { GrafanaTheme2 } from '@grafana/data';
 import { selectors } from '@grafana/e2e-selectors';
@@ -8,7 +9,8 @@ import { useStyles2 } from '../../themes';
 import { IconName } from '../../types/icon';
 import { Button, ButtonVariant } from '../Button';
 import { Input } from '../Input/Input';
-import { HorizontalGroup } from '../Layout/Layout';
+import { Box } from '../Layout/Box/Box';
+import { Stack } from '../Layout/Stack/Stack';
 import { Modal } from '../Modal/Modal';
 
 export interface ConfirmModalProps {
@@ -95,38 +97,44 @@ export const ConfirmModal = ({
     }
   };
 
+  const { handleSubmit } = useForm();
+
   return (
     <Modal className={cx(styles.modal, modalClass)} title={title} icon={icon} isOpen={isOpen} onDismiss={onDismiss}>
-      <div className={styles.modalText}>
-        {body}
-        {description ? <div className={styles.modalDescription}>{description}</div> : null}
-        {confirmationText ? (
-          <div className={styles.modalConfirmationInput}>
-            <HorizontalGroup>
-              <Input placeholder={`Type "${confirmationText}" to confirm`} onChange={onConfirmationTextChange} />
-            </HorizontalGroup>
-          </div>
-        ) : null}
-      </div>
-      <Modal.ButtonRow>
-        <Button variant={dismissVariant} onClick={onDismiss} fill="outline">
-          {dismissText}
-        </Button>
-        <Button
-          variant={confirmButtonVariant}
-          onClick={onConfirmClick}
-          disabled={disabled}
-          ref={buttonRef}
-          data-testid={selectors.pages.ConfirmModal.delete}
-        >
-          {confirmText}
-        </Button>
-        {onAlternative ? (
-          <Button variant="primary" onClick={onAlternative}>
-            {alternativeText}
+      <form onSubmit={handleSubmit(onConfirmClick)}>
+        <div className={styles.modalText}>
+          {body}
+          {description ? <div className={styles.modalDescription}>{description}</div> : null}
+          {confirmationText ? (
+            <div className={styles.modalConfirmationInput}>
+              <Stack alignItems="flex-start">
+                <Box>
+                  <Input placeholder={`Type "${confirmationText}" to confirm`} onChange={onConfirmationTextChange} />
+                </Box>
+              </Stack>
+            </div>
+          ) : null}
+        </div>
+        <Modal.ButtonRow>
+          <Button variant={dismissVariant} onClick={onDismiss} fill="outline">
+            {dismissText}
           </Button>
-        ) : null}
-      </Modal.ButtonRow>
+          <Button
+            type="submit"
+            variant={confirmButtonVariant}
+            disabled={disabled}
+            ref={buttonRef}
+            data-testid={selectors.pages.ConfirmModal.delete}
+          >
+            {confirmText}
+          </Button>
+          {onAlternative ? (
+            <Button variant="primary" onClick={onAlternative}>
+              {alternativeText}
+            </Button>
+          ) : null}
+        </Modal.ButtonRow>
+      </form>
     </Modal>
   );
 };