Skip to content

fix(drag-in-the-blank): update onChoiceDone to pass latest value from… #3053

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
PatriciaRomaniuc wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

fix(drag-in-the-blank): update onChoiceDone to pass latest value from… #3053

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 12 additions & 4 deletions packages/drag-in-the-blank/configure/src/choices.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,12 +134,20 @@ export class Choices extends React.Component {
onChange(newChoices);
};

onChoiceDone = (choiceId) => {
onChoiceDone = (choiceId, latestValue) => {
const { onChange, model } = this.props;
const { choices } = model;
const currentChoice = (choices || []).find((c) => c.id === choiceId);

if (!currentChoice || !choiceIsEmpty(currentChoice)) {
// model.choices[i].value can be stale when the editor's onChange did not fire for the most recent edit
// (for example, image uploads). In that case, we want to use the latest value from the editor.
const effectiveValue = latestValue !== undefined ? latestValue : currentChoice && currentChoice.value;

if (!currentChoice || !choiceIsEmpty({ value: effectiveValue })) {
if (currentChoice && currentChoice.value !== effectiveValue) {
const newChoices = (choices || []).map((c) => (c.id === choiceId ? { ...c, value: effectiveValue } : c));
onChange(newChoices);
}
this.setState({ focusedEl: undefined });
return;
}
Expand Down Expand Up @@ -270,12 +278,12 @@ export class Choices extends React.Component {

this.onChoiceChanged(choice.value, val, choice.id);
}}
onDone={() => {
onDone={(val) => {
if (this.preventDone) {
return;
}

this.onChoiceDone(choice.id);
this.onChoiceDone(choice.id, val);
}}
onBlur={(e) => {
const inInInsertCharacter = e.relatedTarget && e.relatedTarget.closest('.insert-character-dialog');
Expand Down
Loading