From dade7b450f3432b2df22e7a9769ae31e58a29b11 Mon Sep 17 00:00:00 2001 From: Anirudh <70373803+techwithanirudh@users.noreply.github.com> Date: Fri, 2 Jun 2023 09:41:34 +0530 Subject: [PATCH] feat: Add clear button to search bar (#328) * feat: Add clear button to search bar This commit introduces a clear button to the SearchBar component using the X icon from Lucide-React. When the user enters a query in the input field, the clear button appears allowing them to easily remove the search term. The clear button is hidden when there is no search term entered. * Refactor SearchBar component to improve user experience Changed SearchBar's input field to add padding on the left side and an absolute positioned search icon. Also, added absolute positioned X icon on the right side when there is an input value, ensuring a better user experience. * Refactor SearchBar component to show Clear Search icon dynamically This commit makes changes to the SearchBar React component to render the Clear Search X icon only when the input field has a value. A showClearIcon state using useState hook is added and updated every time the input value changes. The useEffect hook is used to handle the case when the user clears the input value. This allows better UX by providing clear intent to the user that the icon is clickable and will clear the search query. * Improve UX: Add styling to clear button & export button This commit modifies the NavLinks component to improve user experience by removing a rounded styling to the "Clear conversations" and "Export conversations" buttons. Prior to this change, the buttons had a rounded styling. * Refactor submit button styling for improved accessibility and readability. Changed submit button styling for better accessibility and readability, including adjustments to padding and hover effects. The new styles ensure that the button is easily clickable for all users, while also improving its visual appearance. * hotfix * Improve UI styling in Conversation component Changed the background color and hover effect of the conversation link in Conversation component to make it more visually appealing. The previous background color was '#2A2B32' and now it's 'gray-800'. The 'px-4' class has also been changed to 'hover:pr-4' for better readability. --------- Co-authored-by: Danny Avila <110412045+danny-avila@users.noreply.github.com> --- .../components/Conversations/Conversation.jsx | 2 +- client/src/components/Input/SubmitButton.jsx | 2 +- client/src/components/Nav/NavLinks.jsx | 4 +-- client/src/components/Nav/SearchBar.jsx | 30 +++++++++++++++---- 4 files changed, 28 insertions(+), 10 deletions(-) diff --git a/client/src/components/Conversations/Conversation.jsx b/client/src/components/Conversations/Conversation.jsx index 47676b20ff..94c26713e8 100644 --- a/client/src/components/Conversations/Conversation.jsx +++ b/client/src/components/Conversations/Conversation.jsx @@ -86,7 +86,7 @@ export default function Conversation({ conversation, retainView }) { if (currentConversation?.conversationId !== conversationId) { aProps.className = - 'group relative flex cursor-pointer items-center gap-3 break-all rounded-md py-3 px-3 hover:bg-[#2A2B32] hover:pr-4'; + 'group relative flex cursor-pointer items-center gap-3 break-all rounded-md py-3 px-3 hover:bg-gray-800 hover:pr-4'; } return ( diff --git a/client/src/components/Input/SubmitButton.jsx b/client/src/components/Input/SubmitButton.jsx index 955f9b181e..130350d81f 100644 --- a/client/src/components/Input/SubmitButton.jsx +++ b/client/src/components/Input/SubmitButton.jsx @@ -88,7 +88,7 @@ export default function SubmitButton({ disabled={disabled} className="group absolute bottom-0 right-0 flex h-[100%] w-[50px] items-center justify-center bg-transparent p-1 text-gray-500" > -
+
} @@ -91,7 +91,7 @@ export default function NavLinks({ clearSearch, isSearchEnabled }) { } text="Clear conversations" clickHandler={() => setShowClearConvos(true)} diff --git a/client/src/components/Nav/SearchBar.jsx b/client/src/components/Nav/SearchBar.jsx index e982b92c8a..cc11fe1880 100644 --- a/client/src/components/Nav/SearchBar.jsx +++ b/client/src/components/Nav/SearchBar.jsx @@ -1,11 +1,12 @@ -import { forwardRef } from 'react'; -import { Search } from 'lucide-react'; +import { forwardRef, useState, useEffect } from 'react'; +import { Search, X } from 'lucide-react'; import { useRecoilState } from 'recoil'; import store from '~/store'; const SearchBar = forwardRef((props, ref) => { const { clearSearch } = props; const [searchQuery, setSearchQuery] = useRecoilState(store.searchQuery); + const [showClearIcon, setShowClearIcon] = useState(false); const handleKeyUp = (e) => { const { value } = e.target; @@ -18,17 +19,27 @@ const SearchBar = forwardRef((props, ref) => { const onChange = (e) => { const { value } = e.target; setSearchQuery(value); + setShowClearIcon(value.length > 0); }; + useEffect(() => { + if (searchQuery.length === 0) { + setShowClearIcon(false); + } else { + setShowClearIcon(true); + } + }, [searchQuery]) + + return (
- {} + {} { @@ -37,8 +48,15 @@ const SearchBar = forwardRef((props, ref) => { placeholder="Search messages" onKeyUp={handleKeyUp} /> + { + setSearchQuery(''); + clearSearch(); + }} + />
); }); -export default SearchBar; +export default SearchBar; \ No newline at end of file