Abandon the registerSubmitHandler, and rely only on reliable cleanup.

Author: nedtwigg

src/lib/enhancers/github/GitHubIssueAppendEnhancer.tsx

@@ -1,5 +1,5 @@
 import { IssueOpenedIcon } from '@primer/octicons-react'
-import OverType, { type OverTypeInstance } from 'overtype'
+import OverType from 'overtype'
 import type React from 'react'
 import type {
   CommentEnhancer,
@@ -8,7 +8,6 @@ import type {
   StrippedLocation,
 } from '@/lib/enhancer'
 import { logger } from '@/lib/logger'
-import { oncePerRefresh } from '@/lib/once-per-refresh'
 import { modifyDOM } from '../modifyDOM'
 import { commonGitHubOptions, prepareGitHubHighlighter } from './github-common'
 
@@ -69,44 +68,22 @@ export class GitHubIssueAppendEnhancer implements CommentEnhancer<GitHubIssueApp
     }
   }
 
-  instance: OverTypeInstance | undefined
-
   enhance(textArea: HTMLTextAreaElement, _spot: GitHubIssueAppendSpot): OvertypeWithCleanup {
     prepareGitHubHighlighter()
     const overtypeContainer = modifyDOM(textArea)
-    if (this.instance) {
-      OverType.instances.delete(overtypeContainer)
-      ;(overtypeContainer as any).overTypeInstance = undefined
-    }
-    this.registerSubmitHandler(textArea, _spot)
-    const thing = new OverType(overtypeContainer, {
+    const instance = new OverType(overtypeContainer, {
       ...commonGitHubOptions,
       minHeight: '100px',
       placeholder: 'Use Markdown to format your comment',
     })[0]!
-    this.instance = thing
-    return { instance: thing }
-  }
-
-  private registerSubmitHandler(textArea: HTMLTextAreaElement, _spot: GitHubIssueAppendSpot) {
-    oncePerRefresh('gh-issue-append-events', () => {
-      document.addEventListener('click', (e) => {
-        const target = e.target
-        if (target) {
-          const btn = (e.target as HTMLElement).closest('button')
-          if (btn) {
-            if (
-              btn.textContent.trim() === 'Comment' ||
-              btn.matches('button[data-variant="primary"]')
-            ) {
-              this.enhance(textArea, _spot)
-              return true
-            }
-          }
-        }
-        return false
-      })
-    })
+    const cleanup = () => {
+      OverType.instances.delete(overtypeContainer)
+      ;(overtypeContainer as any).overTypeInstance = undefined
+    }
+    return {
+      cleanup,
+      instance,
+    }
   }
 
   tableUpperDecoration(spot: GitHubIssueAppendSpot): React.ReactNode {

src/lib/registries.ts

@@ -133,6 +133,9 @@ export class TextareaRegistry {
   unregisterDueToModification(textarea: HTMLTextAreaElement): void {
     const enhanced = this.textareas.get(textarea)
     if (enhanced) {
+      if (enhanced.cleanup) {
+        enhanced.cleanup()
+      }
       this.sendEvent('DESTROYED', enhanced)
       this.textareas.delete(textarea)
     }