fix some shit

[alttp.git] / resources / js / components / episodes / Filter.js

diff --git a/resources/js/components/episodes/Filter.js b/resources/js/components/episodes/Filter.js
index 4855a71b5b09156e56e16eb39fd0958b60c3b3cf..b411f82193574c9036b3ff8d22bbe6d4b99a940e 100644 (file)
--- a/resources/js/components/episodes/Filter.js
+++ b/resources/js/components/episodes/Filter.js
@@ -18,13 +18,6 @@ const Filter = ({ filter, setFilter }) => {
                }).then(response => {
                        const newEvents = response.data || [];
                        setEvents(newEvents);
-                       setFilter(filter => {
-                               const eventFilter = filter.event || [];
-                               return {
-                                       ...filter,
-                                       event: eventFilter.filter(newEvents.find(id => newEvents.includes(id))),
-                               };
-                       });
                }).catch(e => {
                        if (!axios.isCancel(e)) {
                                console.error(e);
@@ -33,23 +26,22 @@ const Filter = ({ filter, setFilter }) => {
                return () => {
                        controller.abort();
                };
-       }, [setEvents, setFilter]);
+       }, []);
 
        const toggleEvent = React.useCallback(event => {
-               setFilter(filter => {
-                       const eventFilter = filter.event || [];
-                       if (!eventFilter.includes(event.id)) {
-                               return {
-                                       ...filter,
-                                       event: [...eventFilter, event.id],
-                               };
-                       }
-                       return {
+               const eventFilter = filter.event || [];
+               if (eventFilter.includes(event.id)) {
+                       setFilter({
                                ...filter,
-                               event: eventFilter.filter(id => id !== event.id),
-                       };
-               });
-       }, [setFilter]);
+                               event: eventFilter.filter(id => id !== event.id && events.find(e => e.id === id)),
+                       });
+               } else {
+                       setFilter({
+                               ...filter,
+                               event: [...eventFilter, event.id],
+                       });
+               }
+       }, [events, filter, setFilter]);
 
        const isEventSelected = React.useCallback(event => {
                const eventFilter = filter.event || [];