diff --git a/src/js/components/Person/AddPersonDrawerMainContent.jsx b/src/js/components/Person/AddPersonDrawerMainContent.jsx index cee1718..ea0693a 100644 --- a/src/js/components/Person/AddPersonDrawerMainContent.jsx +++ b/src/js/components/Person/AddPersonDrawerMainContent.jsx @@ -16,6 +16,7 @@ import { import { SpanWithLinkStyle } from '../Style/linkStyles'; import { MatchingPerson, SearchBarWrapper } from '../Style/sharedStyles'; import AddPersonForm from './AddPersonForm'; +import CrossIcon from '../../../img/global/svg-icons/cross.svg'; const LIMIT_NUMBER_SHOWN = 20; @@ -38,7 +39,7 @@ const AddPersonDrawerMainContent = () => { const [teamMemberPersonIdList] = useState([]); const [matchingCountText, setMatchingCountText] = useState(''); - const searchStringInputRef = useRef(''); + const searchStringInputRef = useRef(null); const updateRemainingPeopleToAdd = () => { // console.log('initializeTheRemainingPeopleToAddListList in AddPersonDrawerMainContent'); @@ -103,7 +104,7 @@ const AddPersonDrawerMainContent = () => { setSearchResultsList(undefined); } else { const isMatch = (element) => (element.lastName.toLowerCase().includes(currentValue.toLowerCase()) || - element.firstName.toLowerCase().includes(currentValue.toLowerCase())); + element.firstName.toLowerCase().includes(currentValue.toLowerCase()) || element.firstNamePreferred?.toLowerCase().includes(currentValue.toLowerCase())); const matchingElements = remainingPeopleToAdd ? remainingPeopleToAdd.filter((element) => isMatch(element)) : {}; if (matchingElements && matchingElements.length) { setSearchResultsList(matchingElements); @@ -115,6 +116,12 @@ const AddPersonDrawerMainContent = () => { } }; + const clearSearch = () => { + searchStringInputRef.current.value = ''; + setSearchResultsList(undefined); + setMatchingCountText(''); + }; + const addClicked = (incomingPerson) => { const personId = incomingPerson ? incomingPerson.personId : -1; const teamId = team ? team.teamId : -1; @@ -153,6 +160,16 @@ const AddPersonDrawerMainContent = () => { placeholder="Search by name" defaultValue="" sx={{ minWidth: '250px' }} + InputProps={{ + endAdornment: searchStringInputRef.current?.value ? ( + + Clear search + + ) : null, + }} /> {matchingCountText}