Merge pull request #16 from Brightspace/dbatiste/get-composed-active-…

…element Adding method to get the composed activeElement.
BrightspaceUI · Jan 18, 2018 · ca03a7c · ca03a7c
2 parents e1ec6ae + 86d2a01
commit ca03a7c
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 0 deletions.
diff --git a/README.md b/README.md
@@ -43,6 +43,9 @@ D2L.Dom.isComposedAncestor(ancestorNode, node);
 **D2L.Dom.Focus**
 
 ```javascript
+// get the composed active element (i.e. the actual element that has focus)
+D2L.Dom.Focus.getComposedActiveElement();
+
 // get first focusable child or descendant
 D2L.Dom.Focus.getFirstFocusableDescendant(element);
 

diff --git a/d2l-dom-focus.html b/d2l-dom-focus.html
@@ -20,6 +20,18 @@
 			textarea: true
 		},
 
+		getComposedActiveElement: function() {
+			var node = document.activeElement;
+			while (node.shadowRoot) {
+				if (node.shadowRoot.activeElement) {
+					node = node.shadowRoot.activeElement;
+				} else {
+					break;
+				}
+			}
+			return node;
+		},
+
 		getFirstFocusableDescendant: function(node, includeHidden) {
 
 			var composedChildren = D2L.Dom.getComposedChildren(node);

diff --git a/test/dom-focus.html b/test/dom-focus.html
@@ -110,6 +110,24 @@
 				mixedFixture = fixture('mixedFixture');
 			});
 
+			describe('getComposedActiveElement', function() {
+
+				it('returns composed light-dom element', function() {
+					var expected = wcFixture.querySelector('#light1');
+					expected.focus();
+					expect(D2L.Dom.Focus.getComposedActiveElement())
+						.to.equal(expected);
+				});
+
+				it('returns composed shadow-dom element', function() {
+					var expected = wcFixture.getShadow1();
+					expected.focus();
+					expect(D2L.Dom.Focus.getComposedActiveElement())
+						.to.equal(expected);
+				});
+
+			});
+
 			describe('getFirstFocusableDescendant', function() {
 
 				it('returns focusable child', function() {