remote/datasette
1
0
Fork 0
mirror of https://github.com/simonw/datasette.git synced 2026-06-19 15:24:34 +02:00
Code Issues Projects Releases Packages Wiki Activity

Fix for Safari esc-closes-confirm bug, closes #2784

Browse source
This commit is contained in:
Simon Willison 2026-06-16 13:28:18 -07:00
commit b5ba41c9db
1 changed files with 37 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

46
datasette/static/edit-tools.js
View file

@ -1396,6 +1396,38 @@ function closeRowEditDialogIfConfirmed(state) {
return true;
}
function scheduleCloseRowEditDialogIfConfirmed(state) {
// Fix for an issue in Safari where hitting Esc would show
// the confirm() prompt asking if state should be discarded
// but the Esc key press would then cancel that dialog too.
// Wait for keyup, then move the confirm() to a fresh timer tick.
if (!state || state.isSaving || state.isClosePending) {
return false;
}
if (!rowEditDialogHasChanges(state)) {
state.shouldRestoreFocus = true;
state.dialog.close();
return true;
}
state.isClosePending = true;
var closeAfterKeyup = function () {
if (!state.isClosePending) {
return;
}
state.isClosePending = false;
closeRowEditDialogIfConfirmed(state);
};
var onKeyup = function (ev) {
if (ev.key !== "Escape") {
return;
}
document.removeEventListener("keyup", onKeyup, true);
setTimeout(closeAfterKeyup, 0);
};
document.addEventListener("keyup", onKeyup, true);
return true;
}
function findDataRowElement(root, rowId) {
var elements = root.querySelectorAll("[data-row]");
for (var i = 0; i < elements.length; i += 1) {
@ -1770,6 +1802,7 @@ function ensureRowEditDialog(manager) {
manager: manager,
isLoading: false,
isSaving: false,
isClosePending: false,
hasLoaded: false,
shouldRestoreFocus: true,
};
@ -1797,23 +1830,18 @@ function ensureRowEditDialog(manager) {
return;
}
ev.preventDefault();
closeRowEditDialogIfConfirmed(rowEditDialogState);
scheduleCloseRowEditDialogIfConfirmed(rowEditDialogState);
});
dialog.addEventListener("cancel", function (ev) {
if (
rowEditDialogState.isSaving ||
!confirmDiscardRowEditChanges(rowEditDialogState)
) {
ev.preventDefault();
} else {
rowEditDialogState.shouldRestoreFocus = true;
}
ev.preventDefault();
scheduleCloseRowEditDialogIfConfirmed(rowEditDialogState);
});
dialog.addEventListener("close", function () {
var state = rowEditDialogState;
state.loadId += 1;
state.isClosePending = false;
clearRowEditDialogError(state);
state.hasLoaded = false;
destroyRowEditFields(state);