[#2656] Fix bug with SelectChoices#find only returning results from f…

…irst category
foundryvtt · Dec 1, 2023 · 322650e · 322650e
1 parent 6880955
commit 322650e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/module/documents/actor/select-choices.mjs b/module/documents/actor/select-choices.mjs
@@ -66,8 +66,8 @@ export default class SelectChoices {
   /**
    * Find key and value for the provided key or key suffix.
    * @param {string} key  Full prefixed key (e.g. `tool:art:alchemist`) or just the suffix (e.g. `alchemist`).
-   * @returns {[string, SelectChoicesEntry]}  An array with the first value being the matched key, and the second
-   *                                          being the value.
+   * @returns {[string, SelectChoicesEntry]|null}  An array with the first value being the matched key,
+   *                                               and the second being the value.
    */
   find(key) {
     for ( const [k, v] of Object.entries(this) ) {
@@ -78,7 +78,7 @@ export default class SelectChoices {
         if ( result ) return result;
       }
     }
-    return [];
+    return null;
   }
 
   /* -------------------------------------------- */

diff --git a/module/documents/actor/trait.mjs b/module/documents/actor/trait.mjs
@@ -50,8 +50,8 @@ export async function actorValues(actor, trait) {
   const traitChoices = await choices(trait, {prefixed: true});
 
   const setValue = (k, v) => {
-    const [key] = traitChoices.find(k);
-    if ( key ) values[key] = v;
+    const result = traitChoices.find(k);
+    if ( result ) values[result[0]] = v;
   };
 
   if ( ["skills", "tool"].includes(trait) ) {