Merge branch 'main' into LEMS-1733-add-aria-label-to-line-segment

.changeset/soft-rocks-breathe.md

@@ -0,0 +1,5 @@
+---
+"@khanacademy/perseus": patch
+---
+
+removes context and message properties from IG perseus strings

packages/perseus-editor/CHANGELOG.md

@@ -1,5 +1,18 @@
 # @khanacademy/perseus-editor
 
+## 17.1.1
+
+### Patch Changes
+
+-   [#2064](https://github.com/Khan/perseus/pull/2064) [`55b4615d3`](https://github.com/Khan/perseus/commit/55b4615d3297884d90e6ef4640f7202066334b0d) Thanks [@nishasy](https://github.com/nishasy)! - Remove the locked-figures-aria flag
+
+*   [#2063](https://github.com/Khan/perseus/pull/2063) [`85a5b5e44`](https://github.com/Khan/perseus/commit/85a5b5e4408b19a598107468d7cb0bd10e33b6be) Thanks [@nishasy](https://github.com/nishasy)! - Remove the interactive-graph-locked-features-labels flag
+
+-   [#2065](https://github.com/Khan/perseus/pull/2065) [`eefcf5c5c`](https://github.com/Khan/perseus/commit/eefcf5c5c434455295e17bf4cb411d029f24fe49) Thanks [@nishasy](https://github.com/nishasy)! - Remove the locked-[figureName]-labels flags
+
+-   Updated dependencies [[`55b4615d3`](https://github.com/Khan/perseus/commit/55b4615d3297884d90e6ef4640f7202066334b0d), [`85a5b5e44`](https://github.com/Khan/perseus/commit/85a5b5e4408b19a598107468d7cb0bd10e33b6be), [`781cc7df6`](https://github.com/Khan/perseus/commit/781cc7df65a80e03d3cb809ccf585cb6cf25556e), [`eefcf5c5c`](https://github.com/Khan/perseus/commit/eefcf5c5c434455295e17bf4cb411d029f24fe49), [`265a93104`](https://github.com/Khan/perseus/commit/265a9310486e5c1524af9b502619db9de2f7c01d), [`4bf4960d4`](https://github.com/Khan/perseus/commit/4bf4960d4d88abf9fe07803f1364678a29a20f6e), [`c9a28b34c`](https://github.com/Khan/perseus/commit/c9a28b34c66fdf25d2b0ef8fa1111a5fb97854da), [`4bf4960d4`](https://github.com/Khan/perseus/commit/4bf4960d4d88abf9fe07803f1364678a29a20f6e)]:
+    -   @khanacademy/perseus@49.2.1
+
 ## 17.1.0
 
 ### Minor Changes

packages/perseus-editor/package.json

@@ -3,7 +3,7 @@
     "description": "Perseus editors",
     "author": "Khan Academy",
     "license": "MIT",
-    "version": "17.1.0",
+    "version": "17.1.1",
     "publishConfig": {
         "access": "public"
     },
@@ -39,7 +39,7 @@
         "@khanacademy/keypad-context": "^1.0.12",
         "@khanacademy/kmath": "^0.1.24",
         "@khanacademy/math-input": "^22.1.0",
-        "@khanacademy/perseus": "^49.2.0",
+        "@khanacademy/perseus": "^49.2.1",
         "@khanacademy/perseus-core": "3.0.5",
         "@khanacademy/pure-markdown": "^0.3.20",
         "mafs": "^0.19.0"

packages/perseus/CHANGELOG.md

@@ -1,5 +1,25 @@
 # @khanacademy/perseus
 
+## 49.2.1
+
+### Patch Changes
+
+-   [#2064](https://github.com/Khan/perseus/pull/2064) [`55b4615d3`](https://github.com/Khan/perseus/commit/55b4615d3297884d90e6ef4640f7202066334b0d) Thanks [@nishasy](https://github.com/nishasy)! - Remove the locked-figures-aria flag
+
+*   [#2063](https://github.com/Khan/perseus/pull/2063) [`85a5b5e44`](https://github.com/Khan/perseus/commit/85a5b5e4408b19a598107468d7cb0bd10e33b6be) Thanks [@nishasy](https://github.com/nishasy)! - Remove the interactive-graph-locked-features-labels flag
+
+-   [#2078](https://github.com/Khan/perseus/pull/2078) [`781cc7df6`](https://github.com/Khan/perseus/commit/781cc7df65a80e03d3cb809ccf585cb6cf25556e) Thanks [@SonicScrewdriver](https://github.com/SonicScrewdriver)! - Temporarily fixing pi-based strings for Numeric Input
+
+*   [#2065](https://github.com/Khan/perseus/pull/2065) [`eefcf5c5c`](https://github.com/Khan/perseus/commit/eefcf5c5c434455295e17bf4cb411d029f24fe49) Thanks [@nishasy](https://github.com/nishasy)! - Remove the locked-[figureName]-labels flags
+
+-   [#2068](https://github.com/Khan/perseus/pull/2068) [`265a93104`](https://github.com/Khan/perseus/commit/265a9310486e5c1524af9b502619db9de2f7c01d) Thanks [@benchristel](https://github.com/benchristel)! - Internal: Redesign discriminated union type parser to have a simpler and more intuitive interface.
+
+*   [#2073](https://github.com/Khan/perseus/pull/2073) [`4bf4960d4`](https://github.com/Khan/perseus/commit/4bf4960d4d88abf9fe07803f1364678a29a20f6e) Thanks [@benchristel](https://github.com/benchristel)! - Internal: improve Perseus JSON parsers so they can handle all English-language exercises
+
+-   [#2080](https://github.com/Khan/perseus/pull/2080) [`c9a28b34c`](https://github.com/Khan/perseus/commit/c9a28b34c66fdf25d2b0ef8fa1111a5fb97854da) Thanks [@mark-fitzgerald](https://github.com/mark-fitzgerald)! - [Dropdown] Bugfix - Text in dropdown not in correct vertical position
+
+*   [#2073](https://github.com/Khan/perseus/pull/2073) [`4bf4960d4`](https://github.com/Khan/perseus/commit/4bf4960d4d88abf9fe07803f1364678a29a20f6e) Thanks [@benchristel](https://github.com/benchristel)! - Internal: improve the error messages produced by the versionedWidgetOptions parser
+
 ## 49.2.0
 
 ### Minor Changes

packages/perseus/package.json

@@ -3,7 +3,7 @@
     "description": "Core Perseus API (includes renderers and widgets)",
     "author": "Khan Academy",
     "license": "MIT",
-    "version": "49.2.0",
+    "version": "49.2.1",
     "publishConfig": {
         "access": "public"
     },

packages/perseus/src/strings.ts

@@ -324,8 +324,8 @@ export const strings: {
         "Your answer is close, but you may " +
         "have approximated pi. Enter your " +
         "answer as a multiple of pi, like " +
-        "<code>12\\\\ \\\\text{pi}</code> or " +
-        "<code>2/3\\\\ \\\\text{pi}</code>",
+        "12 pi or " +
+        "2/3 pi",
     EXTRA_SYMBOLS_ERROR:
         "We could not understand your " +
         "answer. Please check your answer for extra " +
@@ -375,8 +375,7 @@ export const strings: {
     mixedExample: "a mixed number, like $1\\\\ 3/4$",
     decimalExample: "an *exact* decimal, like $0.75$",
     percentExample: "a percent, like $12.34\\\\%$",
-    piExample:
-        "a multiple of pi, like $12\\\\ \\\\text{pi}$ or $2/3\\\\ \\\\text{pi}$",
+    piExample: "a multiple of pi, like $12$ pi or $2/3$ pi",
     yourAnswer: "**Your answer should be** ",
     yourAnswerLabel: "Your answer:",
     addPoints: "Click to add points",
@@ -488,115 +487,38 @@ export const strings: {
     // translation tickets after all interactive graph SR strings have
     // been finalized. Remove this comment after the tickets have been
     // created.
-    srPointAtCoordinates: {
-        context: "Screenreader-accessible description of a point on a graph",
-        message: "Point %(num)s at %(x)s comma %(y)s",
-    },
-    srCircleGraph: {
-        context: "Aria label for the circle graph as a whole.",
-        message: "A circle on a coordinate plane.",
-    },
-    srCircleShape: {
-        context:
-            "Aria label for the interactive circle shape in a circle graph.",
-        message:
-            "Circle. The center point is at %(centerX)s comma %(centerY)s.",
-    },
-    srCircleRadiusPoint: {
-        context:
-            "Aria label for the interactive point that sits on the edge of the circle in a circle graph. Moving this point updates the radius of the circle",
-        message: "Radius point at %(radiusPointX)s comma %(radiusPointY)s.",
-    },
-    srCircleRadius: {
-        context:
-            "Screenreader-only description of the radius of a circle in a circle graph.",
-        message: "Circle radius is %(radius)s.",
-    },
-    srCircleOuterPoints: {
-        context:
-            "Screenreader-only description of key points on a circle in a circle graph.",
-        message:
-            "Points on the circle at %(point1X)s comma %(point1Y)s, %(point2X)s comma %(point2Y)s, %(point3X)s comma %(point3Y)s, %(point4X)s comma %(point4Y)s.",
-    },
-    srLinearGraph: {
-        context: "Aria label for the linear graph as a whole.",
-        message: "A line on a coordinate plane.",
-    },
-    srLinearGraphPoints: {
-        context:
-            "Additional information about the points for the linear graph as a whole.",
-        message:
-            "The line has two points, point 1 at %(point1X)s comma %(point1Y)s and point 2 at %(point2X)s comma %(point2Y)s.",
-    },
-    srLinearGraphSlopeIncreasing: {
-        context:
-            "Screenreader-only description of a line's decreasing slope on a linear graph.",
-        message: "Its slope increases from left to right.",
-    },
-    srLinearGraphSlopeDecreasing: {
-        context:
-            "Screenreader-only description of a line's increasing slope on a linear graph.",
-        message: "Its slope decreases from left to right.",
-    },
-    srLinearGraphSlopeHorizontal: {
-        context:
-            "Screenreader-only description of a line's horizontal slope on a linear graph.",
-        message: "Its slope is zero.",
-    },
-    srLinearGraphSlopeVertical: {
-        context:
-            "Screenreader-only description of a line's vertical slope on a linear graph.",
-        message: "Its slope is undefined.",
-    },
-    srLinearGraphXOnlyIntercept: {
-        context:
-            "Screenreader-only description of a line's x-intercept on a linear graph when it only has an x intercept.",
-        message: "The line crosses the X-axis at %(xIntercept)s comma 0.",
-    },
-    srLinearGraphYOnlyIntercept: {
-        context:
-            "Screenreader-only description of a line's y-intercept on a linear graph when it only has a y intercept.",
-        message: "The line crosses the Y-axis at 0 comma %(yIntercept)s.",
-    },
-    srLinearGraphBothIntercepts: {
-        context:
-            "Screenreader-only description of a line's x and y intercepts on a linear graph when both intercepts are present.",
-        message:
-            "The line crosses the X-axis at %(xIntercept)s comma 0 and the Y-axis at 0 comma %(yIntercept)s.",
-    },
-    srLinearGraphOriginIntercept: {
-        context:
-            "Screenreader-only description of the line's intercept when the intercept is the graph's origin.",
-        message: "The line crosses the x and y axes at the graph's origin.",
-    },
-    srLinearGrabHandle: {
-        context:
-            "Screenreader-only label on the grab handle for the line on a linear graph.",
-        message:
-            "Line from %(point1X)s comma %(point1Y)s to %(point2X)s comma %(point2Y)s.",
-    },
-    srAngleSideAtCoordinates: {
-        context:
-            "Screenreader-accessible description of the side / vertex of an angle graph",
-        message: "Point %(point)s, %(side)s at %(x)s comma %(y)s",
-    },
-    srAngleVertexAtCoordinatesWithAngleMeasure: {
-        context:
-            "Screenreader-accessible description of a vertex on an angle graph with an angle measure",
-        message:
-            "Point 2, vertex at %(x)s comma %(y)s. Angle %(angleMeasure)s degrees",
-    },
-    srAngleGraphAriaLabel: {
-        context:
-            "Screenreader-accessible label of an angle graph on a coordinate plane",
-        message: "An angle on a coordinate plane.",
-    },
-    srAngleGraphAriaDescription: {
-        context:
-            "Screenreader-only description of an angle on a coordinate plane.",
-        message:
-            "The angle measure is %(angleMeasure)s degrees with a vertex at %(vertexX)s comma %(vertexY)s, a point on the starting side at %(startingSideX)s comma %(startingSideY)s and a point on the ending side at %(endingSideX)s comma %(endingSideY)s",
-    },
+    srPointAtCoordinates: "Point %(num)s at %(x)s comma %(y)s",
+    srCircleGraph: "A circle on a coordinate plane.",
+    srCircleShape:
+        "Circle. The center point is at %(centerX)s comma %(centerY)s.",
+    srCircleRadiusPoint:
+        "Radius point at %(radiusPointX)s comma %(radiusPointY)s.",
+    srCircleRadius: "Circle radius is %(radius)s.",
+    srCircleOuterPoints:
+        "Points on the circle at %(point1X)s comma %(point1Y)s, %(point2X)s comma %(point2Y)s, %(point3X)s comma %(point3Y)s, %(point4X)s comma %(point4Y)s.",
+    srLinearGraph: "A line on a coordinate plane.",
+    srLinearGraphPoints:
+        "The line has two points, point 1 at %(point1X)s comma %(point1Y)s and point 2 at %(point2X)s comma %(point2Y)s.",
+    srLinearGraphSlopeIncreasing: "Its slope increases from left to right.",
+    srLinearGraphSlopeDecreasing: "Its slope decreases from left to right.",
+    srLinearGraphSlopeHorizontal: "Its slope is zero.",
+    srLinearGraphSlopeVertical: "Its slope is undefined.",
+    srLinearGraphXOnlyIntercept:
+        "The line crosses the X-axis at %(xIntercept)s comma 0.",
+    srLinearGraphYOnlyIntercept:
+        "The line crosses the Y-axis at 0 comma %(yIntercept)s.",
+    srLinearGraphBothIntercepts:
+        "The line crosses the X-axis at %(xIntercept)s comma 0 and the Y-axis at 0 comma %(yIntercept)s.",
+    srLinearGraphOriginIntercept:
+        "The line crosses the x and y axes at the graph's origin.",
+    srLinearGrabHandle:
+        "Line from %(point1X)s comma %(point1Y)s to %(point2X)s comma %(point2Y)s.",
+    srAngleSideAtCoordinates: "Point %(point)s, %(side)s at %(x)s comma %(y)s",
+    srAngleVertexAtCoordinatesWithAngleMeasure:
+        "Point 2, vertex at %(x)s comma %(y)s. Angle %(angleMeasure)s degrees",
+    srAngleGraphAriaLabel: "An angle on a coordinate plane.",
+    srAngleGraphAriaDescription:
+        "The angle measure is %(angleMeasure)s degrees with a vertex at %(vertexX)s comma %(vertexY)s, a point on the starting side at %(startingSideX)s comma %(startingSideY)s and a point on the ending side at %(endingSideX)s comma %(endingSideY)s",
     srSingleSegmentGraphAriaLabel: "A line segment on a coordinate plane.",
     srMultipleSegmentGraphAriaLabel:
         "%(countOfSegments)s segments on a coordinate plane.",

packages/perseus/src/styles/perseus-renderer.less

@@ -414,7 +414,8 @@
     padding: 25px 25px 0 0;
 }
 
-.perseus-dropdown .perseus-renderer .paragraph {
+.perseus-article .perseus-dropdown .perseus-renderer .paragraph,
+.perseus-article .perseus-dropdown .perseus-renderer .perseus-block-math {
     /* overriding overly broad selectors in .framework-perseus rules */
     margin-bottom: 0 !important;
     font-size: 18px !important;