Skip to content

Fix: show translation (not repeated word) on MultipleChoiceContext solution #1002

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

Open
mircealungu wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix: show translation (not repeated word) on MultipleChoiceContext solution #1002

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
32e2f10
Fix: show translation (not repeated L2 word) on MultipleChoiceContext…
claude Mar 30, 2026
2384b81
Refactor: simplify MultipleChoiceContext (boy scout rule)
claude Mar 30, 2026
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
16 changes: 6 additions & 10 deletions src/exercises/exerciseTypes/multipleChoiceContext/MultipleChoiceContext.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,18 +30,13 @@ export default function MultipleChoiceContext({
const [exerciseBookmark, setExerciseBookmark] = useState({ ...bookmarksToStudy[0], isExercise: true });
const [clickedIndex, setClickedIndex] = useState(null);
const [clickedOption, setClickedOption] = useState(null);
const [wordInContextHeadline, setWordInContextHeadline] = useState(removePunctuation(bookmarksToStudy[0].from));
const isExerciseOverRef = useShadowRef(isExerciseOver);

useEffect(() => {
speech.stopAudio(); // Stop any pending speech from previous exercise
resetSubSessionTimer();
setExerciseType(EXERCISE_TYPE);
let initExerciseBookmarks = [...bookmarksToStudy];
for (let i = 0; i < initExerciseBookmarks.length; i++) {
if (i === 0) initExerciseBookmarks[i].isExercise = true;
else initExerciseBookmarks[i].isExercise = false;
}
const initExerciseBookmarks = bookmarksToStudy.map((b, i) => ({ ...b, isExercise: i === 0 }));
setExerciseBookmarks(shuffle(initExerciseBookmarks));
// eslint-disable-next-line
}, []);
Expand Down Expand Up @@ -73,12 +68,11 @@ export default function MultipleChoiceContext({
// eslint-disable-next-line
}, [reload, bookmarksToStudy]);

function notifyChoiceSelection(selectedChoiceId, selectedChoiceContext, index, e) {
function notifyChoiceSelection(selectedChoiceId, index, e) {
if (isExerciseOver) return;
setClickedOption(index);
if (selectedChoiceId === exerciseBookmark.id) {
setClickedIndex(index);
setWordInContextHeadline(removePunctuation(exerciseBookmark.to));
notifyCorrectAnswer(exerciseBookmark);
} else {
setClickedIndex(null);
Expand Down Expand Up @@ -113,7 +107,9 @@ export default function MultipleChoiceContext({
{strings.multipleChoiceContextHeadline}
</div>

<h1 className="wordInContextHeadline">{wordInContextHeadline}</h1>
<h1 className="wordInContextHeadline">
{isExerciseOver ? removePunctuation(exerciseBookmark.to) : removePunctuation(exerciseBookmark.from)}
</h1>
<div style={{ visibility: isExerciseOver ? 'visible' : 'hidden' }}>
{bookmarkProgressBar}
</div>
Expand All @@ -126,7 +122,7 @@ export default function MultipleChoiceContext({
className={
clickedOption !== null ? (index === clickedOption ? (option.isExercise ? "correct" : "wrong") : "") : ""
}
onClick={(e) => notifyChoiceSelection(option.id, option.context, index, e)}
onClick={(e) => notifyChoiceSelection(option.id, index, e)}
>
{option.left_ellipsis && <>...</>}
<span
Expand Down