@khanacademy/perseus 32.0.1 → 33.0.0

package/dist/es/index.js

@@ -10035,11 +10035,36 @@ const setLabelMargins = function setLabelMargins(span, size) {
       marginTop: -height / 2 - y * scale
     });
   } else {
+    var _$container$css, _$container$width, _$span$css;
+    const $container = $span.closest(".svg-image");
+    // Ensuring that the line-height of the text doesn't throw off placement of the text element.
+    // Inherited line-height values can really mess up placement.
+    $container.css("line-height", "normal");
+
+    // The 'max-width' value is the same as the expected (100% scale) width of the graphie.
+    // We are using jQuery to get this information since we don't have a way to pass it to this function.
+    const expectedWidth = (_$container$css = $container.css("max-width")) != null ? _$container$css : "0px";
+    // We can calculate the true scale of the graphie by taking actual width and dividing by the expected width.
+    // NOTE: Using 'slice' to remove the "px" unit from the end of the expected width value.
+    const scale = ((_$container$width = $container.width()) != null ? _$container$width : 0) / parseInt(expectedWidth.replace(/px$/, "")) * 100;
+
+    // Any padding needs to be scaled accordingly.
+    const currentPadding = (_$span$css = $span.css("padding")) != null ? _$span$css : "0px";
+    const newPadding = Math.round(parseInt(currentPadding.slice(0, -2)) * scale) / 100;
+
+    // "multipliers" basically move the position of the text by using 1, 0, -1
+    // 'margin-left' and 'margin-top' are used to position the text.
+    // Margin and font size need to be scaled accordingly.
     const multipliers = labelDirections[direction || "center"];
-    $span.css({
-      marginLeft: Math.round(width * multipliers[0]),
-      marginTop: Math.round(height * multipliers[1])
-    });
+    const styling = {
+      marginLeft: Math.round(width * multipliers[0] * scale) / 100,
+      marginTop: Math.round(height * multipliers[1] * scale) / 100,
+      padding: `${newPadding}px`
+    };
+    if (scale !== 1) {
+      styling["fontSize"] = `${Math.round(scale * 100) / 100}%`;
+    }
+    $span.css(styling);
   }
 };
 const GraphUtils = {
@@ -17231,9 +17256,16 @@ class SvgImage extends React.Component {
           // without coordinates. They don't seem to have any content, so
           // it seems fine to just ignore them (rather than error), but
           // we should figure out why this is happening.
-          const label = graphie.label(labelData.coordinates, labelData.content, labelData.alignment, labelData.typesetAsMath, {
+
+          // 'styling' - When a default scale (1) is used,
+          //     setting the font size to 100% is redundant.
+          // Also, setting the font size to 100% can counteract other scale-based styling.
+          // Therefore, when the scale is not applicable,
+          //     we set the value to 'null' so that no additional styling will be set.
+          const styling = this.props.scale !== 1 ? {
             "font-size": 100 * this.props.scale + "%"
-          });
+          } : null;
+          const label = graphie.label(labelData.coordinates, labelData.content, labelData.alignment, labelData.typesetAsMath, styling);
 
           // Convert absolute positioning css from pixels to percentages
           // TODO(alex): Dynamically resize font-size as well. This
@@ -31994,10 +32026,14 @@ const MafsGraph = props => {
     state,
     dispatch,
     labels,
-    readOnly
+    readOnly,
+    fullGraphAriaLabel,
+    fullGraphAriaDescription
   } = props;
   const [width, height] = props.box;
   const tickStep = props.step;
+  const uniqueId = React.useId();
+  const descriptionId = `interactive-graph-description-${uniqueId}`;
   const graphRef = React.useRef(null);
   return /*#__PURE__*/React.createElement(GraphConfigContext.Provider, {
     value: {
@@ -32033,9 +32069,19 @@ const MafsGraph = props => {
         (_graphRef$current = graphRef.current) == null || _graphRef$current.focus();
       }
     },
+    "aria-label": fullGraphAriaLabel,
+    "aria-describedby": fullGraphAriaDescription ? descriptionId : undefined,
     ref: graphRef,
     tabIndex: 0
-  }, /*#__PURE__*/React.createElement(LegacyGrid, {
+  }, fullGraphAriaDescription && /*#__PURE__*/React.createElement(View, {
+    id: descriptionId,
+    tabIndex: -1,
+    style: {
+      width: 0,
+      height: 0,
+      overflow: "hidden"
+    }
+  }, fullGraphAriaDescription), /*#__PURE__*/React.createElement(LegacyGrid, {
     box: props.box,
     backgroundImage: props.backgroundImage
   }), props.showLabelsFlag && props.lockedFigures && /*#__PURE__*/React.createElement(GraphLockedLabelsLayer, {
@@ -44695,7 +44741,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 = "32.0.1";
+const libVersion = "33.0.0";
 addLibraryVersionToPerseusDebug(libName, libVersion);
 
 const apiVersion = {
@@ -45579,128 +45625,6 @@ const ref = /*#__PURE__*/React.forwardRef((props, ref) => /*#__PURE__*/React.cre
   ref: ref
 }))));
 
-class ArrowPicker extends React.Component {
-  render() {
-    return /*#__PURE__*/React.createElement(ButtonGroup, {
-      value: this.props.value,
-      allowEmpty: false,
-      buttons: [{
-        value: "",
-        content: /*#__PURE__*/React.createElement("span", null, "\u2014")
-      }, {
-        value: "->",
-        content: /*#__PURE__*/React.createElement("span", null, "\u2192")
-      }
-      /*
-      TODO(eater): fix khan-exercises so these are supported
-      {value: "<-", content: <span>&#x2190;</span>},
-      {value: "<->", content: <span>&#x2194;</span>}
-      */],
-
-      onChange: this.props.onChange
-    });
-  }
-}
-ArrowPicker.defaultProps = {
-  value: ""
-};
-
-const COLORS = [KhanColors.BLACK, KhanColors.BLUE, KhanColors.GREEN, KhanColors.PINK, KhanColors.PURPLE, KhanColors.RED, KhanColors.GRAY];
-const LIGHT_COLORS = [KhanColors.LIGHT_BLUE, KhanColors.LIGHT_ORANGE, KhanColors.LIGHT_PINK, KhanColors.LIGHT_GREEN, KhanColors.LIGHT_PURPLE, KhanColors.LIGHT_RED, "#fff"];
-class ColorPicker extends React.Component {
-  render() {
-    const colors = this.props.lightColors ? LIGHT_COLORS : COLORS;
-    return /*#__PURE__*/React.createElement(ButtonGroup, {
-      value: this.props.value,
-      allowEmpty: false,
-      buttons: _.map(colors, color => {
-        return {
-          value: color,
-          content: /*#__PURE__*/React.createElement("span", null, /*#__PURE__*/React.createElement("span", {
-            className: "colorpicker-circle",
-            style: {
-              background: color
-            }
-          }), "\xA0")
-        };
-      }),
-      onChange: this.props.onChange
-    });
-  }
-}
-ColorPicker.defaultProps = {
-  value: KhanColors.BLACK,
-  lightColors: false
-};
-
-class DashPicker extends React.Component {
-  render() {
-    return /*#__PURE__*/React.createElement(ButtonGroup, {
-      value: this.props.value,
-      allowEmpty: false,
-      buttons: [{
-        value: "",
-        content: /*#__PURE__*/React.createElement("span", null, "\u2014")
-      }, {
-        value: "-",
-        content: /*#__PURE__*/React.createElement("span", null, "\u2013\u2013\u2013")
-      }, {
-        value: "- ",
-        content: /*#__PURE__*/React.createElement("span", null, "\u2013\xA0\xA0\u2013")
-      }, {
-        value: ".",
-        content: /*#__PURE__*/React.createElement("span", null, "\xB7\xB7\xB7\xB7")
-      }, {
-        value: ". ",
-        content: /*#__PURE__*/React.createElement("span", null, "\xB7 \xB7 \xB7")
-      }],
-      onChange: this.props.onChange
-    });
-  }
-}
-DashPicker.defaultProps = {
-  value: ""
-};
-
-/* eslint-disable jsx-a11y/anchor-is-valid */
-class ElementContainer extends React.Component {
-  constructor(props) {
-    super(props);
-    this.toggle = e => {
-      e.preventDefault();
-      this.setState({
-        show: !this.state.show
-      });
-    };
-    this.state = {
-      show: props.initiallyVisible
-    };
-  }
-  render() {
-    return /*#__PURE__*/React.createElement("div", {
-      className: "perseus-interaction-element"
-    }, /*#__PURE__*/React.createElement("a", {
-      href: "#",
-      className: "perseus-interaction-element-title " + (this.state.show ? "open" : "closed"),
-      onClick: this.toggle
-    }, this.state.show ? /*#__PURE__*/React.createElement(InlineIcon, iconChevronDown) : /*#__PURE__*/React.createElement(InlineIcon, iconChevronRight), this.props.title), /*#__PURE__*/React.createElement("div", {
-      className: "perseus-interaction-element-content " + (this.state.show ? "enter" : "leave")
-    }, this.props.children, (this.props.onUp != null || this.props.onDown != null || this.props.onDelete != null) && /*#__PURE__*/React.createElement("div", {
-      className: "edit-controls"
-    }, this.props.onUp != null && /*#__PURE__*/React.createElement("button", {
-      onClick: this.props.onUp
-    }, /*#__PURE__*/React.createElement(InlineIcon, iconCircleArrowUp)), this.props.onDown != null && /*#__PURE__*/React.createElement("button", {
-      onClick: this.props.onDown
-    }, /*#__PURE__*/React.createElement(InlineIcon, iconCircleArrowDown)), this.props.onDelete != null && /*#__PURE__*/React.createElement("button", {
-      onClick: this.props.onDelete
-    }, /*#__PURE__*/React.createElement(InlineIcon, iconTrash)))));
-  }
-}
-ElementContainer.defaultProps = {
-  initiallyVisible: false,
-  title: "More"
-};
-
 const devices = {
   PHONE: "phone",
   TABLET: "tablet",
@@ -48280,5 +48204,5 @@ const EditorJsonify = {
   }
 };
 
-export { ApiOptions, ArrowPicker, ArticleRenderer, BaseRadio, Categorizer$1 as Categorizer, changeable as Changeable, ClassNames, ColorPicker, DashPicker, dependencies as Dependencies, EditorJsonify, ElementContainer, Expression, util as GrapherUtil, Grapher$1 as GrapherWidget, HintRenderer, HintsRenderer, InputNumber$1 as InputNumber, InteractiveGraph$1 as InteractiveGraphWidget, ItemExtras, JiptParagraphs, KhanColors, KhanMath, context as LoadingContext, Log, Matrix$1 as MatrixWidget, MultiItems, NumericInput$1 as NumericInput, PerseusExpressionAnswerFormConsidered, PerseusI18nContext, PerseusI18nContextProvider, PerseusMarkdown, Plotter$1 as PlotterWidget, QUESTION_WIDGETS, Radio, Renderer, ref as ServerItemRenderer, sizingUtils as SizingUtils, Table$1 as TableWidget, Util, denylist as WIDGET_PROP_DENYLIST, WidgetJsonifyDeprecated, widgets$1 as Widgets, addWidget, apiVersion, buildEmptyItemTreeForShape, buildMapper, components, constants, contentHasWidgetType, convertWidgetNameToEnum, displaySigFigs, generateTestCategorizerWidget, generateTestExpressionWidget, generateTestInteractiveGraphWidget, generateTestNumericInputWidget, generateTestPerseusItem, generateTestRadioWidget, genericPerseusItemData, getAngleCoords, getAnswerFromUserInput, getAnswersFromWidgets, getCircleCoords, getCorrectAnswerForWidgetId, getLineCoords, getLinearSystemCoords, getPointCoords, getPolygonCoords, getQuadraticCoords, getSegmentCoords, getSinusoidCoords, getValidWidgetIds, getWidgetFromWidgetMap, getWidgetIdsFromContent, getWidgetIdsFromContentByType, getWidgetTypeByWidgetId, getWidgetsFromWidgetMap, getWidgetsMapFromItemData, globalConstants, globalStyles, iconPaths as icons, init, injectWidgets, interactiveSizes$1 as interactiveSizes, isItemRenderableByVersion, isWidgetIdInContent, isWrongAnswerSupported, itemDataVersion, itemToTree, ItemVersion as itemVersion, libVersion, lockedFigureColors, lockedFigureFillStyles, makeSafeUrl, mediaQueries, parsePerseusItem, plotterPlotTypes, preprocessTex, registerAllWidgetsForTesting, shapes, shouldHaveIndividualAnswer, traverse, usePerseusI18n, violatingWidgets, allWidgets as widgets };
+export { ApiOptions, ArticleRenderer, BaseRadio, Categorizer$1 as Categorizer, changeable as Changeable, ClassNames, dependencies as Dependencies, EditorJsonify, Expression, util as GrapherUtil, Grapher$1 as GrapherWidget, HintRenderer, HintsRenderer, InputNumber$1 as InputNumber, InteractiveGraph$1 as InteractiveGraphWidget, ItemExtras, JiptParagraphs, KhanColors, KhanMath, context as LoadingContext, Log, Matrix$1 as MatrixWidget, MultiItems, NumericInput$1 as NumericInput, PerseusExpressionAnswerFormConsidered, PerseusI18nContext, PerseusI18nContextProvider, PerseusMarkdown, Plotter$1 as PlotterWidget, QUESTION_WIDGETS, Radio, Renderer, ref as ServerItemRenderer, sizingUtils as SizingUtils, Table$1 as TableWidget, Util, denylist as WIDGET_PROP_DENYLIST, WidgetJsonifyDeprecated, widgets$1 as Widgets, addWidget, apiVersion, buildEmptyItemTreeForShape, buildMapper, components, constants, contentHasWidgetType, convertWidgetNameToEnum, displaySigFigs, generateTestCategorizerWidget, generateTestExpressionWidget, generateTestInteractiveGraphWidget, generateTestNumericInputWidget, generateTestPerseusItem, generateTestRadioWidget, genericPerseusItemData, getAngleCoords, getAnswerFromUserInput, getAnswersFromWidgets, getCircleCoords, getCorrectAnswerForWidgetId, getLineCoords, getLinearSystemCoords, getPointCoords, getPolygonCoords, getQuadraticCoords, getSegmentCoords, getSinusoidCoords, getValidWidgetIds, getWidgetFromWidgetMap, getWidgetIdsFromContent, getWidgetIdsFromContentByType, getWidgetTypeByWidgetId, getWidgetsFromWidgetMap, getWidgetsMapFromItemData, globalConstants, globalStyles, iconPaths as icons, init, injectWidgets, interactiveSizes$1 as interactiveSizes, isItemRenderableByVersion, isWidgetIdInContent, isWrongAnswerSupported, itemDataVersion, itemToTree, ItemVersion as itemVersion, libVersion, lockedFigureColors, lockedFigureFillStyles, makeSafeUrl, mediaQueries, parsePerseusItem, plotterPlotTypes, preprocessTex, registerAllWidgetsForTesting, shapes, shouldHaveIndividualAnswer, traverse, usePerseusI18n, violatingWidgets, allWidgets as widgets };
 //# sourceMappingURL=index.js.map