@ryuzaki13/react-foundation-ui 1.5.16 → 1.6.1

package/dist/tree-select/index.js

@@ -4,36 +4,36 @@ import { t as n } from "../chunks/check-box-sfGjYczQ.js";
 import { c as r, d as i, f as a, i as o, l as s, n as c, p as l, r as u, t as d, u as f } from "../chunks/picker-lpH_xp14.js";
 import { r as p } from "../chunks/useODataSelectBase-Bq36Wp1U.js";
 import { o as m, s as h } from "../chunks/multi-select-BDvaRbUc.js";
-import { useCallback as g, useLayoutEffect as _, useMemo as v, useRef as y, useState as ee } from "react";
-import { flattenODataDependentServices as b, sortODataDependentSegmentItemsByChains as x, useODataCollection as S, useODataCollectionChains as C, useODataCollectionModel as w } from "@ryuzaki13/react-foundation-api/odata";
-import { cn as T } from "@ryuzaki13/react-foundation-lib/utils";
-import { Fragment as E, jsx as D, jsxs as O } from "react/jsx-runtime";
-import { CheckIcon as te, ChevronRightIcon as ne, MinusIcon as re, XIcon as ie } from "lucide-react";
-import { compareStrings as k } from "@ryuzaki13/react-foundation-lib/string-comparison";
+import { useCallback as g, useLayoutEffect as _, useMemo as v, useRef as y, useState as b } from "react";
+import { flattenODataDependentServices as x, sortODataDependentSegmentItemsByChains as S, useODataCollection as C, useODataCollectionChains as w, useODataCollectionModel as T } from "@ryuzaki13/react-foundation-api/odata";
+import { cn as E } from "@ryuzaki13/react-foundation-lib/utils";
+import { Fragment as D, jsx as O, jsxs as k } from "react/jsx-runtime";
+import { CheckIcon as ee, ChevronRightIcon as te, MinusIcon as ne, XIcon as re } from "lucide-react";
+import { compareStrings as A } from "@ryuzaki13/react-foundation-lib/string-comparison";
 //#region src/tree-select/helpers.ts
