js/webawesome
1
0
Fork 0
mirror of https://github.com/shoelace-style/webawesome.git synced 2026-01-12 04:09:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #135 from shoelace-style/konnorrogers/dropdown-and-input-fixes

Browse Source 
dropdown and input fixes
This commit is contained in:
Cory LaViska
2024-06-18 18:13:50 -04:00
committed by GitHub
parent f33735d321 7bc36712b1
commit 997be64cf9
2 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/components/dropdown/dropdown.ts
View File

@@ -295,9 +295,9 @@ export default class WaDropdown extends WebAwesomeElement {
// Either the tag hasn't registered, or it hasn't rendered.
// So, wait for the tag to register, and then try again.
if (target === undefined) {
if (target === undefined || target === null) {
customElements.whenDefined(tagName).then(async () => {
await (target as WaButton | WaIconButton).updateComplete;
await (accessibleTrigger as WaButton | WaIconButton).updateComplete;
this.updateAccessibleTrigger();
});

17
src/components/input/input.ts
View File

@@ -260,16 +260,23 @@ export default class WaInput extends WebAwesomeFormAssociatedElement {
return;
}
const button = [...form.elements].find((el: HTMLButtonElement) => el.type === 'submit' && !el.disabled) as
| undefined
| HTMLButtonElement
| WaButton;
const formElements = [...form.elements];
if (!button) {
// If we're the only formElement, we submit like a native input.
if (formElements.length === 1) {
form.requestSubmit(null);
return;
}
const button = formElements.find(
(el: HTMLButtonElement) => el.type === 'submit' && !el.matches(':disabled')
) as undefined | HTMLButtonElement | WaButton;
// No button found, don't submit.
if (!button) {
return;
}
if (button.tagName.toLowerCase() === 'button') {
form.requestSubmit(button);
} else {