Refine Label Image Rubric type

.changeset/red-points-call.md

@@ -0,0 +1,5 @@
+---
+"@khanacademy/perseus": patch
+---
+
+Refine LabelImage's Rubric type

packages/perseus/src/validation.types.ts

@@ -11,7 +11,6 @@ import type {
     PerseusIFrameWidgetOptions,
     PerseusImageWidgetOptions,
     PerseusInteractionWidgetOptions,
-    PerseusLabelImageWidgetOptions,
     PerseusMatcherWidgetOptions,
     PerseusMatrixWidgetOptions,
     PerseusNumberLineWidgetOptions,
@@ -124,7 +123,9 @@ export type PerseusInteractiveGraphRubric = {
 
 export type PerseusInteractiveGraphUserInput = PerseusGraphType;
 
-export type PerseusLabelImageRubric = PerseusLabelImageWidgetOptions;
+/* TODO(LEMS-2440): Should be removed or refactored. Grading info may need
+    to be moved to the rubric from userInput. */
+export type PerseusLabelImageRubric = Empty;
 
 export type PerseusLabelImageUserInput = {
     markers: ReadonlyArray<InteractiveMarkerType>;

packages/perseus/src/widgets/label-image/label-image-validator.ts

@@ -43,14 +43,15 @@ export function scoreMarker(
     return score;
 }
 
+// TODO(LEMS-2440): May need to pull answers out of PerseusLabelImageWidgetOptions[markers] for the rubric
 function labelImageValidator(
-    state: PerseusLabelImageUserInput,
+    userInput: PerseusLabelImageUserInput,
     rubric?: PerseusLabelImageRubric,
 ): PerseusScore {
     let numAnswered = 0;
     let numCorrect = 0;
 
-    for (const marker of state.markers) {
+    for (const marker of userInput.markers) {
         const score = scoreMarker(marker);
 
         if (score.hasAnswers) {
@@ -63,7 +64,7 @@ function labelImageValidator(
     }
 
     // We expect all question markers to be answered before grading.
-    if (numAnswered !== state.markers.length) {
+    if (numAnswered !== userInput.markers.length) {
         return {
             type: "invalid",
             message: null,
@@ -74,7 +75,7 @@ function labelImageValidator(
         type: "points",
         // Markers with no expected answers are graded as correct if user
         // makes no answer selection.
-        earned: numCorrect === state.markers.length ? 1 : 0,
+        earned: numCorrect === userInput.markers.length ? 1 : 0,
         total: 1,
         message: null,
     };

packages/perseus/src/widgets/label-image/label-image.tsx

@@ -30,7 +30,10 @@ import type {InteractiveMarkerType} from "./types";
 import type {DependencyProps} from "../../dependencies";
 import type {ChangeableProps} from "../../mixins/changeable";
 import type {APIOptions, Widget, WidgetExports} from "../../types";
-import type {PerseusLabelImageUserInput} from "../../validation.types";
+import type {
+    PerseusLabelImageRubric,
+    PerseusLabelImageUserInput,
+} from "../../validation.types";
 import type {PropsFor} from "@khanacademy/wonder-blocks-core";
 import type {CSSProperties} from "aphrodite";
 
@@ -317,7 +320,8 @@ export class LabelImage
         return {markers};
     }
 
-    showRationalesForCurrentlySelectedChoices(rubric: LabelImageProps) {
+    // TODO(LEMS-2544): Investigate impact on scoring; possibly pull out &/or remove rubric parameter.
+    showRationalesForCurrentlySelectedChoices(rubric: PerseusLabelImageRubric) {
         const {markers} = this.props;
         const {onChange} = this.props;