fix/lint-err

RocketChat · Feb 17, 2024 · 09c13f5 · 09c13f5
1 parent 2e9f9a7
commit 09c13f5
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 23 deletions.
diff --git a/packages/react/src/components/ChatInput/ChatInput.js b/packages/react/src/components/ChatInput/ChatInput.js
@@ -8,7 +8,7 @@ import {
   useMessageStore,
   loginModalStore,
   useChannelStore,
-  useMemberStore
+  useMemberStore,
 } from '../../store';
 import ChatInputFormattingToolbar from './ChatInputFormattingToolbar';
 import useAttachmentWindowStore from '../../store/attachmentwindow';
@@ -59,7 +59,8 @@ const ChatInput = ({ scrollToBottom }) => {
           .catch(console.error);
 
         RCInstance.getChannelMembers(isChannelPrivate)
-          .then((channelMembers) => setMembersHandler(channelMembers.members || []))
+          .then((channelMembers) =>
+            setMembersHandler(channelMembers.members || []))
           .catch(console.error);
       }
     });

diff --git a/packages/react/src/components/Markup/elements/Mention.js b/packages/react/src/components/Markup/elements/Mention.js
@@ -1,5 +1,5 @@
 import React from 'react';
-import { css } from '@emotion/react'
+import { css } from '@emotion/react';
 import PropTypes from 'prop-types';
 import { useMemberStore, useUserStore } from '../../../store';
 
@@ -8,19 +8,27 @@ const Mention = ({ contents }) => {
   const username = useUserStore((state) => state.username);
 
   const mentionStyles = css`
-    background-color: ${contents.value === 'all' || contents.value === 'here' ? '#f38c39' :
-      (contents.value === username ? '#ec0d2a' : '#e4e7ea')
+    background-color: ${contents.value === 'all' || contents.value === 'here'
+      ? '#f38c39'
+      : contents.value === username
+        ? '#ec0d2a'
+        : '#e4e7ea'
     };
-    color: ${contents.value === 'all' || contents.value === 'here' ? '#ffffff' :
-      (contents.value === username ? '#ffffff' : '#2f343d')
+    color: ${contents.value === 'all' || contents.value === 'here'
+      ? '#ffffff' :
+      contents.value === username
+        ? '#ffffff'
+        : '#2f343d'
     };
     font-weight: bold;
     cursor: pointer;
     padding: 1.5px;
     border-radius: 3px;
 
     &:hover {
-      text-decoration: ${contents.value === 'all' || contents.value === 'here' ? 'none' : 'underline'};
+      text-decoration: ${contents.value === 'all' || contents.value === 'here'
+      ? 'none'
+      : 'underline'}; 
     }
   `;
 
@@ -37,11 +45,7 @@ const Mention = ({ contents }) => {
   return (
     <>
       {hasMember(contents.value) === true ? (
-        <span
-          css={mentionStyles}
-        >
-          {contents.value}
-        </span>
+        <span css={mentionStyles}>{contents.value}</span>
       ) : (
         `@${contents.value}`
       )}

diff --git a/packages/react/src/components/Mentions/MembersList.js b/packages/react/src/components/Mentions/MembersList.js
@@ -1,7 +1,7 @@
 import React, { useEffect } from 'react';
 import { css } from '@emotion/react';
-import { Box } from '../Box';
 import PropTypes from 'prop-types';
+import { Box } from '../Box';
 
 function MembersList({ mentionIndex, filteredMembers = [], onMemberClick }) {
   const listStyle = css`
@@ -30,10 +30,10 @@ function MembersList({ mentionIndex, filteredMembers = [], onMemberClick }) {
 
   const listItemStyle = css`
     cursor: pointer;
-    display: flex; 
-    justify-content: space-between; 
-    align-items: center; 
-    padding-left: 0; 
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    padding-left: 0;
     padding-right: 2px;
 
     &:hover {
@@ -46,7 +46,6 @@ function MembersList({ mentionIndex, filteredMembers = [], onMemberClick }) {
     font-weight: 600;
   `;
 
-
   const handleMemberClick = (selectedItem) => {
     onMemberClick(selectedItem);
   };
@@ -55,8 +54,11 @@ function MembersList({ mentionIndex, filteredMembers = [], onMemberClick }) {
     const handleKeyPress = (event) => {
       if (event.key === 'Enter') {
         const selectedItem =
-          mentionIndex < filteredMembers.length ? filteredMembers[mentionIndex] :
-            mentionIndex === filteredMembers.length ? 'all' : 'here';
+          mentionIndex < filteredMembers.length
+            ? filteredMembers[mentionIndex]
+            : mentionIndex === filteredMembers.length
+              ? 'all'
+              : 'here';
         handleMemberClick(selectedItem);
       }
     };
@@ -68,7 +70,6 @@ function MembersList({ mentionIndex, filteredMembers = [], onMemberClick }) {
     };
   }, [mentionIndex, filteredMembers, handleMemberClick]);
 
-
   return (
     <Box css={listStyle}>
       <ul style={{ listStyle: 'none' }}>

diff --git a/packages/react/src/lib/searchToMentionUser.js b/packages/react/src/lib/searchToMentionUser.js
@@ -29,7 +29,9 @@ export const searchToMentionUser = (
       setmentionIndex(-1);
       setshowMembersList(false);
     } else {
-      const query = message.substring(message.lastIndexOf('@') + 1).toLowerCase();
+      const query = message
+        .substring(message.lastIndexOf('@') + 1)
+        .toLowerCase();
       const filteredMentionMembers = roomMembers.filter(
         (member) =>
           member.name.toLowerCase().includes(query) ||