Merge branch 'master' of https://github.com/aecreations/clippings int…

…o branches/6.2 - Pulling in PR for fix for issue #320 into 6.2.x branch
aecreations · Feb 18, 2021 · 8e4951b · 8e4951b
2 parents 955c064 + a294772
commit 8e4951b
Showing 1 changed file with 12 additions and 2 deletions.
diff --git a/wx-src/content.js b/wx-src/content.js
@@ -22,7 +22,7 @@ function handleRequestNewClipping(aRequest)
     return rv;
   }
 
-  let activeElt = window.document.activeElement;
+  let activeElt = getActiveElt();
 
   log("Clippings/wx::content.js: handleRequestNewClipping(): activeElt = " + (activeElt ? activeElt.toString() : "???"));
 
@@ -105,7 +105,7 @@ function handleRequestInsertClipping(aRequest)
   let clippingText = aRequest.content;
   let htmlPaste = aRequest.htmlPaste;
   let autoLineBrk = aRequest.autoLineBreak;
-  let activeElt = window.document.activeElement;
+  let activeElt = getActiveElt();
 
   log("Clippings/wx::content.js: handleRequestInsertClipping(): activeElt = " + (activeElt ? activeElt.toString() : "???"));  
 
@@ -242,6 +242,16 @@ function isGoogleChrome()
   return rv;
 }
 
+function getActiveElt() {
+  let activeElt = window.document.activeElement;
+
+  if (!!activeElt && !!activeElt.shadowRoot) {
+    activeElt = activeElt.shadowRoot.activeElement;
+  }
+
+  return activeElt;
+}
+
 
 function init()
 {