@khanacademy/perseus 22.6.0 → 23.0.0

package/dist/index.css

@@ -4488,6 +4488,9 @@ html body .mq-editable-field .mq-selection .mq-nthroot-container * {
         format("woff");
 }
 
+.MafsView pattern g {
+    stroke: rgba(33, 36, 44, 0.32);
+}
 .axis-tick-labels {
     font-size: 14px;
     font-family: "Mafs-MJXTEX";
@@ -4496,6 +4499,8 @@ html body .mq-editable-field .mq-selection .mq-nthroot-container * {
      * drag interactions on the graph. */
     user-select: none;
     pointer-events: none;
+    /* Prevent labels from covering up interaction points. */
+    z-index: -1;
 }
 
 .y-axis-tick-labels {
@@ -4520,15 +4525,6 @@ html body .mq-editable-field .mq-selection .mq-nthroot-container * {
     transform: translateY(calc(-100% + 0.25em));
 }
 
-.x-axis-tick-labels span,
-.y-axis-tick-labels span {
-    &::before {
-        content: attr(data-content);
-        position: absolute;
-        transform: translate(-100%);
-    }
-}
-
 .y-axis-tick-labels span {
     display: inline-block;
     height: var(--y-axis-label-height, 20px);

package/dist/index.js

@@ -1245,8 +1245,6 @@ const ApiOptions = {
     // drawing area (scratchpad) should be allowed/disallowed.
     // Previously handled by `Khan.scratchpad.enable/disable`
     setDrawingAreaAvailable: PropTypes__default["default"].func,
-    // Whether to use the Draft.js editor or the legacy textarea
-    useDraftEditor: PropTypes__default["default"].bool,
     // The color used for the hint progress indicator (eg. 1 / 3)
     hintProgressColor: PropTypes__default["default"].string,
     // Whether this Renderer is allowed to auto-scroll the rest of the
@@ -1256,8 +1254,6 @@ const ApiOptions = {
     //
     // Defaults to `false`.
     canScrollPage: PropTypes__default["default"].bool,
-    // Whether or not we are rendering content inside of a modal.
-    inModal: PropTypes__default["default"].bool,
     // Whether to enable the cross-out feature on multiple-choice radio
     // widgets. This allows users to note which answers they believe to
     // be incorrect, to find the answer by process of elimination.
@@ -1293,9 +1289,7 @@ const ApiOptions = {
       }
     },
     setDrawingAreaAvailable: function () {},
-    useDraftEditor: false,
     canScrollPage: false,
-    inModal: false,
     crossOutEnabled: false,
     editorChangeDelay: 0
   }
@@ -25197,8 +25191,6 @@ var CSProgram$1 = {
   hidden: true
 };
 
-// TODO(FEI-5054): Figure out how to get global .d.ts files working with monorepos
-
 class Definition extends React__namespace.Component {
   static contextType = PerseusI18nContext;
   static defaultProps = {
@@ -25410,8 +25402,6 @@ var Dropdown$1 = {
 
 /* eslint-disable react/sort-comp */
 
-// TODO(FEI-5054): Figure out how to get global .d.ts files working with monorepos
-
 // transform = _.identity
 
 function mediaQueryIsMatched(mediaQuery) {
@@ -28868,7 +28858,6 @@ function AxisLabels() {
 
 // Range is replaced within this file with Interval, but it is used elsewhere
 // and exported from the package, so we need to keep it around.
-// TODO(FEI-5054): Figure out how to get global .d.ts files working with monorepos
 const ItemExtras = [
 // The user might benefit from using a Scientific Calculator.  Provided on Khan Academy when true
 "calculator",
@@ -30048,9 +30037,14 @@ function initializeGraphState(params) {
         center: [0, 0],
         radiusPoint: [1, 0]
       };
+    case "quadratic":
+      return {
+        ...shared,
+        type: graph.type,
+        coords: getQuadraticCoords(graph, range, step)
+      };
     case "angle":
     case "sinusoid":
-    case "quadratic":
       throw new Error("Mafs not yet implemented for graph type: " + graph.type);
     default:
       throw new wonderStuffCore.UnreachableCaseError(graph);
@@ -30148,6 +30142,12 @@ function getGradableGraph(state, initialGraph) {
       radius: getRadius(state)
     };
   }
+  if (state.type === "quadratic" && initialGraph.type === "quadratic") {
+    return {
+      ...initialGraph,
+      coords: state.coords
+    };
+  }
   throw new Error("Mafs is not yet implemented for graph type: " + initialGraph.type);
 }
 const getDefaultSegments = _ref2 => {
@@ -30227,6 +30227,11 @@ const getPolygonCoords = _ref4 => {
   coords = normalizePoints(range, step, coords, /* noSnap */!snapToGrid);
   return coords;
 };
+const getQuadraticCoords = (graph, range, step) => {
+  let coords = [[0.25, 0.75], [0.5, 0.25], [0.75, 0.75]];
+  coords = normalizePoints(range, step, coords, true);
+  return coords;
+};
 
 /**
  * determine radius of a circle graph
@@ -30336,6 +30341,82 @@ function crossProduct(as, bs) {
   return result;
 }
 
+function QuadraticGraph(props) {
+  const {
+    dispatch,
+    graphState
+  } = props;
+  const {
+    coords
+  } = graphState;
+
+  // The coefficients are used to calculate the quadratic equation, plot the graph, and to indicate
+  // to content creators the currently selected "correct answer". ex: y = 0.200x^2 + 0.000x + 0.000
+  // While we should technically never have invalid coordinates, we want to ensure that we have a fallback
+  const coeffRef = React__namespace.useRef([0, 0, 0]);
+  const coeffs = getQuadraticCoefficients(coords);
+  if (coeffs !== undefined) {
+    coeffRef.current = coeffs;
+  }
+
+  // Destructure the coefficients for calculating the quadratic equation
+  const [a, b, c] = coeffRef.current;
+
+  // Calculate the y value based on the current x value
+  const y = x => (a * x + b) * x + c;
+  const handleOnMove = (destination, elementId) => {
+    // If the destination is invalid, we want do not want to move the point
+    const validDestination = isValidDestination(destination, elementId, coords);
+    if (validDestination === false) {
+      return;
+    }
+    dispatch(movePoint(elementId, destination));
+  };
+  return /*#__PURE__*/React__namespace.createElement(React__namespace.Fragment, null, /*#__PURE__*/React__namespace.createElement(mafs.Plot.OfX, {
+    y: y,
+    color: wonderBlocksTokens.color.blue
+  }), coords.map((coord, i) => /*#__PURE__*/React__namespace.createElement(StyledMovablePoint, {
+    key: "point-" + i,
+    point: coord,
+    onMove: destination => handleOnMove(destination, i)
+  })));
+}
+
+// Ensure that we are only snapping to coordinates that result in a valid quadratic equation
+const isValidDestination = (destination, elementId, coords) => {
+  // Set up the new coords and check if the quadratic coefficients are valid
+  const newCoords = [...coords];
+  newCoords[elementId] = destination;
+  const QuadraticCoefficients = getQuadraticCoefficients(newCoords);
+
+  // If the new destination results in an invalid quadratic equation, we don't want to move the point
+  if (QuadraticCoefficients === undefined) {
+    return false;
+  }
+  return true;
+};
+
+// Get the quadratic coefficients from the 3 control points
+// These equations were originally set up in 2013 and may require some
+// additional comments to help clarify the quadratic formula manipulations
+// Origin: https://phabricator.khanacademy.org/D2413
+const getQuadraticCoefficients = coords => {
+  const p1 = coords[0];
+  const p2 = coords[1];
+  const p3 = coords[2];
+
+  // If the denominator is 0, we are going to return undefined as we are
+  // unable to calculate the quadratic coefficients when they hit infinity
+  const denom = (p1[0] - p2[0]) * (p1[0] - p3[0]) * (p2[0] - p3[0]);
+  if (denom === 0) {
+    return;
+  }
+  const a = (p3[0] * (p2[1] - p1[1]) + p2[0] * (p1[1] - p3[1]) + p1[0] * (p3[1] - p2[1])) / denom;
+  const b = (p3[0] * p3[0] * (p1[1] - p2[1]) + p2[0] * p2[0] * (p3[1] - p1[1]) + p1[0] * p1[0] * (p2[1] - p3[1])) / denom;
+  const c = (p2[0] * p3[0] * (p2[0] - p3[0]) * p1[1] + p3[0] * p1[0] * (p3[0] - p1[0]) * p2[1] + p1[0] * p2[0] * (p1[0] - p2[0]) * p3[1]) / denom;
+  return [a, b, c];
+};
+
 // Universal padding for the axis ticks to ensure that the labels
 // have enough space to render without overlapping the tick lines
 const tickPadding = 5;
@@ -30496,9 +30577,6 @@ const AxisTickLabel = _ref => {
   const pointOnAxis = axis === "x" ? [label, 0] : [0, label];
   const pixelPoint = pointToPixel(pointOnAxis, graphConfig);
 
-  // Remove the negative sign from the label string as it is handled in the data-content attribute
-  const labelString = Math.abs(label).toString();
-
   // Determine the relevant edge of the graph based on the axis type
   const graphEdge = axis === "x" ? graphConfig.width : graphConfig.height;
 
@@ -30514,15 +30592,9 @@ const AxisTickLabel = _ref => {
     gridStep: gridStep[vectorIndex],
     tickStep: tickStep[vectorIndex]
   });
-
-  // Determine whether or not to render a negative symbol for the tick label
-  // as the negative sign is handled in the data-content attribute in order to
-  // maintain the correct spacing between the labels
-  const dataContent = label < 0 && shouldShowLabel ? "−" : null;
   return /*#__PURE__*/React__namespace.createElement("span", {
-    className: `${axis}-axis-tick-label`,
-    "data-content": dataContent
-  }, shouldShowLabel && labelString);
+    className: `${axis}-axis-tick-label`
+  }, shouldShowLabel && label);
 };
 
 // Determine whether or not to show the tick label text
@@ -31477,6 +31549,7 @@ function doMoveControlPoint(state, action) {
       throw new Error("FIXME implement circle reducer");
     case "point":
     case "polygon":
+    case "quadratic":
       throw new Error(`Don't use moveControlPoint for ${state.type} graphs. Use movePoint instead!`);
     default:
       throw new wonderStuffCore.UnreachableCaseError(state);
@@ -31549,8 +31622,24 @@ function doMoveAll(state, action) {
 }
 function doMovePoint(state, action) {
   switch (state.type) {
-    case "point":
     case "polygon":
+    case "point":
+      {
+        return {
+          ...state,
+          hasBeenInteractedWith: true,
+          coords: setAtIndex({
+            array: state.coords,
+            index: action.index,
+            newValue: snap(state.snapStep, bound$1({
+              snapStep: state.snapStep,
+              range: state.range,
+              point: action.destination
+            }))
+          })
+        };
+      }
+    case "quadratic":
       {
         return {
           ...state,
@@ -31567,7 +31656,7 @@ function doMovePoint(state, action) {
         };
       }
     default:
-      throw new Error("The movePoint action is only for point and polygon graphs");
+      throw new Error("The movePoint action is only for point, quadratic, and polygon graphs");
   }
 }
 function doMoveCenter(state, action) {
@@ -31789,6 +31878,11 @@ const renderGraph = props => {
         graphState: state,
         dispatch: dispatch
       });
+    case "quadratic":
+      return /*#__PURE__*/React__namespace.createElement(QuadraticGraph, {
+        graphState: state,
+        dispatch: dispatch
+      });
     default:
       return new wonderStuffCore.UnreachableCaseError(type);
   }
@@ -44002,7 +44096,7 @@ const init = function (options) {
 
 // This file is processed by a Rollup plugin (replace) to inject the production
 const libName = "@khanacademy/perseus";
-const libVersion = "22.6.0";
+const libVersion = "23.0.0";
 perseusCore.addLibraryVersionToPerseusDebug(libName, libVersion);
 
 const apiVersion = {