Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[5.x] Adjust confirmation modal behavior #10537

Merged
merged 2 commits into from
Aug 5, 2024
Merged

[5.x] Adjust confirmation modal behavior #10537

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
06cfe99
remove enter keybinding, switch to a form so that enter in fields sti…
jasonvarga Jul 31, 2024
6f896cc
Use a flat button for canceling modals for better focus states.
jackmcdade Aug 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 4 additions & 6 deletions resources/js/components/modals/ConfirmationModal.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<template>
<modal name="confirmation-modal" @opened="$emit('opened')">
<div class="confirmation-modal flex flex-col h-full">
<form class="confirmation-modal flex flex-col h-full" @submit.prevent="submit">
<header v-if="title" class="text-lg font-semibold px-5 py-3 bg-gray-200 dark:bg-dark-550 rounded-t-lg flex items-center justify-between border-b dark:border-dark-900">
{{ __(title) }}
</header>
Expand All @@ -13,10 +13,10 @@
</slot>
</div>
<div class="px-5 py-3 bg-gray-200 dark:bg-dark-550 rounded-b-lg border-t dark:border-dark-900 flex items-center justify-end text-sm">
<button class="text-gray dark:text-dark-150 hover:text-gray-900 dark:hover:text-dark-100" @click="$emit('cancel')" v-text="__(cancelText)" v-if="cancellable" />
<button class="rtl:mr-4 ltr:ml-4" :class="buttonClass" :disabled="disabled" v-text="__(buttonText)" @click="$emit('confirm')" />
<button class="btn-flat" @click.prevent="$emit('cancel')" v-text="__(cancelText)" v-if="cancellable" />
<button class="rtl:mr-4 ltr:ml-4" :class="buttonClass" :disabled="disabled" v-text="__(buttonText)" />
</div>
</div>
</form>
</modal>
</template>

Expand Down Expand Up @@ -75,12 +75,10 @@ export default {

created() {
this.escBinding = this.$keys.bind('esc', this.dismiss)
this.enterBinding = this.$keys.bind('enter', this.submit)
},

beforeDestroy() {
this.escBinding.destroy()
this.enterBinding.destroy()
},
}
</script>
Loading