Merge pull request #1951 from SpareBank1/develop_fix-collapse

fix(ffe-collapse-react): check if ref exist before removing event lis…
SpareBank1 · Apr 29, 2024 · 9c1b68c · 9c1b68c
2 parents f2bbfac + 58bc672
commit 9c1b68c
Showing 1 changed file with 16 additions and 11 deletions.
diff --git a/packages/ffe-collapse-react/src/Collapse.js b/packages/ffe-collapse-react/src/Collapse.js
@@ -33,23 +33,28 @@ export const Collapse = React.forwardRef(
             const handleTransitionStart = handleTransition('start');
             const handleTransitionEnd = handleTransition('end');
 
-            _collapse.current.addEventListener(
-                'transitionstart',
-                handleTransitionStart,
-            );
-            _collapse.current.addEventListener(
-                'transitionend',
-                handleTransitionEnd,
-            );
-            return () => {
-                _collapse.current.removeEventListener(
+            if (_collapse.current) {
+                _collapse.current.addEventListener(
                     'transitionstart',
                     handleTransitionStart,
                 );
-                _collapse.current.removeEventListener(
+                _collapse.current.addEventListener(
                     'transitionend',
                     handleTransitionEnd,
                 );
+            }
+
+            return () => {
+                if (_collapse.current) {
+                    _collapse.current.removeEventListener(
+                        'transitionstart',
+                        handleTransitionStart,
+                    );
+                    _collapse.current.removeEventListener(
+                        'transitionend',
+                        handleTransitionEnd,
+                    );
+                }
             };
         }, [collapse, isOpen, onRest]);