fix: correctly restore selected streaming service filters (#3249)

Fallenbagel · Jan 16, 2023 · 154f3e7 · 154f3e7
1 parent 6fd11cf
commit 154f3e7
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/src/components/RegionSelector/index.tsx b/src/components/RegionSelector/index.tsx
@@ -76,8 +76,8 @@ const RegionSelector = ({
   }, [value, regions, allRegion]);
 
   useEffect(() => {
-    if (onChange && regions) {
-      onChange(name, selectedRegion?.iso_3166_1 ?? '');
+    if (onChange && regions && selectedRegion) {
+      onChange(name, selectedRegion.iso_3166_1);
     }
   }, [onChange, selectedRegion, name, regions]);
 

diff --git a/src/components/Selector/index.tsx b/src/components/Selector/index.tsx
@@ -307,10 +307,6 @@ export const WatchProviderSelector = ({
     onChange(watchRegion, activeProvider);
   }, [activeProvider, watchRegion, onChange]);
 
-  useEffect(() => {
-    setActiveProvider([]);
-  }, [watchRegion]);
-
   const orderedData = useMemo(() => {
     if (!data) {
       return [];
@@ -335,7 +331,12 @@ export const WatchProviderSelector = ({
       <RegionSelector
         value={watchRegion}
         name="watchRegion"
-        onChange={(_name, value) => setWatchRegion(value)}
+        onChange={(_name, value) => {
+          if (value !== watchRegion) {
+            setActiveProvider([]);
+          }
+          setWatchRegion(value);
+        }}
         disableAll
         watchProviders
       />