#186 disable predefined filter when filter window is open

m2ms · Mar 13, 2020 · 51e4f16 · 51e4f16
1 parent 8359c9c
commit 51e4f16
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/js/components/preview/molecule/moleculeList.js b/js/components/preview/molecule/moleculeList.js
@@ -161,7 +161,7 @@ const MoleculeList = memo(
     const imgWidth = 150;
 
     const [filteredCount, setFilteredCount] = useState(0);
-    const [predefinedFilter, setPredefinedFilter] = useState(DEFAULT_FILTER);
+    const [predefinedFilter, setPredefinedFilter] = useState(filter !== undefined ? filter.predefined : DEFAULT_FILTER);
 
     const isActiveFilter = !!(filterSettings || {}).active;
 
@@ -266,7 +266,7 @@ const MoleculeList = memo(
           hasHeader
           title="Hit navigator"
           headerActions={[
-            <FormControl className={classes.formControl} disabled={!(object_selection || []).length}>
+            <FormControl className={classes.formControl} disabled={!(object_selection || []).length || sortDialogOpen}>
               <Select
                 className={classes.select}
                 value={predefinedFilter}