Now all overtype instances get passed through fixupOvertype.

Author: nedtwigg

src/lib/enhancers/github/GitHubEditEnhancer.tsx

@@ -6,7 +6,7 @@ import type {
   StrippedLocation,
 } from "@/lib/enhancer"
 import { logger } from "@/lib/logger"
-import { modifyDOM } from "../modifyDOM"
+import { fixupOvertype, modifyDOM } from "../modifyDOM"
 import { commonGitHubOptions, prepareGitHubHighlighter } from "./github-common"
 
 const GH_EDIT = "GH_EDIT" as const
@@ -71,13 +71,12 @@ export class GitHubEditEnhancer implements CommentEnhancer<GitHubEditSpot> {
   ): OverTypeInstance {
     prepareGitHubHighlighter()
     const overtypeContainer = modifyDOM(textArea)
-    const overtype = new OverType(overtypeContainer, {
-      ...commonGitHubOptions,
-      padding: spot.isIssue ? "var(--base-size-16)" : "var(--base-size-8)",
-    })[0]!
-    if (!spot.isIssue) {
-      // TODO: autoheight not working
-    }
+    const overtype = fixupOvertype(
+      new OverType(overtypeContainer, {
+        ...commonGitHubOptions,
+        padding: spot.isIssue ? "var(--base-size-16)" : "var(--base-size-8)",
+      })
+    )
     return overtype
   }
 

src/lib/enhancers/github/GitHubIssueAppendEnhancer.tsx

@@ -8,7 +8,7 @@ import type {
   StrippedLocation,
 } from "@/lib/enhancer"
 import { logger } from "@/lib/logger"
-import { modifyDOM } from "../modifyDOM"
+import { fixupOvertype, modifyDOM } from "../modifyDOM"
 import { commonGitHubOptions, prepareGitHubHighlighter } from "./github-common"
 
 const GH_ISSUE_APPEND = "GH_ISSUE_APPEND" as const
@@ -78,11 +78,13 @@ export class GitHubIssueAppendEnhancer
   ): OverTypeInstance {
     prepareGitHubHighlighter()
     const overtypeContainer = modifyDOM(textArea)
-    return new OverType(overtypeContainer, {
-      ...commonGitHubOptions,
-      minHeight: "100px",
-      placeholder: "Use Markdown to format your comment",
-    })[0]!
+    return fixupOvertype(
+      new OverType(overtypeContainer, {
+        ...commonGitHubOptions,
+        minHeight: "100px",
+        placeholder: "Use Markdown to format your comment",
+      })
+    )
   }
 
   tableUpperDecoration(spot: GitHubIssueAppendSpot): React.ReactNode {

src/lib/enhancers/github/GitHubIssueCreateEnhancer.tsx

@@ -7,7 +7,7 @@ import type {
   StrippedLocation,
 } from "../../enhancer"
 import { logger } from "../../logger"
-import { modifyDOM } from "../modifyDOM"
+import { fixupOvertype, modifyDOM } from "../modifyDOM"
 import { commonGitHubOptions, prepareGitHubHighlighter } from "./github-common"
 
 const GH_ISSUE_CREATE = "GH_ISSUE_CREATE" as const
@@ -68,11 +68,13 @@ export class GitHubIssueCreateEnhancer
   ): OverTypeInstance {
     prepareGitHubHighlighter()
     const overtypeContainer = modifyDOM(textArea)
-    return new OverType(overtypeContainer, {
-      ...commonGitHubOptions,
-      minHeight: "400px",
-      placeholder: "Type your description here...",
-    })[0]!
+    return fixupOvertype(
+      new OverType(overtypeContainer, {
+        ...commonGitHubOptions,
+        minHeight: "400px",
+        placeholder: "Type your description here...",
+      })
+    )
   }
 
   tableUpperDecoration(spot: GitHubIssueCreateSpot): React.ReactNode {

src/lib/enhancers/github/GitHubPrAppendEnhancer.tsx

@@ -8,7 +8,7 @@ import type {
   StrippedLocation,
 } from "@/lib/enhancer"
 import { logger } from "@/lib/logger"
-import { modifyDOM } from "../modifyDOM"
+import { fixupOvertype, modifyDOM } from "../modifyDOM"
 import { commonGitHubOptions, prepareGitHubHighlighter } from "./github-common"
 
 const GH_PR_APPEND = "GH_PR_APPEND" as const
@@ -69,12 +69,14 @@ export class GitHubPrAppendEnhancer
   ): OverTypeInstance {
     prepareGitHubHighlighter()
     const overtypeContainer = modifyDOM(textArea)
-    const overtype = new OverType(overtypeContainer, {
-      ...commonGitHubOptions,
-      minHeight: "102px",
-      padding: "var(--base-size-8)",
-      placeholder: "Add your comment here...",
-    })[0]!
+    const overtype = fixupOvertype(
+      new OverType(overtypeContainer, {
+        ...commonGitHubOptions,
+        minHeight: "102px",
+        padding: "var(--base-size-8)",
+        placeholder: "Add your comment here...",
+      })
+    )
     const listenForEmpty = new MutationObserver(() => {
       if (textArea.value === "") {
         overtype.updatePreview()

src/lib/enhancers/github/GitHubPrCreateEnhancer.tsx

@@ -7,7 +7,7 @@ import type {
   StrippedLocation,
 } from "../../enhancer"
 import { logger } from "../../logger"
-import { modifyDOM } from "../modifyDOM"
+import { fixupOvertype, modifyDOM } from "../modifyDOM"
 import { commonGitHubOptions, prepareGitHubHighlighter } from "./github-common"
 
 const GH_PR_CREATE = "GH_PR_CREATE" as const
@@ -83,11 +83,13 @@ export class GitHubPrCreateEnhancer
   ): OverTypeInstance {
     prepareGitHubHighlighter()
     const overtypeContainer = modifyDOM(textArea)
-    return new OverType(overtypeContainer, {
-      ...commonGitHubOptions,
-      minHeight: "250px",
-      placeholder: "Type your description here...",
-    })[0]!
+    return fixupOvertype(
+      new OverType(overtypeContainer, {
+        ...commonGitHubOptions,
+        minHeight: "250px",
+        placeholder: "Type your description here...",
+      })
+    )
   }
 
   tableUpperDecoration(spot: GitHubPrCreateSpot): React.ReactNode {

src/lib/enhancers/modifyDOM.ts

@@ -1,3 +1,15 @@
+import type { OverTypeInstance } from "overtype"
+
+// Assert that OverType returned exactly one instance and return it
+export function fixupOvertype(instances: OverTypeInstance[]): OverTypeInstance {
+  if (instances.length !== 1) {
+    throw new Error(
+      `Expected OverType to return exactly 1 instance, got ${instances.length}`
+    )
+  }
+  return instances[0]!
+}
+
 // Modify the DOM to trick overtype into adopting it instead of recreating it
 export function modifyDOM(overtypeInput: HTMLTextAreaElement): HTMLElement {
   overtypeInput.classList.add("overtype-input")