@khanacademy/perseus 48.2.0 → 49.0.1

package/dist/es/index.js

@@ -2,13 +2,13 @@ import * as KAS from '@khanacademy/kas';
 import { MathInputI18nContext, CursorContext, getKeyTranslator, createMathField, getCursorContext, DesktopKeypad, convertDotToTimesByLocale, mathQuillInstance, KeypadInput, KeypadType, KeyArray, keypadElementPropType } from '@khanacademy/math-input';
 import * as PerseusLinter from '@khanacademy/perseus-linter';
 import { linterContextDefault, Rule } from '@khanacademy/perseus-linter';
-import { View, RenderStateRoot, UniqueIDProvider, useOnMountEffect, useLatestRef, useUniqueIdWithMock, Text as Text$2 } from '@khanacademy/wonder-blocks-core';
+import { View, RenderStateRoot, Id, useOnMountEffect, useLatestRef, Text as Text$2 } from '@khanacademy/wonder-blocks-core';
 import Tooltip$1 from '@khanacademy/wonder-blocks-tooltip';
 import { HeadingMedium, LabelSmall, LabelLarge, Body, LabelMedium } from '@khanacademy/wonder-blocks-typography';
 import { StyleSheet, css } from 'aphrodite';
 import classNames$1 from 'classnames';
 import * as React from 'react';
-import React__default, { useContext, useState, useEffect, useRef, createContext, forwardRef, useLayoutEffect, useImperativeHandle } from 'react';
+import React__default, { useContext, useState, useEffect, useRef, createContext, forwardRef, useLayoutEffect, useImperativeHandle, useId } from 'react';
 import * as ReactDOM from 'react-dom';
 import ReactDOM__default from 'react-dom';
 import _, { debounce as debounce$1 } from 'underscore';
