feat: allow setting mention badge color (#83)

fix!(ui): remove border color of mention badge
graasp · Mar 17, 2023 · b44cd5b · b44cd5b
1 parent f05526d
commit b44cd5b
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 35 deletions.
diff --git a/example/src/components/ChatboxTest.tsx b/example/src/components/ChatboxTest.tsx
@@ -18,7 +18,7 @@ import { MUTATION_KEYS } from '@graasp/query-client';
 import { ChatMention } from '@graasp/sdk';
 import buildI18n, { namespaces } from '@graasp/translations';
 
-import { MentionButton } from '../../../src';
+import { MentionButton } from '@graasp/chatbox';
 import {
   DEFAULT_CHAT_ID,
   DEFAULT_LANG,

diff --git a/package.json b/package.json
@@ -57,9 +57,9 @@
   "dependencies": {
     "@emotion/react": "11.10.6",
     "@emotion/styled": "11.10.6",
-    "@graasp/sdk": "0.5.0",
-    "@graasp/translations": "1.6.0",
-    "@graasp/ui": "0.13.0",
+    "@graasp/sdk": "0.9.2",
+    "@graasp/translations": "1.8.0",
+    "@graasp/ui": "2.2.0",
     "clsx": "1.2.1",
     "i18next": "21.8.1",
     "immutable": "4.2.4",

diff --git a/src/components/Chatbox/InputBar.tsx b/src/components/Chatbox/InputBar.tsx
@@ -1,11 +1,10 @@
-import { EditMessageFunctionType, SendMessageFunctionType } from '@/types';
-
 import { FC, useEffect, useRef, useState } from 'react';
 
 import { MessageBodyType } from '@graasp/sdk';
 
 import { useEditingContext } from '../../context/EditingContext';
 import { useMessagesContext } from '../../context/MessagesContext';
+import { EditMessageFunctionType, SendMessageFunctionType } from '../../types';
 import FullWidthWrapper from '../common/FullWidthWrapper';
 import EditBanner from './EditBanner';
 import Input from './Input';

diff --git a/src/components/Mentions/MentionButton.tsx b/src/components/Mentions/MentionButton.tsx
@@ -5,7 +5,7 @@ import { I18nextProvider } from 'react-i18next';
 import { UseQueryResult } from 'react-query';
 
 import { Notifications } from '@mui/icons-material';
-import { Badge, IconButton, styled } from '@mui/material';
+import { Badge, BadgeProps, IconButton } from '@mui/material';
 
 import { MentionStatus } from '@graasp/sdk';
 import { MemberMentionsRecord, MemberRecord } from '@graasp/sdk/frontend';
@@ -17,6 +17,7 @@ import MentionsTable from './MentionsTable';
 
 type Props = {
   color?: 'primary' | 'secondary';
+  badgeColor?: BadgeProps['color'];
   lang?: string;
   useMentions: (
     options?: { getUpdates?: boolean | undefined } | undefined,
@@ -29,22 +30,14 @@ type Props = {
 
 const MentionButton: FC<Props> = ({
   color = 'primary',
+  badgeColor = 'warning',
   lang = langs.en,
   useMentions,
   useMembers,
   patchMentionFunction,
   deleteMentionFunction,
   clearAllMentionsFunction,
 }) => {
-  const StyledBadge = styled(Badge)(({ theme }) => ({
-    '& .MuiBadge-badge': {
-      border: `2px solid ${
-        color === 'primary'
-          ? theme.palette.background.paper
-          : theme.palette.primary.main
-      }`,
-    },
-  }));
   const i18n = useMemo(() => {
     const i18nInstance = buildI18n(namespaces.chatbox);
     i18nInstance.changeLanguage(lang);
@@ -78,16 +71,16 @@ const MentionButton: FC<Props> = ({
           data-cy={mentionButtonCypress}
           onClick={(): void => setOpen(true)}
         >
-          <StyledBadge
+          <Badge
             overlap="circular"
-            color={color}
+            color={badgeColor}
             badgeContent={
               mentions?.filter((m) => m.status === MentionStatus.UNREAD)
                 ?.size || 0
             }
           >
             <Notifications color={color} />
-          </StyledBadge>
+          </Badge>
         </IconButton>
         <MentionsDialog
           content={

diff --git a/yarn.lock b/yarn.lock
@@ -2289,9 +2289,9 @@ __metadata:
     "@emotion/react": 11.10.6
     "@emotion/styled": 11.10.6
     "@graasp/query-client": 0.3.0
-    "@graasp/sdk": 0.5.0
-    "@graasp/translations": 1.6.0
-    "@graasp/ui": 0.13.0
+    "@graasp/sdk": 0.9.2
+    "@graasp/translations": 1.8.0
+    "@graasp/ui": 2.2.0
     "@mui/icons-material": 5.11.11
     "@mui/lab": 5.0.0-alpha.121
     "@mui/material": 5.11.11
@@ -2402,9 +2402,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@graasp/sdk@npm:0.5.0":
-  version: 0.5.0
-  resolution: "@graasp/sdk@npm:0.5.0"
+"@graasp/sdk@npm:0.9.2":
+  version: 0.9.2
+  resolution: "@graasp/sdk@npm:0.9.2"
   dependencies:
     "@fastify/secure-session": 5.3.0
     aws-sdk: 2.1310.0
@@ -2415,7 +2415,7 @@ __metadata:
     qs: 6.11.0
     slonik: 28.1.1
     uuid: 9.0.0
-  checksum: 2f021d5b8a725e089f8ca473384e0d397f8a2680ec62e5ef290bd5601cb6bd44c59010b80a628d33a8ef5141c7bfa128cc1b78573c9652e605439571f69ebac0
+  checksum: 49daf48b8877b1a0bdd0612c5a88be22860de4e94c494978732add26d38b5d0a6784df8eb8caedd7972b2767c78258c056c89889c73eeeb3971f2ff989a7f1e0
   languageName: node
   linkType: hard
 
@@ -2428,20 +2428,20 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@graasp/translations@npm:1.6.0":
-  version: 1.6.0
-  resolution: "@graasp/translations@npm:1.6.0"
+"@graasp/translations@npm:1.8.0":
+  version: 1.8.0
+  resolution: "@graasp/translations@npm:1.8.0"
   dependencies:
     i18next: 21.8.1
-  checksum: 4decfc135055ab65462cab9f2ba56efb257c836c6ad367d3a81762a4521dd9ff87d031c282eaf49e082a6b1fe385dd6e1b4d4b0ef38be400c68e39199a95b940
+  checksum: 61c99573820d08f675b9294c075c0995bc2589c1aac962c2eb140b73de45125b28131e5712848b416c8e8a7694f7b6381d903b9e8fd6f4db9cb41ab553352c52
   languageName: node
   linkType: hard
 
-"@graasp/ui@npm:0.13.0":
-  version: 0.13.0
-  resolution: "@graasp/ui@npm:0.13.0"
+"@graasp/ui@npm:2.2.0":
+  version: 2.2.0
+  resolution: "@graasp/ui@npm:2.2.0"
   dependencies:
-    "@graasp/sdk": 0.4.1
+    "@graasp/sdk": 0.9.2
     clsx: 1.1.1
     http-status-codes: 2.2.0
     immutable: 4.2.4
@@ -2472,7 +2472,7 @@ __metadata:
       optional: true
     ag-grid-react:
       optional: true
-  checksum: 2188c3b23c3c9751e0255c355671abaad5ac4801c92e29798e6b517dda65b47ad0be5467a3abf646a1c6b1624aa2bc10e9895306dbc131912493732b8c39ad14
+  checksum: 0c87e2a73c223430723fabe02a5186ea44e3815f665bc0c5ba0213eb382925d9437ae3369c715dab02ee1441321ae02a1de233e303e29dd512b58016ff9976cc
   languageName: node
   linkType: hard