@khanacademy/math-input 17.0.4 → 17.0.6

package/dist/components/input/math-wrapper.d.ts

@@ -31,9 +31,9 @@ declare class MathWrapper {
      *                         should be placed
      */
     setCursorPosition(x: number, y: number, hitNode: HTMLElement): void;
-    getCursor(): any;
+    getCursor(): import("mathquill").Cursor;
     contextForCursor(): import("./cursor-contexts").CursorContext;
-    getSelection(): any;
+    getSelection(): import("mathquill").MQSelection | undefined;
     getContent(): string;
     setContent(latex: string): void;
     isEmpty(): boolean;

package/dist/components/input/mathquill-types.d.ts

@@ -7,17 +7,60 @@ export type MathFieldConfig = MathQuill.v3.Config;
  * the ones listed here.
  * https://docs.mathquill.com/en/latest/Api_Methods/
  */
-export type MathFieldInterface = MathQuill.v3.EditableMathQuill;
+export type MathFieldInterface = MathQuill.v3.EditableMathQuill & {
+    cursor: () => MathQuill.Cursor;
+    controller: () => MathQuill.Controller;
+};
 export declare enum MathFieldActionType {
     WRITE = "write",
     CMD = "cmd",
     KEYSTROKE = "keystroke",
     MQ_END = 0
 }
+export type MathFieldUpdaterCallback = (mathField: MathFieldInterface, key: Key) => void;
 /**
- * The MathQuill MathField Cursor
- * it's not part of the public API for MathQuill,
- * we reach into the internals to get it
+ * The MathQuill API (see mathuill.d.ts) does not include types
+ * for cursor() and controller(), and adding these types there
+ * in the MathQuill repo causes unexpected conflicts with other types.
+ *
+ * We don't want to use the cursor and controller default type `any`
+ * so we declare the types here.
  */
-export type MathFieldCursor = any;
-export type MathFieldUpdaterCallback = (mathField: MathFieldInterface, key: Key) => void;
+declare module "mathquill" {
+    interface MQNode extends ControllerRoot {
+        id: number;
+        parent: NodeBase;
+    }
+    interface MQSelection {
+        id: number;
+        getEnd(dir: number): number;
+    }
+    interface NodeBase extends MQNode {
+        ctrlSeq: string | undefined;
+        blocks: MQNode;
+        latex(): string;
+    }
+    interface Cursor {
+        parent: MQNode;
+        selection: MQSelection | undefined;
+        select(): void;
+        endSelection(): void;
+        show(): Cursor;
+        hide(): Cursor;
+        insAtRightEnd(root: ControllerRoot): Cursor;
+        insRightOf(el: MQNode): Cursor;
+        insLeftOf(el: MQNode): Cursor;
+        startSelection(): void;
+    }
+    interface Controller {
+        parent: string;
+        root: ControllerRoot;
+        cursor: Cursor;
+        backspace(): Controller;
+        seek(targetElm: HTMLElement, clientX: number, _clientY: number): Controller;
+    }
+    interface ControllerRoot {
+        controller: Controller;
+        cursor?: Cursor;
+    }
+}

package/dist/es/index.js

@@ -7,7 +7,6 @@ import { StyleSheet, css } from 'aphrodite';
 import * as React from 'react';
 import { useState, useMemo, useEffect } from 'react';
 import ReactDOM from 'react-dom';
-import $ from 'jquery';
 import MathQuill from 'mathquill';
 import { View as View$1 } from '@khanacademy/wonder-blocks-core';
 import Clickable from '@khanacademy/wonder-blocks-clickable';
@@ -17,7 +16,7 @@ import PropTypes from 'prop-types';
 
 // This file is processed by a Rollup plugin (replace) to inject the production
 const libName = "@khanacademy/math-input";
-const libVersion = "17.0.4";
+const libVersion = "17.0.6";
 addLibraryVersionToPerseusDebug(libName, libVersion);
 
 function _extends() {
@@ -408,9 +407,12 @@ let MathFieldActionType = /*#__PURE__*/function (MathFieldActionType) {
 }({});
 
 /**
- * The MathQuill MathField Cursor
- * it's not part of the public API for MathQuill,
- * we reach into the internals to get it
+ * The MathQuill API (see mathuill.d.ts) does not include types
+ * for cursor() and controller(), and adding these types there
+ * in the MathQuill repo causes unexpected conflicts with other types.
+ *
+ * We don't want to use the cursor and controller default type `any`
+ * so we declare the types here.
  */
 
 const Numerals = ["0", "1", "2", "3", "4", "5", "6", "7", "8", "9"];
@@ -1323,7 +1325,7 @@ class MathWrapper {
         const controller = this.mathField.controller();
         const pageX = x - document.body.scrollLeft;
         const pageY = y - document.body.scrollTop;
-        controller.seek($(el), pageX, pageY).cursor.startSelection();
+        controller.seek(el, pageX, pageY).cursor.startSelection();
 
         // Unless that would leave us mid-command, in which case, we
         // need to adjust and place the cursor inside the parens