@zhangt58/svelte-vtable 0.3.8 → 0.4.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +84 -81
- package/dist/components/DataTable.svelte +161 -17
- package/dist/components/DataTable.svelte.d.ts +27 -0
- package/dist/components/DataTableControls.svelte +42 -15
- package/dist/components/DataTableControls.svelte.d.ts +6 -2
- package/dist/components/DataTableFilters.svelte +2 -9
- package/dist/components/DataTableFilters.svelte.d.ts +3 -2
- package/dist/components/filters/ColumnHeaderFilter.svelte +142 -0
- package/dist/components/filters/ColumnHeaderFilter.svelte.d.ts +48 -0
- package/dist/components/filters/FilterDateRange.svelte +57 -13
- package/dist/components/filters/useFilterState.svelte.js +1 -4
- package/dist/components/flowbite/DataTableControls.svelte +56 -17
- package/dist/components/flowbite/DataTableControls.svelte.d.ts +6 -2
- package/dist/filterUtils.d.ts +61 -1
- package/dist/filterUtils.js +126 -21
- package/dist/index.d.ts +4 -3
- package/dist/index.js +10 -2
- package/dist/styles.css +28 -0
- package/package.json +1 -1
|
@@ -3,6 +3,7 @@
|
|
|
3
3
|
import FilterColumn from './filters/FilterColumn.svelte';
|
|
4
4
|
import FilterValueList from './filters/FilterValueList.svelte';
|
|
5
5
|
import FilterDateRange from './filters/FilterDateRange.svelte';
|
|
6
|
+
import { DEFAULT_RELATIVE_RANGE_PRESETS } from '../filterUtils.js';
|
|
6
7
|
|
|
7
8
|
let {
|
|
8
9
|
columnFilters = [],
|
|
@@ -18,15 +19,7 @@
|
|
|
18
19
|
emitDebounce = 100,
|
|
19
20
|
populateThreshold = 200,
|
|
20
21
|
dropdownInline = true,
|
|
21
|
-
relativeRangePresets =
|
|
22
|
-
{ label: '1h', value: 1, unit: 'hour' },
|
|
23
|
-
{ label: '6h', value: 6, unit: 'hour' },
|
|
24
|
-
{ label: '12h', value: 12, unit: 'hour' },
|
|
25
|
-
{ label: '1d', value: 1, unit: 'day' },
|
|
26
|
-
{ label: '7d', value: 7, unit: 'day' },
|
|
27
|
-
{ label: '30d', value: 30, unit: 'day' },
|
|
28
|
-
{ label: '1y', value: 1, unit: 'year' },
|
|
29
|
-
],
|
|
22
|
+
relativeRangePresets = DEFAULT_RELATIVE_RANGE_PRESETS,
|
|
30
23
|
} = $props();
|
|
31
24
|
|
|
32
25
|
const fs = useFilterState({
|
|
@@ -17,7 +17,7 @@ declare const DataTableFilters: import("svelte").Component<{
|
|
|
17
17
|
emitDebounce?: number;
|
|
18
18
|
populateThreshold?: number;
|
|
19
19
|
dropdownInline?: boolean;
|
|
20
|
-
relativeRangePresets?:
|
|
20
|
+
relativeRangePresets?: typeof DEFAULT_RELATIVE_RANGE_PRESETS;
|
|
21
21
|
}, {}, "">;
|
|
22
22
|
type $$ComponentProps = {
|
|
23
23
|
columnFilters?: any[];
|
|
@@ -33,5 +33,6 @@ type $$ComponentProps = {
|
|
|
33
33
|
emitDebounce?: number;
|
|
34
34
|
populateThreshold?: number;
|
|
35
35
|
dropdownInline?: boolean;
|
|
36
|
-
relativeRangePresets?:
|
|
36
|
+
relativeRangePresets?: typeof DEFAULT_RELATIVE_RANGE_PRESETS;
|
|
37
37
|
};
|
|
38
|
+
import { DEFAULT_RELATIVE_RANGE_PRESETS } from '../filterUtils.js';
|
|
@@ -0,0 +1,142 @@
|
|
|
1
|
+
<script>
|
|
2
|
+
import FilterValueList from './FilterValueList.svelte';
|
|
3
|
+
import FilterDateRange from './FilterDateRange.svelte';
|
|
4
|
+
import { DEFAULT_RELATIVE_RANGE_PRESETS } from '../../filterUtils.js';
|
|
5
|
+
|
|
6
|
+
let {
|
|
7
|
+
column,
|
|
8
|
+
selection = [],
|
|
9
|
+
isOpen = false,
|
|
10
|
+
isActive = false,
|
|
11
|
+
align = 'left',
|
|
12
|
+
showCounts = true,
|
|
13
|
+
virtualThreshold = 500,
|
|
14
|
+
virtualItemHeight = 36,
|
|
15
|
+
virtualOverscan = 5,
|
|
16
|
+
populateThreshold = 200,
|
|
17
|
+
relativeRangePresets = DEFAULT_RELATIVE_RANGE_PRESETS,
|
|
18
|
+
ontoggle = undefined,
|
|
19
|
+
onclear = undefined,
|
|
20
|
+
onvaluetoggle = undefined,
|
|
21
|
+
oncheckall = undefined,
|
|
22
|
+
oninvert = undefined,
|
|
23
|
+
onchecknone = undefined,
|
|
24
|
+
ondaterangechange = undefined,
|
|
25
|
+
onsortchange = undefined,
|
|
26
|
+
} = $props();
|
|
27
|
+
|
|
28
|
+
const isDateRange = $derived(column.type === 'daterange' || column.type === 'datetimerange');
|
|
29
|
+
const label = $derived(column.label || column.key);
|
|
30
|
+
const activeBadge = $derived(Array.isArray(selection) ? String(selection.length) : '1');
|
|
31
|
+
|
|
32
|
+
function stopEvent(event) {
|
|
33
|
+
event.stopPropagation();
|
|
34
|
+
}
|
|
35
|
+
|
|
36
|
+
function handleToggle(event) {
|
|
37
|
+
event.stopPropagation();
|
|
38
|
+
if (ontoggle) ontoggle();
|
|
39
|
+
}
|
|
40
|
+
|
|
41
|
+
function handleMenuKeydown(event) {
|
|
42
|
+
if (event.key !== 'Escape') event.stopPropagation();
|
|
43
|
+
}
|
|
44
|
+
</script>
|
|
45
|
+
|
|
46
|
+
<div class="relative inline-flex shrink-0 normal-case tracking-normal">
|
|
47
|
+
<button
|
|
48
|
+
type="button"
|
|
49
|
+
class={'relative inline-flex h-7 w-7 items-center justify-center rounded border text-gray-500 transition-colors focus:outline-none focus-visible:ring-2 focus-visible:ring-blue-500 dark:text-gray-300 ' +
|
|
50
|
+
(isActive
|
|
51
|
+
? 'dark:bg-gray-700'
|
|
52
|
+
: 'border-transparent hover:border-gray-300 hover:bg-gray-100 dark:hover:border-gray-600 dark:hover:bg-gray-700')}
|
|
53
|
+
style={isActive
|
|
54
|
+
? 'border-color: var(--vtable-color-accent-border); background-color: color-mix(in srgb, var(--vtable-color-accent-light) 70%, white); color: var(--vtable-color-accent-text);'
|
|
55
|
+
: ''}
|
|
56
|
+
aria-label="Filter {label}"
|
|
57
|
+
aria-expanded={isOpen}
|
|
58
|
+
aria-controls="vtable-filter-menu-{column.key}"
|
|
59
|
+
title="Filter {label}"
|
|
60
|
+
onclick={handleToggle}
|
|
61
|
+
>
|
|
62
|
+
<svg
|
|
63
|
+
class="h-4 w-4"
|
|
64
|
+
xmlns="http://www.w3.org/2000/svg"
|
|
65
|
+
fill="none"
|
|
66
|
+
viewBox="0 0 24 24"
|
|
67
|
+
stroke="currentColor"
|
|
68
|
+
aria-hidden="true"
|
|
69
|
+
>
|
|
70
|
+
<path
|
|
71
|
+
stroke-linecap="round"
|
|
72
|
+
stroke-linejoin="round"
|
|
73
|
+
stroke-width="2"
|
|
74
|
+
d="M3 5h18l-7 8v5l-4 2v-7L3 5z"
|
|
75
|
+
/>
|
|
76
|
+
</svg>
|
|
77
|
+
|
|
78
|
+
{#if isActive}
|
|
79
|
+
<span
|
|
80
|
+
class="absolute -right-1 -top-1 inline-flex h-4 min-w-4 items-center justify-center rounded-full px-1 text-[10px] font-semibold leading-none text-white"
|
|
81
|
+
style="background-color: var(--vtable-color-accent);"
|
|
82
|
+
aria-hidden="true">{activeBadge}</span
|
|
83
|
+
>
|
|
84
|
+
{/if}
|
|
85
|
+
</button>
|
|
86
|
+
|
|
87
|
+
{#if isOpen}
|
|
88
|
+
<div
|
|
89
|
+
id="vtable-filter-menu-{column.key}"
|
|
90
|
+
class="absolute top-full z-50 mt-1 w-72 max-w-[calc(100vw-2rem)] overflow-hidden rounded-md border border-gray-300 bg-white text-left text-sm font-normal normal-case tracking-normal text-gray-700 shadow-lg dark:border-gray-600 dark:bg-gray-700 dark:text-gray-200 dark:shadow-gray-900"
|
|
91
|
+
class:left-0={align !== 'right'}
|
|
92
|
+
class:right-0={align === 'right'}
|
|
93
|
+
role="dialog"
|
|
94
|
+
aria-label="Filter {label}"
|
|
95
|
+
tabindex="-1"
|
|
96
|
+
onclick={stopEvent}
|
|
97
|
+
onkeydown={handleMenuKeydown}
|
|
98
|
+
>
|
|
99
|
+
<div
|
|
100
|
+
class="flex items-center justify-between gap-2 border-b border-gray-200 px-3 py-2 dark:border-gray-600"
|
|
101
|
+
>
|
|
102
|
+
<span class="min-w-0 truncate text-xs font-semibold text-gray-600 dark:text-gray-200">
|
|
103
|
+
{label}
|
|
104
|
+
</span>
|
|
105
|
+
{#if isActive}
|
|
106
|
+
<button
|
|
107
|
+
type="button"
|
|
108
|
+
class="shrink-0 rounded border border-red-300 px-2 py-0.5 text-xs text-red-600 transition-colors hover:bg-red-50 dark:border-red-500 dark:text-red-300 dark:hover:bg-red-900/20"
|
|
109
|
+
onclick={() => onclear && onclear()}
|
|
110
|
+
>
|
|
111
|
+
Clear
|
|
112
|
+
</button>
|
|
113
|
+
{/if}
|
|
114
|
+
</div>
|
|
115
|
+
|
|
116
|
+
{#if isDateRange}
|
|
117
|
+
<FilterDateRange
|
|
118
|
+
{column}
|
|
119
|
+
selection={selection || {}}
|
|
120
|
+
{relativeRangePresets}
|
|
121
|
+
onchange={(updated) => ondaterangechange && ondaterangechange(updated)}
|
|
122
|
+
onclear={() => onclear && onclear()}
|
|
123
|
+
/>
|
|
124
|
+
{:else}
|
|
125
|
+
<FilterValueList
|
|
126
|
+
{column}
|
|
127
|
+
selections={selection || []}
|
|
128
|
+
{showCounts}
|
|
129
|
+
{virtualThreshold}
|
|
130
|
+
{virtualItemHeight}
|
|
131
|
+
{virtualOverscan}
|
|
132
|
+
{populateThreshold}
|
|
133
|
+
ontoggle={(value) => onvaluetoggle && onvaluetoggle(value)}
|
|
134
|
+
oncheckall={(values) => oncheckall && oncheckall(values)}
|
|
135
|
+
oninvert={(values) => oninvert && oninvert(values)}
|
|
136
|
+
onchecknone={() => onchecknone && onchecknone()}
|
|
137
|
+
onsortchange={(payload) => onsortchange && onsortchange(payload)}
|
|
138
|
+
/>
|
|
139
|
+
{/if}
|
|
140
|
+
</div>
|
|
141
|
+
{/if}
|
|
142
|
+
</div>
|
|
@@ -0,0 +1,48 @@
|
|
|
1
|
+
export default ColumnHeaderFilter;
|
|
2
|
+
type ColumnHeaderFilter = {
|
|
3
|
+
$on?(type: string, callback: (e: any) => void): () => void;
|
|
4
|
+
$set?(props: Partial<$$ComponentProps>): void;
|
|
5
|
+
};
|
|
6
|
+
declare const ColumnHeaderFilter: import("svelte").Component<{
|
|
7
|
+
column: any;
|
|
8
|
+
selection?: any[];
|
|
9
|
+
isOpen?: boolean;
|
|
10
|
+
isActive?: boolean;
|
|
11
|
+
align?: string;
|
|
12
|
+
showCounts?: boolean;
|
|
13
|
+
virtualThreshold?: number;
|
|
14
|
+
virtualItemHeight?: number;
|
|
15
|
+
virtualOverscan?: number;
|
|
16
|
+
populateThreshold?: number;
|
|
17
|
+
relativeRangePresets?: typeof DEFAULT_RELATIVE_RANGE_PRESETS;
|
|
18
|
+
ontoggle?: any;
|
|
19
|
+
onclear?: any;
|
|
20
|
+
onvaluetoggle?: any;
|
|
21
|
+
oncheckall?: any;
|
|
22
|
+
oninvert?: any;
|
|
23
|
+
onchecknone?: any;
|
|
24
|
+
ondaterangechange?: any;
|
|
25
|
+
onsortchange?: any;
|
|
26
|
+
}, {}, "">;
|
|
27
|
+
type $$ComponentProps = {
|
|
28
|
+
column: any;
|
|
29
|
+
selection?: any[];
|
|
30
|
+
isOpen?: boolean;
|
|
31
|
+
isActive?: boolean;
|
|
32
|
+
align?: string;
|
|
33
|
+
showCounts?: boolean;
|
|
34
|
+
virtualThreshold?: number;
|
|
35
|
+
virtualItemHeight?: number;
|
|
36
|
+
virtualOverscan?: number;
|
|
37
|
+
populateThreshold?: number;
|
|
38
|
+
relativeRangePresets?: typeof DEFAULT_RELATIVE_RANGE_PRESETS;
|
|
39
|
+
ontoggle?: any;
|
|
40
|
+
onclear?: any;
|
|
41
|
+
onvaluetoggle?: any;
|
|
42
|
+
oncheckall?: any;
|
|
43
|
+
oninvert?: any;
|
|
44
|
+
onchecknone?: any;
|
|
45
|
+
ondaterangechange?: any;
|
|
46
|
+
onsortchange?: any;
|
|
47
|
+
};
|
|
48
|
+
import { DEFAULT_RELATIVE_RANGE_PRESETS } from '../../filterUtils.js';
|
|
@@ -7,7 +7,7 @@
|
|
|
7
7
|
* - Clear button
|
|
8
8
|
*
|
|
9
9
|
* Props:
|
|
10
|
-
* column — column config { key, label, type, minValue, maxValue }
|
|
10
|
+
* column — column config { key, label, type, minValue, maxValue, dateValues }
|
|
11
11
|
* selection — current range selection { from?: string, to?: string }
|
|
12
12
|
* relativeRangePresets — array of { label, value, unit } presets
|
|
13
13
|
* onchange — callback({ from?, to? }) called with the updated selection
|
|
@@ -29,6 +29,13 @@
|
|
|
29
29
|
: new Date(str).getTime();
|
|
30
30
|
}
|
|
31
31
|
|
|
32
|
+
function parseFilterDateEnd(str) {
|
|
33
|
+
if (!str) return NaN;
|
|
34
|
+
return /^\d{4}-\d{2}-\d{2}$/.test(str)
|
|
35
|
+
? new Date(str + 'T23:59:59.999').getTime()
|
|
36
|
+
: new Date(str).getTime();
|
|
37
|
+
}
|
|
38
|
+
|
|
32
39
|
function formatAsInputValue(ms, type) {
|
|
33
40
|
const d = new Date(ms);
|
|
34
41
|
const pad = (n) => String(n).padStart(2, '0');
|
|
@@ -44,6 +51,11 @@
|
|
|
44
51
|
const totalMs = $derived(maxMs - minMs);
|
|
45
52
|
const fromMs = $derived(parseFilterDate(selection.from));
|
|
46
53
|
const toMs = $derived(parseFilterDate(selection.to));
|
|
54
|
+
const dateValueMs = $derived(
|
|
55
|
+
Array.isArray(column.dateValues)
|
|
56
|
+
? column.dateValues.map(Number).filter((ms) => Number.isFinite(ms))
|
|
57
|
+
: [],
|
|
58
|
+
);
|
|
47
59
|
|
|
48
60
|
const fromPct = $derived(
|
|
49
61
|
totalMs > 0 && !isNaN(fromMs)
|
|
@@ -72,7 +84,7 @@
|
|
|
72
84
|
if (onchange) onchange({ ...selection, to: formatAsInputValue(newToMs, inputType) });
|
|
73
85
|
}
|
|
74
86
|
|
|
75
|
-
function
|
|
87
|
+
function createRelativeRange(value, unit) {
|
|
76
88
|
const now = new Date();
|
|
77
89
|
const from = new Date(now);
|
|
78
90
|
switch (unit) {
|
|
@@ -80,10 +92,12 @@
|
|
|
80
92
|
from.setHours(from.getHours() - value);
|
|
81
93
|
break;
|
|
82
94
|
case 'day':
|
|
83
|
-
from.setDate(from.getDate() - value);
|
|
95
|
+
from.setDate(from.getDate() - (inputType === 'date' ? Math.max(value - 1, 0) : value));
|
|
84
96
|
break;
|
|
85
97
|
case 'week':
|
|
86
|
-
from.setDate(
|
|
98
|
+
from.setDate(
|
|
99
|
+
from.getDate() - (inputType === 'date' ? Math.max(value * 7 - 1, 0) : value * 7),
|
|
100
|
+
);
|
|
87
101
|
break;
|
|
88
102
|
case 'month':
|
|
89
103
|
from.setMonth(from.getMonth() - value);
|
|
@@ -92,13 +106,40 @@
|
|
|
92
106
|
from.setFullYear(from.getFullYear() - value);
|
|
93
107
|
break;
|
|
94
108
|
}
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
109
|
+
return {
|
|
110
|
+
from: formatAsInputValue(from.getTime(), inputType),
|
|
111
|
+
to: formatAsInputValue(now.getTime(), inputType),
|
|
112
|
+
};
|
|
113
|
+
}
|
|
114
|
+
|
|
115
|
+
function relativeRangeHasMatches(range) {
|
|
116
|
+
const rangeFromMs = parseFilterDate(range.from);
|
|
117
|
+
const rangeToMs = parseFilterDateEnd(range.to);
|
|
118
|
+
if (isNaN(rangeFromMs) || isNaN(rangeToMs)) return true;
|
|
119
|
+
|
|
120
|
+
if (dateValueMs.length > 0) {
|
|
121
|
+
return dateValueMs.some((ms) => ms >= rangeFromMs && ms <= rangeToMs);
|
|
122
|
+
}
|
|
123
|
+
|
|
124
|
+
if (!isNaN(minMs) && !isNaN(maxMs)) {
|
|
125
|
+
return maxMs >= rangeFromMs && minMs <= rangeToMs;
|
|
100
126
|
}
|
|
127
|
+
|
|
128
|
+
return column.minValue === undefined && column.maxValue === undefined;
|
|
101
129
|
}
|
|
130
|
+
|
|
131
|
+
function setRelativeRange(value, unit) {
|
|
132
|
+
const range = createRelativeRange(value, unit);
|
|
133
|
+
if (!relativeRangeHasMatches(range)) return;
|
|
134
|
+
if (onchange) onchange(range);
|
|
135
|
+
}
|
|
136
|
+
|
|
137
|
+
const presetStates = $derived(
|
|
138
|
+
applicablePresets.map((preset) => ({
|
|
139
|
+
...preset,
|
|
140
|
+
disabled: !relativeRangeHasMatches(createRelativeRange(preset.value, preset.unit)),
|
|
141
|
+
})),
|
|
142
|
+
);
|
|
102
143
|
</script>
|
|
103
144
|
|
|
104
145
|
<div class="p-3 flex flex-col gap-2">
|
|
@@ -233,13 +274,16 @@
|
|
|
233
274
|
{/if}
|
|
234
275
|
|
|
235
276
|
<!-- Relative-range quick buttons -->
|
|
236
|
-
{#if
|
|
277
|
+
{#if presetStates.length > 0}
|
|
237
278
|
<div class="flex flex-wrap gap-1 pt-1 border-t border-gray-100 dark:border-gray-600">
|
|
238
|
-
{#each
|
|
279
|
+
{#each presetStates as preset (preset.label)}
|
|
239
280
|
<button
|
|
240
281
|
type="button"
|
|
241
|
-
class="px-2 py-0.5 text-xs rounded border border-blue-400 text-blue-700 dark:text-blue-300 hover:bg-blue-50 dark:hover:bg-blue-900/20 transition-colors"
|
|
242
|
-
title=
|
|
282
|
+
class="px-2 py-0.5 text-xs rounded border border-blue-400 text-blue-700 dark:text-blue-300 hover:bg-blue-50 dark:hover:bg-blue-900/20 transition-colors disabled:opacity-50 disabled:cursor-not-allowed disabled:hover:bg-transparent dark:disabled:hover:bg-transparent"
|
|
283
|
+
title={preset.disabled
|
|
284
|
+
? `No matching rows in the last ${preset.value} ${preset.unit}${preset.value !== 1 ? 's' : ''}`
|
|
285
|
+
: `Last ${preset.value} ${preset.unit}${preset.value !== 1 ? 's' : ''}`}
|
|
286
|
+
disabled={preset.disabled}
|
|
243
287
|
onclick={() => setRelativeRange(preset.value, preset.unit)}
|
|
244
288
|
>
|
|
245
289
|
Last {preset.label}
|
|
@@ -1,8 +1,5 @@
|
|
|
1
1
|
import { onDestroy } from 'svelte';
|
|
2
|
-
|
|
3
|
-
function isDateRangeColumn(col) {
|
|
4
|
-
return col.type === 'daterange' || col.type === 'datetimerange';
|
|
5
|
-
}
|
|
2
|
+
import { isDateRangeColumn } from '../../filterUtils.js';
|
|
6
3
|
|
|
7
4
|
/**
|
|
8
5
|
* Svelte 5 reactive composable that manages per-column filter selections,
|
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
import { Search, Badge, Select } from 'flowbite-svelte';
|
|
3
3
|
import FiltersModal from './FiltersModal.svelte';
|
|
4
4
|
import PaginationBar from '../PaginationBar.svelte';
|
|
5
|
+
import { countActiveFilters, resolveColumnFilters } from '../../filterUtils.js';
|
|
5
6
|
|
|
6
7
|
// Props for search, pagination (perPage made bindable using Svelte 5 rune $bindable)
|
|
7
8
|
let {
|
|
@@ -15,8 +16,11 @@
|
|
|
15
16
|
filtersVisible = false,
|
|
16
17
|
// callback when toggle changes: onfilterstoggle({ visible })
|
|
17
18
|
onfilterstoggle = undefined,
|
|
18
|
-
// optional DataTableFilters inputs -
|
|
19
|
-
columnFilters =
|
|
19
|
+
// optional DataTableFilters inputs - explicit configs override derived configs
|
|
20
|
+
columnFilters = null,
|
|
21
|
+
// optional column definitions + base row source used to derive modal filter options
|
|
22
|
+
columns = [],
|
|
23
|
+
filterItems = null,
|
|
20
24
|
activeFilters = {},
|
|
21
25
|
// onfilter({ key, values, allFilters }) — passed through to DataTableFilters
|
|
22
26
|
/** @type {((..._args: any[]) => void) | undefined} */
|
|
@@ -35,18 +39,16 @@
|
|
|
35
39
|
{ value: 100, name: '100 rows' },
|
|
36
40
|
];
|
|
37
41
|
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
}
|
|
47
|
-
|
|
48
|
-
}
|
|
49
|
-
});
|
|
42
|
+
const activeFilterCount = $derived(countActiveFilters(activeFilters));
|
|
43
|
+
|
|
44
|
+
const effectiveColumnFilters = $derived.by(() =>
|
|
45
|
+
resolveColumnFilters({
|
|
46
|
+
columnFilters,
|
|
47
|
+
columns,
|
|
48
|
+
filterItems,
|
|
49
|
+
activeFilters,
|
|
50
|
+
}),
|
|
51
|
+
);
|
|
50
52
|
|
|
51
53
|
// totalPages derived from totalItems and perPage
|
|
52
54
|
const totalPages = $derived(Math.max(1, Math.ceil(totalItems / perPage)));
|
|
@@ -210,8 +212,20 @@
|
|
|
210
212
|
}}
|
|
211
213
|
>
|
|
212
214
|
<!-- Funnel/filter icon (inline SVG) -->
|
|
213
|
-
<svg
|
|
214
|
-
|
|
215
|
+
<svg
|
|
216
|
+
class="h-4 w-4 shrink-0"
|
|
217
|
+
xmlns="http://www.w3.org/2000/svg"
|
|
218
|
+
fill="none"
|
|
219
|
+
viewBox="0 0 24 24"
|
|
220
|
+
stroke="currentColor"
|
|
221
|
+
aria-hidden="true"
|
|
222
|
+
>
|
|
223
|
+
<path
|
|
224
|
+
stroke-linecap="round"
|
|
225
|
+
stroke-linejoin="round"
|
|
226
|
+
stroke-width="2"
|
|
227
|
+
d="M3 4a1 1 0 011-1h16a1 1 0 011 1v2a1 1 0 01-.293.707L13 13.414V19a1 1 0 01-.553.894l-4 2A1 1 0 017 21v-7.586L3.293 6.707A1 1 0 013 6V4z"
|
|
228
|
+
/>
|
|
215
229
|
</svg>
|
|
216
230
|
<span class="text-sm">Filters</span>
|
|
217
231
|
</button>
|
|
@@ -259,7 +273,7 @@
|
|
|
259
273
|
|
|
260
274
|
<FiltersModal
|
|
261
275
|
bind:open={filtersVisible}
|
|
262
|
-
{
|
|
276
|
+
columnFilters={effectiveColumnFilters}
|
|
263
277
|
{activeFilters}
|
|
264
278
|
{onfilter}
|
|
265
279
|
{direction}
|
|
@@ -391,6 +405,31 @@
|
|
|
391
405
|
align-items: center;
|
|
392
406
|
gap: 0.25rem;
|
|
393
407
|
}
|
|
408
|
+
:global(.datatable-table thead th) {
|
|
409
|
+
position: relative;
|
|
410
|
+
}
|
|
411
|
+
:global(.datatable-table thead th .vtable-header-content) {
|
|
412
|
+
display: flex;
|
|
413
|
+
align-items: center;
|
|
414
|
+
justify-content: space-between;
|
|
415
|
+
gap: 0.25rem;
|
|
416
|
+
min-width: 0;
|
|
417
|
+
width: 100%;
|
|
418
|
+
}
|
|
419
|
+
:global(.datatable-table thead th .vtable-header-sort-button) {
|
|
420
|
+
appearance: none;
|
|
421
|
+
border: 0;
|
|
422
|
+
background: transparent;
|
|
423
|
+
color: inherit;
|
|
424
|
+
font: inherit;
|
|
425
|
+
letter-spacing: inherit;
|
|
426
|
+
text-transform: inherit;
|
|
427
|
+
padding: 0;
|
|
428
|
+
display: inline-flex;
|
|
429
|
+
align-items: center;
|
|
430
|
+
gap: 0.25rem;
|
|
431
|
+
text-align: left;
|
|
432
|
+
}
|
|
394
433
|
/* Allow certain long cells to wrap fully if explicitly requested */
|
|
395
434
|
:global(.datatable-table td.wrap) {
|
|
396
435
|
white-space: normal;
|
|
@@ -12,7 +12,9 @@ declare const DataTableControls: import("svelte").Component<{
|
|
|
12
12
|
onsearch?: any;
|
|
13
13
|
filtersVisible?: boolean;
|
|
14
14
|
onfilterstoggle?: any;
|
|
15
|
-
columnFilters?: any
|
|
15
|
+
columnFilters?: any;
|
|
16
|
+
columns?: any[];
|
|
17
|
+
filterItems?: any;
|
|
16
18
|
activeFilters?: Record<string, any>;
|
|
17
19
|
onfilter?: any;
|
|
18
20
|
direction?: string;
|
|
@@ -29,7 +31,9 @@ type $$ComponentProps = {
|
|
|
29
31
|
onsearch?: any;
|
|
30
32
|
filtersVisible?: boolean;
|
|
31
33
|
onfilterstoggle?: any;
|
|
32
|
-
columnFilters?: any
|
|
34
|
+
columnFilters?: any;
|
|
35
|
+
columns?: any[];
|
|
36
|
+
filterItems?: any;
|
|
33
37
|
activeFilters?: Record<string, any>;
|
|
34
38
|
onfilter?: any;
|
|
35
39
|
direction?: string;
|
package/dist/filterUtils.d.ts
CHANGED
|
@@ -1,6 +1,52 @@
|
|
|
1
1
|
/**
|
|
2
|
-
*
|
|
2
|
+
* Resolve a filter config's type from either ColumnDef.filterType or filter config type.
|
|
3
|
+
* @param {object|string|undefined|null} column
|
|
4
|
+
* @returns {string|undefined}
|
|
5
|
+
*/
|
|
6
|
+
export function getFilterType(column: object | string | undefined | null): string | undefined;
|
|
7
|
+
/**
|
|
8
|
+
* Check whether a column filter is date/datetime range based.
|
|
9
|
+
* @param {object|string|undefined|null} column
|
|
10
|
+
* @returns {boolean}
|
|
11
|
+
*/
|
|
12
|
+
export function isDateRangeColumn(column: object | string | undefined | null): boolean;
|
|
13
|
+
/**
|
|
14
|
+
* Return active filters excluding one column key.
|
|
15
|
+
* This is used by faceted option builders so a column's own active filter
|
|
16
|
+
* cannot remove the choices needed to change or clear that filter.
|
|
17
|
+
* @param {Object|null|undefined} activeFilters
|
|
18
|
+
* @param {string} excludedKey
|
|
19
|
+
* @returns {Object}
|
|
20
|
+
*/
|
|
21
|
+
export function filtersWithoutKey(activeFilters: any | null | undefined, excludedKey: string): any;
|
|
22
|
+
/**
|
|
23
|
+
* Resolve column filter configs from either explicit configs or a row source + columns.
|
|
24
|
+
* Explicit `columnFilters` always wins; otherwise `filterItems` is treated as the
|
|
25
|
+
* base source for derived option lists. In faceted mode, each column is built from
|
|
26
|
+
* rows filtered by the other active filters, but not by that column's own filter.
|
|
27
|
+
* @param {object} opts
|
|
28
|
+
* @param {Array|null|undefined} opts.columnFilters - Explicit filter configs.
|
|
29
|
+
* @param {Array} [opts.columns] - Column definitions used for derived filter configs.
|
|
30
|
+
* @param {Array|null|undefined} [opts.filterItems] - Base row source used to derive filter options.
|
|
31
|
+
* @param {Object|null|undefined} [opts.activeFilters] - Current active filter state.
|
|
32
|
+
* @param {boolean} [opts.enabled] - Whether derived filters should be built.
|
|
33
|
+
* @param {boolean} [opts.faceted] - Whether to derive each column from rows filtered by peer columns.
|
|
34
|
+
* @returns {Array}
|
|
3
35
|
*/
|
|
36
|
+
export function resolveColumnFilters({ columnFilters, columns, filterItems, activeFilters, enabled, faceted, }: {
|
|
37
|
+
columnFilters: any[] | null | undefined;
|
|
38
|
+
columns?: any[];
|
|
39
|
+
filterItems?: any[] | null | undefined;
|
|
40
|
+
activeFilters?: any | null | undefined;
|
|
41
|
+
enabled?: boolean;
|
|
42
|
+
faceted?: boolean;
|
|
43
|
+
}): any[];
|
|
44
|
+
/**
|
|
45
|
+
* Check whether a single filter value is active.
|
|
46
|
+
* @param {unknown} value
|
|
47
|
+
* @returns {boolean}
|
|
48
|
+
*/
|
|
49
|
+
export function hasActiveFilterValue(value: unknown): boolean;
|
|
4
50
|
/**
|
|
5
51
|
* Extract unique values and their counts from an array of objects for a given key
|
|
6
52
|
* @param {Array} data - Array of data objects
|
|
@@ -47,6 +93,12 @@ export function applyFilters(data: any[], activeFilters: any): any[];
|
|
|
47
93
|
* @returns {boolean} True if any filters are active
|
|
48
94
|
*/
|
|
49
95
|
export function hasActiveFilters(activeFilters: any): boolean;
|
|
96
|
+
/**
|
|
97
|
+
* Count one filter value. Value-list filters count each selected value; ranges count as 1.
|
|
98
|
+
* @param {unknown} value
|
|
99
|
+
* @returns {number}
|
|
100
|
+
*/
|
|
101
|
+
export function countActiveFilterValue(value: unknown): number;
|
|
50
102
|
/**
|
|
51
103
|
* Count total number of active filter selections.
|
|
52
104
|
* Each active date range counts as 1.
|
|
@@ -74,3 +126,11 @@ export function filtersToSearchParams(activeFilters: any): URLSearchParams;
|
|
|
74
126
|
* @returns {Object} Active filters object
|
|
75
127
|
*/
|
|
76
128
|
export function searchParamsToFilters(searchParams: URLSearchParams | string, columnFilters: any[]): any;
|
|
129
|
+
/**
|
|
130
|
+
* Utility functions for working with DataTableFilters
|
|
131
|
+
*/
|
|
132
|
+
export const DEFAULT_RELATIVE_RANGE_PRESETS: {
|
|
133
|
+
label: string;
|
|
134
|
+
value: number;
|
|
135
|
+
unit: string;
|
|
136
|
+
}[];
|