commit 22ed8194e588a8d5979ed109369092dd3f8139c0
author idillon <io.daza-dillon@savoirfairelinux.com> Tue Nov 29 12:17:04 2022 -0500
committer Io Daza-Dillon <io.daza-dillon@savoirfairelinux.com> Wed Dec 14 15:25:09 2022 -0500
tree 1ab20af8886bf3de9f90071ad6baefbe5f63cafb
parent 07d31cc0b1d535b3dafbd1f551e01fd9ba1f0ef7

Fix dialog styles, remove context menu from ConversationListItem's dialogs

- Restore dialog styles that magically disappeared
- Fix font-family on ConfirmationDialog's content
- Remove the custom context menu that was appearing on dialogs

Change-Id: If828d5f6b3bdfc2a6e31c58fe40ad5fff286df3d

client/src/components/ConversationListItem.tsx

diff --git a/client/src/components/ConversationListItem.tsx b/client/src/components/ConversationListItem.tsx
index f71705f..710fe0b 100644
--- a/client/src/components/ConversationListItem.tsx
+++ b/client/src/components/ConversationListItem.tsx
@@ -80,7 +80,7 @@
   );
 
   return (
-    <Box onContextMenu={contextMenuHandler.handleAnchorPosition}>
+    <Box>
       <ConversationMenu
         conversationId={conversationId}
         conversationName={conversationName}
@@ -88,7 +88,13 @@
         isSelected={isSelected}
         contextMenuProps={contextMenuHandler.props}
       />
-      <ListItem button alignItems="flex-start" selected={isSelected} onClick={onClick}>
+      <ListItem
+        button
+        alignItems="flex-start"
+        selected={isSelected}
+        onClick={onClick}
+        onContextMenu={contextMenuHandler.handleAnchorPosition}
+      >
         <ListItemAvatar>
           <ConversationAvatar displayName={conversationName} />
         </ListItemAvatar>

client/src/components/Dialog.tsx

diff --git a/client/src/components/Dialog.tsx b/client/src/components/Dialog.tsx
index 9a6790d..aa9f01c 100644
--- a/client/src/components/Dialog.tsx
+++ b/client/src/components/Dialog.tsx
@@ -100,6 +100,7 @@
 interface ConfirmationDialogProps extends Omit<BaseDialogProps, 'actions'> {
   onConfirm: () => void;
   confirmButtonText: string;
+  content: string;
 }
 
 export const ConfirmationDialog = ({ onConfirm, confirmButtonText, ...props }: ConfirmationDialogProps) => {
@@ -109,6 +110,7 @@
   return (
     <BaseDialog
       {...props}
+      content={<Typography variant="body1">{props.content}</Typography>}
       actions={
         <>
           <Button onClick={onConfirm}>{confirmButtonText}</Button>

client/src/themes/Default.ts

diff --git a/client/src/themes/Default.ts b/client/src/themes/Default.ts
index 0245b67..aceec0f 100644
--- a/client/src/themes/Default.ts
+++ b/client/src/themes/Default.ts
@@ -253,6 +253,38 @@
           },
         },
       },
+      MuiDialog: {
+        styleOverrides: {
+          paper: {
+            padding: '16px',
+            boxShadow: '3px 3px 7px #00000029',
+            borderRadius: '20px',
+          },
+        },
+      },
+      MuiDialogActions: {
+        styleOverrides: {
+          root: {
+            padding: '0px',
+          },
+        },
+      },
+      MuiDialogContent: {
+        styleOverrides: {
+          root: {
+            padding: '0px',
+            margin: '16px 0px',
+            minWidth: '500px',
+          },
+        },
+      },
+      MuiDialogTitle: {
+        styleOverrides: {
+          root: {
+            padding: '0px',
+          },
+        },
+      },
       MuiSwitch: {
         defaultProps: {
           disableRipple: true,