@svadmin/ui 0.136.0 → 0.137.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/dist/app.css +107 -2
- package/dist/app.theme.css +107 -2
- package/dist/components/AboutSettings.svelte +1 -1
- package/dist/components/Affix.svelte +17 -2
- package/dist/components/Affix.svelte.d.ts +2 -0
- package/dist/components/Anchor.svelte +33 -8
- package/dist/components/Anchor.svelte.d.ts +6 -2
- package/dist/components/AutoComplete.svelte +27 -3
- package/dist/components/AutoComplete.svelte.d.ts +3 -0
- package/dist/components/BackTop.svelte +18 -7
- package/dist/components/BackTop.svelte.d.ts +4 -0
- package/dist/components/Barcode.svelte +9 -2
- package/dist/components/Barcode.svelte.d.ts +2 -0
- package/dist/components/Breadcrumbs.svelte +21 -8
- package/dist/components/Breadcrumbs.svelte.d.ts +6 -2
- package/dist/components/Calendar.svelte +26 -4
- package/dist/components/Calendar.svelte.d.ts +4 -1
- package/dist/components/Carousel.svelte +30 -4
- package/dist/components/Carousel.svelte.d.ts +4 -0
- package/dist/components/Cascader.svelte +79 -17
- package/dist/components/Cascader.svelte.d.ts +9 -2
- package/dist/components/CheckCard.svelte +14 -4
- package/dist/components/CheckCard.svelte.d.ts +4 -2
- package/dist/components/Col.svelte +14 -10
- package/dist/components/Col.svelte.d.ts +2 -0
- package/dist/components/Collapse.svelte +67 -9
- package/dist/components/Collapse.svelte.d.ts +12 -4
- package/dist/components/ColorPicker.svelte +76 -14
- package/dist/components/ColorPicker.svelte.d.ts +6 -0
- package/dist/components/ConfigProvider.svelte +1 -0
- package/dist/components/ConfigProvider.svelte.d.ts +1 -0
- package/dist/components/ConfirmDialog.svelte +33 -8
- package/dist/components/ConfirmDialog.svelte.d.ts +5 -0
- package/dist/components/Countdown.svelte +49 -15
- package/dist/components/Countdown.svelte.d.ts +6 -2
- package/dist/components/DatePicker.svelte +36 -8
- package/dist/components/DatePicker.svelte.d.ts +8 -0
- package/dist/components/DateRangeInput.svelte +67 -4
- package/dist/components/DateRangeInput.svelte.d.ts +7 -0
- package/dist/components/DateTimeInput.svelte +19 -1
- package/dist/components/DateTimeInput.svelte.d.ts +4 -0
- package/dist/components/Divider.svelte +27 -4
- package/dist/components/Divider.svelte.d.ts +6 -0
- package/dist/components/DrawerForm.svelte +131 -43
- package/dist/components/DrawerForm.svelte.d.ts +14 -1
- package/dist/components/EditableTabs.svelte +1 -1
- package/dist/components/EllipsisText.svelte +31 -8
- package/dist/components/EllipsisText.svelte.d.ts +8 -0
- package/dist/components/EmptyState.svelte +25 -5
- package/dist/components/EmptyState.svelte.d.ts +6 -1
- package/dist/components/FileUpload.svelte +15 -5
- package/dist/components/FileUpload.svelte.d.ts +3 -0
- package/dist/components/FloatButton.svelte +4 -1
- package/dist/components/FloatButton.svelte.d.ts +1 -0
- package/dist/components/HighlightText.svelte +15 -3
- package/dist/components/HighlightText.svelte.d.ts +6 -0
- package/dist/components/Image.svelte +10 -4
- package/dist/components/Image.svelte.d.ts +1 -0
- package/dist/components/LightFilter.svelte +37 -17
- package/dist/components/LightFilter.svelte.d.ts +8 -2
- package/dist/components/Link.svelte +19 -8
- package/dist/components/Link.svelte.d.ts +3 -2
- package/dist/components/ListPagination.svelte +165 -27
- package/dist/components/ListPagination.svelte.d.ts +10 -3
- package/dist/components/MentionsInput.svelte +33 -3
- package/dist/components/MentionsInput.svelte.d.ts +5 -0
- package/dist/components/ModalForm.svelte +116 -48
- package/dist/components/ModalForm.svelte.d.ts +14 -1
- package/dist/components/OtpInput.svelte +40 -12
- package/dist/components/OtpInput.svelte.d.ts +4 -1
- package/dist/components/PageContainer.svelte +74 -22
- package/dist/components/PageContainer.svelte.d.ts +20 -4
- package/dist/components/PageHeader.svelte +47 -8
- package/dist/components/PageHeader.svelte.d.ts +7 -2
- package/dist/components/PasswordInput.svelte +42 -11
- package/dist/components/PasswordInput.svelte.d.ts +10 -3
- package/dist/components/Popconfirm.svelte +96 -17
- package/dist/components/Popconfirm.svelte.d.ts +13 -1
- package/dist/components/PresenceAvatarGroup.svelte +12 -4
- package/dist/components/PresenceAvatarGroup.svelte.d.ts +1 -1
- package/dist/components/ProCard.svelte +17 -0
- package/dist/components/ProCard.svelte.d.ts +6 -0
- package/dist/components/ProDescriptions.svelte +28 -12
- package/dist/components/ProDescriptions.svelte.d.ts +7 -3
- package/dist/components/ProSkeleton.svelte +17 -2
- package/dist/components/ProSkeleton.svelte.d.ts +7 -0
- package/dist/components/QRCode.svelte +51 -14
- package/dist/components/QRCode.svelte.d.ts +10 -0
- package/dist/components/QueryFilter.svelte +48 -9
- package/dist/components/QueryFilter.svelte.d.ts +16 -0
- package/dist/components/RadioGroup.svelte +86 -8
- package/dist/components/RadioGroup.svelte.d.ts +2 -0
- package/dist/components/RangeSlider.svelte +34 -7
- package/dist/components/RangeSlider.svelte.d.ts +4 -0
- package/dist/components/Rate.svelte +178 -15
- package/dist/components/Rate.svelte.d.ts +16 -0
- package/dist/components/ResizeBox.svelte +39 -9
- package/dist/components/ResizeBox.svelte.d.ts +3 -0
- package/dist/components/Result.svelte +34 -5
- package/dist/components/Result.svelte.d.ts +4 -2
- package/dist/components/Ribbon.svelte +8 -4
- package/dist/components/Ribbon.svelte.d.ts +1 -1
- package/dist/components/Row.svelte +21 -5
- package/dist/components/Row.svelte.d.ts +2 -2
- package/dist/components/RowActions.svelte +4 -0
- package/dist/components/SegmentedControl.svelte +70 -8
- package/dist/components/SegmentedControl.svelte.d.ts +6 -1
- package/dist/components/Slider.svelte +35 -8
- package/dist/components/Slider.svelte.d.ts +4 -0
- package/dist/components/Space.svelte +34 -7
- package/dist/components/Space.svelte.d.ts +3 -3
- package/dist/components/Spin.svelte +142 -9
- package/dist/components/Spin.svelte.d.ts +7 -2
- package/dist/components/Statistic.svelte +29 -6
- package/dist/components/Statistic.svelte.d.ts +5 -1
- package/dist/components/StatisticCard.svelte +20 -4
- package/dist/components/StatisticCard.svelte.d.ts +5 -1
- package/dist/components/Steps.svelte +28 -7
- package/dist/components/Steps.svelte.d.ts +8 -2
- package/dist/components/Tag.svelte +63 -6
- package/dist/components/Tag.svelte.d.ts +12 -3
- package/dist/components/TagsInput.svelte +42 -21
- package/dist/components/TagsInput.svelte.d.ts +4 -0
- package/dist/components/Timeline.svelte +54 -3
- package/dist/components/Timeline.svelte.d.ts +13 -1
- package/dist/components/TooltipButton.svelte +7 -3
- package/dist/components/TooltipButton.svelte.d.ts +4 -1
- package/dist/components/Tour.svelte +56 -6
- package/dist/components/Tour.svelte.d.ts +7 -0
- package/dist/components/Transfer.svelte +77 -20
- package/dist/components/Transfer.svelte.d.ts +11 -2
- package/dist/components/Tree.svelte +109 -26
- package/dist/components/Tree.svelte.d.ts +15 -2
- package/dist/components/TreeSelect.svelte +168 -97
- package/dist/components/TreeSelect.svelte.d.ts +11 -2
- package/dist/components/Typography.svelte +18 -2
- package/dist/components/Typography.svelte.d.ts +4 -1
- package/dist/components/TypographyText.svelte +10 -3
- package/dist/components/TypographyText.svelte.d.ts +3 -1
- package/dist/components/Watermark.svelte +15 -2
- package/dist/components/Watermark.svelte.d.ts +3 -0
- package/dist/components/content/DescriptionList.svelte +21 -8
- package/dist/components/content/DescriptionList.svelte.d.ts +3 -0
- package/dist/components/content/FilterToolbar.svelte +1 -0
- package/dist/components/ui/alert/alert.svelte +51 -7
- package/dist/components/ui/alert/alert.svelte.d.ts +8 -2
- package/dist/components/ui/avatar/avatar-variants.d.ts +1 -1
- package/dist/components/ui/avatar/avatar-variants.js +19 -7
- package/dist/components/ui/avatar/avatar.svelte +50 -3
- package/dist/components/ui/avatar/avatar.svelte.d.ts +5 -0
- package/dist/components/ui/badge/badge.svelte +27 -12
- package/dist/components/ui/badge/badge.svelte.d.ts +5 -2
- package/dist/components/ui/breadcrumb/breadcrumb-separator.svelte +4 -2
- package/dist/components/ui/breadcrumb/breadcrumb-separator.svelte.d.ts +1 -1
- package/dist/components/ui/button/button.svelte +100 -11
- package/dist/components/ui/button/button.svelte.d.ts +15 -2
- package/dist/components/ui/card/card.svelte +40 -4
- package/dist/components/ui/card/card.svelte.d.ts +5 -1
- package/dist/components/ui/checkbox/checkbox.svelte +71 -23
- package/dist/components/ui/checkbox/checkbox.svelte.d.ts +8 -1
- package/dist/components/ui/input/input.svelte +7 -4
- package/dist/components/ui/input/input.svelte.d.ts +2 -2
- package/dist/components/ui/progress/progress.svelte +122 -22
- package/dist/components/ui/progress/progress.svelte.d.ts +9 -1
- package/dist/components/ui/skeleton/index.d.ts +1 -1
- package/dist/components/ui/skeleton/skeleton.svelte +124 -6
- package/dist/components/ui/skeleton/skeleton.svelte.d.ts +19 -3
- package/dist/components/ui/switch/switch.svelte +44 -6
- package/dist/components/ui/switch/switch.svelte.d.ts +10 -3
- package/dist/components/ui/tabs/tabs-content.svelte +6 -1
- package/dist/components/ui/tabs/tabs-content.svelte.d.ts +1 -0
- package/dist/components/ui/tabs/tabs-context.svelte.d.ts +4 -1
- package/dist/components/ui/tabs/tabs-list.svelte +12 -3
- package/dist/components/ui/tabs/tabs-list.svelte.d.ts +4 -2
- package/dist/components/ui/tabs/tabs-trigger.svelte +11 -1
- package/dist/components/ui/tabs/tabs-trigger.svelte.d.ts +3 -0
- package/dist/components/ui/tabs/tabs.svelte +49 -5
- package/dist/components/ui/tabs/tabs.svelte.d.ts +10 -2
- package/dist/components/ui/textarea/textarea.svelte +17 -2
- package/dist/components/ui/textarea/textarea.svelte.d.ts +3 -1
- package/dist/components/ui/tooltip/tooltip-content.svelte +4 -1
- package/dist/components/ui/tooltip/tooltip-content.svelte.d.ts +1 -0
- package/dist/components/ui/tooltip/tooltip.svelte +14 -1
- package/dist/components.css +7 -2
- package/dist/index.d.ts +2 -2
- package/dist/index.js +1 -1
- package/dist/notifications.svelte.d.ts +6 -1
- package/dist/notifications.svelte.js +20 -4
- package/dist/page-chrome.css +5 -0
- package/package.json +1 -1
- package/dist/components/ui/tooltip/tooltip.svelte.d.ts +0 -25
|
@@ -11,12 +11,15 @@
|
|
|
11
11
|
import { useTranslation } from '@svadmin/core/i18n';
|
|
12
12
|
|
|
13
13
|
export interface TreeSelectOption {
|
|
14
|
-
value
|
|
15
|
-
|
|
14
|
+
value?: string | number;
|
|
15
|
+
key?: string | number;
|
|
16
|
+
label?: string;
|
|
17
|
+
title?: string;
|
|
16
18
|
children?: TreeSelectOption[];
|
|
17
19
|
hasChildren?: boolean;
|
|
18
20
|
disabled?: boolean;
|
|
19
21
|
expanded?: boolean;
|
|
22
|
+
[key: string]: unknown;
|
|
20
23
|
}
|
|
21
24
|
|
|
22
25
|
const i18n = useTranslation();
|
|
@@ -27,10 +30,13 @@
|
|
|
27
30
|
describedby?: string | undefined;
|
|
28
31
|
invalid?: boolean | undefined;
|
|
29
32
|
options?: TreeSelectOption[] | undefined;
|
|
33
|
+
treeData?: TreeSelectOption[] | undefined;
|
|
34
|
+
data?: TreeSelectOption[] | undefined;
|
|
30
35
|
value?: string | number | (string | number)[] | undefined;
|
|
31
36
|
multiple?: boolean | undefined;
|
|
32
37
|
placeholder?: string | undefined;
|
|
33
38
|
searchable?: boolean | undefined;
|
|
39
|
+
showSearch?: boolean | undefined;
|
|
34
40
|
onlyLeafSelectable?: boolean | undefined;
|
|
35
41
|
disabled?: boolean | undefined;
|
|
36
42
|
allowClear?: boolean | undefined;
|
|
@@ -38,8 +44,11 @@
|
|
|
38
44
|
virtualized?: boolean | undefined;
|
|
39
45
|
itemHeight?: number | undefined;
|
|
40
46
|
viewportHeight?: number | undefined;
|
|
47
|
+
size?: 'mini' | 'small' | 'default' | 'large' | undefined;
|
|
41
48
|
class?: string | undefined;
|
|
49
|
+
defaultValue?: string | number | (string | number)[] | undefined;
|
|
42
50
|
onchange?: (value: string | number | (string | number)[] | undefined) => void;
|
|
51
|
+
onChange?: (value: string | number | (string | number)[] | undefined) => void;
|
|
43
52
|
}
|
|
44
53
|
|
|
45
54
|
let {
|
|
@@ -48,12 +57,17 @@
|
|
|
48
57
|
describedby,
|
|
49
58
|
invalid = false,
|
|
50
59
|
options = $bindable([]),
|
|
60
|
+
treeData,
|
|
61
|
+
data,
|
|
51
62
|
value = $bindable(undefined),
|
|
63
|
+
defaultValue,
|
|
52
64
|
multiple = false,
|
|
53
65
|
placeholder,
|
|
54
66
|
searchable = true,
|
|
67
|
+
showSearch,
|
|
55
68
|
onlyLeafSelectable = false,
|
|
56
69
|
disabled = false,
|
|
70
|
+
size = 'default',
|
|
57
71
|
allowClear = true,
|
|
58
72
|
loadChildren,
|
|
59
73
|
virtualized = true,
|
|
@@ -61,8 +75,57 @@
|
|
|
61
75
|
viewportHeight = 280,
|
|
62
76
|
class: className,
|
|
63
77
|
onchange,
|
|
78
|
+
onChange,
|
|
64
79
|
}: Props = $props();
|
|
65
80
|
|
|
81
|
+
let initialTreeSelectSync = false;
|
|
82
|
+
$effect.pre(() => {
|
|
83
|
+
if (!initialTreeSelectSync) {
|
|
84
|
+
initialTreeSelectSync = true;
|
|
85
|
+
if (defaultValue !== undefined && value === undefined) {
|
|
86
|
+
value = defaultValue;
|
|
87
|
+
}
|
|
88
|
+
}
|
|
89
|
+
});
|
|
90
|
+
|
|
91
|
+
const effectiveSearchable = $derived(showSearch ?? searchable);
|
|
92
|
+
|
|
93
|
+
/** 归一化后 value / label 一定存在,渲染层按这个类型收窄。 */
|
|
94
|
+
type NormalizedTreeSelectOption = TreeSelectOption & {
|
|
95
|
+
value: string | number;
|
|
96
|
+
label: string;
|
|
97
|
+
children?: NormalizedTreeSelectOption[] | undefined;
|
|
98
|
+
};
|
|
99
|
+
|
|
100
|
+
/** 归一化后的键:宿主可以用 value 或 key,缺省退化为空串。 */
|
|
101
|
+
function optionKey(option: TreeSelectOption): string | number {
|
|
102
|
+
return option.value ?? option.key ?? '';
|
|
103
|
+
}
|
|
104
|
+
|
|
105
|
+
function normalizeTreeNodes(nodes: TreeSelectOption[]): NormalizedTreeSelectOption[] {
|
|
106
|
+
let changed = false;
|
|
107
|
+
const next = nodes.map((node) => {
|
|
108
|
+
const needsVal = node.value === undefined && node.key !== undefined;
|
|
109
|
+
const needsLab = node.label === undefined && node.title !== undefined;
|
|
110
|
+
const children = node.children ? normalizeTreeNodes(node.children) : undefined;
|
|
111
|
+
if (needsVal || needsLab || (children !== undefined && children !== node.children)) {
|
|
112
|
+
changed = true;
|
|
113
|
+
const nextChildren = children ?? node.children;
|
|
114
|
+
return {
|
|
115
|
+
...node,
|
|
116
|
+
value: node.value ?? node.key ?? '',
|
|
117
|
+
label: node.label ?? node.title ?? String(optionKey(node) ?? node.key ?? ''),
|
|
118
|
+
...(nextChildren === undefined ? {} : { children: nextChildren }),
|
|
119
|
+
};
|
|
120
|
+
}
|
|
121
|
+
return node as NormalizedTreeSelectOption;
|
|
122
|
+
});
|
|
123
|
+
return (changed ? next : nodes) as NormalizedTreeSelectOption[];
|
|
124
|
+
}
|
|
125
|
+
|
|
126
|
+
const rawInputOptions = $derived(treeData ?? data ?? options);
|
|
127
|
+
const effectiveOptions = $derived(normalizeTreeNodes(rawInputOptions));
|
|
128
|
+
|
|
66
129
|
const instanceId = $props.id();
|
|
67
130
|
const triggerId = $derived(id ?? `${instanceId}-trigger`);
|
|
68
131
|
const panelId = $derived(`${triggerId}-panel`);
|
|
@@ -92,7 +155,7 @@
|
|
|
92
155
|
let treeScrollTop = $state(0);
|
|
93
156
|
let treeRevision = $state(0);
|
|
94
157
|
const loads = new Map<string | number, ChildLoad>();
|
|
95
|
-
let observedOptions = untrack(() =>
|
|
158
|
+
let observedOptions = untrack(() => effectiveOptions);
|
|
96
159
|
let observedLoader = untrack(() => loadChildren);
|
|
97
160
|
interface SelectionAttempt {
|
|
98
161
|
key: string | number;
|
|
@@ -111,11 +174,11 @@
|
|
|
111
174
|
const map = new Map<string | number, TreeSelectOption>();
|
|
112
175
|
function traverse(nodes: TreeSelectOption[]) {
|
|
113
176
|
for (const node of nodes) {
|
|
114
|
-
map.set(node.
|
|
177
|
+
map.set(optionKey(node) ?? node.key ?? '', node);
|
|
115
178
|
if (node.children) traverse(node.children);
|
|
116
179
|
}
|
|
117
180
|
}
|
|
118
|
-
traverse(
|
|
181
|
+
traverse(effectiveOptions);
|
|
119
182
|
return map;
|
|
120
183
|
});
|
|
121
184
|
|
|
@@ -125,11 +188,11 @@
|
|
|
125
188
|
function visit(nodes: TreeSelectOption[], inherited: boolean): void {
|
|
126
189
|
for (const node of nodes) {
|
|
127
190
|
const unavailable = inherited || node.disabled === true;
|
|
128
|
-
if (unavailable) keys.add(node
|
|
191
|
+
if (unavailable) keys.add(optionKey(node));
|
|
129
192
|
if (node.children) visit(node.children, unavailable);
|
|
130
193
|
}
|
|
131
194
|
}
|
|
132
|
-
visit(
|
|
195
|
+
visit(effectiveOptions, false);
|
|
133
196
|
return keys;
|
|
134
197
|
});
|
|
135
198
|
|
|
@@ -146,8 +209,8 @@
|
|
|
146
209
|
$effect.pre(() => {
|
|
147
210
|
// 外部替换根数组开启新数据版本;内部补充子节点保留当前版本。
|
|
148
211
|
void disabledValues;
|
|
149
|
-
if (
|
|
150
|
-
observedOptions =
|
|
212
|
+
if (effectiveOptions !== observedOptions) {
|
|
213
|
+
observedOptions = effectiveOptions;
|
|
151
214
|
treeEpoch += 1;
|
|
152
215
|
treeRevision += 1;
|
|
153
216
|
expandedOverrides.clear();
|
|
@@ -199,13 +262,13 @@
|
|
|
199
262
|
}
|
|
200
263
|
|
|
201
264
|
function lacksLoadCapability(node: TreeSelectOption): boolean {
|
|
202
|
-
const current = optionMap.get(node
|
|
265
|
+
const current = optionMap.get(optionKey(node)) ?? node;
|
|
203
266
|
return hasChildren(current) && !current.children && !loadChildren;
|
|
204
267
|
}
|
|
205
268
|
|
|
206
269
|
// 祖先反馈只有在整个可交互子树仍存在缺失加载能力的分支时保留。
|
|
207
270
|
function subtreeLacksLoadCapability(node: TreeSelectOption, depth = 0): boolean {
|
|
208
|
-
const current = optionMap.get(node
|
|
271
|
+
const current = optionMap.get(optionKey(node)) ?? node;
|
|
209
272
|
if (current.disabled || depth > 64) return false;
|
|
210
273
|
if (hasChildren(current) && !current.children) return !loadChildren;
|
|
211
274
|
return (current.children ?? []).some(child => subtreeLacksLoadCapability(child, depth + 1));
|
|
@@ -213,8 +276,8 @@
|
|
|
213
276
|
|
|
214
277
|
function isNodeExpanded(node: TreeSelectOption): boolean {
|
|
215
278
|
if (searchQuery.trim()) return true; // Auto expand all on search
|
|
216
|
-
return expandedOverrides.has(node
|
|
217
|
-
? expandedOverrides.get(node
|
|
279
|
+
return expandedOverrides.has(optionKey(node))
|
|
280
|
+
? expandedOverrides.get(optionKey(node)) === true
|
|
218
281
|
: !!node.expanded;
|
|
219
282
|
}
|
|
220
283
|
|
|
@@ -230,10 +293,10 @@
|
|
|
230
293
|
}
|
|
231
294
|
|
|
232
295
|
function isNodeSelected(node: TreeSelectOption): boolean {
|
|
233
|
-
node = optionMap.get(node
|
|
234
|
-
if (!multiple || !hasChildren(node)) return isSelected(node
|
|
296
|
+
node = optionMap.get(optionKey(node)) ?? node;
|
|
297
|
+
if (!multiple || !hasChildren(node)) return isSelected(optionKey(node));
|
|
235
298
|
const leaves = selectableLeaves(node);
|
|
236
|
-
return leaves.length > 0 && !hasUnloadedDescendants(node) && leaves.every((leaf) => isSelected(leaf
|
|
299
|
+
return leaves.length > 0 && !hasUnloadedDescendants(node) && leaves.every((leaf) => isSelected(optionKey(leaf)));
|
|
237
300
|
}
|
|
238
301
|
|
|
239
302
|
function hasUnloadedDescendants(node: TreeSelectOption): boolean {
|
|
@@ -243,17 +306,17 @@
|
|
|
243
306
|
}
|
|
244
307
|
|
|
245
308
|
function isPartiallySelected(node: TreeSelectOption): boolean {
|
|
246
|
-
node = optionMap.get(node
|
|
309
|
+
node = optionMap.get(optionKey(node)) ?? node;
|
|
247
310
|
if (!multiple || !hasChildren(node)) return false;
|
|
248
311
|
const leaves = selectableLeaves(node);
|
|
249
|
-
const count = leaves.filter((leaf) => isSelected(leaf
|
|
312
|
+
const count = leaves.filter((leaf) => isSelected(optionKey(leaf))).length;
|
|
250
313
|
return count > 0 && (count < leaves.length || hasUnloadedDescendants(node));
|
|
251
314
|
}
|
|
252
315
|
|
|
253
316
|
function updateOptionsChildren(nodes: TreeSelectOption[], target: string | number, children: TreeSelectOption[]): TreeSelectOption[] {
|
|
254
317
|
let changed = false;
|
|
255
318
|
const next = nodes.map((node) => {
|
|
256
|
-
if (node
|
|
319
|
+
if (optionKey(node) === target) {
|
|
257
320
|
changed = true;
|
|
258
321
|
return { ...node, children, hasChildren: children.length > 0 };
|
|
259
322
|
}
|
|
@@ -263,19 +326,19 @@
|
|
|
263
326
|
changed = true;
|
|
264
327
|
return { ...node, children: updated };
|
|
265
328
|
});
|
|
266
|
-
return changed ? next : nodes;
|
|
329
|
+
return (changed ? next : nodes) as NormalizedTreeSelectOption[];
|
|
267
330
|
}
|
|
268
331
|
|
|
269
332
|
async function ensureChildren(node: TreeSelectOption, selection?: SelectionAttempt): Promise<boolean> {
|
|
270
|
-
if (!mounted || disabled || disabledValues.has(node
|
|
271
|
-
const existing = loads.get(node
|
|
333
|
+
if (!mounted || disabled || disabledValues.has(optionKey(node))) return false;
|
|
334
|
+
const existing = loads.get(optionKey(node));
|
|
272
335
|
if (existing) {
|
|
273
336
|
if (selection) existing.selection = selection;
|
|
274
337
|
return existing.promise;
|
|
275
338
|
}
|
|
276
|
-
if (loadingValues.has(node
|
|
339
|
+
if (loadingValues.has(optionKey(node))) return false;
|
|
277
340
|
if (!node.hasChildren || node.children) return true;
|
|
278
|
-
const currentNode = optionMap.get(node
|
|
341
|
+
const currentNode = optionMap.get(optionKey(node));
|
|
279
342
|
if (!loadChildren || !currentNode) return false;
|
|
280
343
|
const request: ChildLoad = {
|
|
281
344
|
node: currentNode,
|
|
@@ -285,27 +348,27 @@
|
|
|
285
348
|
promise: Promise.resolve(false),
|
|
286
349
|
retrying: false,
|
|
287
350
|
};
|
|
288
|
-
loads.set(node
|
|
289
|
-
const current = () => mounted && !disabled && loads.get(node
|
|
351
|
+
loads.set(optionKey(node), request);
|
|
352
|
+
const current = () => mounted && !disabled && loads.get(optionKey(node)) === request
|
|
290
353
|
&& options === observedOptions && treeEpoch === request.treeEpoch
|
|
291
|
-
&& optionMap.has(node
|
|
292
|
-
loadingValues.add(node
|
|
293
|
-
loadErrors.delete(node
|
|
354
|
+
&& optionMap.has(optionKey(node)) && !disabledValues.has(optionKey(node)) && loadChildren === request.loader;
|
|
355
|
+
loadingValues.add(optionKey(node));
|
|
356
|
+
loadErrors.delete(optionKey(node));
|
|
294
357
|
// 展开和级联选择共享包含归属校验、写入与清理的完整请求结果。
|
|
295
358
|
request.promise = (async () => {
|
|
296
359
|
try {
|
|
297
360
|
const children = await request.loader(request.node);
|
|
298
361
|
if (!current()) return false;
|
|
299
|
-
options = updateOptionsChildren(options, node
|
|
300
|
-
observedOptions = options;
|
|
362
|
+
options = updateOptionsChildren(options, optionKey(node), children);
|
|
363
|
+
observedOptions = options as NormalizedTreeSelectOption[];
|
|
301
364
|
return true;
|
|
302
365
|
} catch {
|
|
303
|
-
if (current()) loadErrors.set(node
|
|
366
|
+
if (current()) loadErrors.set(optionKey(node), request);
|
|
304
367
|
return false;
|
|
305
368
|
} finally {
|
|
306
|
-
if (mounted && loads.get(node
|
|
307
|
-
loads.delete(node
|
|
308
|
-
loadingValues.delete(node
|
|
369
|
+
if (mounted && loads.get(optionKey(node)) === request) {
|
|
370
|
+
loads.delete(optionKey(node));
|
|
371
|
+
loadingValues.delete(optionKey(node));
|
|
309
372
|
}
|
|
310
373
|
}
|
|
311
374
|
})();
|
|
@@ -314,16 +377,16 @@
|
|
|
314
377
|
|
|
315
378
|
async function toggleExpandAsync(node: TreeSelectOption, event?: MouseEvent): Promise<void> {
|
|
316
379
|
event?.stopPropagation();
|
|
317
|
-
if (!mounted || disabled || disabledValues.has(node
|
|
318
|
-
if (loadingValues.has(node
|
|
380
|
+
if (!mounted || disabled || disabledValues.has(optionKey(node))) return;
|
|
381
|
+
if (loadingValues.has(optionKey(node))) return;
|
|
319
382
|
if (lacksLoadCapability(node)) {
|
|
320
|
-
capabilityErrors.add(node
|
|
383
|
+
capabilityErrors.add(optionKey(node));
|
|
321
384
|
return;
|
|
322
385
|
}
|
|
323
|
-
capabilityErrors.delete(node
|
|
386
|
+
capabilityErrors.delete(optionKey(node));
|
|
324
387
|
if (!await ensureChildren(node)) return;
|
|
325
388
|
if (!mounted || disabled) return;
|
|
326
|
-
toggleExpand(node
|
|
389
|
+
toggleExpand(optionKey(node));
|
|
327
390
|
}
|
|
328
391
|
|
|
329
392
|
function ownerTreeItem(event: Event): HTMLElement | null {
|
|
@@ -336,22 +399,23 @@
|
|
|
336
399
|
event.stopPropagation();
|
|
337
400
|
const owner = ownerTreeItem(event);
|
|
338
401
|
owner?.focus();
|
|
339
|
-
if (selectionErrors.has(node
|
|
402
|
+
if (selectionErrors.has(optionKey(node))) void handleSelect(node);
|
|
340
403
|
else void toggleExpandAsync(node);
|
|
341
|
-
const request = loads.get(node
|
|
404
|
+
const request = loads.get(optionKey(node));
|
|
342
405
|
if (request) request.retrying = true;
|
|
343
406
|
}
|
|
344
407
|
|
|
345
408
|
function setMultipleSelection(node: TreeSelectOption): void {
|
|
346
409
|
const leaves = selectableLeaves(node);
|
|
347
410
|
if (leaves.length === 0) return;
|
|
348
|
-
const leafValues = new Set(leaves.map((leaf) => leaf
|
|
349
|
-
const shouldRemove = leaves.length > 0 && leaves.every((leaf) => isSelected(leaf
|
|
411
|
+
const leafValues = new Set(leaves.map((leaf) => optionKey(leaf)));
|
|
412
|
+
const shouldRemove = leaves.length > 0 && leaves.every((leaf) => isSelected(optionKey(leaf)));
|
|
350
413
|
const next = shouldRemove
|
|
351
414
|
? selectedValues.filter((value) => !leafValues.has(value))
|
|
352
|
-
: [...selectedValues, ...leaves.map((leaf) => leaf
|
|
415
|
+
: [...selectedValues, ...leaves.map((leaf) => optionKey(leaf)).filter((value) => !isSelected(value))];
|
|
353
416
|
value = next;
|
|
354
417
|
onchange?.(next);
|
|
418
|
+
onChange?.(next);
|
|
355
419
|
}
|
|
356
420
|
|
|
357
421
|
function isCurrentSelection(attempt: SelectionAttempt): boolean {
|
|
@@ -362,11 +426,11 @@
|
|
|
362
426
|
}
|
|
363
427
|
|
|
364
428
|
async function selectSubtree(node: TreeSelectOption): Promise<void> {
|
|
365
|
-
if (selectionAttempt?.key === node
|
|
366
|
-
const attempt: SelectionAttempt = { key: node
|
|
429
|
+
if (selectionAttempt?.key === optionKey(node) && isCurrentSelection(selectionAttempt)) return;
|
|
430
|
+
const attempt: SelectionAttempt = { key: optionKey(node), epoch: treeEpoch, loader: loadChildren, value };
|
|
367
431
|
selectionAttempt = attempt;
|
|
368
|
-
selectionErrors.delete(node
|
|
369
|
-
capabilityErrors.delete(node
|
|
432
|
+
selectionErrors.delete(optionKey(node));
|
|
433
|
+
capabilityErrors.delete(optionKey(node));
|
|
370
434
|
let visited = 0;
|
|
371
435
|
let requests = 0;
|
|
372
436
|
let missingCapability = false;
|
|
@@ -387,20 +451,20 @@
|
|
|
387
451
|
const loaded = optionMap.get(key);
|
|
388
452
|
if (!loaded) return false;
|
|
389
453
|
for (const child of loaded.children ?? []) {
|
|
390
|
-
if (!await loadSubtree(child
|
|
454
|
+
if (!await loadSubtree(optionKey(child), depth + 1)) return false;
|
|
391
455
|
}
|
|
392
456
|
return true;
|
|
393
457
|
}
|
|
394
458
|
try {
|
|
395
|
-
if (!await loadSubtree(node
|
|
459
|
+
if (!await loadSubtree(optionKey(node), 0)) {
|
|
396
460
|
if (isCurrentSelection(attempt)) {
|
|
397
|
-
if (missingCapability) capabilityErrors.add(node
|
|
398
|
-
else selectionErrors.add(node
|
|
461
|
+
if (missingCapability) capabilityErrors.add(optionKey(node));
|
|
462
|
+
else selectionErrors.add(optionKey(node));
|
|
399
463
|
}
|
|
400
464
|
return;
|
|
401
465
|
}
|
|
402
466
|
if (isCurrentSelection(attempt)) {
|
|
403
|
-
const loaded = optionMap.get(node
|
|
467
|
+
const loaded = optionMap.get(optionKey(node));
|
|
404
468
|
if (loaded) setMultipleSelection(loaded);
|
|
405
469
|
}
|
|
406
470
|
} finally {
|
|
@@ -409,9 +473,9 @@
|
|
|
409
473
|
}
|
|
410
474
|
|
|
411
475
|
async function handleSelect(node: TreeSelectOption): Promise<void> {
|
|
412
|
-
node = optionMap.get(node
|
|
413
|
-
if (disabled || disabledValues.has(node
|
|
414
|
-
if (selectionAttempt?.key === node
|
|
476
|
+
node = optionMap.get(optionKey(node)) ?? node;
|
|
477
|
+
if (disabled || disabledValues.has(optionKey(node))) return;
|
|
478
|
+
if (selectionAttempt?.key === optionKey(node) && isCurrentSelection(selectionAttempt)) return;
|
|
415
479
|
const nodeHasChildren = hasChildren(node);
|
|
416
480
|
if (onlyLeafSelectable && nodeHasChildren) {
|
|
417
481
|
await toggleExpandAsync(node);
|
|
@@ -423,29 +487,31 @@
|
|
|
423
487
|
if (hasUnloadedDescendants(node)) await selectSubtree(node);
|
|
424
488
|
else {
|
|
425
489
|
selectionAttempt = undefined;
|
|
426
|
-
selectionErrors.delete(node
|
|
490
|
+
selectionErrors.delete(optionKey(node));
|
|
427
491
|
setMultipleSelection(node);
|
|
428
492
|
}
|
|
429
493
|
}
|
|
430
494
|
else {
|
|
431
495
|
selectionAttempt = undefined;
|
|
432
|
-
const next = isSelected(node
|
|
433
|
-
? selectedValues.filter((selected) => selected !== node
|
|
434
|
-
: [...selectedValues, node
|
|
496
|
+
const next = isSelected(optionKey(node))
|
|
497
|
+
? selectedValues.filter((selected) => selected !== optionKey(node))
|
|
498
|
+
: [...selectedValues, optionKey(node)];
|
|
435
499
|
value = next;
|
|
436
500
|
onchange?.(next);
|
|
501
|
+
onChange?.(next);
|
|
437
502
|
}
|
|
438
503
|
} else {
|
|
439
|
-
const next = node
|
|
504
|
+
const next = optionKey(node);
|
|
440
505
|
value = next;
|
|
441
506
|
onchange?.(next);
|
|
507
|
+
onChange?.(next);
|
|
442
508
|
open = false;
|
|
443
509
|
}
|
|
444
510
|
}
|
|
445
511
|
|
|
446
512
|
function findParent(nodes: TreeSelectOption[], target: string | number, parent?: TreeSelectOption): TreeSelectOption | undefined {
|
|
447
513
|
for (const node of nodes) {
|
|
448
|
-
if (node
|
|
514
|
+
if (optionKey(node) === target) return parent;
|
|
449
515
|
const match = node.children ? findParent(node.children, target, node) : undefined;
|
|
450
516
|
if (match) return match;
|
|
451
517
|
}
|
|
@@ -461,7 +527,7 @@
|
|
|
461
527
|
}
|
|
462
528
|
|
|
463
529
|
async function focusTreeNode(valueToFocus: string | number): Promise<void> {
|
|
464
|
-
const index = flatVisibleNodes.findIndex(entry => entry.node
|
|
530
|
+
const index = flatVisibleNodes.findIndex(entry => optionKey(entry.node) === valueToFocus);
|
|
465
531
|
if (index < 0) return;
|
|
466
532
|
if (shouldVirtualize && treeRoot) {
|
|
467
533
|
const top = index * rowHeight;
|
|
@@ -477,9 +543,9 @@
|
|
|
477
543
|
}
|
|
478
544
|
|
|
479
545
|
function focusSibling(nodeValue: string | number, offset: number): void {
|
|
480
|
-
const index = flatVisibleNodes.findIndex(entry => entry.node
|
|
546
|
+
const index = flatVisibleNodes.findIndex(entry => optionKey(entry.node) === nodeValue);
|
|
481
547
|
const target = flatVisibleNodes[index + offset];
|
|
482
|
-
if (target) void focusTreeNode(target.node
|
|
548
|
+
if (target) void focusTreeNode(optionKey(target.node));
|
|
483
549
|
}
|
|
484
550
|
|
|
485
551
|
async function handleOpenAutoFocus(event: Event): Promise<void> {
|
|
@@ -489,12 +555,12 @@
|
|
|
489
555
|
await tick();
|
|
490
556
|
const panel = panelElement;
|
|
491
557
|
if (!mounted || !open || !panel || !panel.isConnected || panel.contains(document.activeElement)) return;
|
|
492
|
-
if (
|
|
558
|
+
if (effectiveSearchable && searchElement) {
|
|
493
559
|
searchElement.focus();
|
|
494
560
|
return;
|
|
495
561
|
}
|
|
496
562
|
const first = flatVisibleNodes[0];
|
|
497
|
-
if (first) await focusTreeNode(first.node
|
|
563
|
+
if (first) await focusTreeNode(optionKey(first.node));
|
|
498
564
|
if (!mounted || !open || panelElement !== panel || !panel.isConnected) return;
|
|
499
565
|
if (!panel.contains(document.activeElement)) panel.focus();
|
|
500
566
|
}
|
|
@@ -537,52 +603,52 @@
|
|
|
537
603
|
const first = flatVisibleNodes[0];
|
|
538
604
|
if (!first) return;
|
|
539
605
|
event.preventDefault();
|
|
540
|
-
void focusTreeNode(first.node
|
|
606
|
+
void focusTreeNode(optionKey(first.node));
|
|
541
607
|
}
|
|
542
608
|
|
|
543
609
|
function handleTreeKeydown(event: KeyboardEvent, node: TreeSelectOption, expanded: boolean): void {
|
|
544
610
|
if (event.target !== event.currentTarget || event.isComposing || event.altKey || event.ctrlKey || event.metaKey || event.shiftKey) return;
|
|
545
|
-
const sourceNode = optionMap.get(node
|
|
611
|
+
const sourceNode = optionMap.get(optionKey(node)) ?? node;
|
|
546
612
|
const nodeHasChildren = hasChildren(sourceNode);
|
|
547
613
|
if (event.key === 'Enter' || event.key === ' ') {
|
|
548
614
|
event.preventDefault();
|
|
549
|
-
if (loads.get(node
|
|
550
|
-
if (loadErrors.has(node
|
|
615
|
+
if (loads.get(optionKey(node))?.retrying) return;
|
|
616
|
+
if (loadErrors.has(optionKey(node)) || selectionErrors.has(optionKey(node))) retryChildren(sourceNode, event);
|
|
551
617
|
else void handleSelect(node);
|
|
552
618
|
} else if (event.key === 'ArrowDown') {
|
|
553
619
|
event.preventDefault();
|
|
554
|
-
focusSibling(node
|
|
620
|
+
focusSibling(optionKey(node), 1);
|
|
555
621
|
} else if (event.key === 'ArrowUp') {
|
|
556
622
|
event.preventDefault();
|
|
557
|
-
focusSibling(node
|
|
623
|
+
focusSibling(optionKey(node), -1);
|
|
558
624
|
} else if (event.key === 'Home') {
|
|
559
625
|
event.preventDefault();
|
|
560
626
|
const first = flatVisibleNodes[0];
|
|
561
|
-
if (first) void focusTreeNode(first.node
|
|
627
|
+
if (first) void focusTreeNode(optionKey(first.node));
|
|
562
628
|
} else if (event.key === 'End') {
|
|
563
629
|
event.preventDefault();
|
|
564
630
|
const last = flatVisibleNodes[flatVisibleNodes.length - 1];
|
|
565
|
-
if (last) void focusTreeNode(last.node
|
|
631
|
+
if (last) void focusTreeNode(optionKey(last.node));
|
|
566
632
|
} else if (event.key === 'ArrowRight' && nodeHasChildren) {
|
|
567
633
|
event.preventDefault();
|
|
568
|
-
if (disabled || disabledValues.has(sourceNode
|
|
634
|
+
if (disabled || disabledValues.has(optionKey(sourceNode))) return;
|
|
569
635
|
if (searchQuery.trim() && !sourceNode.children) {
|
|
570
|
-
if (lacksLoadCapability(sourceNode)) capabilityErrors.add(sourceNode
|
|
636
|
+
if (lacksLoadCapability(sourceNode)) capabilityErrors.add(optionKey(sourceNode));
|
|
571
637
|
else void ensureChildren(sourceNode);
|
|
572
638
|
}
|
|
573
639
|
else if (!expanded) void toggleExpandAsync(sourceNode);
|
|
574
640
|
else {
|
|
575
|
-
const index = flatVisibleNodes.findIndex(entry => entry.node
|
|
641
|
+
const index = flatVisibleNodes.findIndex(entry => optionKey(entry.node) === optionKey(node));
|
|
576
642
|
const current = flatVisibleNodes[index];
|
|
577
643
|
const next = flatVisibleNodes[index + 1];
|
|
578
|
-
if (current && next && next.level > current.level) void focusTreeNode(next.node
|
|
644
|
+
if (current && next && next.level > current.level) void focusTreeNode(optionKey(next.node));
|
|
579
645
|
}
|
|
580
646
|
} else if (event.key === 'ArrowLeft') {
|
|
581
647
|
event.preventDefault();
|
|
582
|
-
if (nodeHasChildren && expanded) toggleExpand(node
|
|
648
|
+
if (nodeHasChildren && expanded) toggleExpand(optionKey(node));
|
|
583
649
|
else {
|
|
584
|
-
const parent = findParent(options, node
|
|
585
|
-
if (parent) void focusTreeNode(parent
|
|
650
|
+
const parent = findParent(options, optionKey(node));
|
|
651
|
+
if (parent) void focusTreeNode(optionKey(parent));
|
|
586
652
|
}
|
|
587
653
|
}
|
|
588
654
|
}
|
|
@@ -595,6 +661,7 @@
|
|
|
595
661
|
const next = multiple ? [] : undefined;
|
|
596
662
|
value = next;
|
|
597
663
|
onchange?.(next);
|
|
664
|
+
onChange?.(next);
|
|
598
665
|
triggerElement?.focus();
|
|
599
666
|
}
|
|
600
667
|
|
|
@@ -607,17 +674,18 @@
|
|
|
607
674
|
const next = selectedValues.filter((v) => v !== val);
|
|
608
675
|
value = next;
|
|
609
676
|
onchange?.(next);
|
|
677
|
+
onChange?.(next);
|
|
610
678
|
}
|
|
611
679
|
triggerElement?.focus();
|
|
612
680
|
}
|
|
613
681
|
|
|
614
|
-
function filterTree(nodes:
|
|
682
|
+
function filterTree(nodes: NormalizedTreeSelectOption[], query: string): NormalizedTreeSelectOption[] {
|
|
615
683
|
const q = query.trim().toLowerCase();
|
|
616
684
|
if (!q) return nodes;
|
|
617
685
|
|
|
618
|
-
const filtered:
|
|
686
|
+
const filtered: NormalizedTreeSelectOption[] = [];
|
|
619
687
|
for (const node of nodes) {
|
|
620
|
-
const matchSelf = node.label.toLowerCase().includes(q);
|
|
688
|
+
const matchSelf = (node.label ?? node.title ?? '').toLowerCase().includes(q);
|
|
621
689
|
const filteredChildren = node.children ? filterTree(node.children, q) : undefined;
|
|
622
690
|
const matchChildren = filteredChildren && filteredChildren.length > 0;
|
|
623
691
|
|
|
@@ -631,17 +699,17 @@
|
|
|
631
699
|
return filtered;
|
|
632
700
|
}
|
|
633
701
|
|
|
634
|
-
const visibleOptions = $derived(filterTree(
|
|
702
|
+
const visibleOptions = $derived(filterTree(effectiveOptions, searchQuery));
|
|
635
703
|
|
|
636
704
|
interface VisibleNode {
|
|
637
|
-
node:
|
|
705
|
+
node: NormalizedTreeSelectOption;
|
|
638
706
|
level: number;
|
|
639
707
|
position: number;
|
|
640
708
|
size: number;
|
|
641
709
|
}
|
|
642
710
|
const flatVisibleNodes = $derived.by(() => {
|
|
643
711
|
const result: VisibleNode[] = [];
|
|
644
|
-
function visit(nodes:
|
|
712
|
+
function visit(nodes: NormalizedTreeSelectOption[], level: number): void {
|
|
645
713
|
nodes.forEach((node, index) => {
|
|
646
714
|
result.push({ node, level, position: index + 1, size: nodes.length });
|
|
647
715
|
if (hasChildren(node) && isNodeExpanded(node) && node.children) visit(node.children, level + 1);
|
|
@@ -661,9 +729,9 @@
|
|
|
661
729
|
? flatVisibleNodes.slice(virtualStart, virtualEnd)
|
|
662
730
|
: flatVisibleNodes);
|
|
663
731
|
// 当前节点被过滤、折叠或滚出渲染窗口时,仍保留一个有效的 Tab 入口。
|
|
664
|
-
const tabStopValue = $derived(renderedNodes.some(entry => entry.node
|
|
732
|
+
const tabStopValue = $derived(renderedNodes.some(entry => optionKey(entry.node) === activeTreeValue)
|
|
665
733
|
? activeTreeValue
|
|
666
|
-
: renderedNodes[0]?.node.
|
|
734
|
+
: renderedNodes[0]?.node === undefined ? undefined : optionKey(renderedNodes[0].node));
|
|
667
735
|
|
|
668
736
|
$effect(() => {
|
|
669
737
|
// 搜索和外部数据替换从顶部开始;折叠或数据缩短只钳制窗口。
|
|
@@ -680,7 +748,7 @@
|
|
|
680
748
|
});
|
|
681
749
|
</script>
|
|
682
750
|
|
|
683
|
-
{#snippet treeNode(node:
|
|
751
|
+
{#snippet treeNode(node: NormalizedTreeSelectOption, level: number, position: number, size: number, recursive = true)}
|
|
684
752
|
{@const nodeHasChildren = hasChildren(optionMap.get(node.value) ?? node)}
|
|
685
753
|
{@const expanded = isNodeExpanded(node)}
|
|
686
754
|
{@const selected = isNodeSelected(node)}
|
|
@@ -768,7 +836,7 @@
|
|
|
768
836
|
|
|
769
837
|
{#if recursive && nodeHasChildren && expanded && node.children}
|
|
770
838
|
<div id={`${currentNodeId}-group`} role="group" class="flex flex-col">
|
|
771
|
-
{#each node.children as child, index (treeKey(child.value))}
|
|
839
|
+
{#each node.children as child, index (treeKey(child.value ?? child.key ?? ''))}
|
|
772
840
|
{@render treeNode(child, level + 1, index + 1, node.children.length)}
|
|
773
841
|
{/each}
|
|
774
842
|
</div>
|
|
@@ -778,7 +846,7 @@
|
|
|
778
846
|
|
|
779
847
|
<svelte:window onfocusin={handleWindowFocusIn} />
|
|
780
848
|
|
|
781
|
-
<div class={cn('relative w-full', className)} data-testid="tree-select">
|
|
849
|
+
<div class={cn('relative w-full', className)} data-size={size} data-testid="tree-select">
|
|
782
850
|
<Popover.Root bind:open>
|
|
783
851
|
<Popover.Trigger id={triggerId} {disabled} class="w-full">
|
|
784
852
|
{#snippet child({ props })}
|
|
@@ -788,6 +856,9 @@
|
|
|
788
856
|
class={cn(
|
|
789
857
|
'tree-select-control',
|
|
790
858
|
'flex min-h-9 w-full items-center justify-between rounded-md border border-input bg-background px-3 py-1.5 text-xs ring-offset-background placeholder:text-muted-foreground focus:outline-hidden focus:ring-2 focus:ring-ring focus:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50 text-left',
|
|
859
|
+
size === 'mini' && 'min-h-6 h-6 px-2 text-[11px]',
|
|
860
|
+
size === 'small' && 'min-h-7 h-7 px-2.5 text-xs',
|
|
861
|
+
size === 'large' && 'min-h-10 h-10 px-3.5 text-sm',
|
|
791
862
|
open && 'ring-2 ring-ring ring-offset-2'
|
|
792
863
|
)}
|
|
793
864
|
>
|
|
@@ -863,7 +934,7 @@
|
|
|
863
934
|
{#snippet child({ props, wrapperProps })}
|
|
864
935
|
<div {...wrapperProps}>
|
|
865
936
|
<div {...props} id={panelId} bind:this={panelElement}>
|
|
866
|
-
{#if
|
|
937
|
+
{#if effectiveSearchable}
|
|
867
938
|
<div class="relative mb-2">
|
|
868
939
|
<Search class="absolute left-2.5 top-2.5 h-3.5 w-3.5 text-muted-foreground" />
|
|
869
940
|
<Input
|
|
@@ -893,13 +964,13 @@
|
|
|
893
964
|
{#if shouldVirtualize}
|
|
894
965
|
<div style={`height:${totalHeight}px;position:relative;`}>
|
|
895
966
|
<div style={`position:absolute;top:${virtualStart * rowHeight}px;left:0;right:0;`}>
|
|
896
|
-
{#each renderedNodes as entry (treeKey(entry.node
|
|
967
|
+
{#each renderedNodes as entry (treeKey(optionKey(entry.node)))}
|
|
897
968
|
{@render treeNode(entry.node, entry.level, entry.position, entry.size, false)}
|
|
898
969
|
{/each}
|
|
899
970
|
</div>
|
|
900
971
|
</div>
|
|
901
972
|
{:else if visibleOptions.length > 0}
|
|
902
|
-
{#each visibleOptions as rootNode, index (treeKey(rootNode
|
|
973
|
+
{#each visibleOptions as rootNode, index (treeKey(optionKey(rootNode)))}
|
|
903
974
|
{@render treeNode(rootNode, 0, index + 1, visibleOptions.length)}
|
|
904
975
|
{/each}
|
|
905
976
|
{:else}
|