-function A(e) {
+function j(e) {
 	return e ? { [e.codeKey]: [e.value] } : {};
 }
 //#endregion
 //#region src/tree-select/model/buildODataTreeNodes.ts
-function j(e, t, n) {
+function M(e, t, n) {
 	return e ? `${e}/${t}:${n}` : `${t}:${n}`;
 }
-function M(e, t, n) {
+function N(e, t, n) {
 	let r = n[t];
 	return r && e[r] || e[t];
 }
-function ae(e) {
+function ie(e) {
 	return [...new Set(e.filter(Boolean))].join(" ");
 }
-function oe(e) {
+function ae(e) {
 	return {
-		id: j(e.parentId, e.codeKey, e.value),
+		id: M(e.parentId, e.codeKey, e.value),
 		codeKey: e.codeKey,
 		value: e.value,
 		label: e.label,
 		code: e.code,
-		searchText: ae([
+		searchText: ie([
 			e.value,
 			e.label,
 			e.code
@@ -43,14 +43,14 @@ function oe(e) {
 		childByBranchKey: /* @__PURE__ */ new Map()
 	};
 }
-function se(e, t) {
+function oe(e, t) {
 	e.sort((e, n) => {
 		let r = t ? e.sortCode : e.label, i = t ? n.sortCode : n.label;
-		return k(r, i) || k(e.sortCode, n.sortCode);
+		return A(r, i) || A(e.sortCode, n.sortCode);
 	});
-	for (let n of e) se(n.children, t);
+	for (let n of e) oe(n.children, t);
 }
-function ce(e) {
+function se(e) {
 	return {
 		id: e.id,
 		codeKey: e.codeKey,
@@ -58,98 +58,104 @@ function ce(e) {
 		label: e.label,
 		code: e.code,
 		searchText: e.searchText,
-		children: e.children.length > 0 ? e.children.map(ce) : void 0
+		children: e.children.length > 0 ? e.children.map(se) : void 0
 	};
 }
-function le({ items: e, orderedCodeKeys: t, keyPairsMap: n, hiddenCodeKeys: r, textValueCodeKeys: i, sortByCode: a = !0 }) {
+function ce({ items: e, orderedCodeKeys: t, keyPairsMap: n, hiddenCodeKeys: r, textValueCodeKeys: i, allowEmptyCodeKeys: a, sortByCode: o = !0 }) {
 	if (t.length === 0 || e.length === 0) return [];
-	let o = [], s = /* @__PURE__ */ new Map();
-	for (let a of e) {
+	let s = [], c = /* @__PURE__ */ new Map();
+	for (let o of e) {
 		let e;
-		for (let c of t) {
-			let t = String(a[c] ?? "");
-			if (!t) break;
-			let l = String(M(a, c, n) ?? ""), u = i?.has(c) ? l : t, d = `${c}:${u}`, f = e ? e.childByBranchKey : s, p = f.get(d);
-			p || (p = oe({
+		for (let l of t) {
+			let t = String(o[l] ?? "");
+			if (!t && !a?.has(l)) break;
+			let u = String(N(o, l, n) ?? ""), d = i?.has(l) ? u : t, f = `${l}:${d}`, p = e ? e.childByBranchKey : c, m = p.get(f);
+			m || (m = ae({
 				parentId: e?.id,
-				codeKey: c,
-				value: u,
-				label: l,
-				code: r.has(c) ? void 0 : t,
+				codeKey: l,
+				value: d,
+				label: u,
+				code: r.has(l) ? void 0 : t,
 				sortCode: t
-			}), f.set(d, p), e ? e.children.push(p) : o.push(p)), e = p;
+			}), p.set(f, m), e ? e.children.push(m) : s.push(m)), e = m;
 		}
 	}
-	return se(o, a), o.map(ce);
+	return oe(s, o), s.map(se);
 }
 //#endregion
 //#region src/tree-select/model/resolveOrderedTreeSegmentItems.ts
-function N(e, t) {
-	return x(e, t);
+function P(e, t, n) {
+	return S(e, t, n);
 }
 //#endregion
 //#region src/tree-select/model/useODataTreeData.ts
-function ue(e, t, n) {
-	return b([{
+function le(e, t, n) {
+	return x([{
 		odata: e,
 		segments: t,
 		model: n
 	}]);
 }
-function de(e) {
+function ue(e) {
 	return e[0]?.id;
 }
-function P({ odata: e, segments: t, model: n }) {
-	let r = `${e.service}.${e.target}`, i = v(() => ue(e, t, n), [
+function F({ odata: e, segments: t, model: n, segmentOrder: r, allowEmptyCodeKeys: i }) {
+	let a = `${e.service}.${e.target}`, o = v(() => le(e, t, n), [
 		e,
 		t,
 		n
-	]), a = C([e]), o = v(() => N(i, a), [i, a]), s = v(() => o.map((e) => e.id), [o]), c = de(o) ?? Object.keys(t)[0], l = w({
-		codeKey: c,
+	]), s = w([e]), c = v(() => P(o, s, r), [
+		o,
+		s,
+		r
+	]), l = v(() => c.map((e) => e.id), [c]), u = v(() => new Set(i), [i]), d = ue(c) ?? Object.keys(t)[0], f = T({
+		codeKey: d,
 		...n
-	}), u = S({
+	}), p = C({
 		odata: e,
-		model: l
-	}), { hiddenCodeKeys: d, textValueCodeKeys: f } = v(() => {
+		model: f
+	}), { hiddenCodeKeys: m, textValueCodeKeys: h } = v(() => {
 		let t = /* @__PURE__ */ new Set(), n = /* @__PURE__ */ new Set();
-		for (let r of o) (r.segment.hideCode ?? e.hideCode) && t.add(r.id), r.segment.selectText && n.add(r.id);
+		for (let r of c) (r.segment.hideCode ?? e.hideCode) && t.add(r.id), r.segment.selectText && n.add(r.id);
 		return {
 			hiddenCodeKeys: t,
 			textValueCodeKeys: n
 		};
-	}, [e.hideCode, o]), p = v(() => le({
-		items: u.data?.items ?? [],
-		orderedCodeKeys: s,
-		keyPairsMap: u.data?.keyPairsMap ?? {},
-		hiddenCodeKeys: d,
-		textValueCodeKeys: f,
+	}, [e.hideCode, c]), g = v(() => ce({
+		items: p.data?.items ?? [],
+		orderedCodeKeys: l,
+		keyPairsMap: p.data?.keyPairsMap ?? {},
+		hiddenCodeKeys: m,
+		textValueCodeKeys: h,
+		allowEmptyCodeKeys: u,
 		sortByCode: e.sortByCode
 	}), [
-		u.data?.items,
-		u.data?.keyPairsMap,
-		d,
+		u,
+		p.data?.items,
+		p.data?.keyPairsMap,
+		m,
 		e.sortByCode,
-		s,
-		f
-	]), m = o[0]?.segment.placeholder ?? "Выберите значение", h = !!a[r]?.length;
+		l,
+		h
+	]), _ = c[0]?.segment.placeholder ?? "Выберите значение", y = !!s[a]?.length;
 	return {
-		nodes: p,
-		orderedSegmentItems: o,
-		orderedCodeKeys: s,
-		isLoading: u.isLoading,
-		isError: u.isError,
-		placeholder: m,
-		hasResolvedChain: h
+		nodes: g,
+		orderedSegmentItems: c,
+		orderedCodeKeys: l,
+		isLoading: p.isLoading,
+		isError: p.isError,
+		placeholder: _,
+		hasResolvedChain: y
 	};
 }
 //#endregion
 //#region src/tree-select/model/treeUtils.ts
-function F(e, t) {
+function de(e, t) {
 	return `${e}::${t}`;
 }
 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(F(e.codeKey, e.value), e.id);
+		t.set(e.id, e), n.set(e.id, c), i.set(e.id, o++), a.set(de(e.codeKey, e.value), e.id);
 		let l = (e.children ?? []).map((e) => e.id);
 		r.set(e.id, l);
 		for (let t of e.children ?? []) s(t, e.id);
@@ -165,13 +171,13 @@ function fe(e) {
 	};
 }
 function pe(e, t) {
-	if (e) return t.nodeIdByCodeValue.get(F(e.codeKey, e.value));
+	if (e) return t.nodeIdByCodeValue.get(de(e.codeKey, e.value));
 }
 function I(e, t) {
 	let n = /* @__PURE__ */ new Set();
 	if (!e) return n;
 	for (let [r, i] of Object.entries(e)) for (let e of i) {
-		let i = t.nodeIdByCodeValue.get(F(r, e));
+		let i = t.nodeIdByCodeValue.get(de(r, e));
 		i && n.add(i);
 	}
 	return he(n, t);
@@ -208,11 +214,15 @@ function B(e, t, n) {
 }
 function he(e, t) {
 	let n = new Set(e);
+	for (let e of [...n]) if (t.nodeById.get(e)?.selectionBehavior === "descendants") {
+		n.delete(e);
+		for (let r of G(t, t.childrenById.get(e) ?? [])) n.add(r);
+	}
 	for (let e of [...n]) R(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) ?? [];
-		r.length === 0 || n.has(e) || t.nodeById.get(e)?.disabled || r.every((e) => B(e, n, t)) && (z(n, e, t), n.add(e));
+		r.length === 0 || n.has(e) || t.nodeById.get(e)?.disabled || t.nodeById.get(e)?.selectionBehavior === "descendants" || r.every((e) => B(e, n, t)) && (z(n, e, t), n.add(e));
 	}
 	return n;
 }
@@ -264,7 +274,13 @@ function W(e, t) {
 function G(e, t = e.rootIds) {
 	let n = (t) => {
 		let r = e.nodeById.get(t), i = (e.childrenById.get(t) ?? []).map(n), a = i.flatMap((e) => e.selectedIds), o = r?.disabled === !0 || i.some((e) => e.containsDisabled);
-		return !r || r.disabled || o ? {
+		return !r || r.disabled ? {
+			containsDisabled: !0,
+			selectedIds: a
+		} : r.selectionBehavior === "descendants" ? {
+			containsDisabled: o,
+			selectedIds: a
+		} : o ? {
 			containsDisabled: !0,
 			selectedIds: a
 		} : {
@@ -455,13 +471,13 @@ var Q = {
 //#region src/tree-select/TreeNodeContent.tsx
 function ke({ 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", m = l === "columns" && t === 0;
-	return /* @__PURE__ */ O(E, { children: [
-		/* @__PURE__ */ D("span", {
+	return /* @__PURE__ */ k(D, { children: [
+		/* @__PURE__ */ O("span", {
 			className: Q.treeIndent,
 			style: { "--tree-level": t },
 			"aria-hidden": "true"
 		}),
-		f && i ? /* @__PURE__ */ D("button", {
+		f && i ? /* @__PURE__ */ O("button", {
 			type: "button",
 			className: Q.treeExpander,
 			onClick: (e) => {
@@ -470,30 +486,30 @@ function ke({ node: e, level: t, highlight: r, hasChildren: i, isExpanded: a, se
 			"aria-label": a ? "Свернуть ветку" : "Развернуть ветку",
 			"data-ui": "tree-select-expander",
 			"data-action": a ? "collapse-tree-select-node" : "expand-tree-select-node",
-			children: /* @__PURE__ */ D(ne, { className: T(Q.treeExpanderIcon, a && Q.treeExpanderIconExpanded) })
-		}) : f ? /* @__PURE__ */ D("span", {
+			children: /* @__PURE__ */ O(te, { className: E(Q.treeExpanderIcon, a && Q.treeExpanderIconExpanded) })
+		}) : f ? /* @__PURE__ */ O("span", {
 			className: Q.treeExpanderPlaceholder,
 			"aria-hidden": "true"
 		}) : null,
-		c === "multi" && l === "columns" ? /* @__PURE__ */ D("span", {
+		c === "multi" && l === "columns" ? /* @__PURE__ */ O("span", {
 			className: Q.treeColumnCheckBox,
 			onMouseDown: (e) => e.stopPropagation(),
 			onClick: (e) => e.stopPropagation(),
-			children: /* @__PURE__ */ D(n, {
+			children: /* @__PURE__ */ O(n, {
 				value: o,
 				indeterminate: s,
 				disabled: e.disabled,
 				"aria-label": `Выбрать ${e.label}`,
 				onChange: () => d?.()
 			})
-		}) : c === "multi" ? /* @__PURE__ */ D("span", {
-			className: T(Q.treeSelection, o && Q.treeSelectionChecked, s && Q.treeSelectionPartial),
+		}) : c === "multi" ? /* @__PURE__ */ O("span", {
+			className: E(Q.treeSelection, o && Q.treeSelectionChecked, s && Q.treeSelectionPartial),
 			"aria-hidden": "true",
-			children: o ? /* @__PURE__ */ D(te, { className: Q.treeSelectionIcon }) : s ? /* @__PURE__ */ D(re, { className: Q.treeSelectionIcon }) : null
+			children: o ? /* @__PURE__ */ O(ee, { className: Q.treeSelectionIcon }) : s ? /* @__PURE__ */ O(ne, { className: Q.treeSelectionIcon }) : null
 		}) : null,
-		/* @__PURE__ */ D("div", {
+		/* @__PURE__ */ O("div", {
 			className: Q.treeNodeOptionContent,
-			children: /* @__PURE__ */ D(p, {
+			children: /* @__PURE__ */ O(p, {
 				label: e.label,
 				code: e.code,
 				highlight: r,
@@ -505,29 +521,29 @@ function ke({ node: e, level: t, highlight: r, hasChildren: i, isExpanded: a, se
 }
 //#endregion
 //#region src/tree-select/TreePickerBase.tsx
-function Ae({ label: n, description: c, disabled: p, placeholder: m, size: h, nodes: b, selectedIds: x, partialIds: S, selectionMode: C, optionsLayout: w = "tree", defaultExpandedCodeKeys: te, open: ne, onOpenChange: re, bulkActions: k, triggerMode: A = "display", selectedSummary: j, selectedSummaryText: M, query: ae, defaultQuery: oe, onQuery: se, onNodeActivate: ce, onClearSelection: le, isLoading: N, error: ue }) {
-	let de = y(null), P = y(null), [F, pe] = ee(!1), I = ne !== void 0, L = I ? ne : F, [R, me] = ee(() => /* @__PURE__ */ new Map()), z = A === "search" ? C === "multi" ? "search-multi" : "search-single" : "display", B = v(() => fe(b), [b]), he = v(() => `${m} <${B.nodeById.size}>`, [m, B]), V = v(() => new Set(te), [te]), { query: U, setQuery: W, resetQueryOnClose: G } = u({
-		query: ae,
-		defaultQuery: oe,
-		onQuery: se,
+function Ae({ label: n, description: c, disabled: p, placeholder: m, size: h, nodes: x, selectedIds: S, partialIds: C, selectionMode: w, optionsLayout: T = "tree", defaultExpandedCodeKeys: ee, open: te, onOpenChange: ne, bulkActions: A, triggerMode: j = "display", selectedSummary: M, selectedSummaryText: N, query: ie, defaultQuery: ae, onQuery: oe, onNodeActivate: se, onClearSelection: ce, isLoading: P, error: le }) {
+	let ue = y(null), F = y(null), [de, pe] = b(!1), I = te !== void 0, L = I ? te : de, [R, me] = b(() => /* @__PURE__ */ new Map()), z = j === "search" ? w === "multi" ? "search-multi" : "search-single" : "display", B = v(() => fe(x), [x]), he = v(() => `${m} <${B.nodeById.size}>`, [m, B]), V = v(() => new Set(ee), [ee]), { query: U, setQuery: W, resetQueryOnClose: G } = u({
+		query: ie,
+		defaultQuery: ae,
+		onQuery: oe,
 		triggerMode: z
 	}), ge = (e) => {
-		L && !e && G && W(""), I || pe(e), re?.(e);
-	}, { nodes: _e, expandedIds: K } = v(() => be(b, U), [b, U]), q = v(() => ve(x, B), [x, B]), Ce = v(() => ye(B, V, R), [
+		L && !e && G && W(""), I || pe(e), ne?.(e);
+	}, { nodes: _e, expandedIds: K } = v(() => be(x, U), [x, U]), q = v(() => ve(S, B), [S, B]), Ce = v(() => ye(B, V, R), [
 		V,
 		R,
 		B
-	]), we = v(() => new Set([...B.childrenById].filter(([, e]) => e.length > 0).map(([e]) => e)), [B]), Te = v(() => w === "columns" ? we : /* @__PURE__ */ new Set([
+	]), we = v(() => new Set([...B.childrenById].filter(([, e]) => e.length > 0).map(([e]) => e)), [B]), Te = v(() => T === "columns" ? we : /* @__PURE__ */ new Set([
 		...Ce,
 		...K,
 		...q
 	]), [
 		we,
 		Ce,
-		w,
+		T,
 		K,
 		q
-	]), J = v(() => xe(_e, Te), [_e, Te]), Ee = v(() => J.findIndex((e) => x.has(e.node.id)), [x, J]), De = v(() => Se(J), [J]), Y = g((e) => {
+	]), J = v(() => xe(_e, Te), [_e, Te]), Ee = v(() => J.findIndex((e) => S.has(e.node.id)), [S, J]), De = v(() => Se(J), [J]), Y = g((e) => {
 		let t = Oe({
 			...e,
 			descriptor: De
@@ -548,31 +564,31 @@ function Ae({ label: n, description: c, disabled: p, placeholder: m, size: h, no
 		selectedIndex: Ee,
 		open: L,
 		onOpenChange: ge,
-		onSelect: (e) => ce(e.node),
+		onSelect: (e) => se(e.node),
 		getOptionDisabled: (e) => e.node.disabled === !0,
-		disabled: p || N,
-		closeOnSelect: C === "single",
+		disabled: p || P,
+		closeOnSelect: w === "single",
 		allowOpenWithoutOptions: !0,
 		triggerMode: z,
-		placementStrategy: w === "columns" ? "auto" : "flip",
-		resolveFloatingSize: w === "columns" ? Y : void 0
-	}), Ue = Z.update, We = x.size > 0, Ge = A === "search" && (L || U.length > 0), Ke = Ge ? U : M ?? "", qe = A === "display" && !!j, Je = z === "search-multi" && !!j, Ye = z === "search-multi" && !We || z === "search-single" && (!M || Ge) || z === "display" && !We, $ = d({
+		placementStrategy: T === "columns" ? "auto" : "flip",
+		resolveFloatingSize: T === "columns" ? Y : void 0
+	}), Ue = Z.update, We = S.size > 0, Ge = j === "search" && (L || U.length > 0), Ke = Ge ? U : N ?? "", qe = j === "display" && !!M, Je = z === "search-multi" && !!M, Ye = z === "search-multi" && !We || z === "search-single" && (!N || Ge) || z === "display" && !We, $ = d({
 		mode: z,
 		open: L,
 		currentQuery: U,
-		hasDisplayValue: !!M,
-		inputRef: de,
+		hasDisplayValue: !!N,
+		inputRef: ue,
 		setQuery: W,
 		openList: Ie,
 		close: Fe,
 		toggleOpen: Le
-	}), Xe = w === "columns" && C === "multi" && k, Ze = A === "display", Qe = Xe || Ze ? /* @__PURE__ */ O("div", {
+	}), Xe = T === "columns" && w === "multi" && A, Ze = j === "display", Qe = Xe || Ze ? /* @__PURE__ */ k("div", {
 		className: Q.treePopupHeader,
-		children: [Xe ? /* @__PURE__ */ D(i, {
-			onSelectAll: k.onSelectAll,
-			onDeselectAll: k.onDeselectAll,
-			selectAllButtonRef: P
-		}) : null, Ze ? /* @__PURE__ */ D(t, {
+		children: [Xe ? /* @__PURE__ */ O(i, {
+			onSelectAll: A.onSelectAll,
+			onDeselectAll: A.onDeselectAll,
+			selectAllButtonRef: F
+		}) : null, Ze ? /* @__PURE__ */ O(t, {
 			value: U,
 			onChange: W,
 			onClear: () => W(""),
@@ -586,61 +602,61 @@ function Ae({ label: n, description: c, disabled: p, placeholder: m, size: h, no
 		}) : null]
 	}) : void 0;
 	_(() => {
-		L && w === "columns" && Ue();
+		L && T === "columns" && Ue();
 	}, [
 		De.signature,
 		L,
-		w,
+		T,
 		Ue
 	]);
 	let $e = (e) => {
-		de.current = e;
+		ue.current = e;
 	}, et = () => {
-		le?.(), W(""), C === "single" && Fe();
+		ce?.(), W(""), w === "single" && Fe();
 	}, tt = (e) => {
 		e.hasChildren && me((t) => {
 			let n = new Map(t), r = t.get(e.node.id) ?? V.has(e.node.codeKey);
 			return n.set(e.node.id, !r), n;
 		});
 	};
-	return /* @__PURE__ */ D(l, {
+	return /* @__PURE__ */ O(l, {
 		label: n,
 		description: c,
 		disabled: p,
 		size: h,
 		children: ({ controlId: t, labelId: i, describedBy: o }) => {
 			let c = `${t}-listbox`, l = typeof n == "string" ? n : m;
-			return /* @__PURE__ */ O(E, { children: [/* @__PURE__ */ D(r, {
+			return /* @__PURE__ */ k(D, { children: [/* @__PURE__ */ O(r, {
 				ref: $e,
 				rootRef: Me,
 				id: t,
 				type: "text",
 				role: "combobox",
 				autoComplete: "off",
-				isLoading: N,
+				isLoading: P,
 				disabled: p,
-				readOnly: A !== "search",
-				value: A === "display" && qe ? "" : Ke,
+				readOnly: j !== "search",
+				value: j === "display" && qe ? "" : Ke,
 				placeholder: Ye ? he : void 0,
 				"aria-labelledby": i,
 				"aria-label": i ? void 0 : m,
 				"aria-describedby": o,
-				"aria-haspopup": w === "columns" ? "dialog" : "listbox",
+				"aria-haspopup": T === "columns" ? "dialog" : "listbox",
 				"aria-expanded": L,
 				"aria-controls": L ? c : void 0,
-				"aria-autocomplete": w !== "columns" && A === "search" ? "list" : "none",
-				"aria-activedescendant": w !== "columns" && L && J.length > 0 ? He(c) : void 0,
-				inputClassName: T(We && Q.treeSummary, qe && Q.inputWithOverlay),
-				overlay: qe ? /* @__PURE__ */ D("div", {
+				"aria-autocomplete": T !== "columns" && j === "search" ? "list" : "none",
+				"aria-activedescendant": T !== "columns" && L && J.length > 0 ? He(c) : void 0,
+				inputClassName: E(We && Q.treeSummary, qe && Q.inputWithOverlay),
+				overlay: qe ? /* @__PURE__ */ O("div", {
 					className: Q.valueOverlay,
-					children: j
-				}) : Je ? j : void 0,
-				endAdornment: /* @__PURE__ */ D(s, {
+					children: M
+				}) : Je ? M : void 0,
+				endAdornment: /* @__PURE__ */ O(s, {
 					open: L,
-					disabled: p || N,
+					disabled: p || P,
 					onToggleMouseDown: $.handleToggleMouseDown,
 					onToggleClick: $.handleToggleClick,
-					children: We && le ? /* @__PURE__ */ D("button", {
+					children: We && ce ? /* @__PURE__ */ O("button", {
 						type: "button",
 						className: Q.treeClearButton,
 						onMouseDown: (e) => {
@@ -650,19 +666,19 @@ function Ae({ label: n, description: c, disabled: p, placeholder: m, size: h, no
 							e.preventDefault(), e.stopPropagation(), et();
 						},
 						"aria-label": "Очистить выбор",
-						children: /* @__PURE__ */ D(ie, {})
+						children: /* @__PURE__ */ O(re, {})
 					}) : null
 				}),
 				onChange: (e) => {
-					A === "search" && $.handleTriggerInputChange(e.target.value);
+					j === "search" && $.handleTriggerInputChange(e.target.value);
 				},
 				onClick: $.handleTriggerClick,
 				onFocus: (e) => {
 					$.handleTriggerFocus(e.currentTarget);
 				},
 				onKeyDown: (e) => {
-					if (w === "columns" && L && e.key === "Tab" && !e.shiftKey && P.current) {
-						e.preventDefault(), P.current.focus();
+					if (T === "columns" && L && e.key === "Tab" && !e.shiftKey && F.current) {
+						e.preventDefault(), F.current.focus();
 						return;
 					}
 					ze(e), !e.defaultPrevented && $.handleTriggerKeyDown({
@@ -671,10 +687,10 @@ function Ae({ label: n, description: c, disabled: p, placeholder: m, size: h, no
 							let e = X >= 0 ? J[X] : void 0;
 							e && Re(e);
 						},
-						enableSpaceActivation: A === "display"
+						enableSpaceActivation: j === "display"
 					});
 				}
-			}), /* @__PURE__ */ D(a, {
+			}), /* @__PURE__ */ O(a, {
 				open: L,
 				context: Z,
 				floatingStyles: Ae,
@@ -682,32 +698,32 @@ function Ae({ label: n, description: c, disabled: p, placeholder: m, size: h, no
 				labelId: i,
 				popupAriaLabel: l,
 				descriptionId: o,
-				activeOptionId: w !== "columns" && J.length > 0 ? He(c) : void 0,
-				ariaMultiselectable: w !== "columns" && C === "multi",
-				popupRole: w === "columns" ? "dialog" : "listbox",
+				activeOptionId: T !== "columns" && J.length > 0 ? He(c) : void 0,
+				ariaMultiselectable: T !== "columns" && w === "multi",
+				popupRole: T === "columns" ? "dialog" : "listbox",
 				setFloating: Ne,
 				getFloatingProps: je,
 				onKeyDown: Be,
 				className: e.uiPopupOptions,
-				layoutClassName: w === "columns" ? Q.treeColumnsPopupLayout : void 0,
+				layoutClassName: T === "columns" ? Q.treeColumnsPopupLayout : void 0,
 				bodyClassName: "scrollable",
 				header: Qe,
-				children: /* @__PURE__ */ D("div", {
-					className: T(w === "columns" && Q.treeColumns),
-					children: J.length === 0 ? /* @__PURE__ */ D(f, {
-						errorState: ue,
-						emptyState: !ue && !N ? "Нет данных" : void 0
+				children: /* @__PURE__ */ O("div", {
+					className: E(T === "columns" && Q.treeColumns),
+					children: J.length === 0 ? /* @__PURE__ */ O(f, {
+						errorState: le,
+						emptyState: !le && !P ? "Нет данных" : void 0
 					}) : J.map((e, t) => {
-						let n = C === "multi" ? H(e.node.id, x, B) : x.has(e.node.id), r = C === "multi" && !n && S.has(e.node.id), i = t === X, a = e.node.disabled === !0;
-						return /* @__PURE__ */ D("div", {
+						let n = w === "multi" ? H(e.node.id, S, B) : S.has(e.node.id), r = w === "multi" && !n && C.has(e.node.id), i = t === X, a = e.node.disabled === !0;
+						return /* @__PURE__ */ O("div", {
 							"data-ui": "tree-select-option",
 							id: Ve(c, t),
 							ref: (e) => Pe(t, e),
-							role: w === "columns" ? void 0 : "option",
-							"aria-selected": w === "columns" ? void 0 : n,
+							role: T === "columns" ? void 0 : "option",
+							"aria-selected": T === "columns" ? void 0 : n,
 							"aria-disabled": a || void 0,
-							className: T(Q.treeRow, w === "columns" && Q.treeColumnRow, a && Q.treeRowDisabled, i && Q.treeRowActive, n && Q.treeRowSelected),
-							style: w === "columns" ? {
+							className: E(Q.treeRow, T === "columns" && Q.treeColumnRow, a && Q.treeRowDisabled, i && Q.treeRowActive, n && Q.treeRowSelected),
+							style: T === "columns" ? {
 								"--tree-option-column": `var(--tree-option-${t}-column, auto)`,
 								"--tree-option-row": `var(--tree-option-${t}-row, auto)`
 							} : void 0,
@@ -715,9 +731,9 @@ function Ae({ label: n, description: c, disabled: p, placeholder: m, size: h, no
 								e.preventDefault();
 							},
 							onClick: () => Re(e),
-							children: /* @__PURE__ */ D("div", {
+							children: /* @__PURE__ */ O("div", {
 								className: Q.treeNodeButton,
-								children: /* @__PURE__ */ D(ke, {
+								children: /* @__PURE__ */ O(ke, {
 									node: e.node,
 									level: e.level,
 									highlight: U,
@@ -725,8 +741,8 @@ function Ae({ label: n, description: c, disabled: p, placeholder: m, size: h, no
 									isExpanded: e.isExpanded,
 									selected: n,
 									partial: r,
-									selectionMode: C,
-									optionsLayout: w,
+									selectionMode: w,
+									optionsLayout: T,
 									onToggleExpand: () => tt(e),
 									onToggleSelection: () => Re(e)
 								})
@@ -754,44 +770,44 @@ function Me(e, t, n) {
 	return r.size === i.size && [...r].every((e) => i.has(e));
 }
 function Ne({ 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: m = "tree", defaultExpandedCodeKeys: g }) {
-	let [_, y] = ee(!1), b = v(() => fe(a), [a]), { draftValue: x, setDraftValue: S, prepareOpen: C } = c({
+	let [_, y] = b(!1), x = v(() => fe(a), [a]), { draftValue: S, setDraftValue: C, prepareOpen: w } = c({
 		value: o,
 		open: _,
 		onCommit: s,
-		isEqual: (e, t) => Me(e, t, b)
-	}), w = _ ? x : o, T = v(() => I(w, b), [w, b]), E = v(() => W(T, b), [T, b]), O = v(() => je(T, b), [T, b]);
-	return /* @__PURE__ */ D(Ae, {
+		isEqual: (e, t) => Me(e, t, x)
+	}), T = _ ? S : o, E = v(() => I(T, x), [T, x]), D = v(() => W(E, x), [E, x]), k = v(() => je(E, x), [E, x]);
+	return /* @__PURE__ */ O(Ae, {
 		label: e,
 		description: t,
 		disabled: n,
 		placeholder: r,
 		size: i,
 		nodes: a,
-		selectedIds: E.selectedIds,
-		partialIds: E.partialIds,
+		selectedIds: D.selectedIds,
+		partialIds: D.partialIds,
 		selectionMode: "multi",
 		optionsLayout: m,
 		defaultExpandedCodeKeys: g,
 		open: _,
 		onOpenChange: (e) => {
-			e && !_ && C(), y(e);
+			e && !_ && w(), y(e);
 		},
 		bulkActions: {
 			onSelectAll: () => {
-				S(L(G(b), b));
+				C(L(G(x), x));
 			},
-			onDeselectAll: () => S({})
+			onDeselectAll: () => C({})
 		},
 		triggerMode: "search",
-		selectedSummary: O ? /* @__PURE__ */ D(h, { value: O }) : void 0,
+		selectedSummary: k ? /* @__PURE__ */ O(h, { value: k }) : void 0,
 		query: l,
 		defaultQuery: u,
 		onQuery: d,
 		onNodeActivate: (e) => {
-			S((t) => ge(t, e.id, b));
+			C((t) => ge(t, e.id, x));
 		},
 		onClearSelection: () => {
-			S({}), _ || s({});
+			C({}), _ || s({});
 		},
 		isLoading: f,
 		error: p
@@ -799,19 +815,25 @@ function Ne({ label: e, description: t, disabled: n, placeholder: r = "Выбе
 }
 //#endregion
 //#region src/tree-select/ODataTreeMultiSelect.tsx
-function Pe({ 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, defaultExpandedCodeKeys: m }) {
-	let h = P({
+function Pe({ 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, defaultExpandedCodeKeys: m, segmentOrder: h, allowEmptyCodeKeys: g, transformNodes: _ }) {
+	let y = F({
 		odata: d,
 		segments: f,
-		model: p
-	});
-	return /* @__PURE__ */ D(Ne, {
+		model: p,
+		segmentOrder: h,
+		allowEmptyCodeKeys: g
+	}), b = v(() => _?.(y.nodes, { orderedCodeKeys: y.orderedCodeKeys }) ?? y.nodes, [
+		_,
+		y.nodes,
+		y.orderedCodeKeys
+	]);
+	return /* @__PURE__ */ O(Ne, {
 		label: e,
 		description: t,
-		disabled: n || h.isLoading,
+		disabled: n || y.isLoading,
 		size: r,
-		placeholder: i ?? h.placeholder,
-		nodes: h.nodes,
+		placeholder: i ?? y.placeholder,
+		nodes: b,
 		value: l,
 		onChange: u,
 		query: a,
@@ -819,8 +841,8 @@ function Pe({ label: e, description: t, disabled: n, size: r, placeholder: i, qu
 		onQuery: s,
 		optionsLayout: c,
 		defaultExpandedCodeKeys: m,
-		isLoading: h.isLoading,
-		error: h.isError ? "Ошибка загрузки" : void 0
+		isLoading: y.isLoading,
+		error: y.isError ? "Ошибка загрузки" : void 0
 	});
 }
 //#endregion
@@ -830,7 +852,7 @@ function Fe(e) {
 }
 function Ie({ 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, defaultExpandedCodeKeys: m }) {
 	let h = v(() => fe(a), [a]), g = pe(o, h), _ = g ? h.nodeById.get(g) : void 0;
-	return /* @__PURE__ */ D(Ae, {
+	return /* @__PURE__ */ O(Ae, {
 		label: e,
 		description: t,
 		disabled: n,
@@ -858,12 +880,12 @@ function Ie({ label: e, description: t, disabled: n, placeholder: r = "Выбе
 //#endregion
 //#region src/tree-select/ODataTreeSelect.tsx
 function Le({ 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, defaultExpandedCodeKeys: m }) {
-	let h = P({
+	let h = F({
 		odata: u,
 		segments: d,
 		model: f
 	});
-	return /* @__PURE__ */ D(Ie, {
+	return /* @__PURE__ */ O(Ie, {
 		label: e,
 		description: t,
 		disabled: n || h.isLoading,
@@ -882,6 +904,6 @@ function Le({ label: e, description: t, disabled: n, size: r, placeholder: i, qu
 	});
 }
 //#endregion
-export { Pe as ODataTreeMultiSelect, Le as ODataTreeSelect, Ne as TreeMultiSelect, Ie as TreeSelect, A as treeSelectValueToSelectedFilters };
+export { Pe as ODataTreeMultiSelect, Le as ODataTreeSelect, Ne as TreeMultiSelect, Ie as TreeSelect, j as treeSelectValueToSelectedFilters };
 
 //# sourceMappingURL=index.js.map