reset discipline and location filters query on popover close

frontend/src/components/filters/DisciplineFilter.tsx

@@ -57,6 +57,10 @@ export function DisciplineFilter(
     setQ("");
   }, [pendingSport]);
 
+  useEffect(() => {
+    if (!open) setQ("");
+  }, [open]);
+
   const pendingDisciplines = pendingSport
     ? disciplinesBySport.get(pendingSport)
     : null;
@@ -118,6 +122,7 @@ export function DisciplineFilter(
       setPendingSport(null);
       return;
     }
+
     setOpen(newOpen);
   };
 

frontend/src/components/filters/LocationFilter.tsx

@@ -16,7 +16,7 @@ import { FilterBaseProps } from "./common";
 import { $api } from "@/api";
 import { BaseFilter } from "./BaseFilter";
 import { Filters } from "@/lib/types";
-import { useMemo, useState } from "react";
+import { useEffect, useMemo, useState } from "react";
 import { Badge } from "../ui/badge";
 import { useDebounce } from "react-use";
 import { cn } from "@/lib/utils";
@@ -106,6 +106,7 @@ export function LocationFilter(props: FilterBaseProps<Filters["location"]>) {
     return flat;
   }, [data]);
 
+  const [open, setOpen] = useState(false)
   const [q, setQ] = useState("");
   const [qDeb, setQDeb] = useState("");
   useDebounce(
@@ -116,6 +117,13 @@ export function LocationFilter(props: FilterBaseProps<Filters["location"]>) {
     [q, setQDeb],
   );
 
+  useEffect(() => {
+    if (!open) {
+      setQ('')
+      setQDeb('')
+    }
+  }, [open])
+
   const filtered = useMemo(
     () =>
       all
@@ -138,7 +146,7 @@ export function LocationFilter(props: FilterBaseProps<Filters["location"]>) {
 
   return (
     <BaseFilter {...rest}>
-      <Popover>
+      <Popover open={open} onOpenChange={setOpen}>
         <PopoverTrigger asChild>
           <Button
             disabled={disabled}