enhancement: improve apply filter button (#5912)

iotaledger · Feb 20, 2023 · 99d378c · 99d378c
1 parent 814d3fe
commit 99d378c
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/packages/desktop/components/filter/Filter.svelte b/packages/desktop/components/filter/Filter.svelte
@@ -33,9 +33,18 @@
         openFilterItemIndex = index
     }
 
-    $: isChanged = JSON.stringify($filterStore) !== JSON.stringify(filter)
+    $: isChanged = isFilterChanged($filterStore, filter)
     $: filterActive = modal?.isOpened()
     $: activeFilterCount = Object.keys($filterStore).filter((f) => $filterStore[f].active).length
+
+    function isFilterChanged(originalFilter: Filter, filter: Filter): boolean {
+        const oldHasActiveFilters = Object.keys(originalFilter).some((key) => originalFilter[key].active)
+        const newHasActiveFilters = Object.keys(filter).some((key) => filter[key].active)
+
+        const stayedDeactivated = !oldHasActiveFilters && !newHasActiveFilters
+        const isDifferent = JSON.stringify(originalFilter) !== JSON.stringify(filter)
+        return isDifferent && !stayedDeactivated
+    }
 </script>
 
 <filter-container class="block h-6 relative">