From f5415a25adbbf1652fdc1c52b725159e10fe09df Mon Sep 17 00:00:00 2001
From: Peter Zimon <peter.zimon@gmail.com>
Date: Tue, 6 Jun 2023 09:49:10 +0200
Subject: [PATCH] Added backDropClick param. to modals in AdminX

refs. https://github.com/TryGhost/Team/issues/3351
---
 .../src/admin-x-ds/global/Modal.tsx           | 42 +++++++++++--------
 .../general/modals/UserDetailModal.tsx        |  1 +
 2 files changed, 25 insertions(+), 18 deletions(-)

diff --git a/ghost/admin-x-settings/src/admin-x-ds/global/Modal.tsx b/ghost/admin-x-settings/src/admin-x-ds/global/Modal.tsx
index f3c79d2fe7..4664cd863d 100644
--- a/ghost/admin-x-settings/src/admin-x-ds/global/Modal.tsx
+++ b/ghost/admin-x-settings/src/admin-x-ds/global/Modal.tsx
@@ -2,6 +2,7 @@ import Button, {IButton} from './Button';
 import ButtonGroup from './ButtonGroup';
 import Heading from './Heading';
 import React from 'react';
+import clsx from 'clsx';
 import {useModal} from '@ebay/nice-modal-react';
 
 export type ModalSize = 'sm' | 'md' | 'lg' | 'xl' | 'full' | 'bleed' | number;
@@ -24,21 +25,23 @@ export interface ModalProps {
     onCancel?: () => void;
     children?: React.ReactNode;
     backDrop?: boolean;
+    backDropClick?: boolean;
 }
 
 const Modal: React.FC<ModalProps> = ({
-    size = 'md', 
-    title, 
-    okLabel = 'OK', 
-    cancelLabel = 'Cancel', 
-    customFooter, 
-    leftButtonLabel, 
-    noPadding = false, 
-    onOk, 
-    okColor = 'black', 
-    onCancel, 
+    size = 'md',
+    title,
+    okLabel = 'OK',
+    cancelLabel = 'Cancel',
+    customFooter,
+    leftButtonLabel,
+    noPadding = false,
+    onOk,
+    okColor = 'black',
+    onCancel,
     children,
-    backDrop = true
+    backDrop = true,
+    backDropClick = true
 }) => {
     const modal = useModal();
 
@@ -47,7 +50,7 @@ const Modal: React.FC<ModalProps> = ({
     if (!customFooter) {
         buttons.push({
             key: 'cancel-modal',
-            label: cancelLabel, 
+            label: cancelLabel,
             onClick: (onCancel ? onCancel : () => {
                 modal.remove();
             })
@@ -55,7 +58,7 @@ const Modal: React.FC<ModalProps> = ({
 
         buttons.push({
             key: 'ok-modal',
-            label: okLabel, 
+            label: okLabel,
             color: okColor,
             className: 'min-w-[80px]',
             onClick: onOk
@@ -95,14 +98,14 @@ const Modal: React.FC<ModalProps> = ({
         modalClasses += ` h-full ${!noPadding && 'p-12'}`;
         break;
 
-    default: 
+    default:
         modalClasses += ` ${!noPadding && 'p-8'}`;
         backdropClasses += ' p-[8vmin]';
         break;
     }
 
-    const handleBackdropClick = (e: React.MouseEvent<HTMLDivElement>) => {        
-        if (e.target === e.currentTarget && backDrop) {
+    const handleBackdropClick = (e: React.MouseEvent<HTMLDivElement>) => {
+        if (e.target === e.currentTarget && backDropClick) {
             modal.remove();
         }
     };
@@ -113,13 +116,16 @@ const Modal: React.FC<ModalProps> = ({
 
     return (
         <div className={backdropClasses} id='modal-backdrop' onClick={handleBackdropClick}>
-            <div className={`pointer-events-none fixed inset-0 z-0 bg-[rgba(98,109,121,0.15)] backdrop-blur-[3px]`}></div>
+            <div className={clsx(
+                'pointer-events-none fixed inset-0 z-0',
+                backDrop && 'bg-[rgba(98,109,121,0.15)] backdrop-blur-[3px]'
+            )}></div>
             <section className={modalClasses} style={modalStyles}>
                 <div className='h-full'>
                     {title && <Heading level={4}>{title}</Heading>}
                     {children}
                 </div>
-                {customFooter ? customFooter : 
+                {customFooter ? customFooter :
                     <div className='w-100 flex items-center justify-between gap-6'>
                         <div>
                             {leftButtonLabel &&
diff --git a/ghost/admin-x-settings/src/components/settings/general/modals/UserDetailModal.tsx b/ghost/admin-x-settings/src/components/settings/general/modals/UserDetailModal.tsx
index 99b83e6fa3..2cae4e6070 100644
--- a/ghost/admin-x-settings/src/components/settings/general/modals/UserDetailModal.tsx
+++ b/ghost/admin-x-settings/src/components/settings/general/modals/UserDetailModal.tsx
@@ -589,6 +589,7 @@ const UserDetailModal:React.FC<UserDetailModalProps> = ({user, updateUser}) => {
 
     return (
         <Modal
+            backDropClick={false}
             okColor='green'
             okLabel={okLabel}
             size='lg'