Bug fixes

src/pages/settings/components/Search/DebouncedSearchProvider.tsx

@@ -16,7 +16,7 @@ import { cardClasses, textInputClasses } from 'styles';
 import type { Provider } from 'types';
 import DeleteItemModal from '../Shared/DeleteItemModal';
 
-function DebouncedSearchProvider({ searchProvider }: any) {
+function DebouncedSearchProvider({ searchProvider, setIsOpen }: any) {
 	const { theme, handleDelete } = useCommonHooks();
 	const [modalOpened, { open: openModal, close: closeModal }] = useDisclosure(false);
 	const { mutateAsync } = useMutationAPI();
@@ -25,6 +25,11 @@ function DebouncedSearchProvider({ searchProvider }: any) {
 	const [update, setUpdate] = useState<any>({});
 	const [debounced] = useDebouncedValue(update, 1000);
 
+	const handleClose = () => {
+		setIsOpen(false);
+		closeModal();
+	};
+
 	useEffect(() => {
 		if (Object.keys(debounced).length) {
 			mutateAsync({ method: 'PATCH', endpoint: 'api/providers', body: debounced });
@@ -41,7 +46,7 @@ function DebouncedSearchProvider({ searchProvider }: any) {
 		<Card className={cardClasses.settingsItem} classNames={cardClasses}>
 			<DeleteItemModal
 				modalOpened={modalOpened}
-				handleClose={closeModal}
+				handleClose={handleClose}
 				title={'Delete Search Provider'}
 				body={
 					<Stack gap={0} w={'100%'} h={'150px'} align='center'>
@@ -64,7 +69,7 @@ function DebouncedSearchProvider({ searchProvider }: any) {
 								styles={{ label: { color: 'black' } }}
 								onClick={() => {
 									handleDelete(provider, 'api/providers');
-									closeModal();
+									handleClose();
 								}}
 							>
 								Delete
@@ -72,9 +77,7 @@ function DebouncedSearchProvider({ searchProvider }: any) {
 							<Button
 								color={'grey'}
 								styles={{ label: { color: 'black' } }}
-								onClick={() => {
-									closeModal();
-								}}
+								onClick={handleClose}
 							>
 								Cancel
 							</Button>
@@ -92,6 +95,7 @@ function DebouncedSearchProvider({ searchProvider }: any) {
 					right={16}
 					color='red'
 					onClick={() => {
+						setIsOpen(true);
 						openModal();
 					}}
 				>

src/pages/settings/components/Search/SearchProviders.tsx

@@ -37,6 +37,7 @@ const SearchProviderSettings = () => {
 	const [modalOpened, { open: openModal, close: closeModal }] = useDisclosure(false);
 	const [searchValue, setSearchValue] = useState('');
 	const [debouncedSearch] = useDebouncedValue(searchValue, 500);
+	const [isOpen, setIsOpen] = useState(false);
 
 	const handleClose = () => {
 		setNewProvider(defaultProvider);
@@ -151,7 +152,12 @@ const SearchProviderSettings = () => {
 				<Grid columns={18} w={'75%'}>
 					{providerData?.map((provider: Provider) => (
 						<GridCol span={isMobile ? 18 : 6} key={provider.id}>
-							<Popover withArrow withOverlay withinPortal={false}>
+							<Popover
+								withArrow
+								withOverlay
+								withinPortal={false}
+								closeOnClickOutside={!isOpen}
+							>
 								<Popover.Target>
 									<Box
 										onClick={(e) => {
@@ -162,7 +168,10 @@ const SearchProviderSettings = () => {
 									</Box>
 								</Popover.Target>
 								<Popover.Dropdown>
-									<DebouncedSearchProvider searchProvider={provider} />
+									<DebouncedSearchProvider
+										searchProvider={provider}
+										setIsOpen={setIsOpen}
+									/>
 								</Popover.Dropdown>
 							</Popover>
 						</GridCol>