Skip to content

An open-source, self-hostable PaaS alternative to Vercel, Heroku & Netlify that lets you easily deploy static sites, databases, full-stack applications and 360+ one-click services on your own servers.

fix(ui): release modal scroll lock before confirmation submission

Andras Bacsai15072b9cf7e5
diff --git a/resources/views/components/modal-confirmation.blade.php b/resources/views/components/modal-confirmation.blade.php
index 0e4350f50f..d63c1953f2 100644
--- a/resources/views/components/modal-confirmation.blade.php
+++ b/resources/views/components/modal-confirmation.blade.php
@@ -334,12 +334,15 @@
step++;
} else {
submitting = true;
- submitForm().then((result) => {
- submitting = false;
- modalOpen = false;
- resetModal();
- }).catch(() => {
- submitting = false;
+ modalOpen = false;
+ $nextTick(() => {
+ submitForm().then((result) => {
+ submitting = false;
+ resetModal();
+ }).catch(() => {
+ submitting = false;
+ modalOpen = true;
+ });
});
}
">
@@ -388,17 +391,21 @@
$wire.dispatch(dispatchEventType, dispatchEventMessage);
}
submitting = true;
- submitForm().then((result) => {
- submitting = false;
- if (result === true) {
- modalOpen = false;
- resetModal();
- } else {
- passwordError = result;
- password = '';
- }
- }).catch(() => {
- submitting = false;
+ modalOpen = false;
+ $nextTick(() => {
+ submitForm().then((result) => {
+ submitting = false;
+ if (result === true) {
+ resetModal();
+ } else {
+ modalOpen = true;
+ passwordError = result;
+ password = '';
+ }
+ }).catch(() => {
+ submitting = false;
+ modalOpen = true;
+ });
});
">
<x-loading-on-button x-show="submitting" x-cloak />
diff --git a/tests/Feature/ModalScrollLockTest.php b/tests/Feature/ModalScrollLockTest.php
index 7863325a20..17d293519d 100644
--- a/tests/Feature/ModalScrollLockTest.php
+++ b/tests/Feature/ModalScrollLockTest.php
@@ -7,3 +7,11 @@ test('confirmation modal closes before dispatching an event that can open anothe
'/if \(dispatchEvent\) \{\s*modalOpen = false;\s*\$nextTick\(\(\) => \$wire\.dispatch\(dispatchEventType, dispatchEventMessage\)\);/s'
);
});
+
+test('confirmation modal releases its scroll lock before submitting a destructive action', function () {
+ $modal = file_get_contents(resource_path('views/components/modal-confirmation.blade.php'));
+
+ expect($modal)
+ ->toMatch('/submitting = true;\s*modalOpen = false;\s*\$nextTick\(\(\) => \{\s*submitForm\(\)/s')
+ ->toMatch('/if \(result === true\) \{\s*resetModal\(\);/s');
+});