@khanacademy/perseus 23.0.0 → 23.1.0

package/dist/index.d.ts

@@ -87,7 +87,7 @@ export type { ILogger, LogErrorOptions, ErrorKind } from "./logging/log";
 export type { ServerItemRenderer as ServerItemRendererComponent } from "./server-item-renderer";
 export type { Alignment, APIOptions, APIOptionsWithDefaults, ChangeHandler, DeviceType, DomInsertCheckFn, EditorMode, FocusPath, Hint, ImageDict, ImageUploader, JiptLabelStore, JiptRenderer, PerseusDependencies, PerseusScore, Version, VideoData, VideoKind, WidgetDict, WidgetExports, } from "./types";
 export type { ParsedValue } from "./util";
-export type { LockedFigure, LockedFigureColor, LockedFigureType, LockedPointType, LockedLineType, PerseusGraphType, PerseusAnswerArea, PerseusExpressionWidgetOptions, Range, Size, MathFormat, InputNumberWidget, // TODO(jeremy): remove?
+export type { LockedFigure, LockedFigureColor, LockedFigureType, LockedPointType, LockedLineType, LockedCircleType, PerseusGraphType, PerseusAnswerArea, PerseusExpressionWidgetOptions, Range, Size, MathFormat, InputNumberWidget, // TODO(jeremy): remove?
 PerseusImageBackground, PerseusInputNumberWidgetOptions, PerseusInteractiveGraphWidgetOptions, PerseusItem, PerseusPlotterWidgetOptions, PerseusPythonProgramWidgetOptions, PerseusRadioWidgetOptions, PerseusExampleWidgetOptions, PerseusExampleGraphieWidgetOptions, PerseusSimpleMarkdownTesterWidgetOptions, PerseusRenderer, PerseusWidget, PerseusWidgetsMap, } from "./perseus-types";
 export type { Coord } from "./interactive2/types";
 export type { MarkerType } from "./widgets/label-image/types";

package/dist/index.js

@@ -17598,16 +17598,8 @@ class SvgImage extends React__namespace.Component {
     // Props to send to all images
     const imageProps = {
       alt: this.props.alt,
-      title: this.props.title,
-      tabIndex: "0"
+      title: this.props.title
     };
-    // If alt text is present, AND overrideAriaHidden is true,
-    // include aria-hidden to avoid screen reader from crawling texts
-    // both from the div meant for screen readers (see svg-image.jsx)
-    // and alt attribute.
-    if (this.props.alt && this.props.overrideAriaHidden) {
-      imageProps["aria-hidden"] = true;
-    }
     const width = this.props.width && this.props.width * this.props.scale;
     const height = this.props.height && this.props.height * this.props.scale;
     const dimensions = {
@@ -27649,7 +27641,7 @@ class ImageWidget extends React__namespace.Component {
 
   render() {
     let image;
-    let alt;
+    const alt = this.props.caption === this.props.alt ? "" : this.props.alt;
     const {
       apiOptions
     } = this.props;
@@ -27662,29 +27654,7 @@ class ImageWidget extends React__namespace.Component {
         } = _ref;
         return /*#__PURE__*/React__namespace.createElement(SvgImage, {
           src: url,
-          alt:
-          /* alt text is formatted in a sr-only
-          div next to the image in addition to
-          the alt attribute.
-          If there is no alt text at all,
-          we don't put an alt attribute on
-          the image, so that screen readers
-          know there's something they can't
-          read there :(.
-          NOTE: React <=0.13 (maybe later)
-          has a bug where it won't ever
-          remove an attribute, so if this
-          alt node is ever defined it's
-          not removed. This is sort of
-          dangerous, but we usually re-key
-          new renderers so that they're
-          rendered from scratch anyways,
-          so this shouldn't be a problem
-          in practice right now, although
-          it will exhibit weird behaviour
-          while editing. */
-          this.props.alt,
-          overrideAriaHidden: true,
+          alt: alt,
           width: backgroundImage.width,
           height: backgroundImage.height,
           preloader: apiOptions.imagePreloader,
@@ -27701,16 +27671,6 @@ class ImageWidget extends React__namespace.Component {
         });
       });
     }
-    if (this.props.alt) {
-      alt = /*#__PURE__*/React__namespace.createElement("span", {
-        className: "perseus-sr-only"
-      }, /*#__PURE__*/React__namespace.createElement(Renderer, {
-        content: this.props.alt,
-        apiOptions: apiOptions,
-        linterContext: this.props.linterContext,
-        strings: this.context.strings
-      }));
-    }
 
     // For mobile we combine an image's title and caption.
     if (apiOptions.isMobile) {
@@ -27777,7 +27737,7 @@ class ImageWidget extends React__namespace.Component {
         style: {
           maxWidth: backgroundImage.width
         }
-      }, image, alt, titleAndCaption);
+      }, image, titleAndCaption);
     }
     let title;
     let caption;
@@ -27809,7 +27769,7 @@ class ImageWidget extends React__namespace.Component {
       style: {
         maxWidth: backgroundImage.width
       }
-    }, title, image, alt, caption);
+    }, title, image, caption);
   }
   static validate(userInput, rubric) {
     return {
@@ -28964,6 +28924,28 @@ const lockedFigureColors = {
 };
 const plotterPlotTypes = ["bar", "line", "pic", "histogram", "dotplot"];
 
+const LockedCircle = props => {
+  const {
+    center,
+    radius,
+    color,
+    fillStyle,
+    strokeStyle
+  } = props;
+  const fill = {
+    none: 0,
+    solid: 1,
+    translucent: 0.4
+  };
+  return /*#__PURE__*/React__namespace.createElement(mafs.Circle, {
+    center: center,
+    radius: radius,
+    fillOpacity: fill[fillStyle],
+    strokeStyle: strokeStyle,
+    color: lockedFigureColors[color]
+  });
+};
+
 function pathBuilder() {
   return new PathBuilder();
 }
@@ -29232,6 +29214,10 @@ const GraphLockedLayer = props => {
           key: `line-${index}`,
           range: props.range
         }, figure));
