Merge pull request #1641 from dmitrylyzo/fix-event-source-2

Fix event source for inputManager in case of multiple open dialogs

(cherry picked from commit f5e93a18de)
Signed-off-by: Joshua M. Boniface <joshua@boniface.me>
This commit is contained in:
dkanada
2020-07-25 19:15:52 +09:00
committed by Joshua M. Boniface
parent 875c4e0882
commit 37cde45d12

View File

@@ -66,9 +66,12 @@ import appHost from 'apphost';
if (!sourceElement) {
sourceElement = document.activeElement || window;
const dlg = document.querySelector('.dialogContainer .dialog.opened');
const dialogs = document.querySelectorAll('.dialogContainer .dialog.opened');
if (dlg && (!sourceElement || !dlg.contains(sourceElement))) {
// Suppose the top open dialog is active
const dlg = dialogs.length ? dialogs[dialogs.length - 1] : null;
if (dlg && !dlg.contains(sourceElement)) {
sourceElement = dlg;
}
}