FIX: Context menu not appearing in Firefox (#154)

discourse · Aug 23, 2023 · 3cf316f · 3cf316f
1 parent 7d943be
commit 3cf316f
Showing 1 changed file with 16 additions and 4 deletions.
diff --git a/assets/javascripts/discourse/connectors/after-d-editor/ai-helper-context-menu.js b/assets/javascripts/discourse/connectors/after-d-editor/ai-helper-context-menu.js
@@ -85,12 +85,25 @@ export default class AiHelperContextMenu extends Component {
   }
 
   @bind
-  selectionChanged(event) {
-    if (!event.target.activeElement.classList.contains("d-editor-input")) {
+  selectionChanged() {
+    if (document.activeElement !== this._dEditorInput) {
       return;
     }
 
-    if (window.getSelection().toString().length === 0) {
+    const canSelect = Boolean(
+      window.getSelection() &&
+        document.activeElement &&
+        document.activeElement.value
+    );
+
+    this.selectedText = canSelect
+      ? document.activeElement.value.substring(
+          document.activeElement.selectionStart,
+          document.activeElement.selectionEnd
+        )
+      : "";
+
+    if (this.selectedText.length === 0) {
       if (this.loading) {
         // prevent accidentally closing context menu while results loading
         return;
@@ -100,7 +113,6 @@ export default class AiHelperContextMenu extends Component {
       return;
     }
 
-    this.selectedText = event.target.getSelection().toString();
     this._onSelectionChanged();
   }