From e9b7ad2e60e7aa83ef80522870a141f71ca541ab Mon Sep 17 00:00:00 2001
From: Jason Merrill <jwmerrill@gmail.com>
Date: Wed, 18 Sep 2024 11:37:26 -0400
Subject: [PATCH] Type chainable methods generically

---
 src/commands/math.ts |  4 ++--
 src/commands/text.ts |  2 +-
 src/mathquill.d.ts   | 18 +++++-------------
 3 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/src/commands/math.ts b/src/commands/math.ts
index 92f914b02..6dd1dcabd 100644
--- a/src/commands/math.ts
+++ b/src/commands/math.ts
@@ -723,9 +723,9 @@ API.StaticMath = function (APIClasses: APIClasses) {
         node.registerInnerField(innerFields, APIClasses.InnerMathField);
       });
     }
-    latex(s: string): IBaseMathQuill;
+    latex(s: string): this;
     latex(): string;
-    latex(_latex?: string): string | IBaseMathQuill {
+    latex(_latex?: string): string | this {
       var returned = super.latex.apply(this, arguments as unknown as any);
       if (arguments.length > 0) {
         var innerFields = (this.innerFields = []);
diff --git a/src/commands/text.ts b/src/commands/text.ts
index 8a8b407a0..9db40828b 100644
--- a/src/commands/text.ts
+++ b/src/commands/text.ts
@@ -540,7 +540,7 @@ API.TextField = function (APIClasses: APIClasses) {
       return this;
     }
     latex(): string;
-    latex(l: string): IEditableField;
+    latex(l: string): this;
     latex(latex?: string) {
       if (latex) {
         this.__controller.renderLatexText(latex);
diff --git a/src/mathquill.d.ts b/src/mathquill.d.ts
index e9e0c5b71..ea73df4bc 100644
--- a/src/mathquill.d.ts
+++ b/src/mathquill.d.ts
@@ -36,12 +36,12 @@ declare namespace MathQuill {
       };
 
       //chainable methods
-      config(opts: Config): BaseMathQuill;
-      latex(latex: string): BaseMathQuill;
+      config(opts: Config): this;
+      latex(latex: string): this;
       latex(): string;
-      setAriaLabel(str: string): BaseMathQuill;
-      blur(): BaseMathQuill;
-      focus(): BaseMathQuill;
+      setAriaLabel(str: string): this;
+      blur(): this;
+      focus(): this;
     }
 
     interface EditableMathQuill extends BaseMathQuill {
@@ -57,14 +57,6 @@ declare namespace MathQuill {
       setAriaPostLabel: (str: string, timeout?: number) => EditableMathQuill;
       ignoreNextMousedown: (func: () => boolean) => EditableMathQuill;
       clickAt: (x: number, y: number, el: HTMLElement) => EditableMathQuill;
-
-      //override return signature on chainable methods
-      config(opts: Config): EditableMathQuill;
-      latex(latex: string): EditableMathQuill;
-      latex(): string;
-      setAriaLabel(str: string): EditableMathQuill;
-      blur(): EditableMathQuill;
-      focus(): EditableMathQuill;
     }
 
     interface API {