Refactor #7062
parent
73bfa103ae
commit
44064c5e5c
|
@ -2568,22 +2568,23 @@ export default {
|
||||||
if (this.timeOnly) {
|
if (this.timeOnly) {
|
||||||
focusableElements[0].focus();
|
focusableElements[0].focus();
|
||||||
} else {
|
} else {
|
||||||
let spanIndex = null;
|
let elementIndex = focusableElements.findIndex((el) => el.tagName === 'SPAN');
|
||||||
|
|
||||||
for (let i = 0; i < focusableElements.length; i++) {
|
if (elementIndex === -1) {
|
||||||
if (focusableElements[i].tagName === 'SPAN') {
|
elementIndex = focusableElements.findIndex((el) => el.tagName === 'BUTTON');
|
||||||
spanIndex = i;
|
|
||||||
break;
|
|
||||||
} else if (focusableElements[i].tagName === 'BUTTON') {
|
|
||||||
spanIndex = i;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
focusableElements[spanIndex].focus();
|
if (elementIndex !== -1) {
|
||||||
|
focusableElements[elementIndex].focus();
|
||||||
|
} else {
|
||||||
|
focusableElements[0].focus();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
} else if (focusedIndex === focusableElements.length - 1) focusableElements[0].focus();
|
} else if (focusedIndex === focusableElements.length - 1) {
|
||||||
else focusableElements[focusedIndex + 1].focus();
|
focusableElements[0].focus();
|
||||||
|
} else {
|
||||||
|
focusableElements[focusedIndex + 1].focus();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue