Merge pull request #707 from PEM-Humboldt/hotfix/2.0.3

Set default accordion first time it has content
PEM-Humboldt · Aug 12, 2022 · 840e2b7 · 840e2b7
2 parents 265b4bd + 2aedf9f
commit 840e2b7
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 10 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "biotablero",
-  "version": "2.0.2",
+  "version": "2.0.3",
   "scripts": {
     "start": "react-scripts start",
     "build": "react-scripts build",

diff --git a/src/pages/search/Accordion.jsx b/src/pages/search/Accordion.jsx
@@ -16,18 +16,31 @@ class Accordion extends React.Component {
   componentDidMount() {
     const { componentsArray } = this.props;
     if (componentsArray.length > 0) {
-      let defaultTab = componentsArray.find(
-        (item) => !item.label.collapsed,
-      );
-      if (defaultTab) {
-        defaultTab = defaultTab.label.id;
-      } else {
-        defaultTab = null;
-      }
-      this.setState({ expanded: defaultTab });
+      this.setDefaultTab();
     }
   }
 
+  componentDidUpdate(prevProps) {
+    const { componentsArray: prevArray } = prevProps;
+    const { componentsArray } = this.props;
+    if (prevArray.length === 0 && componentsArray.length > 0) {
+      this.setDefaultTab();
+    }
+  }
+
+  setDefaultTab = () => {
+    const { componentsArray } = this.props;
+    let defaultTab = componentsArray.find(
+      (item) => !item.label.collapsed,
+    );
+    if (defaultTab) {
+      defaultTab = defaultTab.label.id;
+    } else {
+      defaultTab = null;
+    }
+    this.setState({ expanded: defaultTab });
+  }
+
   render() {
     const {
       componentsArray,