overlay or descendat feature

sharedlabs · Aug 3, 2017 · 64369b2 · 64369b2
1 parent fb161b4
commit 64369b2
Showing 1 changed file with 22 additions and 1 deletion.
diff --git a/overlay-container.html b/overlay-container.html
@@ -84,7 +84,7 @@
 
       __onOverlayClosed(event) {
         const overlay = this.__getLastOverlay();
-        if (overlay) {
+        if (overlay && !this.__isOverlayOrDescendantFocused(overlay)) {
           overlay.focus();
         }
         this.__updateBackdrop();
@@ -135,6 +135,27 @@
         }
       }
 
+      __isOverlayOrDescendantFocused(overlay) {
+        const activeElement = this.__getDeepActiveElement();
+        if (activeElement) {
+          let node = activeElement;
+          while(node && node !== this) {
+            if (node === overlay) {
+              return true;
+            }
+            node = node.parentNode || node.host;
+          }
+        }
+        return false;
+      }
+
+      __getDeepActiveElement() {
+        var activeElement = document.activeElement;
+        while (activeElement && activeElement.shadowRoot && activeElement.shadowRoot.activeElement)
+          activeElement = activeElement.shadowRoot.activeElement;
+        return activeElement;
+      }
+
     }
 
     customElements.define(OverlayContainer.is, OverlayContainer);