Merge pull request #38 from concord-consortium/186752905-filter-modal…

…-fix 186752905 filter modal fix
concord-consortium · Jan 29, 2024 · d8ab2ba · d8ab2ba
2 parents 697ffc8 + 1a01416
commit d8ab2ba
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/src/components/attribute-filter.scss b/src/components/attribute-filter.scss
@@ -105,7 +105,7 @@ table tr:nth-child(even) {
   box-sizing: border-box;
 
   &.wide {
-    width: 217px;
+    width: 227px;
     left: 114px;
   }
 
@@ -208,7 +208,7 @@ table tr:nth-child(even) {
   }
 
   .filter-operator-selection-container {
-    width: 165px;
+    width: 180px;
     max-height: 190px;
     padding: 9px 12px 5px 9px;
     box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.5);
@@ -226,6 +226,7 @@ table tr:nth-child(even) {
       height: 176px;
       outline: none;
       box-sizing: border-box;
+      overflow: hidden;
 
       option {
         font-family: "Montserrat", sans-serif;

diff --git a/src/components/attribute-filter.tsx b/src/components/attribute-filter.tsx
@@ -206,8 +206,10 @@ const FilterModal = ({attr, position, targetFilterBottom, setShowFilterModal, se
   },[dropdownBottom, showOperatorSelectionModal, windowHeight]);
 
   const handleReset = () => {
-    setOperator(currentAttrFilter?.operator || "equals");
-    setShowFilterModal(false);
+    setOperator("equals");
+    if (filterValueInputElRef.current) {
+      filterValueInputElRef.current.value = "0";
+    }
   };
 
   const handleSubmitFilter = () => {
@@ -294,7 +296,7 @@ const FilterModal = ({attr, position, targetFilterBottom, setShowFilterModal, se
               </input>;
     } else {
       return  <input ref={filterValueInputElRef} key={`${operator}-${units}`} className="filter-value"
-                defaultValue={`${Array.isArray(currentFilterValue) ? currentFilterValue[0] : "100"} ${currentAttr?.unit[units]}`}>
+                defaultValue={`${Array.isArray(currentFilterValue) ? currentFilterValue[0] : "0"} ${currentAttr?.unit[units]}`}>
               </input>;
     }
   };