@khanacademy/perseus-editor 14.7.0 → 14.8.0

package/dist/hint-editor.d.ts

@@ -1,6 +1,6 @@
 import * as React from "react";
 import Editor from "./editor";
-import type { APIOptions, WidgetDict, ImageDict, Hint, ChangeHandler, DeviceType, ImageUploader } from "@khanacademy/perseus";
+import type { APIOptions, ImageDict, Hint, ChangeHandler, DeviceType, ImageUploader, PerseusWidgetsMap } from "@khanacademy/perseus";
 type HintEditorProps = {
     itemId?: string;
     apiOptions?: APIOptions;
@@ -11,7 +11,7 @@ type HintEditorProps = {
     showTitle?: boolean;
     content?: string | null | undefined;
     replace?: boolean | null | undefined;
-    widgets?: WidgetDict | null | undefined;
+    widgets?: PerseusWidgetsMap | null | undefined;
     images?: ImageDict | null | undefined;
     isLast: boolean;
     isFirst: boolean;

package/dist/index.js

@@ -98,7 +98,7 @@ var arrowCounterClockwise__default = /*#__PURE__*/_interopDefaultLegacy(arrowCou
 
 // This file is processed by a Rollup plugin (replace) to inject the production
 const libName = "@khanacademy/perseus-editor";
-const libVersion = "14.7.0";
+const libVersion = "14.8.0";
 perseusCore.addLibraryVersionToPerseusDebug(libName, libVersion);
 
 function _extends() {
@@ -21354,7 +21354,7 @@ class Editor extends React__namespace.Component {
       if (matches != null) {
         const text = matches[1];
         const widgets = perseus.Widgets.getAllWidgetTypes();
-        const matchingWidgets = ___default["default"].filter(widgets, name => {
+        const matchingWidgets = widgets.filter(name => {
           return name.substring(0, text.length) === text;
         });
         if (matchingWidgets.length === 1) {
@@ -21513,8 +21513,9 @@ class Editor extends React__namespace.Component {
     const newPrelude = isBlock ? makeEndWithAParagraphIfNecessary(prelude) : prelude;
     const newPostlude = isBlock ? makeStartWithAParagraphAlways(postlude) : postlude;
     const newContent = newPrelude + widgetContent + newPostlude;
-    const newWidgets = ___default["default"].clone(this.props.widgets);
-    // @ts-expect-error TS(2345) Type '"categorizer" | undefined' is not assignable to type '"deprecated-standin"'.
+    const newWidgets = {
+      ...this.props.widgets
+    };
     newWidgets[id] = {
       options: perseus.Widgets.getEditor(widgetType)?.defaultProps,
       type: widgetType,
@@ -31100,28 +31101,21 @@ const LockedEllipseSettings = props => {
     onRemove
   } = props;
   function getPrepopulatedAriaLabel() {
+    let visiblelabel = "";
+    if (labels && labels.length > 0) {
+      visiblelabel += ` ${labels.map(l => l.text).join(" ")}`;
+    }
     const isCircle = radius[0] === radius[1];
     let str = "";
     if (isCircle) {
-      str += `Circle with radius ${radius[0]}`;
+      str += `Circle${visiblelabel} with radius ${radius[0]}`;
     } else {
-      str += `Ellipse with x radius ${radius[0]} and y radius ${radius[1]}`;
+      str += `Ellipse${visiblelabel} with x radius ${radius[0]} and y radius ${radius[1]}`;
     }
     str += `, centered at (${center[0]}, ${center[1]})`;
     if (!isCircle && angle !== 0) {
       str += `, rotated by ${radianToDegree(angle)} degrees`;
     }
-    if (labels && labels.length > 0) {
-      str += ", with label";
-      // Make it "with labels" instead of "with label" if there are
-      // multiple labels.
-      if (labels.length > 1) {
-        str += "s";
-      }
-
-      // Separate additional labels with commas.
-      str += ` ${labels.map(l => l.text).join(", ")}`;
-    }
     return str;
   }
   function handleCenterChange(newCoord) {
@@ -31371,24 +31365,17 @@ const LockedFunctionSettings = props => {
     setDomainEntries([domain && domain[0] !== -Infinity ? domain[0].toString() : "", domain && domain[1] !== Infinity ? domain[1].toString() : ""]);
   }, [domain]);
   function getPrepopulatedAriaLabel() {
-    let str = `Function with equation ${equationPrefix}${equation}`;
+    let visiblelabel = "";
+    if (labels && labels.length > 0) {
+      visiblelabel += ` ${labels.map(l => l.text).join(", ")}`;
+    }
+    let str = `Function${visiblelabel} with equation ${equationPrefix}${equation}`;
 
     // Add the domain/range constraints to the aria label
     // if they are not the default values.
     if (domain && !(domain[0] === -Infinity && domain[1] === Infinity)) {
       str += `, domain from ${domain[0]} to ${domain[1]}`;
     }
-    if (labels && labels.length > 0) {
-      str += ", with label";
-      // Make it "with labels" instead of "with label" if there are
-      // multiple labels.
-      if (labels.length > 1) {
-        str += "s";
-      }
-
-      // Separate additional labels with commas.
-      str += ` ${labels.map(l => l.text).join(", ")}`;
-    }
     return str;
   }
 
@@ -31814,18 +31801,11 @@ const LockedPointSettings = props => {
    * "Point at (x, y) with label1, label2, label3".
    */
   function getPrepopulatedAriaLabel() {
-    let str = `Point at (${coord[0]}, ${coord[1]})`;
+    let visiblelabel = "";
     if (labels && labels.length > 0) {
-      str += " with label";
-      // Make it "with labels" instead of "with label" if there are
-      // multiple labels.
-      if (labels.length > 1) {
-        str += "s";
-      }
-
-      // Separate additional labels with commas.
-      str += ` ${labels.map(l => l.text).join(", ")}`;
+      visiblelabel += ` ${labels.map(l => l.text).join(", ")}`;
     }
+    const str = `Point${visiblelabel} at (${coord[0]}, ${coord[1]})`;
     return str;
   }
   function handleColorChange(newValue) {
@@ -32026,18 +32006,11 @@ const LockedLineSettings = props => {
   // Check if the line has length 0.
   const isInvalid = kmath.vector.equal(point1.coord, point2.coord);
   function getPrepopulatedAriaLabel() {
-    let str = `${capitalizeKind} from (${point1.coord[0]}, ${point1.coord[1]}) to (${point2.coord[0]}, ${point2.coord[1]})`;
+    let visiblelabel = "";
     if (labels && labels.length > 0) {
-      str += " with label";
-      // Make it "with labels" instead of "with label" if there are
-      // multiple labels.
-      if (labels.length > 1) {
-        str += "s";
-      }
-
-      // Separate additional labels with commas.
-      str += ` ${labels.map(l => l.text).join(", ")}`;
+      visiblelabel += ` ${labels.map(l => l.text).join(", ")}`;
     }
+    const str = `${capitalizeKind}${visiblelabel} from (${point1.coord[0]}, ${point1.coord[1]}) to (${point2.coord[0]}, ${point2.coord[1]})`;
     return str;
   }
   function handleChangePoint(newPointProps, index) {
@@ -32305,24 +32278,17 @@ const LockedPolygonSettings = props => {
     onRemove
   } = props;
   function getPrepopulatedAriaLabel() {
-    let str = `Polygon with ${points.length} sides, vertices at `;
+    let visiblelabel = "";
+    if (labels && labels.length > 0) {
+      visiblelabel += ` ${labels.map(l => l.text).join(", ")}`;
+    }
+    let str = `Polygon${visiblelabel} with ${points.length} sides, vertices at `;
 
     // Add the coordinates of each point to the aria label
     str += points.map(_ref => {
       let [x, y] = _ref;
       return `(${x}, ${y})`;
     }).join(", ");
-    if (labels && labels.length > 0) {
-      str += ", with label";
-      // Make it "with labels" instead of "with label" if there are
-      // multiple labels.
-      if (labels.length > 1) {
-        str += "s";
-      }
-
-      // Separate additional labels with commas.
-      str += ` ${labels.map(l => l.text).join(", ")}`;
-    }
     return str;
   }
   function handleColorChange(newValue) {
@@ -32653,18 +32619,11 @@ const LockedVectorSettings = props => {
   // Check if the line has length 0.
   const isInvalid = kmath.vector.equal(tail, tip);
   function getPrepopulatedAriaLabel() {
-    let str = `Vector from (${tail[0]}, ${tail[1]}) to (${tip[0]}, ${tip[1]})`;
+    let visiblelabel = "";
     if (labels && labels.length > 0) {
-      str += " with label";
-      // Make it "with labels" instead of "with label" if there are
-      // multiple labels.
-      if (labels.length > 1) {
-        str += "s";
-      }
-
-      // Separate additional labels with commas.
-      str += ` ${labels.map(l => l.text).join(", ")}`;
+      visiblelabel += ` ${labels.map(l => l.text).join(", ")}`;
     }
+    const str = `Vector${visiblelabel} from (${tail[0]}, ${tail[1]}) to (${tip[0]}, ${tip[1]})`;
     return str;
   }
   function handleChangePoint(newCoord, index) {