Convert remaining select helpers that don't require getData changes (…

…foundryvtt#14549)

static/templates/items/feat-sidebar.hbs

@@ -2,11 +2,7 @@
  <div class="form-group">
  <label>{{localize "PF2E.Category"}}</label>
  <select name="system.category">
- {{#select data.category}}
- {{#each categories as |label type|}}
- <option value="{{type}}">{{localize label}}</option>
- {{/each}}
- {{/select}}
+ {{selectOptions categories selected=data.category localize=true}}
  </select>
  </div>
 

static/templates/items/lore-details.hbs

@@ -2,11 +2,7 @@
  <div class="form-group">
  <label>{{localize "PF2E.ProficiencyLabel"}}</label>
  <select name="system.proficient.value" data-dtype="Number">
- {{#select data.proficient.value}}
- {{#each proficiencyRanks as |label value|}}
- <option value="{{value}}">{{localize label}}</option>
- {{/each}}
- {{/select}}
+ {{selectOptions proficiencyRanks selected=data.proficient.value localize=true}}
  </select>
  </div>
 </fieldset>

static/templates/items/melee-details.hbs

@@ -13,22 +13,13 @@
  <div class="form-group type">
  <label>{{localize "PF2E.Roll.Type"}}</label>
  <select name="system.damageRolls.{{key}}.damageType">
- {{#select (lookup damageRoll "damageType")}}
- {{#each @root.damageTypes as |label type|}}
- <option value="{{type}}">{{localize label}}</option>
- {{/each}}
- {{/select}}
+ {{selectOptions @root.damageTypes selected=damageRoll.damageType localize=true}}
  </select>
  </div>
  <div class="form-group category">
  <label>{{localize "PF2E.Category"}}</label>
  <select name="system.damageRolls.{{key}}.category">
- {{#select (lookup damageRoll "category")}}
- <option value=""></option>
- {{#each @root.damageCategories as |label category|}}
- <option value="{{category}}">{{localize label}}</option>
- {{/each}}
- {{/select}}
+ {{selectOptions @root.damageCategories selected=damageRoll.category blank="" localize=true}}
  </select>
  </div>
  <a class="damage-control remove-partial" data-action="remove-partial"><i class="fa-solid fa-minus"></i></a>

static/templates/items/partials/ability-activation.hbs

@@ -3,19 +3,11 @@
  <label for="{{fieldIdPrefix}}action-type">{{localize "PF2E.ActionActionsLabel"}}</label>
  <div class="form-fields">
  <select name="system.actionType.value" id="{{fieldIdPrefix}}action-type">
- {{#select data.actionType.value}}
- {{#each actionTypes as |name type|}}
- <option value="{{type}}">{{localize name}}</option>
- {{/each}}
- {{/select}}
+ {{selectOptions actionTypes selected=data.actionType.value localize=true}}
  </select>
  {{#if (eq data.actionType.value "action")}}
  <select name="system.actions.value" data-dtype="Number">
- {{#select data.actions.value}}
- {{#each actionsNumber as |name type|}}
- <option value="{{type}}">{{localize name}}</option>
- {{/each}}
- {{/select}}
+ {{selectOptions actionsNumber selected=data.actions.value localize=true}}
  </select>
  {{else}}
  <input type="hidden" name="system.actions.value" value="" />
@@ -31,11 +23,7 @@
  <input type="number" name="system.frequency.max" id="{{fieldIdPrefix}}frequency" min="1" max="99" value="{{data.frequency.max}}" />
  <span>{{localize "PF2E.Frequency.per"}}</span>
  <select name="system.frequency.per">
- {{#select data.frequency.per}}
- {{#each @root.frequencies as |name type|}}
- <option value="{{type}}">{{localize name}}</option>
- {{/each}}
- {{/select}}
+ {{selectOptions @root.frequencies selected=data.frequency.per localize=true}}
  </select>
  <a data-action="frequency-delete"><i class="fa-solid fa-fw fa-times"></i></a>
  </div>

static/templates/items/partials/apex.hbs

@@ -3,11 +3,7 @@
  <label>{{localize "PF2E.Actor.Character.Attribute.Apex"}}</label>
  <div class="form-fields">
  <select name="system.apex.attribute">
- {{#select item.system.apex.attribute}}
- {{#each attributes as |label slug|}}
- <option value="{{slug}}">{{localize label}}</option>
- {{/each}}
- {{/select}}
+ {{selectOptions attributes selected=item.system.apex.attribute localize=true}}
  </select>
  </div>
  </div>

static/templates/items/partials/duration.hbs

@@ -5,10 +5,6 @@
  <input type="number" name="{{base}}.value" value="{{duration.value}}" />
  {{/if}}
  <select id="{{item.uuid}}-duration" name="{{base}}.unit">
- {{#select duration.unit}}
- {{#each units as |label key|}}
- <option value="{{key}}">{{localize label}}</option>
- {{/each}}
- {{/select}}
+ {{selectOptions units selected=duration.unit localize=true}}
  </select>
 </div>

static/templates/items/persistent-damage-dialog.hbs

@@ -46,10 +46,6 @@
 
 {{~#*inline "damageTypeSelect"~}}
  <select class="damageType">
- {{#select selected}}
- {{#each @root.damageTypes}}
- <option value="{{type}}">{{label}}</option>
- {{/each}}
- {{/select}}
+ {{selectOptions @root.damageTypes valueAttr="type" selected=selected}}
  </select>
 {{~/inline~}}

static/templates/items/rules/fast-healing.hbs

@@ -4,11 +4,7 @@
  <div class="form-fields">
  {{{form.resolvableValue "value"}}}
  <select name="system.rules.{{index}}.type" class="short">
- {{#select rule.type}}
- {{#each types as |label key|}}
- <option value="{{key}}">{{localize label}}</option>
- {{/each}}
- {{/select}}
+ {{selectOptions types selected=rule.type localize=true}}
  </select>
  {{{form.resolvableAddBracket "value"}}}
  </div>

static/templates/items/rules/flat-modifier.hbs

@@ -28,11 +28,7 @@
  <div class="form-fields">
  {{#if (eq rule.type "ability")}}
  <select name="{{basePath}}.ability">
- {{#select rule.ability}}
- {{#each abilities as |label key|}}
- <option value="{{key}}">{{localize label}}</option>
- {{/each}}
- {{/select}}
+ {{selectOptions abilities selected=rule.ability localize=true}}
  </select>
  <label>
  {{localize "PF2E.RuleEditor.FlatModifier.Force"}}
@@ -42,11 +38,7 @@
  {{{form.resolvableValue "value" hideButton=true}}}
  {{/if}}
  <select name="{{basePath}}.type" class="short">
- {{#select rule.type}}
- {{#each types as |label slug|}}
- <option value="{{slug}}">{{label}}</option>
- {{/each}}
- {{/select}}
+ {{selectOptions types selected=rule.type localize=true}}
  </select>
 
  {{{form.resolvableAddBracket "value"}}}
@@ -61,12 +53,7 @@
  <div class="form-fields">
  <input type="text" class="pf2e-tagify damage-type" name="{{basePath}}.damageType" value="{{rule.damageType}}"/>
  <select name="{{basePath}}.damageCategory" class="short">
- {{#select rule.damageCategory}}
- <option value=""></option>
- {{#each damageCategories as |label key|}}
- <option value="{{key}}">{{localize label}}</option>
- {{/each}}
- {{/select}}
+ {{selectOptions damageCategories selected=rule.damageCategory blank="" localize=true}}
  </select>
  <select name="{{basePath}}.critical" class="short">
  {{#select rule.critical}}

static/templates/items/shield-details.hbs

@@ -3,12 +3,7 @@
  <div class="form-group">
  <label for="{{fieldIdPrefix}}base">{{localize "PF2E.Item.Physical.Base"}}</label>
  <select id="{{fieldIdPrefix}}base" data-property="system.baseItem">
- {{#select data.baseItem}}
- <option value=""></option>
- {{#each baseTypes as |label slug|}}
- <option value="{{slug}}">{{label}}</option>
- {{/each}}
- {{/select}}
+ {{selectOptions baseTypes selected=data.baseItem blank=""}}
  </select>
  </div>
 
@@ -82,52 +77,29 @@
  data-dtype="JSON"
  {{disabled (not canChangeMaterial)}}
  >
- {{#select preciousMaterials.value}}
- <option value="{&quot;type&quot;:null,&quot;grade&quot;:null}"></option>
- {{#each preciousMaterials.materials as |material|}}
- <optgroup label="{{material.label}}">
- {{#each material.grades as |grade|}}
- <option value="{{grade.value}}">
- {{localize "PF2E.Item.Weapon.MaterialAndRunes.MaterialOption" type=material.label grade=grade.label}}
- </option>
- {{/each}}
- </optgroup>
- {{/each}}
- {{/select}}
+ {{selectOptions preciousMaterials.materials selected=preciousMaterials.value}}
  </select>
  </div>
 
  <div class="form-group">
  <label for="{{fieldIdPrefix}}runes-reinforcing">{{localize "PF2E.Item.Shield.Rune.Reinforcing.Label"}}</label>
  <select name="system.runes.reinforcing" id="{{fieldIdPrefix}}runes-reinforcing" data-dtype="Number">
- {{#select data.runes.reinforcing}}
- {{#each reinforcing as |label number|}}
- <option value="{{number}}">{{localize label}}</option>
- {{/each}}
- {{/select}}
+ {{selectOptions (omit reinforcing 0) selected=data.runes.reinforcing blank="" labelAttr="name" localize=true}}
  </select>
  </div>
 
  {{#if weaponRunes}}
  <div class="form-group">
  <label for="{{fieldIdPrefix}}integrated-potency">{{localize "PF2E.PotencyRuneLabel"}}</label>
  <select name="system.traits.integrated.runes.potency" id="{{fieldIdPrefix}}integrated-potency" data-dtype="Number">
- {{#select data.traits.integrated.runes.potency}}
- {{#each weaponRunes.potency as |data number|}}
- <option value="{{number}}">{{localize (coalesce data.name "")}}</option>
- {{/each}}
- {{/select}}
+ {{selectOptions (omit weaponRunes.potency 0) selected=data.traits.integrated.runes.potency labelAttr="name" blank="" localize=true}}
  </select>
  </div>
 
  <div class="form-group">
  <label for="{{fieldIdPrefix}}integrated-runes-potency">{{localize "PF2E.StrikingRuneLabel"}}</label>
  <select name="system.traits.integrated.runes.striking" id="{{fieldIdPrefix}}integrated-runes-potency" data-dtype="Number">
- {{#select data.traits.integrated.runes.striking}}
- {{#each weaponRunes.striking as |data number|}}
- <option value="{{number}}">{{localize (coalesce data.name "")}}</option>
- {{/each}}
- {{/select}}
+ {{selectOptions (omit weaponRunes.striking 0) selected=data.traits.integrated.runes.striking labelAttr="name" blank="" localize=true}}
  </select>
  </div>
 
@@ -145,12 +117,7 @@
  {{disabled slot.disabled}}
  {{#if slot.readOnly}}class="readonly"{{/if}}
  >
- {{#select slot.slug}}
- <option value=""></option>
- {{#each @root.weaponRunes.property as |rune|}}
- <option value="{{rune.slug}}">{{localize rune.name}}</option>
- {{/each}}
- {{/select}}
+ {{selectOptions @root.weaponRunes.property selected=slot.slug valueAttr="slug" labelAttr="name" blank="" localize=true}}
  </select>
  </div>
  {{/each}}

static/templates/items/spell-details.hbs

@@ -31,12 +31,7 @@
  <div class="details-container-two-columns">
  <input type="number" name="system.area.value" min="5" step="5" value="{{data.area.value}}" />
  <select name="system.area.type">
- <option value=""></option>
- {{#select data.area.type}}
- {{#each areaShapes as |label shape|}}
- <option value="{{shape}}">{{localize label}}</option>
- {{/each}}
- {{/select}}
+ {{selectOptions areaShapes selected=data.area.type blank="" localize=true}}
  </select>
  </div>
  </div>
@@ -137,19 +132,10 @@
  <input type="checkbox" name="system.damage.{{id}}.applyMod" {{checked partial.applyMod}} />
  </label>
  <select name="system.damage.{{id}}.category">
- {{#select partial.category}}
- <option value=""></option>
- {{#each @root.damageSubtypes as |name type|}}
- <option value="{{type}}">{{localize name}}</option>
- {{/each}}
- {{/select}}
+ {{selectOptions @root.damageSubtypes selected=partial.category blank="" localize=true}}
  </select>
  <select name="system.damage.{{id}}.type">
- {{#select partial.type}}
- {{#each @root.damageTypes as |name type|}}
- <option value="{{type}}">{{localize name}}</option>
- {{/each}}
- {{/select}}
+ {{selectOptions @root.damageTypes selected=partial.type localize=true}}
  </select>
  <select class="kinds" name="system.damage.{{id}}.kinds" data-dtype="JSON">
  {{#each (lookup @root.damageKinds id) as |kind|}}

static/templates/items/spell-overlay.hbs

@@ -81,11 +81,7 @@
  <div class="details-container-two-columns">
  <input type="number" name="{{dataPath}}.area.value" min="5" step="5" value="{{system.area.value}}" />
  <select name="{{dataPath}}.area.type">
- {{#select system.area.type}}
- {{#each @root.areaShapes as |label shape|}}
- <option value="{{shape}}">{{localize label}}</option>
- {{/each}}
- {{/select}}
+ {{selectOptions @root.areaShapes selected=system.area.type localize=true}}
  </select>
  </div>
  </div>
@@ -122,20 +118,10 @@
  <input type="checkbox" name="{{../dataPath}}.damage.{{id}}.applyMod" {{checked damage.applyMod}} />
  </label>
  <select name="{{../dataPath}}.damage.{{id}}.category">
- {{#select damage.category}}
- <option value=""></option>
- {{#each @root.damageSubtypes as |name type|}}
- <option value="{{type}}">{{localize name}}</option>
- {{/each}}
- {{/select}}
+ {{selectOptions @root.damageSubtypes selected=damage.category blank="" localize=true}}
  </select>
  <select name="{{../dataPath}}.damage.{{id}}.type">
- {{#select damage.type}}
- <option value=""></option>
- {{#each @root.damageTypes as |name type|}}
- <option value="{{type}}">{{localize name}}</option>
- {{/each}}
- {{/select}}
+ {{selectOptions @root.damageTypes selected=damage.type localize=true}}
  </select>
  <div class="item-controls">
  <a class="tag-selector"

static/templates/popups/casting-item-create-dialog.hbs

@@ -4,22 +4,14 @@
  <div class="form-group">
  <p><label>{{localize "PF2E.CastingItemCreateDialog.spellLevelLabel"}}</label>
  <select name="level" data-dtype="Number">
- {{#select level}}
- {{#each validLevels as |key|}}
- <option value="{{key}}">{{key}}</option>
- {{/each}}
- {{/select}}
+ {{selectOptions validLevels selected=level valueAttr="label"}}
  </select></p>
  </div>
  {{/if}}
  <div class="form-group">
  <p><label>{{localize "PF2E.CastingItemCreateDialog.itemTypeLabel"}}</label>
  <select name="itemType" data-dtype="String">
- {{#select itemType}}
- {{#each itemTypeOptions}}
- <option value="{{@key}}">{{localize this}}</option>
- {{/each}}
- {{/select}}
+ {{selectOptions itemTypeOptions selected=itemType localize=true}}
  </select></p>
  </div>
  <button type="submit"><i class="fa-regular fa-save"></i>{{localize "PF2E.CastingItemCreateDialog.submit"}}</button>

static/templates/system/settings/basic-setting.hbs

@@ -3,11 +3,7 @@
  <div class="form-fields">
  {{#if setting.isSelect}}
  <select name="{{setting.key}}">
- {{#select setting.value}}
- {{#each setting.choices as |label value|}}
- <option value="{{value}}">{{localize label}}</option>
- {{/each}}
- {{/select}}
+ {{selectOptions setting.choices selected=setting.value localize=true}}
  </select>
  {{else if setting.isCheckbox}}
  <input type="checkbox" name="{{setting.key}}" {{checked setting.value}} />

static/templates/system/settings/homebrew.hbs

@@ -18,12 +18,7 @@
  <div class="form-group common-language">
  <label for="{{options.id}}-common">{{localize "PF2E.SETTINGS.Homebrew.Languages.CommonLanguage.Label"}}</label>
  <select id="{{options.id}}-common" data-common-language>
- <option></option>
- {{#each languageRarities.common as |language|}}
- {{#select ../languageRarities.commonLanguage}}
- <option value="{{language.slug}}">{{language.label}}</option>
- {{/select}}
- {{/each}}
+ {{selectOptions languageRarities.common selected=../languageRarities.commonLanguage valueAttr="slug" blank="" localize=true}}
  </select>
  <p class="hint">{{localize "PF2E.SETTINGS.Homebrew.Languages.CommonLanguage.Hint"}}</p>
  </div>
@@ -122,12 +117,7 @@
  <td>{{type.slug}}</td>
  <td>
  <select name="damageTypes.{{idx}}.category">
- {{#select type.category}}
- <option value="">{{localize "PF2E.NoneOption"}}</option>
- {{#each @root.damageCategories as |label category|}}
- <option value="{{category}}">{{localize label}}</option>
- {{/each}}
- {{/select}}
+ {{selectOptions @root.damageCategories selected=type.category blank="" localize=true}}
  </select>
  </td>
  <td>