@khanacademy/perseus-editor 14.7.1 → 14.8.0

package/dist/components/widget-editor.d.ts

@@ -22,7 +22,7 @@ declare class WidgetEditor extends React.Component<WidgetEditorProps, WidgetEdit
     _handleAlignmentChange: (e: React.SyntheticEvent<HTMLSelectElement>) => void;
     getSaveWarnings: () => any;
     serialize: () => {
-        type: "definition" | "group" | "radio" | "table" | "categorizer" | "iframe" | "video" | "image" | "cs-program" | "dropdown" | "explanation" | "expression" | "graded-group-set" | "graded-group" | "grapher" | "input-number" | "interaction" | "interactive-graph" | "label-image" | "matcher" | "matrix" | "measurer" | "molecule-renderer" | "number-line" | "numeric-input" | "orderer" | "passage-ref" | "passage" | "phet-simulation" | "plotter" | "python-program" | "passage-ref-target" | "sorter" | "deprecated-standin";
+        type: "definition" | "group" | "radio" | "table" | "categorizer" | "cs-program" | "dropdown" | "explanation" | "expression" | "grapher" | "graded-group" | "graded-group-set" | "iframe" | "image" | "input-number" | "interaction" | "interactive-graph" | "label-image" | "matcher" | "matrix" | "measurer" | "molecule-renderer" | "number-line" | "numeric-input" | "orderer" | "passage" | "passage-ref" | "phet-simulation" | "plotter" | "python-program" | "sorter" | "video" | "passage-ref-target" | "deprecated-standin";
         alignment: string | undefined;
         static: boolean | undefined;
         graded: boolean | undefined;

package/dist/editor.d.ts

@@ -1,15 +1,13 @@
 import "./katex-mhchem";
 import * as React from "react";
-import type { ChangeHandler, ImageUploader, PerseusWidget } from "@khanacademy/perseus";
+import type { ChangeHandler, ImageUploader, PerseusWidget, PerseusWidgetsMap } from "@khanacademy/perseus";
 type Props = Readonly<{
     apiOptions: any;
     className?: string;
     content: string;
     replace?: any;
     placeholder: string;
-    widgets: {
-        [name: string]: PerseusWidget;
-    };
+    widgets: PerseusWidgetsMap;
     images: any;
     disabled: boolean;
     widgetEnabled: boolean;

package/dist/es/index.js

@@ -46,7 +46,7 @@ import arrowCounterClockwise from '@phosphor-icons/core/bold/arrow-counter-clock
 
 // This file is processed by a Rollup plugin (replace) to inject the production
 const libName = "@khanacademy/perseus-editor";
-const libVersion = "14.7.1";
+const libVersion = "14.8.0";
 addLibraryVersionToPerseusDebug(libName, libVersion);
 
 function _extends() {
@@ -21215,7 +21215,7 @@ class Editor extends React.Component {
         if (matches != null) {
           const text = matches[1];
           const widgets = Widgets.getAllWidgetTypes();
-          const matchingWidgets = _.filter(widgets, name => {
+          const matchingWidgets = widgets.filter(name => {
             return name.substring(0, text.length) === text;
           });
           if (matchingWidgets.length === 1) {
@@ -21375,8 +21375,7 @@ class Editor extends React.Component {
       const newPrelude = isBlock ? makeEndWithAParagraphIfNecessary(prelude) : prelude;
       const newPostlude = isBlock ? makeStartWithAParagraphAlways(postlude) : postlude;
       const newContent = newPrelude + widgetContent + newPostlude;
-      const newWidgets = _.clone(this.props.widgets);
-      // @ts-expect-error TS(2345) Type '"categorizer" | undefined' is not assignable to type '"deprecated-standin"'.
+      const newWidgets = _extends({}, this.props.widgets);
       newWidgets[id] = {
         options: (_Widgets$getEditor = Widgets.getEditor(widgetType)) == null ? void 0 : _Widgets$getEditor.defaultProps,
         type: widgetType,
@@ -30993,28 +30992,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) {
@@ -31260,24 +31252,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;
   }
 
@@ -31700,18 +31685,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) {
@@ -31908,18 +31886,11 @@ const LockedLineSettings = props => {
   // Check if the line has length 0.
   const isInvalid = 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) {
@@ -32177,21 +32148,14 @@ 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(([x, y]) => `(${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) {
@@ -32503,18 +32467,11 @@ const LockedVectorSettings = props => {
   // Check if the line has length 0.
   const isInvalid = 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) {