@ryuzaki13/react-foundation-ui 1.3.0 → 1.3.2

package/dist/tree-select/index.js

@@ -9,39 +9,45 @@ import { flattenODataDependentServices as y, sortODataDependentSegmentItemsByCha
 import { cn as C } from "@ryuzaki13/react-foundation-lib/utils";
 import { CheckIcon as w, ChevronRightIcon as T, MinusIcon as ne, XIcon as re } from "lucide-react";
 import { Fragment as ie, jsx as E, jsxs as D } from "react/jsx-runtime";
+import { compareStrings as O } from "@ryuzaki13/react-foundation-lib/string-comparison";
 //#region src/tree-select/helpers.ts
-function O(e) {
+function k(e) {
 	return e ? { [e.codeKey]: [e.value] } : {};
 }
 //#endregion
 //#region src/tree-select/model/buildODataTreeNodes.ts
-function k(e, t, n) {
+function A(e, t, n) {
 	return e ? `${e}/${t}:${n}` : `${t}:${n}`;
 }
-function A(e, t, n) {
+function j(e, t, n) {
 	let r = n[t];
 	return r && e[r] || e[t];
 }
-function j(e) {
+function ae(e) {
 	return [...new Set(e.filter(Boolean))].join(" ");
 }
-function ae(e) {
+function oe(e) {
 	return {
-		id: k(e.parentId, e.codeKey, e.value),
+		id: A(e.parentId, e.codeKey, e.value),
 		codeKey: e.codeKey,
 		value: e.value,
 		label: e.label,
 		code: e.code,
-		searchText: j([
+		searchText: ae([
 			e.value,
 			e.label,
 			e.code
 		]),
+		sortCode: e.sortCode,
 		children: [],
 		childByBranchKey: /* @__PURE__ */ new Map()
 	};
 }
-function oe(e) {
+function se(e, t) {
+	e.sort((e, n) => O(t ? e.sortCode : e.label, t ? n.sortCode : n.label) || O(e.sortCode, n.sortCode));
+	for (let n of e) se(n.children, t);
+}
+function ce(e) {
 	return {
 		id: e.id,
 		codeKey: e.codeKey,
@@ -49,55 +55,56 @@ function oe(e) {
 		label: e.label,
 		code: e.code,
 		searchText: e.searchText,
-		children: e.children.length > 0 ? e.children.map(oe) : void 0
+		children: e.children.length > 0 ? e.children.map(ce) : void 0
 	};
 }
-function se({ items: e, orderedCodeKeys: t, keyPairsMap: n, hiddenCodeKeys: r, textValueCodeKeys: i }) {
+function le({ items: e, orderedCodeKeys: t, keyPairsMap: n, hiddenCodeKeys: r, textValueCodeKeys: i, sortByCode: a = !0 }) {
 	if (t.length === 0 || e.length === 0) return [];
-	let a = [], o = /* @__PURE__ */ new Map();
-	for (let s of e) {
+	let o = [], s = /* @__PURE__ */ new Map();
+	for (let a of e) {
 		let e;
 		for (let c of t) {
-			let t = String(s[c] ?? "");
+			let t = String(a[c] ?? "");
 			if (!t) break;
-			let l = String(A(s, c, n) ?? ""), u = i?.has(c) ? l : t, d = `${c}:${u}`, f = e ? e.childByBranchKey : o, p = f.get(d);
-			p || (p = ae({
+			let l = String(j(a, c, n) ?? ""), u = i?.has(c) ? l : t, d = `${c}:${u}`, f = e ? e.childByBranchKey : s, p = f.get(d);
+			p || (p = oe({
 				parentId: e?.id,
 				codeKey: c,
 				value: u,
 				label: l,
-				code: r.has(c) ? void 0 : t
-			}), f.set(d, p), e ? e.children.push(p) : a.push(p)), e = p;
+				code: r.has(c) ? void 0 : t,
+				sortCode: t
+			}), f.set(d, p), e ? e.children.push(p) : o.push(p)), e = p;
 		}
 	}
-	return a.map(oe);
+	return se(o, a), o.map(ce);
 }
 //#endregion
 //#region src/tree-select/model/resolveOrderedTreeSegmentItems.ts
-function ce(e, t) {
+function M(e, t) {
 	return b(e, t);
 }
 //#endregion
 //#region src/tree-select/model/useODataTreeData.ts
-function le(e, t, n) {
+function ue(e, t, n) {
 	return y([{
 		odata: e,
 		segments: t,
 		model: n
 	}]);
 }
-function M(e) {
+function de(e) {
 	return e[0]?.id;
 }
 function N({ odata: e, segments: t, model: n }) {
-	let r = `${e.service}.${e.target}`, i = _(() => le(e, t, n), [
+	let r = `${e.service}.${e.target}`, i = _(() => ue(e, t, n), [
 		e,
 		t,
 		n
-	]), a = te([e]), o = _(() => ce(i, a), [i, a]), s = _(() => o.map((e) => e.id), [o]), c = x({
+	]), a = te([e]), o = _(() => M(i, a), [i, a]), s = _(() => o.map((e) => e.id), [o]), c = x({
 		odata: e,
 		model: S({
-			codeKey: M(o) ?? Object.keys(t)[0],
+			codeKey: de(o) ?? Object.keys(t)[0],
 			...n
 		})
 	}), { hiddenCodeKeys: l, textValueCodeKeys: u } = _(() => {
@@ -107,16 +114,18 @@ function N({ odata: e, segments: t, model: n }) {
 			hiddenCodeKeys: t,
 			textValueCodeKeys: n
 		};
-	}, [e.hideCode, o]), d = _(() => se({
+	}, [e.hideCode, o]), d = _(() => le({
 		items: c.data?.items ?? [],
 		orderedCodeKeys: s,
 		keyPairsMap: c.data?.keyPairsMap ?? {},
 		hiddenCodeKeys: l,
-		textValueCodeKeys: u
+		textValueCodeKeys: u,
+		sortByCode: e.sortByCode
 	}), [
 		c.data?.items,
 		c.data?.keyPairsMap,
 		l,
+		e.sortByCode,
 		s,
 		u
 	]), f = o[0]?.segment.placeholder ?? "Выберите значение", p = !!a[r]?.length;
@@ -135,7 +144,7 @@ function N({ odata: e, segments: t, model: n }) {
 function P(e, t) {
 	return `${e}::${t}`;
 }
-function ue(e) {
+function fe(e) {
 	let t = /* @__PURE__ */ new Map(), n = /* @__PURE__ */ new Map(), r = /* @__PURE__ */ new Map(), i = /* @__PURE__ */ new Map(), a = /* @__PURE__ */ new Map(), o = 0, s = (e, c) => {
 		t.set(e.id, e), n.set(e.id, c), i.set(e.id, o++), a.set(P(e.codeKey, e.value), e.id);
 		let l = (e.children ?? []).map((e) => e.id);
@@ -152,10 +161,10 @@ function ue(e) {
 		nodeIdByCodeValue: a
 	};
 }
-function F(e, t) {
+function pe(e, t) {
 	if (e) return t.nodeIdByCodeValue.get(P(e.codeKey, e.value));
 }
-function I(e, t) {
+function F(e, t) {
 	let n = /* @__PURE__ */ new Set();
 	if (!e) return n;
 	for (let [r, i] of Object.entries(e)) for (let e of i) {
@@ -164,7 +173,7 @@ function I(e, t) {
 	}
 	return V(n, t);
 }
-function L(e, t) {
+function I(e, t) {
 	let n = [...e].sort((e, n) => (t.preorderIndexById.get(e) ?? 2 ** 53 - 1) - (t.preorderIndexById.get(n) ?? 2 ** 53 - 1)), r = {};
 	for (let e of n) {
 		let n = t.nodeById.get(e);
@@ -172,7 +181,7 @@ function L(e, t) {
 	}
 	return r;
 }
-function de(e, t) {
+function L(e, t) {
 	let n = [], r = t.parentById.get(e);
 	for (; r;) n.push(r), r = t.parentById.get(r);
 	return n;
@@ -196,7 +205,7 @@ function B(e, t, n) {
 }
 function V(e, t) {
 	let n = new Set(e);
-	for (let e of [...n]) de(e, t).some((e) => n.has(e)) && n.delete(e);
+	for (let e of [...n]) L(e, t).some((e) => n.has(e)) && n.delete(e);
 	let r = [...t.nodeById.keys()].sort((e, n) => (t.preorderIndexById.get(n) ?? 0) - (t.preorderIndexById.get(e) ?? 0));
 	for (let e of r) {
 		let r = t.childrenById.get(e) ?? [];
@@ -204,7 +213,7 @@ function V(e, t) {
 	}
 	return n;
 }
-function fe(e, t, n) {
+function me(e, t, n) {
 	let r = n.parentById.get(t);
 	for (; r;) {
 		if (e.has(r)) {
@@ -217,7 +226,7 @@ function fe(e, t, n) {
 	return !1;
 }
 function H(e, t, n) {
-	return t.has(e) ? !0 : de(e, n).some((e) => t.has(e));
+	return t.has(e) ? !0 : L(e, n).some((e) => t.has(e));
 }
 function U(e, t, n, r) {
 	let i = n.childrenById.get(e) ?? [];
@@ -241,7 +250,7 @@ function U(e, t, n, r) {
 		partial: !1
 	};
 }
-function pe(e, t) {
+function he(e, t) {
 	let n = {
 		selectedIds: /* @__PURE__ */ new Set(),
 		partialIds: /* @__PURE__ */ new Set()
@@ -262,14 +271,14 @@ function W(e, t = e.rootIds) {
 	};
 	return new Set(t.flatMap((e) => n(e).selectedIds));
 }
-function me(e, t, n) {
-	let r = I(e, n), i = (e) => {
+function ge(e, t, n) {
+	let r = F(e, n), i = (e) => {
 		if (H(e, r, n)) {
 			if (r.has(e)) {
 				r.delete(e);
 				return;
 			}
-			fe(r, e, n) && i(e);
+			me(r, e, n) && i(e);
 			return;
 		}
 		z(r, e, n), r.add(e);
@@ -278,25 +287,25 @@ function me(e, t, n) {
 		let t = H(e, r, n);
 		(o && t || !o && !t) && i(e);
 	}
-	return L(V(r, n), n);
+	return I(V(r, n), n);
 }
-function G(e, t, n) {
+function _e(e, t, n) {
 	let r = t.parentById.get(e);
 	for (; r;) n.add(r), r = t.parentById.get(r);
 }
-function he(e, t) {
+function ve(e, t) {
 	let n = /* @__PURE__ */ new Set();
-	for (let r of e) G(r, t, n);
+	for (let r of e) _e(r, t, n);
 	return n;
 }
-function ge(e, t, n) {
-	let r = (e.children ?? []).map((e) => ge(e, t, n)).filter((e) => !!e);
+function G(e, t, n) {
+	let r = (e.children ?? []).map((e) => G(e, t, n)).filter((e) => !!e);
 	return !e.searchText.toLowerCase().includes(t) && r.length === 0 ? null : (r.length > 0 && n.add(e.id), r.length === 0 ? e : {
 		...e,
 		children: r
 	});
 }
-function _e(e, t) {
+function ye(e, t) {
 	let n = t.trim().toLowerCase();
 	if (!n) return {
 		nodes: [...e],
@@ -304,11 +313,11 @@ function _e(e, t) {
 	};
 	let r = /* @__PURE__ */ new Set();
 	return {
-		nodes: e.map((e) => ge(e, n, r)).filter((e) => !!e),
+		nodes: e.map((e) => G(e, n, r)).filter((e) => !!e),
 		expandedIds: r
 	};
 }
-function ve(e, t) {
+function be(e, t) {
 	let n = [], r = (e, i, a) => {
 		let o = (e.children?.length ?? 0) > 0, s = o && t.has(e.id);
 		if (n.push({
@@ -325,17 +334,17 @@ function ve(e, t) {
 }
 //#endregion
 //#region src/tree-select/model/resolveBalancedTreeColumnsLayout.ts
-var ye = 8, K = 16, q = 48, be = 224, J = 10, xe = 32, Se = 6;
+var K = 8, q = 16, xe = 48, Se = 224, J = 10, Ce = 32, we = 6;
 function Y(e, t) {
 	return Number.isFinite(e) && e > 0 ? e : t;
 }
-function Ce({ itemCount: e, availableWidth: t, availableHeight: n, viewportWidth: r, viewportHeight: i, referenceWidth: a }) {
-	let o = Math.max(0, Math.floor(Number.isFinite(e) ? e : 0)), s = Y(t, 240), c = Y(n, 80), l = Y(r, s + ye * 2), u = Y(i, c), d = Math.max(1, Math.min(s, Math.max(1, l - ye * 2))), f = Math.max(1, Math.min(c, u * .75)), p = Math.max(1, Y(a, 1)), m = Math.min(d, p), h = Math.max(1, Math.floor((d - K + J) / 234)), g = Math.max(1, Math.min(Se, h, o || 1)), _ = 1, v = Infinity;
+function Te({ itemCount: e, availableWidth: t, availableHeight: n, viewportWidth: r, viewportHeight: i, referenceWidth: a }) {
+	let o = Math.max(0, Math.floor(Number.isFinite(e) ? e : 0)), s = Y(t, 240), c = Y(n, 80), l = Y(r, s + K * 2), u = Y(i, c), d = Math.max(1, Math.min(s, Math.max(1, l - K * 2))), f = Math.max(1, Math.min(c, u * .75)), p = Math.max(1, Y(a, 1)), m = Math.min(d, p), h = Math.max(1, Math.floor((d - q + J) / 234)), g = Math.max(1, Math.min(we, h, o || 1)), _ = 1, v = Infinity;
 	for (let e = 1; e <= g; e += 1) {
-		let t = Math.ceil(o / e), n = Math.max(m, K + e * be + (e - 1) * J), r = q + t * xe, i = n / d, a = r / f, s = o ? (e * t - o) / o : 0, c = Math.max(i, a) + .25 * Math.abs(i - a) + .01 * s + .04 * (e - 1);
+		let t = Math.ceil(o / e), n = Math.max(m, q + e * Se + (e - 1) * J), r = xe + t * Ce, i = n / d, a = r / f, s = o ? (e * t - o) / o : 0, c = Math.max(i, a) + .25 * Math.abs(i - a) + .01 * s + .04 * (e - 1);
 		c < v && (v = c, _ = e);
 	}
-	let ee = Math.ceil(o / _), y = Math.max(m, K + _ * be + (_ - 1) * J);
+	let ee = Math.ceil(o / _), y = Math.max(m, q + _ * Se + (_ - 1) * J);
 	return {
 		columnCount: _,
 		rowCount: ee,
@@ -372,7 +381,7 @@ var X = {
 };
 //#endregion
 //#region src/tree-select/TreeNodeContent.tsx
-function we({ node: e, level: t, highlight: r, hasChildren: i, isExpanded: a, selected: o, partial: s, selectionMode: c, optionsLayout: l = "tree", onToggleExpand: u, onToggleSelection: d }) {
+function Ee({ node: e, level: t, highlight: r, hasChildren: i, isExpanded: a, selected: o, partial: s, selectionMode: c, optionsLayout: l = "tree", onToggleExpand: u, onToggleSelection: d }) {
 	let f = l === "tree";
 	return /* @__PURE__ */ D(ie, { children: [
 		/* @__PURE__ */ E("span", {
@@ -422,27 +431,27 @@ function we({ node: e, level: t, highlight: r, hasChildren: i, isExpanded: a, se
 }
 //#endregion
 //#region src/tree-select/TreePickerBase.tsx
-function Te({ label: n, description: c, disabled: p, placeholder: m, size: y, nodes: b, selectedIds: x, partialIds: te, selectionMode: S, optionsLayout: w = "tree", open: T, onOpenChange: ne, bulkActions: O, triggerMode: k = "display", selectedSummary: A, selectedSummaryText: j, query: ae, defaultQuery: oe, onQuery: se, onNodeActivate: ce, onClearSelection: le, isLoading: M, error: N }) {
-	let P = v(null), F = v(null), I = v(!1), [L, de] = ee(() => /* @__PURE__ */ new Set()), R = k === "search" ? S === "multi" ? "search-multi" : "search-single" : "display", z = _(() => ue(b), [b]), { query: B, setQuery: V } = u({
+function De({ label: n, description: c, disabled: p, placeholder: m, size: y, nodes: b, selectedIds: x, partialIds: te, selectionMode: S, optionsLayout: w = "tree", open: T, onOpenChange: ne, bulkActions: O, triggerMode: k = "display", selectedSummary: A, selectedSummaryText: j, query: ae, defaultQuery: oe, onQuery: se, onNodeActivate: ce, onClearSelection: le, isLoading: M, error: ue }) {
+	let de = v(null), N = v(null), P = v(!1), [pe, F] = ee(() => /* @__PURE__ */ new Set()), I = k === "search" ? S === "multi" ? "search-multi" : "search-single" : "display", L = _(() => fe(b), [b]), { query: R, setQuery: z } = u({
 		open: !0,
 		query: ae,
 		defaultQuery: oe,
 		onQuery: se,
 		triggerMode: "display"
-	}), { nodes: fe, expandedIds: U } = _(() => _e(b, B), [b, B]), pe = _(() => he(x, z), [x, z]), W = _(() => new Set([...z.childrenById].filter(([, e]) => e.length > 0).map(([e]) => e)), [z]), me = _(() => w === "columns" ? W : /* @__PURE__ */ new Set([
-		...L,
-		...U,
-		...pe
+	}), { nodes: B, expandedIds: V } = _(() => ye(b, R), [b, R]), me = _(() => ve(x, L), [x, L]), U = _(() => new Set([...L.childrenById].filter(([, e]) => e.length > 0).map(([e]) => e)), [L]), he = _(() => w === "columns" ? U : /* @__PURE__ */ new Set([
+		...pe,
+		...V,
+		...me
 	]), [
-		W,
-		L,
-		w,
 		U,
-		pe
-	]), G = _(() => ve(fe, me), [fe, me]), ge = _(() => G.findIndex((e) => x.has(e.node.id)), [x, G]), ye = h((e) => {
-		let t = Ce({
+		pe,
+		w,
+		V,
+		me
+	]), W = _(() => be(B, he), [B, he]), ge = _(() => W.findIndex((e) => x.has(e.node.id)), [x, W]), _e = h((e) => {
+		let t = Te({
 			...e,
-			itemCount: G.length
+			itemCount: W.length
 		});
 		return {
 			width: `${t.width}px`,
@@ -452,8 +461,8 @@ function Te({ label: n, description: c, disabled: p, placeholder: m, size: y, no
 			"--tree-column-count": String(t.columnCount),
 			"--tree-row-count": String(Math.max(t.rowCount, 1))
 		};
-	}, [G.length]), { open: K, activeIndex: q, context: be, floatingStyles: J, getFloatingProps: xe, setReference: Se, setFloating: Y, setOptionRef: Te, close: Ee, openList: De, toggleOpen: Oe, selectOption: Z, handleReferenceKeyDown: ke, handleFloatingKeyDown: Ae, getOptionId: je, getActiveOptionId: Me } = o({
-		options: G,
+	}, [W.length]), { open: G, activeIndex: K, context: q, floatingStyles: xe, getFloatingProps: Se, setReference: J, setFloating: Ce, setOptionRef: we, close: Y, openList: De, toggleOpen: Oe, selectOption: ke, handleReferenceKeyDown: Ae, handleFloatingKeyDown: je, getOptionId: Me, getActiveOptionId: Z } = o({
+		options: W,
 		selectedIndex: ge,
 		open: T,
 		onOpenChange: ne,
@@ -462,29 +471,29 @@ function Te({ label: n, description: c, disabled: p, placeholder: m, size: y, no
 		disabled: p || M,
 		closeOnSelect: S === "single",
 		allowOpenWithoutOptions: !0,
-		triggerMode: R,
+		triggerMode: I,
 		placementStrategy: w === "columns" ? "auto" : "flip",
-		resolveFloatingSize: w === "columns" ? ye : void 0
-	}), Q = x.size > 0, Ne = k === "search" && (K || B.length > 0), Pe = Ne ? B : j ?? "", Fe = k === "display" && !!A, Ie = R === "search-multi" && !!A, Le = R === "search-multi" && !Q || R === "search-single" && (!j || Ne) || R === "display" && !Q, $ = d({
-		mode: R,
-		open: K,
-		currentQuery: B,
+		resolveFloatingSize: w === "columns" ? _e : void 0
+	}), Q = x.size > 0, Ne = k === "search" && (G || R.length > 0), Pe = Ne ? R : j ?? "", Fe = k === "display" && !!A, Ie = I === "search-multi" && !!A, Le = I === "search-multi" && !Q || I === "search-single" && (!j || Ne) || I === "display" && !Q, $ = d({
+		mode: I,
+		open: G,
+		currentQuery: R,
 		hasDisplayValue: !!j,
-		inputRef: P,
-		setQuery: V,
+		inputRef: de,
+		setQuery: z,
 		openList: De,
-		close: Ee,
+		close: Y,
 		toggleOpen: Oe
 	}), Re = w === "columns" && S === "multi" && O, ze = k === "display", Be = Re || ze ? /* @__PURE__ */ D("div", {
 		className: X.treePopupHeader,
 		children: [Re ? /* @__PURE__ */ E(i, {
 			onSelectAll: O.onSelectAll,
 			onDeselectAll: O.onDeselectAll,
-			selectAllButtonRef: F
+			selectAllButtonRef: N
 		}) : null, ze ? /* @__PURE__ */ E(t, {
-			value: B,
-			onChange: V,
-			onClear: () => V(""),
+			value: R,
+			onChange: z,
+			onClear: () => z(""),
 			placeholder: "Поиск по дереву",
 			onKeyDown: (e) => {
 				e.key !== "Escape" && e.key !== "Tab" && e.stopPropagation();
@@ -495,18 +504,18 @@ function Te({ label: n, description: c, disabled: p, placeholder: m, size: y, no
 		}) : null]
 	}) : void 0;
 	g(() => {
-		I.current && !K && $.policy.resetQueryOnClose && V(""), I.current = K;
+		P.current && !G && $.policy.resetQueryOnClose && z(""), P.current = G;
 	}, [
-		K,
-		V,
+		G,
+		z,
 		$.policy.resetQueryOnClose
 	]);
 	let Ve = (e) => {
-		P.current = e;
+		de.current = e;
 	}, He = () => {
-		le?.(), V(""), S === "single" && Ee();
+		le?.(), z(""), S === "single" && Y();
 	}, Ue = (e) => {
-		e.hasChildren && de((t) => {
+		e.hasChildren && F((t) => {
 			let n = new Set(t);
 			return n.has(e.node.id) ? n.delete(e.node.id) : n.add(e.node.id), n;
 		});
@@ -521,7 +530,7 @@ function Te({ label: n, description: c, disabled: p, placeholder: m, size: y, no
 			let c = `${t}-listbox`, l = typeof n == "string" ? n : m;
 			return /* @__PURE__ */ D(ie, { children: [/* @__PURE__ */ E(r, {
 				ref: Ve,
-				rootRef: Se,
+				rootRef: J,
 				id: t,
 				type: "text",
 				role: "combobox",
@@ -534,17 +543,17 @@ function Te({ label: n, description: c, disabled: p, placeholder: m, size: y, no
 				"aria-label": i ? void 0 : m,
 				"aria-describedby": o,
 				"aria-haspopup": w === "columns" ? "dialog" : "listbox",
-				"aria-expanded": K,
-				"aria-controls": K ? c : void 0,
+				"aria-expanded": G,
+				"aria-controls": G ? c : void 0,
 				"aria-autocomplete": w !== "columns" && k === "search" ? "list" : "none",
-				"aria-activedescendant": w !== "columns" && K && G.length > 0 ? Me(c) : void 0,
+				"aria-activedescendant": w !== "columns" && G && W.length > 0 ? Z(c) : void 0,
 				inputClassName: C(Q && X.treeSummary, Fe && X.inputWithOverlay),
 				overlay: Fe ? /* @__PURE__ */ E("div", {
 					className: X.valueOverlay,
 					children: A
 				}) : void 0,
 				endAdornment: /* @__PURE__ */ D(s, {
-					open: K,
+					open: G,
 					disabled: p || M,
 					onToggleMouseDown: $.handleToggleMouseDown,
 					onToggleClick: $.handleToggleClick,
@@ -569,48 +578,48 @@ function Te({ label: n, description: c, disabled: p, placeholder: m, size: y, no
 					$.handleTriggerFocus(e.currentTarget);
 				},
 				onKeyDown: (e) => {
-					if (w === "columns" && K && e.key === "Tab" && !e.shiftKey && F.current) {
-						e.preventDefault(), F.current.focus();
+					if (w === "columns" && G && e.key === "Tab" && !e.shiftKey && N.current) {
+						e.preventDefault(), N.current.focus();
 						return;
 					}
-					ke(e), !e.defaultPrevented && $.handleTriggerKeyDown({
+					Ae(e), !e.defaultPrevented && $.handleTriggerKeyDown({
 						event: e,
 						onActivateWhenOpen: () => {
-							let e = q >= 0 ? G[q] : void 0;
-							e && Z(e);
+							let e = K >= 0 ? W[K] : void 0;
+							e && ke(e);
 						},
 						enableSpaceActivation: k === "display"
 					});
 				}
 			}), /* @__PURE__ */ E(a, {
-				open: K,
-				context: be,
-				floatingStyles: J,
+				open: G,
+				context: q,
+				floatingStyles: xe,
 				listId: c,
 				labelId: i,
 				popupAriaLabel: l,
 				descriptionId: o,
-				activeOptionId: w !== "columns" && G.length > 0 ? Me(c) : void 0,
+				activeOptionId: w !== "columns" && W.length > 0 ? Z(c) : void 0,
 				ariaMultiselectable: w !== "columns" && S === "multi",
 				popupRole: w === "columns" ? "dialog" : "listbox",
-				setFloating: Y,
-				getFloatingProps: xe,
-				onKeyDown: Ae,
+				setFloating: Ce,
+				getFloatingProps: Se,
+				onKeyDown: je,
 				className: e.uiPopupOptions,
 				bodyClassName: "scrollable",
 				header: Be,
 				children: /* @__PURE__ */ E("div", {
 					className: C(w === "columns" && X.treeColumns),
-					children: G.length === 0 ? /* @__PURE__ */ E(f, {
-						errorState: N,
+					children: W.length === 0 ? /* @__PURE__ */ E(f, {
+						errorState: ue,
 						loadingState: M ? "Загрузка..." : void 0,
-						emptyState: !N && !M ? "Нет данных" : void 0
-					}) : G.map((e, t) => {
-						let n = S === "multi" ? H(e.node.id, x, z) : x.has(e.node.id), r = S === "multi" && !n && te.has(e.node.id), i = t === q, a = e.node.disabled === !0;
+						emptyState: !ue && !M ? "Нет данных" : void 0
+					}) : W.map((e, t) => {
+						let n = S === "multi" ? H(e.node.id, x, L) : x.has(e.node.id), r = S === "multi" && !n && te.has(e.node.id), i = t === K, a = e.node.disabled === !0;
 						return /* @__PURE__ */ E("div", {
 							"data-ui": "tree-select-option",
-							id: je(c, t),
-							ref: (e) => Te(t, e),
+							id: Me(c, t),
+							ref: (e) => we(t, e),
 							role: w === "columns" ? void 0 : "option",
 							"aria-selected": w === "columns" ? void 0 : n,
 							"aria-disabled": a || void 0,
@@ -618,13 +627,13 @@ function Te({ label: n, description: c, disabled: p, placeholder: m, size: y, no
 							onMouseDown: (e) => {
 								e.preventDefault();
 							},
-							onClick: () => Z(e),
+							onClick: () => ke(e),
 							children: /* @__PURE__ */ E("div", {
 								className: X.treeNodeButton,
-								children: /* @__PURE__ */ E(we, {
+								children: /* @__PURE__ */ E(Ee, {
 									node: e.node,
 									level: e.level,
-									highlight: B,
+									highlight: R,
 									hasChildren: e.hasChildren,
 									isExpanded: e.isExpanded,
 									selected: n,
@@ -632,7 +641,7 @@ function Te({ label: n, description: c, disabled: p, placeholder: m, size: y, no
 									selectionMode: S,
 									optionsLayout: w,
 									onToggleExpand: () => Ue(e),
-									onToggleSelection: () => Z(e)
+									onToggleSelection: () => ke(e)
 								})
 							})
 						}, e.node.id);
@@ -644,7 +653,7 @@ function Te({ label: n, description: c, disabled: p, placeholder: m, size: y, no
 }
 //#endregion
 //#region src/tree-select/TreeMultiSelect.tsx
-function Ee(e, t) {
+function Oe(e, t) {
 	if (e.size !== 0) {
 		if (e.size === 1) {
 			let n = t.nodeById.get([...e][0]);
@@ -653,18 +662,18 @@ function Ee(e, t) {
 		return `${e.size} элементов`;
 	}
 }
-function De(e, t, n) {
-	let r = I(e, n), i = I(t, n);
+function ke(e, t, n) {
+	let r = F(e, n), i = F(t, n);
 	return r.size === i.size && [...r].every((e) => i.has(e));
 }
-function Oe({ label: e, description: t, disabled: n, placeholder: r = "Выберите значения", size: i, nodes: a, value: o, onChange: s, query: l, defaultQuery: u, onQuery: d, isLoading: f, error: p, optionsLayout: h = "tree" }) {
-	let [g, v] = ee(!1), y = _(() => ue(a), [a]), { draftValue: b, setDraftValue: x, prepareOpen: te } = c({
+function Ae({ label: e, description: t, disabled: n, placeholder: r = "Выберите значения", size: i, nodes: a, value: o, onChange: s, query: l, defaultQuery: u, onQuery: d, isLoading: f, error: p, optionsLayout: h = "tree" }) {
+	let [g, v] = ee(!1), y = _(() => fe(a), [a]), { draftValue: b, setDraftValue: x, prepareOpen: te } = c({
 		value: o,
 		open: g,
 		onCommit: s,
-		isEqual: (e, t) => De(e, t, y)
-	}), S = g ? b : o, C = _(() => I(S, y), [S, y]), w = _(() => pe(C, y), [C, y]), T = _(() => Ee(C, y), [C, y]);
-	return /* @__PURE__ */ E(Te, {
+		isEqual: (e, t) => ke(e, t, y)
+	}), S = g ? b : o, C = _(() => F(S, y), [S, y]), w = _(() => he(C, y), [C, y]), T = _(() => Oe(C, y), [C, y]);
+	return /* @__PURE__ */ E(De, {
 		label: e,
 		description: t,
 		disabled: n,
@@ -681,7 +690,7 @@ function Oe({ label: e, description: t, disabled: n, placeholder: r = "Выбе
 		},
 		bulkActions: {
 			onSelectAll: () => {
-				x(L(W(y), y));
+				x(I(W(y), y));
 			},
 			onDeselectAll: () => x({})
 		},
@@ -691,7 +700,7 @@ function Oe({ label: e, description: t, disabled: n, placeholder: r = "Выбе
 		defaultQuery: u,
 		onQuery: d,
 		onNodeActivate: (e) => {
-			x((t) => me(t, e.id, y));
+			x((t) => ge(t, e.id, y));
 		},
 		onClearSelection: () => {
 			x({}), g || s({});
@@ -702,13 +711,13 @@ function Oe({ label: e, description: t, disabled: n, placeholder: r = "Выбе
 }
 //#endregion
 //#region src/tree-select/ODataTreeMultiSelect.tsx
-function Z({ label: e, description: t, disabled: n, size: r, placeholder: i, query: a, defaultQuery: o, onQuery: s, optionsLayout: c, value: l, onChange: u, odata: d, segments: f, model: p }) {
+function je({ label: e, description: t, disabled: n, size: r, placeholder: i, query: a, defaultQuery: o, onQuery: s, optionsLayout: c, value: l, onChange: u, odata: d, segments: f, model: p }) {
 	let m = N({
 		odata: d,
 		segments: f,
 		model: p
 	});
-	return /* @__PURE__ */ E(Oe, {
+	return /* @__PURE__ */ E(Ae, {
 		label: e,
 		description: t,
 		disabled: n || m.isLoading,
@@ -727,12 +736,12 @@ function Z({ label: e, description: t, disabled: n, size: r, placeholder: i, que
 }
 //#endregion
 //#region src/tree-select/TreeSelect.tsx
-function ke(e) {
+function Me(e) {
 	if (e) return e.code && e.code !== e.label ? `${e.label} · ${e.code}` : e.label;
 }
-function Ae({ label: e, description: t, disabled: n, placeholder: r = "Выберите значение", size: i, nodes: a, value: o, onChange: s, query: c, defaultQuery: l, onQuery: u, isLoading: d, error: f, clearable: p = !1 }) {
-	let m = _(() => ue(a), [a]), h = F(o, m), g = h ? m.nodeById.get(h) : void 0;
-	return /* @__PURE__ */ E(Te, {
+function Z({ label: e, description: t, disabled: n, placeholder: r = "Выберите значение", size: i, nodes: a, value: o, onChange: s, query: c, defaultQuery: l, onQuery: u, isLoading: d, error: f, clearable: p = !1 }) {
+	let m = _(() => fe(a), [a]), h = pe(o, m), g = h ? m.nodeById.get(h) : void 0;
+	return /* @__PURE__ */ E(De, {
 		label: e,
 		description: t,
 		disabled: n,
@@ -743,7 +752,7 @@ function Ae({ label: e, description: t, disabled: n, placeholder: r = "Выбе
 		partialIds: /* @__PURE__ */ new Set(),
 		selectionMode: "single",
 		triggerMode: "search",
-		selectedSummaryText: ke(g),
+		selectedSummaryText: Me(g),
 		query: c,
 		defaultQuery: l,
 		onQuery: u,
@@ -758,13 +767,13 @@ function Ae({ label: e, description: t, disabled: n, placeholder: r = "Выбе
 }
 //#endregion
 //#region src/tree-select/ODataTreeSelect.tsx
-function je({ label: e, description: t, disabled: n, size: r, placeholder: i, query: a, defaultQuery: o, onQuery: s, value: c, onChange: l, odata: u, segments: d, model: f, clearable: p }) {
+function Q({ label: e, description: t, disabled: n, size: r, placeholder: i, query: a, defaultQuery: o, onQuery: s, value: c, onChange: l, odata: u, segments: d, model: f, clearable: p }) {
 	let m = N({
 		odata: u,
 		segments: d,
 		model: f
 	});
-	return /* @__PURE__ */ E(Ae, {
+	return /* @__PURE__ */ E(Z, {
 		label: e,
 		description: t,
 		disabled: n || m.isLoading,
@@ -782,6 +791,6 @@ function je({ label: e, description: t, disabled: n, size: r, placeholder: i, qu
 	});
 }
 //#endregion
-export { Z as ODataTreeMultiSelect, je as ODataTreeSelect, Oe as TreeMultiSelect, Ae as TreeSelect, O as treeSelectValueToSelectedFilters };
+export { je as ODataTreeMultiSelect, Q as ODataTreeSelect, Ae as TreeMultiSelect, Z as TreeSelect, k as treeSelectValueToSelectedFilters };
 
 //# sourceMappingURL=index.js.map