Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support n-dimensional coord Qs #1251

Draft
wants to merge 4 commits into
base: master
Choose a base branch
from
Draft

Support n-dimensional coord Qs #1251

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bb0debd
Support n-dimensional coord questions
axlewin Dec 16, 2024
8e4f471
Handle blank inputs
axlewin Dec 18, 2024
50d31be
Merge branch 'master' of https://github.com/isaacphysics/isaac-react-…
axlewin Dec 18, 2024
c4c5e11
Remove outdated comment
axlewin Dec 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions src/IsaacApiTypes.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,8 +219,8 @@ export interface IsaacSymbolicQuestionDTO extends QuestionDTO {

export interface IsaacCoordinateQuestionDTO extends QuestionDTO {
numberOfCoordinates?: number;
placeholderXValue?: string;
placeholderYValue?: string;
numberOfDimensions?: number;
placeholderValues?: string[];
}

export interface IsaacTopicSummaryPageDTO extends SeguePageDTO {
Expand Down Expand Up @@ -513,8 +513,7 @@ export interface ParsonsItemDTO extends ItemDTO {
}

export interface CoordinateItemDTO extends ItemDTO {
x?: string;
y?: string;
coordinates?: string[];
}

export interface QuantityDTO extends ChoiceDTO {
Expand Down
63 changes: 28 additions & 35 deletions src/app/components/content/IsaacCoordinateQuestion.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,17 @@ import {IsaacQuestionProps} from "../../../IsaacAppTypes";
import {Immutable} from "immer";
import QuestionInputValidation from "../elements/inputs/QuestionInputValidation";

// Custom input component for coordinates - a pair of inputs, one for x and one for y, formatted with brackets
// and a comma in between.
// Custom input component for coordinates
interface CoordinateInputProps {
value: Immutable<CoordinateItemDTO>;
placeholderXValue?: string;
placeholderYValue?: string;
placeholderValues: string[];
numberOfDimensions: number;
onChange: (value: Immutable<CoordinateItemDTO>) => void;
readonly?: boolean;
remove?: () => void;
}

export const coordinateInputValidator = (input: string[][]) => {
export const coordinateInputValidator = (input: (readonly string[])[]) => {
const errors: string[] = [];
const allBadChars: string[] = [];
let containsComma = false;
Expand Down Expand Up @@ -51,32 +50,26 @@ export const coordinateInputValidator = (input: string[][]) => {
};

const CoordinateInput = (props: CoordinateInputProps) => {
const {value, placeholderXValue, placeholderYValue, onChange, readonly, remove} = props;
return <span className="coordinate-input">
(
<Input
type="text"
className="force-print"
placeholder={placeholderXValue ?? "x"}
value={value.x ?? ""}
onChange={event => onChange({...value, x: event.target.value === "" ? undefined : event.target.value})}
readOnly={readonly}
/>
<span className="coordinate-input-separator">,&nbsp;</span>
<Input
type="text"
className="force-print"
placeholder={placeholderYValue ?? "y"}
value={value.y ?? ""}
onChange={event => onChange({...value, y: event.target.value === "" ? undefined : event.target.value})}
readOnly={readonly}
/>
)
{remove && <Button className="ms-3" size="sm" onClick={remove}>Delete</Button>}
const {value, placeholderValues, numberOfDimensions, onChange, readonly, remove} = props;
return <span className="coordinate-input">{[...Array(numberOfDimensions)].map((_, i) =>
<>
<Input
key={i}
type="text"
className="force-print"
placeholder={placeholderValues[i] ?? ""}
value={value.coordinates ? value.coordinates[i] : ""}
onChange={event => onChange({...value, coordinates: value.coordinates && value.coordinates.length ? value.coordinates.with(i, event.target.value) :
(event.target.value === "" ? undefined : Array<string>(numberOfDimensions).fill("").with(i, event.target.value))})}
readOnly={readonly}
/>
{(i < numberOfDimensions - 1) && <span className="coordinate-input-separator">,&nbsp;</span>}
</>)}
{remove && <Button className="ms-3" size="sm" onClick={remove}>Delete</Button>}
</span>;
};

const DEFAULT_COORDINATE_ITEM = {type: "coordinateItem", x: undefined, y: undefined};
const DEFAULT_COORDINATE_ITEM = {type: "coordinateItem", coordinates: []};

const IsaacCoordinateQuestion = ({doc, questionId, readonly}: IsaacQuestionProps<IsaacCoordinateQuestionDTO>) => {

Expand Down Expand Up @@ -110,8 +103,8 @@ const IsaacCoordinateQuestion = ({doc, questionId, readonly}: IsaacQuestionProps
? Array.from({length: doc.numberOfCoordinates}).map((_, index) =>
<CoordinateInput
key={index}
placeholderXValue={doc.placeholderXValue}
placeholderYValue={doc.placeholderYValue}
placeholderValues={doc.placeholderValues ?? []}
numberOfDimensions={doc.numberOfDimensions ?? 1}
value={currentAttempt?.items?.[index] ?? {...DEFAULT_COORDINATE_ITEM}}
readonly={readonly}
onChange={value => updateItem(index, value)}
Expand All @@ -121,8 +114,8 @@ const IsaacCoordinateQuestion = ({doc, questionId, readonly}: IsaacQuestionProps
{currentAttempt?.items?.map((item, index) =>
<CoordinateInput
key={index}
placeholderXValue={doc.placeholderXValue}
placeholderYValue={doc.placeholderYValue}
placeholderValues={doc.placeholderValues ?? []}
numberOfDimensions={doc.numberOfDimensions ?? 1}
value={item}
readonly={readonly}
onChange={value => updateItem(index, value)}
Expand All @@ -132,14 +125,14 @@ const IsaacCoordinateQuestion = ({doc, questionId, readonly}: IsaacQuestionProps
</>
: <CoordinateInput
key={0}
placeholderXValue={doc.placeholderXValue}
placeholderYValue={doc.placeholderYValue}
placeholderValues={doc.placeholderValues ?? []}
numberOfDimensions={doc.numberOfDimensions ?? 1}
value={{...DEFAULT_COORDINATE_ITEM}}
readonly={readonly}
onChange={value => updateItem(0, value)}
/>
}
<QuestionInputValidation userInput={currentAttempt?.items?.map(answer => [answer.x ?? "", answer.y ?? ""]) ?? []} validator={coordinateInputValidator}/>
<QuestionInputValidation userInput={currentAttempt?.items?.map(answer => answer.coordinates ?? []) ?? []} validator={coordinateInputValidator}/>
{!doc.numberOfCoordinates && <Button color="secondary" size="sm" className="mt-3" onClick={() => updateItem(currentAttempt?.items?.length ?? 1, {...DEFAULT_COORDINATE_ITEM})}>Add coordinate</Button>}
</div>;
};
Expand Down
Loading