Fix sonarjs no-collapsible-if

2022-10-03 14:22:02 -04:00
parent ccdbf0bfc3
commit 1f4e65822b
33 changed files with 330 additions and 473 deletions
@@ -384,10 +384,11 @@ import scrollManager from './scrollManager';
            // See if there's a focusable container, and if so, send the focus command to that
            if (activeElement) {
                const nearestElementFocusableParent = dom.parentWithClass(nearestElement, 'focusable');
-                if (nearestElementFocusableParent && nearestElementFocusableParent !== nearestElement) {
-                    if (focusableContainer !== nearestElementFocusableParent) {
-                        nearestElement = nearestElementFocusableParent;
-                    }
+                if (nearestElementFocusableParent
+                    && nearestElementFocusableParent !== nearestElement
+                    && focusableContainer !== nearestElementFocusableParent
+                ) {
+                    nearestElement = nearestElementFocusableParent;
                }
            }
            focus(nearestElement);