gatsby-matrix-theme 3.2.24 → 3.2.25

package/CHANGELOG.md

@@ -1,3 +1,16 @@
+## [3.2.25](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/compare/v3.2.24...v3.2.25) (2022-02-07)
+
+
+### Bug Fixes
+
+* clean up gatsby config ([5c2f4df](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/5c2f4df24fce6888fe8222084c7d7c5cd7b1f9e5))
+* fixed conflicts ([e2b84b8](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/e2b84b885e229e28ca9fc71c36fc728a854d5693))
+* keep open FAQ when js is blocked ([230d1db](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/230d1db97e2fd99646ee63abab10473d204d1adc))
+* return 70 coverage ([b14b876](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/b14b876bba8ffbfd90fa27da95b5bdb2650dde3e))
+
+
+* Merge branch 'tm-2697-Faq' into 'master' ([4615d58](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/4615d5853a2ef640834bbbdfc0ba019ed2987cb6))
+
 ## [3.2.24](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/compare/v3.2.23...v3.2.24) (2022-02-07)
 
 

package/gatsby-config.js

@@ -20,8 +20,7 @@ module.exports = {
           'https://www.google-analytics.com',
           'https://www.googletagmanager.com',
           'https://gm.innocraft.cloud',
-          'https://assets-srv.s3.eu-west-1.amazonaws.com',
-          'https://d3449cb8ihm3k3.cloudfront.net',
+          process.env.IMAGE_CDN_URL,
         ],
       },
     },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gatsby-matrix-theme",
-  "version": "3.2.24",
+  "version": "3.2.25",
   "main": "index.js",
   "description": "Matrix Theme NPM Package",
   "author": "",

package/src/components/molecules/faq/index.js

@@ -7,15 +7,15 @@ import keygen from '~helpers/keygen';
 
 /* eslint-disable react/no-danger */
 
-const Faq = ({ module, openAll = true, openItem, closeOthers = false, icon = '' }) => {
+const Faq = ({ module, closeAll = false, openItem, closeOthers = false, icon = '' }) => {
   const { items } = module;
   const itemRefs = useRef([]);
   const btnRefs = useRef([]);
 
-  const openAllItems = () => {
+  const closeAllItems = () => {
     for (let i = 0; i < itemRefs.current.length; i += 1) {
-      itemRefs.current[i].classList.add(styles.active);
-      btnRefs.current[i].classList.add(styles.invertArrow);
+      itemRefs.current[i].classList.remove(styles.active);
+      btnRefs.current[i].classList.remove(styles.invertArrow);
     }
   };
 
@@ -45,8 +45,8 @@ const Faq = ({ module, openAll = true, openItem, closeOthers = false, icon = ''
   };
 
   useEffect(() => {
-    if (openAll) {
-      openAllItems();
+    if (closeAll) {
+      closeAllItems();
     }
   });
   useEffect(() => {
@@ -72,7 +72,7 @@ const Faq = ({ module, openAll = true, openItem, closeOthers = false, icon = ''
               </span>
             </button>
             <div
-              className={styles.content}
+              className={`${styles.content} ${styles.active}`}
               ref={(el) => (itemRefs.current[index] = el)}
               dangerouslySetInnerHTML={{ __html: item.answer }}
             />
@@ -93,7 +93,7 @@ Faq.propTypes = {
       })
     ),
   }).isRequired,
-  openAll: PropTypes.bool,
+  closeAll: PropTypes.bool,
   openItem: PropTypes.number,
   closeOthers: PropTypes.bool,
   styles: PropTypes.shape({}),