use rc-utils

react-component · Feb 14, 2019 · ad56a1d · ad56a1d
1 parent f4a0852
commit ad56a1d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 10 deletions.
diff --git a/src/Align.jsx b/src/Align.jsx
@@ -143,9 +143,7 @@ class Align extends Component {
         result = alignPoint(source, point, align);
       }
 
-      if (activeElement && activeElement !== document.activeElement) {
-        restoreFocus(activeElement, source);
-      }
+      restoreFocus(activeElement, source);
 
       if (onAlign) {
         onAlign(source, result);

diff --git a/src/util.js b/src/util.js
@@ -1,3 +1,5 @@
+import contains from 'rc-util/lib/Dom/contains';
+
 export function buffer(fn, ms) {
   let timer;
 
@@ -44,16 +46,12 @@ export function isSimilarValue(val1, val2) {
 }
 
 export function restoreFocus(activeElement, container) {
-  let currentElement = activeElement;
-  while (currentElement) {
-    if (currentElement === container) {
-      break;
-    }
-    currentElement = currentElement.parentNode;
+  if (!activeElement || activeElement === document.activeElement) {
+    return;
   }
 
   // Focus back if is in the container
-  if (currentElement) {
+  if (contains(container, activeElement)) {
     activeElement.focus();
   }
 }