@khanacademy/perseus 19.1.2 → 19.1.4

package/dist/extra-widgets.d.ts

@@ -3,6 +3,7 @@ declare const _default: readonly Readonly<{
     name: string;
     displayName: string;
     getWidget?: (() => import("react").ComponentType<any>) | undefined;
+    widget: import("react").ComponentType<any>;
     accessible?: boolean | ((props: any) => boolean) | undefined;
     hidden?: boolean | undefined;
     version?: import("./types").Version | undefined;
@@ -17,6 +18,5 @@ declare const _default: readonly Readonly<{
     propUpgrades?: {
         [key: string]: (arg1: any) => any;
     } | undefined;
-    widget: import("react").ComponentType<any>;
 }>[];
 export default _default;

package/dist/index.js

@@ -4009,8 +4009,13 @@ const MovableHelperMethods = {
   /**
    * Fire an onSomething type event to all functions in listeners
    */
-  _fireEvent: function (listeners, currentValue, previousValue) {
-    ___default["default"].invoke(listeners, "call", this, currentValue, previousValue);
+  _fireEvent: function (listeners) {
+    for (var _len = arguments.length, args = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
+      args[_key - 1] = arguments[_key];
+    }
+    for (const listener of listeners) {
+      listener.call(this, ...args);
+    }
   },
   /**
    * Combine the array of constraints functions
@@ -4148,6 +4153,7 @@ function computeCanUse3dTransform() {
   // @ts-expect-error - TS2538 - Type 'null' cannot be used as an index type. | TS2538 - Type 'undefined' cannot be used as an index type.
   return !!el.style[prefix];
 }
+const FUNCTION_ARRAY_OPTIONS = ["add", "modify", "draw", "remove", "constraints", "onMoveStart", "onMove", "onMoveEnd", "onClick"];
 const InteractiveUtil = {
   assert: function (isTrue, message) {
     if (!isTrue) {
@@ -4191,21 +4197,16 @@ const InteractiveUtil = {
   /**
    * Convert all function-or-array arguments to arrays of functions
    */
-  normalizeOptions: function (arrayOptionNames, options) {
-    // TODO(jack): Having to clone here is annoying; this
-    // function should really just modify this.state in place
-    // (and maybe be a function on MovableHelperMethods to get access
-    // to this.state), which would also be nicer because we could
-    // normalizeOptions once in this.modify
-    const result = ___default["default"].clone(options);
-    ___default["default"].each(arrayOptionNames, function (eventName) {
-      const funcOrArray = options[eventName];
+  normalizeOptions: function (options) {
+    const result = {
+      ...options
+    };
+    FUNCTION_ARRAY_OPTIONS.forEach(function (eventName) {
       // Only propagate values which were set; not present values
       // shouldn't be added to options because we'd like them to
       // fall through to defaults
-      if (funcOrArray !== undefined) {
-        const funcArray = InteractiveUtil.arrayify(funcOrArray);
-        result[eventName] = funcArray;
+      if (options[eventName] !== undefined) {
+        result[eventName] = InteractiveUtil.arrayify(options[eventName]);
       }
     });
     return result;
@@ -8717,6 +8718,9 @@ class Graphie$1 {
   init(options) {
     let scale = options.scale || [40, 40];
     scale = typeof scale === "number" ? [scale, scale] : scale;
+
+    // TODO(jeremy): This can be removed once we're confident that callers
+    // obey the Typescript types.
     if (options.range == null) {
       throw new PerseusError("range should be specified in graph init", Errors.Internal);
     }
@@ -13742,10 +13746,6 @@ var GraphieClasses = {
 const normalizeOptions$3 = InteractiveUtil.normalizeOptions;
 const assert$8 = InteractiveUtil.assert;
 
-// state parameters that should be converted into an array of
-// functions
-const FUNCTION_ARRAY_OPTIONS$3 = ["add", "modify", "draw", "remove", "onMoveStart", "onMove", "onMoveEnd", "onClick"];
-
 // Default "props" and "state". Both are added to this.state and
 // receive magic getter methods (this.isHovering() etc).
 // However, properties in DEFAULT_PROPS are updated on `modify()`,
@@ -13765,7 +13765,7 @@ const DEFAULT_STATE$3 = {
 const Movable = function (graphie, options) {
   // @ts-expect-error - TS2683 - 'this' implicitly has type 'any' because it does not have a type annotation.
   ___default["default"].extend(this, {
-    graphie: graphie,
+    graphie,
     state: {
       // Set here because this must be unique for each instance
       id: ___default["default"].uniqueId("movable")
@@ -13780,10 +13780,12 @@ InteractiveUtil.createGettersFor(Movable, ___default["default"].extend({}, DEFAU
 InteractiveUtil.addMovableHelperMethodsTo(Movable);
 ___default["default"].extend(Movable.prototype, {
   cloneState: function () {
-    return ___default["default"].clone(this.state);
+    return {
+      ...this.state
+    };
   },
   _createDefaultState: function () {
-    return ___default["default"].extend({
+    return {
       id: this.state.id,
       add: [],
       modify: [],
@@ -13792,11 +13794,11 @@ ___default["default"].extend(Movable.prototype, {
       onMoveStart: [],
       onMove: [],
       onMoveEnd: [],
-      onClick: []
-
+      onClick: [],
       // We only update props here, because we want things on state to
       // be persistent, and updated appropriately in modify()
-    }, DEFAULT_PROPS$3);
+      ...DEFAULT_PROPS$3
+    };
   },
   /**
    * Resets the object to its state as if it were constructed with
@@ -13805,7 +13807,10 @@ ___default["default"].extend(Movable.prototype, {
    * Analogous to React.js's replaceProps
    */
   modify: function (options) {
-    this.update(___default["default"].extend({}, this._createDefaultState(), options));
+    this.update({
+      ...this._createDefaultState(),
+      ...options
+    });
   },
   /**
    * Simulates a mouse grab event on the movable object.
@@ -13853,7 +13858,7 @@ ___default["default"].extend(Movable.prototype, {
     const self = this;
     const graphie = self.graphie;
     const prevState = self.cloneState();
-    const state = ___default["default"].extend(self.state, normalizeOptions$3(FUNCTION_ARRAY_OPTIONS$3, options));
+    const state = ___default["default"].extend(self.state, normalizeOptions$3(options));
 
     // the invisible shape in front of the point that gets mouse events
     if (state.mouseTarget && !prevState.mouseTarget) {
@@ -14279,7 +14284,6 @@ var MovableLineOptions = {
  */
 const assert$7 = InteractiveUtil.assert;
 const normalizeOptions$2 = InteractiveUtil.normalizeOptions;
-const FUNCTION_ARRAY_OPTIONS$2 = ["add", "draw", "remove", "onMoveStart", "constraints", "onMove", "onMoveEnd"];
 
 // Default "props" and "state". Both are added to this.state and
 // receive magic getter methods (this.cursor() etc).
@@ -14332,7 +14336,7 @@ ___default["default"].extend(MovableLine$4.prototype, {
   _createDefaultState: function () {
     return ___default["default"].extend({
       id: this.state.id
-    }, normalizeOptions$2(FUNCTION_ARRAY_OPTIONS$2,
+    }, normalizeOptions$2(
     // Defaults are copied from MovableLineOptions.*.standard
     // These defaults are set here instead of DEFAULT_PROPS/STATE
     // because they:
@@ -14359,7 +14363,7 @@ ___default["default"].extend(MovableLine$4.prototype, {
   update: function (options) {
     const self = this;
     const graphie = this.graphie;
-    const state = self.state = ___default["default"].extend(self.state, normalizeOptions$2(FUNCTION_ARRAY_OPTIONS$2, options));
+    const state = self.state = ___default["default"].extend(self.state, normalizeOptions$2(options));
 
     // Default things inside the state.normalStyle object, because
     // _.extend is not deep.
@@ -14867,10 +14871,6 @@ const {
   processMath
 } = Tex$1;
 
-// State parameters that should be converted into an array of
-// functions
-const FUNCTION_ARRAY_OPTIONS$1 = ___default["default"].keys(MovablePointOptions);
-
 // Default "props" and "state". Both are added to this.state and
 // receive magic getter methods (this.coord() etc).
 // However, properties in DEFAULT_PROPS are updated on `modify()`,
@@ -14923,7 +14923,7 @@ ___default["default"].extend(MovablePoint$5.prototype, {
   _createDefaultState: function () {
     return ___default["default"].extend({
       id: this.state.id
-    }, normalizeOptions$1(FUNCTION_ARRAY_OPTIONS$1,
+    }, normalizeOptions$1(
     // Defaults are copied from MovablePointOptions.*.standard
     // These defaults are set here instead of DEFAULT_PROPS/STATE
     // because they:
@@ -14996,7 +14996,7 @@ ___default["default"].extend(MovablePoint$5.prototype, {
   update: function (options) {
     const self = this;
     const graphie = self.graphie;
-    const state = ___default["default"].extend(self.state, normalizeOptions$1(FUNCTION_ARRAY_OPTIONS$1, options));
+    const state = ___default["default"].extend(self.state, normalizeOptions$1(options));
     assert$6(kmath.point.is(state.coord));
 
     // Default things inside the state.normalStyle object, because
@@ -15603,10 +15603,6 @@ var MovablePolygonOptions = {
 const assert$5 = InteractiveUtil.assert;
 const normalizeOptions = InteractiveUtil.normalizeOptions;
 
-// State parameters that should be converted into an array of
-// functions
-const FUNCTION_ARRAY_OPTIONS = ___default["default"].keys(MovablePolygonOptions);
-
 // Default "props" and "state". Both are added to this.state and
 // receive magic getter methods (this.points() etc).
 // However, properties in DEFAULT_PROPS are updated on `modify()`,
@@ -15666,7 +15662,7 @@ ___default["default"].extend(MovablePolygon.prototype, {
   _createDefaultState: function () {
     return ___default["default"].extend({
       id: this.state.id
-    }, normalizeOptions(FUNCTION_ARRAY_OPTIONS,
+    }, normalizeOptions(
     // Defaults are copied from MovablePolygonOptions.*.standard
     // These defaults are set here instead of DEFAULT_PROPS/STATE
     // because they:
@@ -15697,7 +15693,7 @@ ___default["default"].extend(MovablePolygon.prototype, {
   update: function (options) {
     const self = this;
     const graphie = self.graphie;
-    const state = ___default["default"].extend(self.state, normalizeOptions(FUNCTION_ARRAY_OPTIONS, options));
+    const state = ___default["default"].extend(self.state, normalizeOptions(options));
 
     // Default things inside the state.normalStyle object, because
     // _.extend is not deep.
@@ -18622,7 +18618,10 @@ const getAllWidgetTypes = () => {
 };
 const upgradeWidgetInfoToLatestVersion = oldWidgetInfo => {
   const type = oldWidgetInfo.type;
-  // TODO(LP-10707): Remove unnecessary type checking (`type` is a string)
+  // NOTE(jeremy): This looks like it could be replaced by fixing types so
+  // that `type` is non-optional. But we're seeing this in Sentry today so I
+  // suspect we have legacy data (potentially unpublished) and we should
+  // figure that out before depending solely on types.
   if (!___default["default"].isString(type)) {
     throw new PerseusError("widget type must be a string, but was: " + type, Errors.Internal);
   }
@@ -31116,7 +31115,8 @@ class Marker extends React__namespace.Component {
       answerSide,
       answerStyles,
       hovered,
-      focused
+      focused,
+      label
     } = this.props;
 
     // We cannot make dropdown openers untabbable, so we isolate tabbing
@@ -31125,6 +31125,9 @@ class Marker extends React__namespace.Component {
     const active = hovered || focused;
     return /*#__PURE__*/React__namespace.createElement(React__namespace.Fragment, null, /*#__PURE__*/React__namespace.createElement(wonderBlocksCore.View, {
       style: [styles$g.marker, active && !markerDisabled && styles$g.markerActive]
+      // already translated in: /widgets/graded-group.tsx
+      ,
+      "aria-label": markerDisabled ? i18n__namespace._("Correct!") : label
     }, this.renderIcon()), !!selected && showAnswer && /*#__PURE__*/React__namespace.createElement(AnswerPill, {
       selectedAnswers: selected,
       showCorrectness: showCorrectness,
@@ -31672,15 +31675,12 @@ class LabelImage extends React__namespace.Component {
         disabled: disabled,
         opener: _ref => {
           let {
-            opened,
-            text
+            opened
           } = _ref;
           return /*#__PURE__*/React__namespace.createElement(Clickable__default["default"], {
             role: "button",
-            key: `marker-${marker.x}.${marker.y}`,
-            "aria-label":
-            // already translated in: /widgets/graded-group.tsx
-            showCorrectness === "correct" ? i18n__namespace._("Correct!") : marker.label
+            "aria-expanded": opened,
+            key: `marker-${marker.x}.${marker.y}`
           }, _ref2 => {
             let {
               hovered,
@@ -41585,11 +41585,7 @@ var extraWidgets = [Categorizer$1, CSProgram$1, Dropdown$1, Explanation$1, Defin
 const init = function (options) {
   registerWidgets(basicWidgets);
   registerWidgets(extraWidgets);
-
-  // This section replaces widgets
-  // When it's time to replace the transformer widget
-  // uncomment this line
-  // Widgets.replaceWidget("transformer", "deprecated-standin");
+  replaceWidget("transformer", "deprecated-standin");
 
   // Pass skipMathJax: true if MathJax is already loaded and configured.
   const skipMathJax = options.skipMathJax;
@@ -41615,7 +41611,7 @@ const init = function (options) {
 
 // This file is processed by a Rollup plugin (replace) to inject the production
 const libName = "@khanacademy/perseus";
-const libVersion = "19.1.2";
+const libVersion = "19.1.4";
 perseusCore.addLibraryVersionToPerseusDebug(libName, libVersion);
 
 const apiVersion = {