+      case "circle":
+        return /*#__PURE__*/React__namespace.createElement(LockedCircle, _extends({
+          key: `circle-${index}`
+        }, figure));
       default:
         /**
          * Devlopment-time future-proofing: This should
@@ -30043,8 +30029,13 @@ function initializeGraphState(params) {
         type: graph.type,
         coords: getQuadraticCoords(graph, range, step)
       };
-    case "angle":
     case "sinusoid":
+      return {
+        ...shared,
+        type: graph.type,
+        coords: getSinusoidCoords(graph, range, step)
+      };
+    case "angle":
       throw new Error("Mafs not yet implemented for graph type: " + graph.type);
     default:
       throw new wonderStuffCore.UnreachableCaseError(graph);
@@ -30148,6 +30139,12 @@ function getGradableGraph(state, initialGraph) {
       coords: state.coords
     };
   }
+  if (state.type === "sinusoid" && initialGraph.type === "sinusoid") {
+    return {
+      ...initialGraph,
+      coords: state.coords
+    };
+  }
   throw new Error("Mafs is not yet implemented for graph type: " + initialGraph.type);
 }
 const getDefaultSegments = _ref2 => {
@@ -30227,6 +30224,11 @@ const getPolygonCoords = _ref4 => {
   coords = normalizePoints(range, step, coords, /* noSnap */!snapToGrid);
   return coords;
 };
+const getSinusoidCoords = (graph, range, step) => {
+  let coords = [[0.5, 0.5], [0.65, 0.6]];
+  coords = normalizePoints(range, step, coords, true);
+  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);
@@ -30417,6 +30419,62 @@ const getQuadraticCoefficients = coords => {
   return [a, b, c];
 };
 
+function SinusoidGraph(props) {
+  const {
+    dispatch,
+    graphState
+  } = props;
+
+  // Destructure the coordinates from the graph state
+  // Note: The order of the coordinates is important:
+  // The coords[0] is the root and the coords[1] is the first peak
+  const {
+    coords
+  } = graphState;
+
+  // Get the coefficients for calculating the quadratic equation
+  const coeffs = getSinusoidCoefficients(coords);
+  return /*#__PURE__*/React__namespace.createElement(React__namespace.Fragment, null, /*#__PURE__*/React__namespace.createElement(mafs.Plot.OfX, {
+    y: x => computeSine(x, coeffs),
+    color: wonderBlocksTokens.color.blue
+  }), coords.map((coord, i) => /*#__PURE__*/React__namespace.createElement(StyledMovablePoint, {
+    key: "point-" + i,
+    point: coord,
+    onMove: destination => dispatch(movePoint(i, destination))
+  })));
+}
+
+// Plot a sinusoid of the form: f(x) = a * sin(b * x - c) + d
+const computeSine = function (x,
+// x-coordinate
+sinusoidCoefficients) {
+  // Break down the coefficients for the sine function to improve readability
+  const {
+    amplitude: a,
+    angularFrequency: b,
+    phase: c,
+    verticalOffset: d
+  } = sinusoidCoefficients;
+  return a * Math.sin(b * x - c) + d;
+};
+const getSinusoidCoefficients = coords => {
+  // It's assumed that p1 is the root and p2 is the first peak
+  const p1 = coords[0];
+  const p2 = coords[1];
+
+  // Resulting coefficients are canonical for this sine curve
+  const amplitude = p2[1] - p1[1];
+  const angularFrequency = Math.PI / (2 * (p2[0] - p1[0]));
+  const phase = p1[0] * angularFrequency;
+  const verticalOffset = p1[1];
+  return {
+    amplitude,
+    angularFrequency,
+    phase,
+    verticalOffset
+  };
+};
+
 // Universal padding for the axis ticks to ensure that the labels
 // have enough space to render without overlapping the tick lines
 const tickPadding = 5;
@@ -31550,6 +31608,7 @@ function doMoveControlPoint(state, action) {
     case "point":
     case "polygon":
     case "quadratic":
+    case "sinusoid":
       throw new Error(`Don't use moveControlPoint for ${state.type} graphs. Use movePoint instead!`);
     default:
       throw new wonderStuffCore.UnreachableCaseError(state);
@@ -31639,6 +31698,30 @@ function doMovePoint(state, action) {
           })
         };
       }
+    case "sinusoid":
+      {
+        // First, we need to verify that the new coordinates are not on the same vertical line
+        // If they are, we don't want to move the point
+        const destination = action.destination;
+        const newCoords = [...state.coords];
+        newCoords[action.index] = action.destination;
+        if (newCoords[0][0] === newCoords[1][0]) {
+          return state;
+        }
+        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: destination
+            }))
+          })
+        };
+      }
     case "quadratic":
       {
         return {
@@ -31883,6 +31966,11 @@ const renderGraph = props => {
         graphState: state,
         dispatch: dispatch
       });
+    case "sinusoid":
+      return /*#__PURE__*/React__namespace.createElement(SinusoidGraph, {
+        graphState: state,
+        dispatch: dispatch
+      });
     default:
       return new wonderStuffCore.UnreachableCaseError(type);
   }
@@ -44096,7 +44184,7 @@ const init = function (options) {
 
 // This file is processed by a Rollup plugin (replace) to inject the production
 const libName = "@khanacademy/perseus";
-const libVersion = "23.0.0";
+const libVersion = "23.1.0";
 perseusCore.addLibraryVersionToPerseusDebug(libName, libVersion);
 
 const apiVersion = {