Skip to content

[6.x] Limit filter delete action to the "x" to prevent accidental destructi… #14220

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

Open
jaygeorge wants to merge 5 commits into
base: 6.x
Choose a base branch
from
Open

[6.x] Limit filter delete action to the "x" to prevent accidental destructi… #14220

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
26a9766
Limit filter delete action to the "x" to prevent accidental destructi…
jaygeorge Mar 11, 2026
6a7ee3c
Simplify
jaygeorge Mar 11, 2026
e904b18
Simplify
jaygeorge Mar 11, 2026
ad3a7c0
Simplify
jaygeorge Mar 11, 2026
2049708
Improve accessibility
jaygeorge Mar 11, 2026
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
86 changes: 58 additions & 28 deletions resources/js/components/ui/Listing/Filters.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,18 @@ function removeFieldFilter(filterHandle, fieldHandle) {
setFilter(filterHandle, fields);
}

function getFieldFilterBadgeLabel(handle, badge) {
if (handle === 'date') {
return [badge.field, badge.translatedOperator].filter(Boolean).join(' ');
}

return badge;
}

function getClearFilterLabel(label) {
return `${__('Clear')} ${label}`;
}

function isActive(handle) {
return activeFilters.value.hasOwnProperty(handle);
}
Expand Down Expand Up @@ -171,39 +183,57 @@ function handleStackClosed() {
</div>
</Stack>

<Button
<div
v-for="({ filter, handle, badge }, index) in fieldFilterBadges"
:key="`${filter}-${handle}`"
variant="filled"
:icon-append="reorderable ? null : 'x'"
:disabled="reorderable"
class="last:me-12"
@click="removeFieldFilter(filter, handle)"
class="relative inline-flex h-10 shrink-0 items-center whitespace-nowrap rounded-lg bg-gray-950/5 ps-4 pe-2 text-sm font-medium text-gray-900 last:me-12 gap-1 dark:bg-white/4 dark:text-gray-200 [&_svg]:shrink-0 [&_svg]:text-gray-925 [&_svg]:opacity-60 dark:[&_svg]:text-white"
>
<template v-if="handle == 'date'">
{{ badge.field }}
{{ badge.translatedOperator }}
<template v-if="badge.operator === 'between'">
<date-time :of="badge.value.start" options="date" />
{{ __('and') }}
<date-time :of="badge.value.end" options="date" />
<div class="flex items-center gap-1.5 whitespace-nowrap">
<template v-if="handle == 'date'">
{{ badge.field }}
{{ badge.translatedOperator }}
<template v-if="badge.operator === 'between'">
<date-time :of="badge.value.start" options="date" />
{{ __('and') }}
<date-time :of="badge.value.end" options="date" />
</template>
<date-time v-else :of="badge.value" options="date" />
</template>
<date-time v-else :of="badge.value" options="date" />
</template>

<template v-else>
{{ badge }}
</template>
</Button>
<Button

<template v-else>
{{ badge }}
</template>
</div>

<Button
v-if="!reorderable"
variant="ghost"
size="xs"
icon="x"
iconOnly
inset
class="opacity-100 [&_svg]:size-4"
:aria-label="getClearFilterLabel(getFieldFilterBadgeLabel(handle, badge))"
@click="removeFieldFilter(filter, handle)"
/>
</div>
<div
v-for="(badge, handle, index) in standardBadges"
:key="handle"
variant="filled"
:icon-append="reorderable ? null : 'x'"
:text="badge"
:disabled="reorderable"
class="last:me-12"
@click="setFilter(handle, null)"
/>
class="relative inline-flex h-10 shrink-0 items-center whitespace-nowrap rounded-lg bg-gray-950/5 ps-4 pe-2 text-sm font-medium text-gray-900 last:me-12 gap-1 dark:bg-white/4 dark:text-gray-200 [&_svg]:shrink-0 [&_svg]:text-gray-925 [&_svg]:opacity-60 dark:[&_svg]:text-white"
>
<span class="whitespace-nowrap">{{ badge }}</span>
<Button
v-if="!reorderable"
variant="ghost"
size="xs"
icon="x"
iconOnly
inset
class="opacity-100 [&_svg]:size-4"
:aria-label="getClearFilterLabel(badge)"
@click="setFilter(handle, null)"
/>
</div>
</div>
</template>
Loading