@@ -44,13 +44,21 @@ import cornersOutIcon from '@phosphor-icons/core/regular/corners-out.svg';
 import Link from '@khanacademy/wonder-blocks-link';
 
 function _extends() {
-  return _extends = Object.assign ? Object.assign.bind() : function (n) {
-    for (var e = 1; e < arguments.length; e++) {
-      var t = arguments[e];
-      for (var r in t) ({}).hasOwnProperty.call(t, r) && (n[r] = t[r]);
+  _extends = Object.assign || function (target) {
+    for (var i = 1; i < arguments.length; i++) {
+      var source = arguments[i];
+
+      for (var key in source) {
+        if (Object.prototype.hasOwnProperty.call(source, key)) {
+          target[key] = source[key];
+        }
+      }
     }
-    return n;
-  }, _extends.apply(null, arguments);
+
+    return target;
+  };
+
+  return _extends.apply(this, arguments);
 }
 
 /**
@@ -4445,14 +4453,17 @@ const InteractiveUtil = {
   }
 };
 
-function _classPrivateFieldBase(e, t) {
-  if (!{}.hasOwnProperty.call(e, t)) throw new TypeError("attempted to use private field on non-instance");
-  return e;
+function _classPrivateFieldBase(receiver, privateKey) {
+  if (!Object.prototype.hasOwnProperty.call(receiver, privateKey)) {
+    throw new TypeError("attempted to use private field on non-instance");
+  }
+
+  return receiver;
 }
 
 var id = 0;
-function _classPrivateFieldKey(e) {
-  return "__private_" + id++ + "_" + e;
+function _classPrivateFieldKey(name) {
+  return "__private_" + id++ + "_" + name;
 }
 
 /*!
@@ -8859,13 +8870,10 @@ const reactRootCache = new WeakMap();
  */
 function render(element, container) {
   /**
-   * `RenderStateRoot` is responsible for tracking whether it's
-   * the initial render or subsequent renders.  It's used by
-   * `useUniqueId` and will be used by `UniqueIDProvider` and
-   * `WithSSRPlaceholder` in the future.  We're placing it as
-   * high up in the render tree as possible to ensure that any
-   * components using that hook or those components will function
-   * correctly.
+   * `RenderStateRoot` is responsible for tracking whether it's the initial
+   * render or subsequent renders.  It's used by `WithSSRPlaceholder`.  We're
+   * placing it as high up in the render tree as possible to ensure that any
+   * components using that hook or those components will function correctly.
    */
   const children = /*#__PURE__*/React.createElement(RenderStateRoot, {
     throwIfNested: false
@@ -21081,14 +21089,19 @@ TextInput.defaultProps = {
   disabled: false
 };
 
-function _objectWithoutPropertiesLoose(r, e) {
-  if (null == r) return {};
-  var t = {};
-  for (var n in r) if ({}.hasOwnProperty.call(r, n)) {
-    if (e.includes(n)) continue;
-    t[n] = r[n];
+function _objectWithoutPropertiesLoose(source, excluded) {
+  if (source == null) return {};
+  var target = {};
+  var sourceKeys = Object.keys(source);
+  var key, i;
+
+  for (i = 0; i < sourceKeys.length; i++) {
+    key = sourceKeys[i];
+    if (excluded.indexOf(key) >= 0) continue;
+    target[key] = source[key];
   }
-  return t;
+
+  return target;
 }
 
 const _excluded$7 = ["position", "visibility", "left", "top"];
@@ -27369,10 +27382,7 @@ class Dropdown extends React.Component {
       value: String(i + 1),
       label: choice
     }))];
-    return /*#__PURE__*/React.createElement(UniqueIDProvider, {
-      scope: "dropdown-widget",
-      mockOnFirstRender: true
-    }, ids => /*#__PURE__*/React.createElement(View
+    return /*#__PURE__*/React.createElement(Id, null, dropdownId => /*#__PURE__*/React.createElement(View
     // NOTE(jared): These are required to prevent weird behavior
     // When there's a dropdown in a zoomable table.
     , {
@@ -27384,9 +27394,9 @@ class Dropdown extends React.Component {
       }
     }, this.props.visibleLabel && /*#__PURE__*/React.createElement(LabelLarge, {
       tag: "label",
-      htmlFor: ids.get("dropdown")
+      htmlFor: dropdownId
     }, this.props.visibleLabel), /*#__PURE__*/React.createElement(SingleSelect, {
-      id: ids.get("dropdown"),
+      id: dropdownId,
       placeholder: "",
       onChange: value => this._handleChange(parseInt(value)),
       selectedValue: String(this.props.selected),
@@ -27501,12 +27511,9 @@ class Explanation extends React.Component {
       "white-space": "normal"
     };
     const contentStyling = [styles$k.content, this.state.expanded ? styles$k.contentExpanded : styles$k.contentCollapsed, allowTransition && (this.state.expanded ? styles$k.transitionExpanded : styles$k.transitionCollapsed)];
-    return /*#__PURE__*/React.createElement(UniqueIDProvider, {
-      mockOnFirstRender: true,
-      scope: "explanation-widget"
-    }, ids => /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Button, {
+    return /*#__PURE__*/React.createElement(Id, null, contentId => /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Button, {
       "aria-expanded": this.state.expanded,
-      "aria-controls": ids.get("content"),
+      "aria-controls": contentId,
       endIcon: caretIcon,
       kind: "tertiary",
       labelStyle: labelStyle,
@@ -27514,7 +27521,7 @@ class Explanation extends React.Component {
       size: "small",
       style: buttonStyleOverrides
     }, promptText), /*#__PURE__*/React.createElement(View, {
-      id: ids.get("content"),
+      id: contentId,
       style: contentStyling,
       "aria-hidden": !this.state.expanded,
       testId: "content-container"
@@ -32682,6 +32689,17 @@ const getIntersectionOfRayWithBox = (initialPoint, throughPoint, box) => {
 function isBetween(x, low, high) {
   return x >= low && x <= high;
 }
+function getArrayWithoutDuplicates(array) {
+  const returnArray = [];
+  for (const coordPair of array) {
+    if (
+    // Check if the coordPair is not already in the returnArray
+    !returnArray.some(([x, y]) => x === coordPair[0] && y === coordPair[1])) {
+      returnArray.push(coordPair);
+    }
+  }
+  return returnArray;
+}
 
 const LockedLine = props => {
   var _flags$mafs;
@@ -34092,6 +34110,12 @@ function getGradableGraph(state, initialGraph) {
     });
   }
   if (state.type === "polygon" && initialGraph.type === "polygon") {
+    // Unless the polygon is closed it is not considered score-able.
+    if (state.numSides === "unlimited" && !state.closedPolygon) {
+      return _extends({}, initialGraph, {
+        coords: null
+      });
+    }
     return _extends({}, initialGraph, {
       coords: state.coords
     });
@@ -34603,6 +34627,15 @@ const PolygonGraph = props => {
       (_pointsRef$current$fo = pointsRef.current[focusedIndex]) == null || _pointsRef$current$fo.focus();
     }
   }, [props.graphState.focusedPointIndex, pointsRef]);
+
+  // If the unlimited polygon is rendered with 3 or more coordinates
+  // Close the polygon, but only on first render.
+  React.useEffect(() => {
+    if (numSides === "unlimited" && props.graphState.coords.length > 2) {
+      dispatch(actions.polygon.closePolygon());
+    }
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, []);
   const statefulProps = _extends({}, props, {
     graphConfig,
     polygonRef,
@@ -34743,7 +34776,16 @@ const UnlimitedPolygonGraph = statefulProps => {
   } = graphConfig;
   const widthPx = graphDimensionsInPixels[0];
   const heightPx = graphDimensionsInPixels[1];
-  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("rect", {
+  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Polyline, {
+    points: [...points],
+    color: "var(--movable-line-stroke-color)",
+    svgPolylineProps: {
+      strokeWidth: "var(--movable-line-stroke-weight)",
+      style: {
+        fill: "transparent"
+      }
+    }
+  }), /*#__PURE__*/React.createElement("rect", {
     style: {
       fill: "rgba(0,0,0,0)",
       cursor: "crosshair"
@@ -34759,15 +34801,6 @@ const UnlimitedPolygonGraph = statefulProps => {
       const graphCoordinates = pixelsToVectors([[x, y]], graphConfig);
       dispatch(actions.polygon.addPoint(graphCoordinates[0]));
     }
-  }), /*#__PURE__*/React.createElement(Polyline, {
-    points: [...points],
-    color: "var(--movable-line-stroke-color)",
-    svgPolylineProps: {
-      strokeWidth: "var(--movable-line-stroke-weight)",
-      style: {
-        fill: "transparent"
-      }
-    }
   }), coords.map((point, i) => /*#__PURE__*/React.createElement(MovablePoint$1, {
     key: i,
     point: point,
@@ -34781,9 +34814,10 @@ const UnlimitedPolygonGraph = statefulProps => {
     },
     onClick: () => {
       // If the point being clicked is the first point and
-      // there's enough points to form a polygon (3 or more)
-      // Close the shape before setting focus.
-      if (i === 0 && coords.length >= 3) {
+      // there's enough non-duplicated points to form
+      // a polygon (3 or more), close the shape before
+      // setting focus.
+      if (i === 0 && getArrayWithoutDuplicates(coords).length >= 3) {
         dispatch(actions.polygon.closePolygon());
       }
       dispatch(actions.polygon.clickPoint(i));
@@ -35406,7 +35440,7 @@ const renderPolygonGraphControls = props => {
 
   // We want to disable the closePolygon button when
   // there are not enough coords to make a polygon
-  const disableCloseButton = coords.length < 3;
+  const disableCloseButton = getArrayWithoutDuplicates(coords).length < 3;
 
   // If polygon is closed, show open button.
   // If polygon is open, show close button.
@@ -36106,7 +36140,13 @@ function doClickPoint(state, action) {
 }
 function doClosePolygon(state) {
   if (isUnlimitedGraphState(state) && state.type === "polygon") {
+    // We want to remove any duplicate points when closing the polygon to
+    // (1) prevent the polygon from sides with length zero, and
+    // (2) make sure the question is can be marked correct if the polygon
+    //     LOOKS correct, even if two of the points are at the same coords.
+    const noDupedPoints = getArrayWithoutDuplicates(state.coords);
     return _extends({}, state, {
+      coords: noDupedPoints,
       closedPolygon: true
     });
   }
@@ -38888,9 +38928,8 @@ const AnswerChoices = props => {
 };
 
 const HideAnswersToggle = props => {
-  const idFactory = useUniqueIdWithMock();
-  const switchId = idFactory.get("hide-answers-toggle");
-  const labelId = idFactory.get("hide-answers-label");
+  const switchId = useId();
+  const labelId = useId();
   const {
     strings
   } = usePerseusI18n();
@@ -38933,7 +38972,7 @@ const AnswerPill = props => {
     focused,
     hovered
   } = props;
-  const idFactory = useUniqueIdWithMock();
+  const pillId = useId();
   const {
     strings
   } = usePerseusI18n();
@@ -38960,7 +38999,7 @@ const AnswerPill = props => {
   }) => /*#__PURE__*/React.createElement(Pill, {
     size: "large",
     kind: "accent",
-    id: idFactory.get("perseus-label-image-widget-answer-pill"),
+    id: pillId,
     onClick: correct ? undefined : onClick,
     ref: ref,
     style: [style, popperStyle, styles$b.pill, correct && styles$b.correct, incorrect && styles$b.incorrect, (focused || hovered) && BringToFront]
@@ -45276,7 +45315,7 @@ const init = function init() {
 
 // This file is processed by a Rollup plugin (replace) to inject the production
 const libName = "@khanacademy/perseus";
-const libVersion = "48.2.0";
+const libVersion = "49.0.1";
 addLibraryVersionToPerseusDebug(libName, libVersion);
 
 const apiVersion = {