@khanacademy/perseus 17.2.0 → 17.3.1

package/dist/perseus-types.d.ts

@@ -30,14 +30,8 @@ export type PerseusImageDetail = {
     width: number;
     height: number;
 };
-export type PerseusAnswerArea = {
-    zTable: boolean;
-    chi2Table: boolean;
-    tTable: boolean;
-    calculator: boolean;
-    periodicTable: boolean;
-    periodicTableWithKey?: boolean;
-};
+export declare const ItemExtras: readonly ["calculator", "chi2Table", "financialCalculatorMonthlyPayment", "financialCalculatorTotalAmount", "financialCalculatorTimeToPayOff", "periodicTable", "periodicTableWithKey", "tTable", "zTable"];
+export type PerseusAnswerArea = Record<typeof ItemExtras[number], boolean>;
 type Widget<Type extends string, Options> = {
     type: Type;
     static?: boolean;

package/dist/question-paragraph.d.ts

@@ -4,6 +4,7 @@ type Props = {
     translationIndex: number;
     paragraphIndex?: number;
     children?: React.ReactNode;
+    inline?: boolean;
 };
 declare class QuestionParagraph extends React.Component<Props> {
     render(): React.ReactNode;

package/dist/renderer.d.ts

@@ -59,6 +59,7 @@ type Props = Partial<React.ContextType<typeof DependenciesContext>> & {
     linterContext: LinterContextProps;
     legacyPerseusLint?: ReadonlyArray<string>;
     widgets: PerseusRenderer["widgets"];
+    inline?: boolean;
 };
 type State = {
     translationLintErrors: ReadonlyArray<string>;

package/package.json

@@ -3,7 +3,7 @@
     "description": "Core Perseus API (includes renderers and widgets)",
     "author": "Khan Academy",
     "license": "MIT",
-    "version": "17.2.0",
+    "version": "17.3.1",
     "publishConfig": {
         "access": "public"
     },
@@ -24,7 +24,7 @@
     "dependencies": {
         "@khanacademy/kas": "^0.3.7",
         "@khanacademy/kmath": "^0.1.8",
-        "@khanacademy/math-input": "^16.3.0",
+        "@khanacademy/math-input": "^16.4.0",
         "@khanacademy/perseus-core": "1.4.1",
         "@khanacademy/perseus-linter": "^0.3.10",
         "@khanacademy/pure-markdown": "^0.2.13",

package/src/__testdata__/graphie.testdata.ts

@@ -1,13 +1,13 @@
-import type {PerseusItem} from "../perseus-types";
+import {
+    ItemExtras,
+    type PerseusAnswerArea,
+    type PerseusItem,
+} from "../perseus-types";
 
 export const itemWithPieChart: PerseusItem = {
-    answerArea: {
-        calculator: false,
-        chi2Table: false,
-        periodicTable: false,
-        tTable: false,
-        zTable: false,
-    },
+    answerArea: Object.fromEntries(
+        ItemExtras.map((extra) => [extra, false]),
+    ) as PerseusAnswerArea,
     hints: [],
     itemDataVersion: {
         major: 0,

package/src/__testdata__/server-item-renderer.testdata.ts

@@ -1,8 +1,10 @@
-import type {
-    InputNumberWidget,
-    LabelImageWidget,
-    PerseusItem,
-    PerseusRenderer,
+import {
+    ItemExtras,
+    type InputNumberWidget,
+    type LabelImageWidget,
+    type PerseusItem,
+    type PerseusRenderer,
+    type PerseusAnswerArea,
 } from "../perseus-types";
 
 export const itemWithInput: PerseusItem = {
@@ -37,13 +39,9 @@ export const itemWithInput: PerseusItem = {
 };
 
 export const labelImageItem: PerseusItem = {
-    answerArea: {
-        calculator: false,
-        chi2Table: false,
-        periodicTable: false,
-        tTable: false,
-        zTable: false,
-    },
+    answerArea: Object.fromEntries(
+        ItemExtras.map((extra) => [extra, false]),
+    ) as PerseusAnswerArea,
     _multi: null,
     answer: null,
     hints: [],

package/src/__tests__/mock-asset-loading-widget.tsx

@@ -1,8 +1,9 @@
 import * as React from "react";
 
 import AssetContext from "../asset-context";
+import {ItemExtras} from "../perseus-types";
 
-import type {PerseusItem} from "../perseus-types";
+import type {PerseusAnswerArea, PerseusItem} from "../perseus-types";
 import type {WidgetExports} from "../types";
 
 export const mockedAssetItem: PerseusItem = {
@@ -20,13 +21,9 @@ export const mockedAssetItem: PerseusItem = {
             },
         },
     },
-    answerArea: {
-        calculator: false,
-        chi2Table: false,
-        periodicTable: false,
-        tTable: false,
-        zTable: false,
-    },
+    answerArea: Object.fromEntries(
+        ItemExtras.map((extra) => [extra, false]),
+    ) as PerseusAnswerArea,
     itemDataVersion: {major: 0, minor: 1},
     hints: [],
     _multi: null,

package/src/index.ts

@@ -64,6 +64,7 @@ export {default as PerseusMarkdown} from "./perseus-markdown";
 export {
     PerseusExpressionAnswerFormConsidered,
     plotterPlotTypes,
+    ItemExtras,
 } from "./perseus-types";
 export {traverse} from "./traversal";
 export {isItemRenderableByVersion} from "./renderability";
@@ -127,6 +128,7 @@ export type {
     PerseusExpressionWidgetOptions,
     PerseusPlotterWidgetOptions,
     PerseusRenderer,
+    PerseusAnswerArea,
 } from "./perseus-types";
 export type {Coord} from "./interactive2/types";
 export type {MarkerType} from "./widgets/label-image/types";

package/src/perseus-types.ts

@@ -62,20 +62,27 @@ export type PerseusImageDetail = {
     height: number;
 };
 
-export type PerseusAnswerArea = {
-    // The user might benefit from using a statistics Z Table like https://www.ztable.net/
-    zTable: boolean;
-    // The user might benefit from using a statistics Chi Squared Table like https://people.richland.edu/james/lecture/m170/tbl-chi.html
-    chi2Table: boolean;
-    // The user might benefit from using a statistics T Table like https://www.statisticshowto.com/tables/t-distribution-table/
-    tTable: boolean;
+export const ItemExtras = [
     // The user might benefit from using a Scientific Calculator.  Provided on Khan Academy when true
-    calculator: boolean;
+    "calculator",
+    // The user might benefit from using a statistics Chi Squared Table like https://people.richland.edu/james/lecture/m170/tbl-chi.html
+    "chi2Table",
+    // The user might benefit from a monthly payments calculator.  Provided on Khan Academy when true
+    "financialCalculatorMonthlyPayment",
+    // The user might benefit from a total amount calculator.  Provided on Khan Academy when true
+    "financialCalculatorTotalAmount",
+    // The user might benefit from a time to pay off calculator.  Provided on Khan Academy when true
+    "financialCalculatorTimeToPayOff",
     // The user might benefit from using a Periodic Table of Elements.  Provided on Khan Academy when true
-    periodicTable: boolean;
+    "periodicTable",
     // The user might benefit from using a Periodic Table of Elements with key.  Provided on Khan Academy when true
-    periodicTableWithKey?: boolean;
-};
+    "periodicTableWithKey",
+    // The user might benefit from using a statistics T Table like https://www.statisticshowto.com/tables/t-distribution-table/
+    "tTable",
+    // The user might benefit from using a statistics Z Table like https://www.ztable.net/
+    "zTable",
+] as const;
+export type PerseusAnswerArea = Record<typeof ItemExtras[number], boolean>;
 
 type Widget<Type extends string, Options> = {
     // The "type" of widget which will define what the Options field looks like

package/src/question-paragraph.tsx

@@ -5,6 +5,7 @@ type Props = {
     translationIndex: number;
     paragraphIndex?: number;
     children?: React.ReactNode;
+    inline?: boolean;
 };
 
 class QuestionParagraph extends React.Component<Props> {
@@ -16,7 +17,11 @@ class QuestionParagraph extends React.Component<Props> {
         // to attach some metadata to top-level QuestionParagraphs:
         return (
             <div
-                className={className}
+                className={
+                    this.props.inline
+                        ? this.props.className ?? undefined
+                        : className
+                }
                 data-perseus-component-index={this.props.translationIndex}
                 data-perseus-paragraph-index={this.props.paragraphIndex}
             >

package/src/renderer.tsx

@@ -172,6 +172,8 @@ type Props = Partial<React.ContextType<typeof DependenciesContext>> & {
     linterContext: LinterContextProps;
     legacyPerseusLint?: ReadonlyArray<string>;
     widgets: PerseusRenderer["widgets"];
+    // Skip adding paragraph class
+    inline?: boolean;
 };
 
 type State = {
@@ -1060,6 +1062,7 @@ class Renderer extends React.Component<Props, State> {
                 className={className}
                 translationIndex={this.translationIndex}
                 paragraphIndex={state.paragraphIndex}
+                inline={this.props.inline}
             >
                 <ErrorBoundary>{output}</ErrorBoundary>
             </QuestionParagraph>
@@ -1919,13 +1922,17 @@ class Renderer extends React.Component<Props, State> {
         this._isTwoColumn = false;
 
         // Parse the string of markdown to a parse tree
-        const parsedMarkdown = PerseusMarkdown.parse(content, {
-            // Recognize crowdin IDs while translating articles
-            // (This should never be hit by exercises, though if you
-            // decide you want to add a check that this is an article,
-            // go for it.)
-            isJipt: this.translationIndex != null,
-        });
+        const parsedMarkdown = this.props.inline
+            ? PerseusMarkdown.parseInline(content, {
+                  // Recognize crowdin IDs while translating articles
+                  // (This should never be hit by exercises, though if you
+                  // decide you want to add a check that this is an article,
+                  // go for it.)
+                  isJipt: this.translationIndex != null,
+              })
+            : PerseusMarkdown.parse(content, {
+                  isJipt: this.translationIndex != null,
+              });
 
         // Optionally apply the linter to the parse tree
         if (this.props.linterContext.highlightLint) {

package/src/styles/widgets/label-image.less

@@ -5,35 +5,18 @@
             margin: 0;
         }
     }
-    button[id*="perseus-label-image-widget-answer-pill"],
-    div[id*="perseus-label-image-widget-answer-pill"] {
-        // Reset text content.
-        div.paragraph {
-            all: revert;
-        }
-        // Allow for padding around math content. Accounting for the negative margin here:
-        // https://github.com/Khan/perseus/blob/bafd35daee723456bf259a39b88e7638d91c8c3b/packages/perseus/src/renderer.tsx#L1176
-        div.perseus-block-math-inner {
-            margin: -5px 0 !important;
-        }
-    }
 }
 
 // Reset mobile text content for answer pills.
 @media (max-width: 767px) {
     [id*="perseus-label-image-widget-answer-pill"] {
-        div.paragraph {
-            all: revert;
-        }
         > div.perseus-renderer-responsive {
             all: revert;
         }
     }
-
     .framework-perseus.perseus-mobile
         [id*="perseus-label-image-widget-answer-pill"] {
-        .perseus-renderer > .paragraph,
-        .perseus-renderer > .paragraph .paragraph {
+        mjx-container {
             all: revert;
         }
     }

package/src/widgets/__stories__/label-image.stories.tsx

@@ -5,6 +5,8 @@ import {
     textQuestion,
     mathQuestion,
     numberline,
+    longTextFromArticle,
+    mixedContentQuestion,
 } from "../__testdata__/label-image.testdata";
 
 import type {PerseusRenderer} from "../../perseus-types";
@@ -59,6 +61,21 @@ export const LabelWidgetWithText = (args: StoryArgs): React.ReactElement => {
     );
 };
 
+export const LabelWidgetWithLongText = (
+    args: StoryArgs,
+): React.ReactElement => {
+    const apiOptions: APIOptions = {
+        isMobile: args.isMobile,
+    };
+
+    return (
+        <RendererWithDebugUI
+            question={applyStoryArgs(longTextFromArticle, args)}
+            apiOptions={apiOptions}
+        />
+    );
+};
+
 export const LabelWidgetWithMath = (args: StoryArgs): React.ReactElement => {
     const apiOptions: APIOptions = {
         isMobile: args.isMobile,
@@ -85,6 +102,19 @@ export const LabelImageNumberline = (args: StoryArgs): React.ReactElement => {
     );
 };
 
+export const LabelImageMixedContent = (args: StoryArgs): React.ReactElement => {
+    const apiOptions: APIOptions = {
+        isMobile: args.isMobile,
+    };
+
+    return (
+        <RendererWithDebugUI
+            question={applyStoryArgs(mixedContentQuestion, args)}
+            apiOptions={apiOptions}
+        />
+    );
+};
+
 export default {
     title: "Perseus/Widgets/Label Image",
     args: {

package/src/widgets/__testdata__/expression.testdata.ts

@@ -1,3 +1,13 @@
+import {
+    ItemExtras,
+    type PerseusExpressionWidgetOptions,
+    type Version,
+    type PerseusItem,
+    type PerseusRenderer,
+    type ExpressionWidget,
+    type PerseusAnswerArea,
+} from "../../perseus-types";
+
 import {
     arrayOfLength,
     randomBoolean,
@@ -8,14 +18,6 @@ import {
     randomWord,
 } from "./randomizers";
 
-import type {
-    PerseusExpressionWidgetOptions,
-    Version,
-    PerseusItem,
-    PerseusRenderer,
-    ExpressionWidget,
-} from "../../perseus-types";
-
 const createItemJson = (
     widgetOptions: PerseusExpressionWidgetOptions,
     version: Version,
@@ -35,13 +37,9 @@ const createItemJson = (
         },
         _multi: null,
         answer: null,
-        answerArea: {
-            zTable: false,
-            chi2Table: false,
-            tTable: false,
-            calculator: false,
-            periodicTable: false,
-        },
+        answerArea: Object.fromEntries(
+            ItemExtras.map((extra) => [extra, false]),
+        ) as PerseusAnswerArea,
         itemDataVersion: {
             major: 0,
             minor: 1,

package/src/widgets/__testdata__/label-image.testdata.ts

@@ -178,3 +178,131 @@ export const numberline: PerseusRenderer = {
         },
     },
 };
+
+export const longTextFromArticle: PerseusRenderer = {
+    content: "[[☃ label-image 1]]",
+    images: {},
+    widgets: {
+        "label-image 1": {
+            type: "label-image",
+            alignment: "default",
+            static: false,
+            graded: true,
+            options: {
+                static: false,
+                choices: [
+                    "long wavelength & low frequency",
+                    "short wavelength & high frequency",
+                ],
+                imageAlt:
+                    "Section of a rainbow in the sky. From left to right, the colors appear as violet, indigo, blue, green, yellow, orange, and red.",
+                imageUrl:
+                    "https://cdn.kastatic.org/ka-content-images/227d402cb09ebc1b67f197467212fa4ab3ced5b3.jpg",
+                imageWidth: 400,
+                imageHeight: 289,
+                markers: [
+                    {
+                        answers: ["short wavelength & high frequency"],
+                        label: "Violet side of the rainbow",
+                        x: 35.8,
+                        y: 13,
+                    },
+                    {
+                        answers: ["long wavelength & low frequency"],
+                        label: "Red side of the rainbow",
+                        x: 71.8,
+                        y: 50.5,
+                    },
+                ],
+                multipleAnswers: false,
+                hideChoicesFromInstructions: true,
+            },
+            version: {
+                major: 0,
+                minor: 0,
+            },
+        },
+    },
+};
+
+export const mixedContentQuestion: PerseusRenderer = {
+    content:
+        "A beach ball floats on water. The ball is at rest.\n\n[[☃ image 1]]\n\n**Complete the free body diagram by labeling the forces acting on the ball.**\n\n[[☃ label-image 1]]",
+    images: {
+        "https://cdn.kastatic.org/ka-content-images/0fa7eefde0067d986d2e6dc377e8d2db3e1d466f.svg":
+            {
+                width: 150,
+                height: 300,
+            },
+    },
+    widgets: {
+        "image 1": {
+            type: "image",
+            alignment: "block",
+            static: false,
+            graded: true,
+            options: {
+                static: false,
+                title: "",
+                range: [
+                    [0, 10],
+                    [0, 10],
+                ],
+                box: [350, 219],
+                backgroundImage: {
+                    url: "https://cdn.kastatic.org/ka-content-images/581c7d3928ba5f81e9dc5720291ec895764cc7e8.png",
+                    width: 350,
+                    height: 219,
+                },
+                labels: [],
+                alt: "An inflated beach ball floats on the surface of water. Only a small portion of the ball is underwater.",
+                caption: "",
+            },
+            version: {
+                major: 0,
+                minor: 0,
+            },
+        },
+        "label-image 1": {
+            type: "label-image",
+            alignment: "default",
+            static: false,
+            graded: true,
+            options: {
+                static: false,
+                choices: [
+                    "lift $(F_\\text{L})$",
+                    "buoyant force $(F_\\text{B})$",
+                    "gravity $(F_\\text{g})$",
+                    "normal force $(F_\\text{N})$",
+                ],
+                imageAlt:
+                    "A model shows a square with two arrows pointing out of it. One arrow points up and another arrow points down.",
+                imageUrl:
+                    "https://cdn.kastatic.org/ka-content-images/b24e40b5a36890130acfb7bd237c4bf0d85c7b44.svg",
+                imageWidth: 150,
+                imageHeight: 300,
+                markers: [
+                    {
+                        answers: ["buoyant force $(F_\\text{B})$"],
+                        label: "An arrow that points upward from the square",
+                        x: 64.2,
+                        y: 17.6,
+                    },
+                    {
+                        answers: ["gravity $(F_\\text{g})$"],
+                        label: "An arrow that points downward from the square",
+                        x: 66.2,
+                        y: 81.8,
+                    },
+                ],
+                multipleAnswers: false,
+                hideChoicesFromInstructions: true,
+            },
+            version: {
+                major: 0,
+                minor: 0,
+            },
+        },
+    },
+};

package/src/widgets/__tests__/expression-mobile.test.tsx

@@ -121,6 +121,35 @@ describe("expression mobile", () => {
         );
     });
 
+    it("shows keypad after focused input interaction", async () => {
+        render(<ConnectedRenderer />);
+
+        const input = screen.getByLabelText(
+            "Math input box Tap with one or two fingers to open keyboard",
+        );
+
+        fireEvent.touchStart(input);
+
+        // waiting because `visibility` is animated
+        await waitFor(() =>
+            expect(screen.getByRole("button", {name: "1"})).toBeVisible(),
+        );
+
+        userEvent.click(screen.getByRole("tab", {name: "Dismiss"}));
+
+        // wait for the keypad to close
+        await waitFor(() =>
+            expect(screen.queryByRole("button", {name: "1"})).toBeNull(),
+        );
+
+        fireEvent.touchStart(input);
+
+        // confirm that the keypad has reopened
+        await waitFor(() =>
+            expect(screen.getByRole("button", {name: "1"})).toBeVisible(),
+        );
+    });
+
     it("is possible to use the keypad", async () => {
         render(<ConnectedRenderer />);
 

package/src/widgets/label-image/__stories__/answer-pill.stories.tsx

@@ -22,7 +22,7 @@ export default story;
 export const SingleAnswer = {
     args: {
         id: "1",
-        selectedAnswers: ["Answer Pill!"],
+        selectedAnswers: ["Answer Pill"],
         markerRef: null,
         side: "top",
         onClick: () => {},
@@ -42,7 +42,7 @@ export const MultipleAnswers = {
 export const Correct = {
     args: {
         id: "1",
-        selectedAnswers: ["Right Answer!"],
+        selectedAnswers: ["Right Answer"],
         showCorrectness: "correct",
         markerRef: null,
         side: "top",
@@ -53,7 +53,7 @@ export const Correct = {
 export const Incorrect = {
     args: {
         id: "1",
-        selectedAnswers: ["Wrong Answer!"],
+        selectedAnswers: ["Wrong Answer"],
         showCorrectness: "incorrect",
         markerRef: null,
         side: "top",

package/src/widgets/label-image/answer-pill.tsx

@@ -72,7 +72,7 @@ export const AnswerPill = (props: {
                         incorrect && styles.incorrect,
                     ]}
                 >
-                    <Renderer content={answerString} />
+                    <Renderer content={answerString} inline />
                 </Pill>
             )}
         </Popper>

package/src/widgets/label-image.tsx

@@ -667,7 +667,7 @@ export class LabelImage extends React.Component<
                 [`margin${
                     markerPosition.charAt(0).toUpperCase() +
                     markerPosition.slice(1)
-                }`]: 5, // move pill further from marker
+                }`]: 15, // move pill further from marker
             };
 
             const showAnswerChoice =

package/src/widgets/passage-ref-target.tsx

@@ -50,8 +50,11 @@ class PassageRefTarget extends React.Component<any> {
         return (
             <Renderer
                 content={this.props.content}
-                // @ts-expect-error - TS2322 - Type '{ content: any; inline: boolean; apiOptions: any; linterContext: any; }' is not assignable to type 'IntrinsicAttributes & IntrinsicClassAttributes<Renderer> & Pick<Readonly<Props> & Readonly<{ children?: ReactNode; }>, "children" | ... 3 more ... | "legacyPerseusLint"> & InexactPartial<...> & InexactPartial<...>'.
-                inline={true}
+                // This was already here before inline was recently added (#873)
+                // It was for a different use case a long time ago:
+                // https://phabricator.khanacademy.org/D12113
+                // Commenting out to prevent unanticipated side effects
+                // inline={true}
                 apiOptions={this.props.apiOptions}
                 linterContext={this.props.linterContext}
             />