Merge pull request #1414 from nextstrain/collapsible-filters

collapsible filter lists in footer
nextstrain · Oct 19, 2021 · c35bdc8 · c35bdc8
2 parents c871641 + 6bc7f3c
commit c35bdc8
Show file tree

Hide file tree

Showing 3 changed files with 60 additions and 25 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -101,6 +101,7 @@
     "query-string": "^4.2.3",
     "react": "^16.8.6",
     "react-addons-css-transition-group": "^15.6.0",
+    "react-collapsible": "^2.8.4",
     "react-dom": "^16.8.6",
     "react-ga": "^2.2.0",
     "react-helmet": "^5.2.1",

diff --git a/src/components/framework/footer.js b/src/components/framework/footer.js
@@ -1,7 +1,9 @@
 import React, { Suspense, lazy } from "react";
 import { connect } from "react-redux";
 import styled from 'styled-components';
+import Collapsible from "react-collapsible";
 import { withTranslation } from "react-i18next";
+import {FaAngleUp, FaAngleDown} from "react-icons/fa";
 import { dataFont } from "../../globalStyles";
 import Flex from "./flex";
 import { applyFilter } from "../../actions/tree";
@@ -92,8 +94,8 @@ const FooterStyles = styled.div`
   }
 
   .line {
-    margin-top: 20px;
-    margin-bottom: 20px;
+    margin-top: 15px;
+    margin-bottom: 15px;
     border-bottom: 1px solid #CCC;
   }
 
@@ -163,6 +165,24 @@ const removeFiltersButton = (dispatch, filterNames, outerClassName, label) => (
   </SimpleFilter>
 );
 
+const TitleContainer = styled.div`
+  display: flex;
+  justify-content: space-between;
+  margin: 0px;
+  padding: 0px;
+`;
+const IconContainer = styled.span`
+  font-size: 22px;
+  font-weight: 500;
+`;
+
+const CollapseTitle = ({name, isExpanded=false}) => (
+  <TitleContainer>
+    {name}
+    <IconContainer>{isExpanded ? <FaAngleUp /> : <FaAngleDown />}</IconContainer>
+  </TitleContainer>
+);
+
 
 @connect((state) => {
   return {
@@ -197,30 +217,39 @@ class Footer extends React.Component {
     const totalStateCount = this.props.totalStateCounts[filterName];
     const filterTitle = this.props.metadata.colorings[filterName] ? this.props.metadata.colorings[filterName].title : filterName;
     const activeFilterItems = this.props.activeFilters[filterName].filter((x) => x.active).map((x) => x.value);
+    const title = (<div>
+      {t("Filter by {{filterTitle}}", {filterTitle: filterTitle}) + ` (n=${totalStateCount.size})`}
+      {this.props.activeFilters[filterName].length ? removeFiltersButton(this.props.dispatch, [filterName], "inlineRight", t("Clear {{filterName}} filter", { filterName: filterName})) : null}
+    </div>);
     return (
       <div>
-        {t("Filter by {{filterTitle}}", {filterTitle: filterTitle})}
-        {this.props.activeFilters[filterName].length ? removeFiltersButton(this.props.dispatch, [filterName], "inlineRight", t("Clear {{filterName}} filter", { filterName: filterName})) : null}
-        <div className='filterList'>
-          <Flex wrap="wrap" justifyContent="flex-start" alignItems="center">
-            {
-              Array.from(totalStateCount.keys())
-                .filter((itemName) => isValueValid(itemName)) // remove invalid values present across the tree
-                .sort() // filters are sorted alphabetically
-                .map((itemName) => (
-                  <SimpleFilter
-                    key={itemName}
-                    active={activeFilterItems.indexOf(itemName) !== -1}
-                    onClick={() => dispatchFilter(this.props.dispatch, this.props.activeFilters, filterName, itemName)}
-                  >
-                    <span>
-                      {`${itemName} (${totalStateCount.get(itemName)})`}
-                    </span>
-                  </SimpleFilter>
-                ))
-            }
-          </Flex>
-        </div>
+        <Collapsible
+          triggerWhenOpen={<CollapseTitle name={title} isExpanded />}
+          trigger={<CollapseTitle name={title} />}
+          triggerStyle={{cursor: "pointer", textDecoration: "none"}}
+          transitionTime={100}
+        >
+          <div className='filterList'>
+            <Flex wrap="wrap" justifyContent="flex-start" alignItems="center">
+              {
+                Array.from(totalStateCount.keys())
+                  .filter((itemName) => isValueValid(itemName)) // remove invalid values present across the tree
+                  .sort() // filters are sorted alphabetically
+                  .map((itemName) => (
+                    <SimpleFilter
+                      key={itemName}
+                      active={activeFilterItems.indexOf(itemName) !== -1}
+                      onClick={() => dispatchFilter(this.props.dispatch, this.props.activeFilters, filterName, itemName)}
+                    >
+                      <span>
+                        {`${itemName} (${totalStateCount.get(itemName)})`}
+                      </span>
+                    </SimpleFilter>
+                  ))
+              }
+            </Flex>
+          </div>
+        </Collapsible>
       </div>
     );
   }