@khanacademy/perseus 19.1.3 → 19.1.4

package/CHANGELOG.md

@@ -1,5 +1,16 @@
 # @khanacademy/perseus
 
+## 19.1.4
+
+### Patch Changes
+
+-   [#958](https://github.com/Khan/perseus/pull/958) [`729b419a`](https://github.com/Khan/perseus/commit/729b419a5c31eaa6ac4da996a0683a2fdffc5997) Thanks [@benchristel](https://github.com/benchristel)! - Internal: Add tests for normalizeOptions function (used by Movable)
+
+*   [#960](https://github.com/Khan/perseus/pull/960) [`ce0227c1`](https://github.com/Khan/perseus/commit/ce0227c1d7b432b6a9484c32542ddf23d27b1e95) Thanks [@jeremywiebe](https://github.com/jeremywiebe)! - Add tests for Movable pseudo-class
+
+*   Updated dependencies [[`a4a4dc44`](https://github.com/Khan/perseus/commit/a4a4dc447037eaea83423dc21a15076435c4b638)]:
+    -   @khanacademy/math-input@17.0.3
+
 ## 19.1.3
 
 ### Patch Changes

package/dist/es/index.js

@@ -3985,8 +3985,10 @@ const MovableHelperMethods = {
   /**
    * Fire an onSomething type event to all functions in listeners
    */
-  _fireEvent: function (listeners, currentValue, previousValue) {
-    _.invoke(listeners, "call", this, currentValue, previousValue);
+  _fireEvent: function (listeners, ...args) {
+    for (const listener of listeners) {
+      listener.call(this, ...args);
+    }
   },
   /**
    * Combine the array of constraints functions
@@ -4086,10 +4088,6 @@ const MovableHelperMethods = {
   }
 };
 
-/**
- * Utility functions for writing Interactive2 movablethings
- */
-
 /**
  * Compute the correct vendor-prefixed `transform`.
  */
@@ -4123,6 +4121,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) {
@@ -4166,21 +4165,14 @@ 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 = _.clone(options);
-    _.each(arrayOptionNames, function (eventName) {
-      const funcOrArray = options[eventName];
+  normalizeOptions: function (options) {
+    const result = _extends({}, 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;
@@ -8873,6 +8865,9 @@ class Graphie$1 {
     var _options$isMobile;
     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);
     }
@@ -13724,24 +13719,9 @@ var GraphieClasses = {
   createSimpleClass: createSimpleClass
 };
 
-/**
- * Movable
- *
- * A Movable Something, that sends onMove events based on the
- * mouse coordinate (graphie unscaled, non-pixel-value) of the
- * move.
- *
- * Other MovableThings should generally have a Movable field, and
- * let this class handle all of the virtual mouse events, and then
- * take appropriate action in onMoveStart, onMove, onMoveEnd
- */
 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()`,
@@ -13761,7 +13741,7 @@ const DEFAULT_STATE$3 = {
 const Movable = function Movable(graphie, options) {
   // @ts-expect-error - TS2683 - 'this' implicitly has type 'any' because it does not have a type annotation.
   _.extend(this, {
-    graphie: graphie,
+    graphie,
     state: {
       // Set here because this must be unique for each instance
       id: _.uniqueId("movable")
@@ -13776,10 +13756,10 @@ InteractiveUtil.createGettersFor(Movable, _.extend({}, DEFAULT_PROPS$3, DEFAULT_
 InteractiveUtil.addMovableHelperMethodsTo(Movable);
 _.extend(Movable.prototype, {
   cloneState: function () {
-    return _.clone(this.state);
+    return _extends({}, this.state);
   },
   _createDefaultState: function () {
-    return _.extend({
+    return _extends({
       id: this.state.id,
       add: [],
       modify: [],
@@ -13789,9 +13769,6 @@ _.extend(Movable.prototype, {
       onMove: [],
       onMoveEnd: [],
       onClick: []
-
-      // We only update props here, because we want things on state to
-      // be persistent, and updated appropriately in modify()
     }, DEFAULT_PROPS$3);
   },
   /**
@@ -13801,7 +13778,7 @@ _.extend(Movable.prototype, {
    * Analogous to React.js's replaceProps
    */
   modify: function (options) {
-    this.update(_.extend({}, this._createDefaultState(), options));
+    this.update(_extends({}, this._createDefaultState(), options));
   },
   /**
    * Simulates a mouse grab event on the movable object.
@@ -13849,7 +13826,7 @@ _.extend(Movable.prototype, {
     const self = this;
     const graphie = self.graphie;
     const prevState = self.cloneState();
-    const state = _.extend(self.state, normalizeOptions$3(FUNCTION_ARRAY_OPTIONS$3, options));
+    const state = _.extend(self.state, normalizeOptions$3(options));
 
     // the invisible shape in front of the point that gets mouse events
     if (state.mouseTarget && !prevState.mouseTarget) {
@@ -14275,7 +14252,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).
@@ -14328,7 +14304,7 @@ _.extend(MovableLine$4.prototype, {
   _createDefaultState: function () {
     return _.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:
@@ -14355,7 +14331,7 @@ _.extend(MovableLine$4.prototype, {
   update: function (options) {
     const self = this;
     const graphie = this.graphie;
-    const state = self.state = _.extend(self.state, normalizeOptions$2(FUNCTION_ARRAY_OPTIONS$2, options));
+    const state = self.state = _.extend(self.state, normalizeOptions$2(options));
 
     // Default things inside the state.normalStyle object, because
     // _.extend is not deep.
@@ -14859,10 +14835,6 @@ const {
   processMath
 } = Tex$1;
 
-// State parameters that should be converted into an array of
-// functions
-const FUNCTION_ARRAY_OPTIONS$1 = _.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()`,
@@ -14915,7 +14887,7 @@ _.extend(MovablePoint$5.prototype, {
   _createDefaultState: function () {
     return _.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:
@@ -14988,7 +14960,7 @@ _.extend(MovablePoint$5.prototype, {
   update: function (options) {
     const self = this;
     const graphie = self.graphie;
-    const state = _.extend(self.state, normalizeOptions$1(FUNCTION_ARRAY_OPTIONS$1, options));
+    const state = _.extend(self.state, normalizeOptions$1(options));
     assert$6(point.is(state.coord));
 
     // Default things inside the state.normalStyle object, because
@@ -15595,10 +15567,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 = _.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()`,
@@ -15658,7 +15626,7 @@ _.extend(MovablePolygon.prototype, {
   _createDefaultState: function () {
     return _.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:
@@ -15689,7 +15657,7 @@ _.extend(MovablePolygon.prototype, {
   update: function (options) {
     const self = this;
     const graphie = self.graphie;
-    const state = _.extend(self.state, normalizeOptions(FUNCTION_ARRAY_OPTIONS, options));
+    const state = _.extend(self.state, normalizeOptions(options));
 
     // Default things inside the state.normalStyle object, because
     // _.extend is not deep.
@@ -41499,7 +41467,7 @@ const init = function init(options) {
 
 // This file is processed by a Rollup plugin (replace) to inject the production
 const libName = "@khanacademy/perseus";
-const libVersion = "19.1.3";
+const libVersion = "19.1.4";
 addLibraryVersionToPerseusDebug(libName, libVersion);
 
 const apiVersion = {