zydronium/manage.get.gov
1
0
Fork 0
mirror of https://github.com/cisagov/manage.get.gov.git synced 2025-08-24 02:01:11 +02:00
Code Issues Projects Releases Packages Wiki Activity

additional edits to uswds and to combobox.js to accomodate for empty values in options

Browse source
This commit is contained in:
David Kennedy 2025-01-14 19:23:29 -05:00
parent ea509f63ef
commit 1ca52b49bb
No known key found for this signature in database
GPG key ID: 6528A5386E66B96B
2 changed files with 37 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

31
src/registrar/assets/js/uswds-edited.js
View file

@ -1167,15 +1167,23 @@ const enhanceComboBox = _comboBoxEl => {
placeholder placeholder
}); });
} }
if (defaultValue) { // DOTGOV - allowing for defaultValue to be empty
//if (defaultValue) {
// for (let i = 0, len = selectEl.options.length; i < len; i += 1) {
// const optionEl = selectEl.options[i];
// if (optionEl.value === defaultValue) {
// selectedOption = optionEl;
// break;
// }
// }
//}
for (let i = 0, len = selectEl.options.length; i < len; i += 1) { for (let i = 0, len = selectEl.options.length; i < len; i += 1) {
const optionEl = selectEl.options[i]; const optionEl = selectEl.options[i];
if (optionEl.value === defaultValue) { if ((optionEl.value === defaultValue) || (!optionEl.value && !defaultValue)) {
selectedOption = optionEl; selectedOption = optionEl;
break; break;
} }
} }
}
/** /**
* Throw error if combobox is missing a label or label is missing * Throw error if combobox is missing a label or label is missing
@ -1500,10 +1508,22 @@ const resetSelection = el => {
} = getComboBoxContext(el); } = getComboBoxContext(el);
const selectValue = selectEl.value; const selectValue = selectEl.value;
const inputValue = (inputEl.value || "").toLowerCase(); const inputValue = (inputEl.value || "").toLowerCase();
if (selectValue) { // DOTGOV - allow for option value to be empty string
//if (selectValue) {
// for (let i = 0, len = selectEl.options.length; i < len; i += 1) {
// const optionEl = selectEl.options[i];
// if (optionEl.value === selectValue) {
// if (inputValue !== optionEl.text) {
// changeElementValue(inputEl, optionEl.text);
// }
// comboBoxEl.classList.add(COMBO_BOX_PRISTINE_CLASS);
// return;
// }
// }
//}
for (let i = 0, len = selectEl.options.length; i < len; i += 1) { for (let i = 0, len = selectEl.options.length; i < len; i += 1) {
const optionEl = selectEl.options[i]; const optionEl = selectEl.options[i];
if (optionEl.value === selectValue) { if ((!selectValue && !optionEl.value) || optionEl.value === selectValue) {
if (inputValue !== optionEl.text) { if (inputValue !== optionEl.text) {
changeElementValue(inputEl, optionEl.text); changeElementValue(inputEl, optionEl.text);
} }
@ -1511,7 +1531,6 @@ const resetSelection = el => {
return; return;
} }
} }
}
if (inputValue) { if (inputValue) {
changeElementValue(inputEl); changeElementValue(inputEl);
} }

2
src/registrar/assets/src/js/getgov/combobox.js
View file

@ -48,7 +48,7 @@ export function loadInitialValuesForComboBoxes() {
// Change the default input behaviour - have it reset to the data default instead // Change the default input behaviour - have it reset to the data default instead
clearInputButton.addEventListener("click", (e) => { clearInputButton.addEventListener("click", (e) => {
if (overrideDefaultClearButton && initialValue) { if (overrideDefaultClearButton) {
e.preventDefault(); e.preventDefault();
e.stopPropagation(); e.stopPropagation();
input.click(); input.click();