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

Update field_userenum.ts #9654

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

Update field_userenum.ts #9654

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a6a1eb4
Update field_userenum.ts
jp-96 Aug 24, 2023
9a6f287
Update pxtblocks/fields/field_userenum.ts
jp-96 Aug 25, 2023
0e2c369
Update pxtblocks/fields/field_userenum.ts
jp-96 Aug 25, 2023
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
13 changes: 12 additions & 1 deletion pxtblocks/fields/field_userenum.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,17 @@ namespace pxtblockly {
}

doClassValidation_(value: any) {
// The format of the name is 10mem where "10" is the value and "mem" is the enum member
if (this.sourceBlock_?.workspace) {
const options = this.sourceBlock_.workspace.getVariablesOfType(this.opts.name);
const matchingOption = options.find(model => {
const [name, ] = parseName(model);
return name === value;
});
if (matchingOption) {
value = matchingOption.name;
}
}
// update cached option list when adding a new kind
if (this.opts?.initialMembers && !this.opts.initialMembers.find(el => el == value)) this.getOptions();
return super.doClassValidation_(value);
Expand Down Expand Up @@ -169,4 +180,4 @@ namespace pxtblockly {
}
return undefined;
}
}
}