@ryuzaki13/react-foundation-ui 1.3.3 → 1.4.0

package/dist/tree-select/index.js

@@ -2,14 +2,14 @@ import { t as e } from "../chunks/ui.module-BisoTevy.js";
 import { o as t } from "../chunks/input-BCJfUdK_.js";
 import { t as n } from "../chunks/check-box-Dd3YFuxd.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-BAQ9NeHe.js";
-import { r as p } from "../chunks/useODataSelectBase-CWBR3WCn.js";
-import { o as m } from "../chunks/multi-select-DgSwr3Pf.js";
-import { useCallback as h, useEffect as g, useMemo as _, useRef as v, useState as ee } from "react";
-import { flattenODataDependentServices as y, sortODataDependentSegmentItemsByChains as b, useODataCollection as x, useODataCollectionChains as te, useODataCollectionModel as S } from "@ryuzaki13/react-foundation-api/odata";
-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";
+import { r as p } from "../chunks/useODataSelectBase-CKe1AVMI.js";
+import { o as m } from "../chunks/multi-select-CWx12rgb.js";
+import { useCallback as h, useEffect 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 te, useODataCollectionModel as C } from "@ryuzaki13/react-foundation-api/odata";
+import { cn as w } from "@ryuzaki13/react-foundation-lib/utils";
+import { CheckIcon as T, ChevronRightIcon as E, MinusIcon as ne, XIcon as re } from "lucide-react";
+import { Fragment as ie, jsx as D, jsxs as O } from "react/jsx-runtime";
+import { compareStrings as ae } from "@ryuzaki13/react-foundation-lib/string-comparison";
 //#region src/tree-select/helpers.ts
 function k(e) {
 	return e ? { [e.codeKey]: [e.value] } : {};
@@ -23,7 +23,7 @@ function j(e, t, n) {
 	let r = n[t];
 	return r && e[r] || e[t];
 }
-function ae(e) {
+function M(e) {
 	return [...new Set(e.filter(Boolean))].join(" ");
 }
 function oe(e) {
@@ -33,7 +33,7 @@ function oe(e) {
 		value: e.value,
 		label: e.label,
 		code: e.code,
-		searchText: ae([
+		searchText: M([
 			e.value,
 			e.label,
 			e.code
@@ -44,7 +44,7 @@ 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));
+	e.sort((e, n) => ae(t ? e.sortCode : e.label, t ? n.sortCode : n.label) || ae(e.sortCode, n.sortCode));
 	for (let n of e) se(n.children, t);
 }
 function ce(e) {
@@ -81,13 +81,13 @@ function le({ items: e, orderedCodeKeys: t, keyPairsMap: n, hiddenCodeKeys: r, t
 }
 //#endregion
 //#region src/tree-select/model/resolveOrderedTreeSegmentItems.ts
-function M(e, t) {
-	return b(e, t);
+function ue(e, t) {
+	return x(e, t);
 }
 //#endregion
 //#region src/tree-select/model/useODataTreeData.ts
-function ue(e, t, n) {
-	return y([{
+function N(e, t, n) {
+	return b([{
 		odata: e,
 		segments: t,
 		model: n
@@ -96,25 +96,25 @@ function ue(e, t, n) {
 function de(e) {
 	return e[0]?.id;
 }
-function N({ odata: e, segments: t, model: n }) {
-	let r = `${e.service}.${e.target}`, i = _(() => ue(e, t, n), [
+function P({ odata: e, segments: t, model: n }) {
+	let r = `${e.service}.${e.target}`, i = v(() => N(e, t, n), [
 		e,
 		t,
 		n
-	]), a = te([e]), o = _(() => M(i, a), [i, a]), s = _(() => o.map((e) => e.id), [o]), c = x({
+	]), a = te([e]), o = v(() => ue(i, a), [i, a]), s = v(() => o.map((e) => e.id), [o]), c = S({
 		odata: e,
-		model: S({
+		model: C({
 			codeKey: de(o) ?? Object.keys(t)[0],
 			...n
 		})
-	}), { hiddenCodeKeys: l, textValueCodeKeys: u } = _(() => {
+	}), { hiddenCodeKeys: l, textValueCodeKeys: u } = 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);
 		return {
 			hiddenCodeKeys: t,
 			textValueCodeKeys: n
 		};
-	}, [e.hideCode, o]), d = _(() => le({
+	}, [e.hideCode, o]), d = v(() => le({
 		items: c.data?.items ?? [],
 		orderedCodeKeys: s,
 		keyPairsMap: c.data?.keyPairsMap ?? {},
@@ -141,12 +141,12 @@ function N({ odata: e, segments: t, model: n }) {
 }
 //#endregion
 //#region src/tree-select/model/treeUtils.ts
-function P(e, t) {
+function F(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(P(e.codeKey, e.value), e.id);
+		t.set(e.id, e), n.set(e.id, c), i.set(e.id, o++), a.set(F(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);
@@ -162,18 +162,18 @@ function fe(e) {
 	};
 }
 function pe(e, t) {
-	if (e) return t.nodeIdByCodeValue.get(P(e.codeKey, e.value));
+	if (e) return t.nodeIdByCodeValue.get(F(e.codeKey, e.value));
 }
-function F(e, t) {
+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(P(r, e));
+		let i = t.nodeIdByCodeValue.get(F(r, e));
 		i && n.add(i);
 	}
 	return V(n, t);
 }
-function I(e, t) {
+function me(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);
@@ -213,7 +213,7 @@ function V(e, t) {
 	}
 	return n;
 }
-function me(e, t, n) {
+function he(e, t, n) {
 	let r = n.parentById.get(t);
 	for (; r;) {
 		if (e.has(r)) {
@@ -250,7 +250,7 @@ function U(e, t, n, r) {
 		partial: !1
 	};
 }
-function he(e, t) {
+function ge(e, t) {
 	let n = {
 		selectedIds: /* @__PURE__ */ new Set(),
 		partialIds: /* @__PURE__ */ new Set()
@@ -271,14 +271,14 @@ function W(e, t = e.rootIds) {
 	};
 	return new Set(t.flatMap((e) => n(e).selectedIds));
 }
-function ge(e, t, n) {
-	let r = F(e, n), i = (e) => {
+function _e(e, t, n) {
+	let r = I(e, n), i = (e) => {
 		if (H(e, r, n)) {
 			if (r.has(e)) {
 				r.delete(e);
 				return;
 			}
-			me(r, e, n) && i(e);
+			he(r, e, n) && i(e);
 			return;
 		}
 		z(r, e, n), r.add(e);
@@ -287,17 +287,26 @@ function ge(e, t, n) {
 		let t = H(e, r, n);
 		(o && t || !o && !t) && i(e);
 	}
-	return I(V(r, n), n);
+	return me(V(r, n), n);
 }
-function _e(e, t, n) {
+function ve(e, t, n) {
 	let r = t.parentById.get(e);
 	for (; r;) n.add(r), r = t.parentById.get(r);
 }
-function ve(e, t) {
+function ye(e, t) {
 	let n = /* @__PURE__ */ new Set();
-	for (let r of e) _e(r, t, n);
+	for (let r of e) ve(r, t, n);
 	return n;
 }
+function be(e, t, n) {
+	let r = /* @__PURE__ */ new Set();
+	for (let [i, a] of e.childrenById) {
+		if (a.length === 0) continue;
+		let o = e.nodeById.get(i);
+		o && (n.get(i) ?? t.has(o.codeKey)) && r.add(i);
+	}
+	return r;
+}
 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 : {
@@ -305,7 +314,7 @@ function G(e, t, n) {
 		children: r
 	});
 }
-function ye(e, t) {
+function xe(e, t) {
 	let n = t.trim().toLowerCase();
 	if (!n) return {
 		nodes: [...e],
@@ -317,7 +326,7 @@ function ye(e, t) {
 		expandedIds: r
 	};
 }
-function be(e, t) {
+function Se(e, t) {
 	let n = [], r = (e, i, a) => {
 		let o = (e.children?.length ?? 0) > 0, s = o && t.has(e.id);
 		if (n.push({
@@ -333,27 +342,90 @@ function be(e, t) {
 	return n;
 }
 //#endregion
+//#region src/tree-select/model/buildTreeColumnsLayoutDescriptor.ts
+function Ce(e) {
+	let t = [], n = 0;
+	for (; n < e.length;) {
+		let r = n + 1;
+		for (; r < e.length && e[r]?.level !== 0;) r += 1;
+		let i = [];
+		for (let t = n + 1; t < r; t += 1) e[t]?.level === 1 && i.push(t);
+		t.push({
+			startIndex: n,
+			endIndexExclusive: r,
+			...i.length > 2 ? { protectedPrefixEndIndexExclusive: (i[1] ?? n) + 1 } : {}
+		}), n = r;
+	}
+	let r = t.map(({ startIndex: e, endIndexExclusive: t, protectedPrefixEndIndexExclusive: n }) => `${e}:${t}:${n ?? "-"}`).join("|");
+	return {
+		itemCount: e.length,
+		groups: t,
+		signature: `${e.length}|${r}`
+	};
+}
+//#endregion
 //#region src/tree-select/model/resolveBalancedTreeColumnsLayout.ts
-var K = 8, q = 16, xe = 48, Se = 224, J = 10, Ce = 32, we = 6;
-function Y(e, t) {
+var K = 8, q = 16, we = 48, J = 224, Y = 10, Te = 32, Ee = 6;
+function X(e, t) {
 	return Number.isFinite(e) && e > 0 ? e : t;
 }
-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, 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);
+function De(e, t) {
+	let n = e.endIndexExclusive - e.startIndex;
+	if (n <= t) return n;
+	if (e.protectedPrefixEndIndexExclusive === void 0) return 0;
+	let r = e.protectedPrefixEndIndexExclusive - e.startIndex;
+	return r <= t ? r : Math.min(3, n);
+}
+function Z(e, t) {
+	let n = Math.max(1, t), r = [], i = 1, a = 1, o = 0;
+	for (let t of e.groups) {
+		let e = De(t, n), s = n - a + 1;
+		a > 1 && e > s && (o += s, i += 1, a = 1);
+		for (let e = t.startIndex; e < t.endIndexExclusive; e += 1) r[e] = {
+			column: i,
+			row: a
+		}, a += 1, a > n && (i += 1, a = 1);
 	}
-	let ee = Math.ceil(o / _), y = Math.max(m, q + _ * Se + (_ - 1) * J);
 	return {
-		columnCount: _,
-		rowCount: ee,
-		width: Math.min(d, y),
+		placements: r,
+		usedColumnCount: r.length ? Math.max(...r.map((e) => e.column)) : 1,
+		intentionalGapCount: o
+	};
+}
+function Oe({ descriptor: e, availableWidth: t, availableHeight: n, viewportWidth: r, viewportHeight: i, referenceWidth: a }) {
+	let o = Math.max(0, Math.floor(Number.isFinite(e.itemCount) ? e.itemCount : 0)), s = X(t, 240), c = X(n, 80), l = X(r, s + K * 2), u = X(i, c), d = Math.max(1, Math.min(s, Math.max(1, l - K * 2))), f = Math.max(1, Math.min(c, u - K * 2)), p = Math.max(1, X(a, 1)), m = Math.min(d, p), h = Math.max(1, Math.floor((d - q + Y) / 234)), g = Math.max(1, Math.min(Ee, h, o || 1)), _ = e.groups.some((e) => e.protectedPrefixEndIndexExclusive !== void 0) ? 3 : 1;
+	if (o === 0) return {
+		columnCount: 1,
+		rowCount: 1,
+		width: m,
+		minWidth: m,
+		maxHeight: f,
+		placements: []
+	};
+	let v, y = Infinity;
+	for (let t = 1; t <= g; t += 1) {
+		let n = Math.max(_, Math.ceil(o / t)), r = Z(e, n);
+		for (; r.usedColumnCount > t && n < o;) n += 1, r = Z(e, n);
+		let i = r.usedColumnCount, a = Math.max(m, q + i * J + (i - 1) * Y), s = we + n * Te, c = a / d, l = s / f, u = (i * n - o) / o, p = r.intentionalGapCount / o, h = Math.max(c, l) + .25 * Math.abs(c - l) + .01 * u + .02 * p + .04 * (i - 1);
+		h < y && (y = h, v = {
+			columnCount: i,
+			rowCount: n,
+			width: Math.min(d, a),
+			minWidth: m,
+			maxHeight: f,
+			placements: r.placements
+		});
+	}
+	return v ?? {
+		columnCount: 1,
+		rowCount: o,
+		width: m,
 		minWidth: m,
-		maxHeight: f
+		maxHeight: f,
+		placements: Z(e, o).placements
 	};
 }
-var X = {
+var Q = {
 	treeRow: "eMqOwq",
 	treeRowSelected: "JKstO-",
 	treeRowActive: "hKgr8e",
@@ -362,6 +434,9 @@ var X = {
 	treePopupHeader: "UBll8Q",
 	treeColumns: "-y3RZP",
 	treeColumnRow: "ayLJ50",
+	treeColumnsPopupLayout: "_430vL2",
+	treeColumnRootLabel: "FkzTJI",
+	treeColumnRootCode: "e8fE4t",
 	treeColumnCheckBox: "_2MFkGF",
 	treeNodeOptionContent: "SWQUvb",
 	treeIndent: "o5NWnX",
@@ -381,119 +456,128 @@ var X = {
 };
 //#endregion
 //#region src/tree-select/TreeNodeContent.tsx
-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", {
-			className: X.treeIndent,
+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(ie, { children: [
+		/* @__PURE__ */ D("span", {
+			className: Q.treeIndent,
 			style: { "--tree-level": t },
 			"aria-hidden": "true"
 		}),
-		f && i ? /* @__PURE__ */ E("button", {
+		f && i ? /* @__PURE__ */ D("button", {
 			type: "button",
-			className: X.treeExpander,
+			className: Q.treeExpander,
 			onClick: (e) => {
 				e.stopPropagation(), u?.();
 			},
 			"aria-label": a ? "Свернуть ветку" : "Развернуть ветку",
 			"data-ui": "tree-select-expander",
 			"data-action": a ? "collapse-tree-select-node" : "expand-tree-select-node",
-			children: /* @__PURE__ */ E(T, { className: C(X.treeExpanderIcon, a && X.treeExpanderIconExpanded) })
-		}) : f ? /* @__PURE__ */ E("span", {
-			className: X.treeExpanderPlaceholder,
+			children: /* @__PURE__ */ D(E, { className: w(Q.treeExpanderIcon, a && Q.treeExpanderIconExpanded) })
+		}) : f ? /* @__PURE__ */ D("span", {
+			className: Q.treeExpanderPlaceholder,
 			"aria-hidden": "true"
 		}) : null,
-		c === "multi" && l === "columns" ? /* @__PURE__ */ E("span", {
-			className: X.treeColumnCheckBox,
+		c === "multi" && l === "columns" ? /* @__PURE__ */ D("span", {
+			className: Q.treeColumnCheckBox,
 			onMouseDown: (e) => e.stopPropagation(),
 			onClick: (e) => e.stopPropagation(),
-			children: /* @__PURE__ */ E(n, {
+			children: /* @__PURE__ */ D(n, {
 				value: o,
 				indeterminate: s,
 				disabled: e.disabled,
 				"aria-label": `Выбрать ${e.label}`,
 				onChange: () => d?.()
 			})
-		}) : c === "multi" ? /* @__PURE__ */ E("span", {
-			className: C(X.treeSelection, o && X.treeSelectionChecked, s && X.treeSelectionPartial),
+		}) : c === "multi" ? /* @__PURE__ */ D("span", {
+			className: w(Q.treeSelection, o && Q.treeSelectionChecked, s && Q.treeSelectionPartial),
 			"aria-hidden": "true",
-			children: o ? /* @__PURE__ */ E(w, { className: X.treeSelectionIcon }) : s ? /* @__PURE__ */ E(ne, { className: X.treeSelectionIcon }) : null
+			children: o ? /* @__PURE__ */ D(T, { className: Q.treeSelectionIcon }) : s ? /* @__PURE__ */ D(ne, { className: Q.treeSelectionIcon }) : null
 		}) : null,
-		/* @__PURE__ */ E("div", {
-			className: X.treeNodeOptionContent,
-			children: /* @__PURE__ */ E(p, {
+		/* @__PURE__ */ D("div", {
+			className: Q.treeNodeOptionContent,
+			children: /* @__PURE__ */ D(p, {
 				label: e.label,
 				code: e.code,
-				highlight: r
+				highlight: r,
+				labelClassName: m ? Q.treeColumnRootLabel : void 0,
+				codeClassName: m ? Q.treeColumnRootCode : void 0
 			})
 		})
 	] });
 }
 //#endregion
 //#region src/tree-select/TreePickerBase.tsx
-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({
+function Ae({ label: n, description: c, disabled: p, placeholder: m, size: b, nodes: x, selectedIds: S, partialIds: te, selectionMode: C, optionsLayout: T = "tree", defaultExpandedCodeKeys: E, open: ne, onOpenChange: ae, bulkActions: k, triggerMode: A = "display", selectedSummary: j, selectedSummaryText: M, query: oe, defaultQuery: se, onQuery: ce, onNodeActivate: le, onClearSelection: ue, isLoading: N, error: de }) {
+	let P = y(null), F = y(null), pe = y(!1), [I, me] = ee(() => /* @__PURE__ */ new Map()), L = A === "search" ? C === "multi" ? "search-multi" : "search-single" : "display", R = v(() => fe(x), [x]), z = v(() => new Set(E), [E]), { query: B, setQuery: V } = u({
 		open: !0,
-		query: ae,
-		defaultQuery: oe,
-		onQuery: se,
+		query: oe,
+		defaultQuery: se,
+		onQuery: ce,
 		triggerMode: "display"
-	}), { 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
+	}), { nodes: he, expandedIds: U } = v(() => xe(x, B), [x, B]), ge = v(() => ye(S, R), [S, R]), W = v(() => be(R, z, I), [
+		z,
+		I,
+		R
+	]), _e = v(() => new Set([...R.childrenById].filter(([, e]) => e.length > 0).map(([e]) => e)), [R]), ve = v(() => T === "columns" ? _e : /* @__PURE__ */ new Set([
+		...W,
+		...U,
+		...ge
 	]), [
+		_e,
+		W,
+		T,
 		U,
-		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({
+		ge
+	]), G = v(() => Se(he, ve), [he, ve]), K = v(() => G.findIndex((e) => S.has(e.node.id)), [S, G]), q = v(() => Ce(G), [G]), we = h((e) => {
+		let t = Oe({
 			...e,
-			itemCount: W.length
-		});
-		return {
+			descriptor: q
+		}), n = {};
+		return t.placements.forEach((e, t) => {
+			n[`--tree-option-${t}-column`] = String(e.column), n[`--tree-option-${t}-row`] = String(e.row);
+		}), {
 			width: `${t.width}px`,
 			minWidth: `${t.minWidth}px`,
 			maxWidth: `${t.width}px`,
 			maxHeight: `${t.maxHeight}px`,
 			"--tree-column-count": String(t.columnCount),
-			"--tree-row-count": String(Math.max(t.rowCount, 1))
+			"--tree-row-count": String(t.rowCount),
+			...n
 		};
-	}, [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,
-		onSelect: (e) => ce(e.node),
+	}, [q]), { open: J, activeIndex: Y, context: Te, floatingStyles: Ee, getFloatingProps: X, setReference: De, setFloating: Z, setOptionRef: Ae, close: je, openList: Me, toggleOpen: Ne, selectOption: Pe, handleReferenceKeyDown: Fe, handleFloatingKeyDown: Ie, getOptionId: Le, getActiveOptionId: Re } = o({
+		options: G,
+		selectedIndex: K,
+		open: ne,
+		onOpenChange: ae,
+		onSelect: (e) => le(e.node),
 		getOptionDisabled: (e) => e.node.disabled === !0,
-		disabled: p || M,
-		closeOnSelect: S === "single",
+		disabled: p || N,
+		closeOnSelect: C === "single",
 		allowOpenWithoutOptions: !0,
-		triggerMode: I,
-		placementStrategy: w === "columns" ? "auto" : "flip",
-		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: de,
-		setQuery: z,
-		openList: De,
-		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: N
-		}) : null, ze ? /* @__PURE__ */ E(t, {
-			value: R,
-			onChange: z,
-			onClear: () => z(""),
+		triggerMode: L,
+		placementStrategy: T === "columns" ? "auto" : "flip",
+		resolveFloatingSize: T === "columns" ? we : void 0
+	}), ze = Te.update, Be = S.size > 0, Ve = A === "search" && (J || B.length > 0), He = Ve ? B : M ?? "", Ue = A === "display" && !!j, We = L === "search-multi" && !!j, Ge = L === "search-multi" && !Be || L === "search-single" && (!M || Ve) || L === "display" && !Be, $ = d({
+		mode: L,
+		open: J,
+		currentQuery: B,
+		hasDisplayValue: !!M,
+		inputRef: P,
+		setQuery: V,
+		openList: Me,
+		close: je,
+		toggleOpen: Ne
+	}), Ke = T === "columns" && C === "multi" && k, qe = A === "display", Je = Ke || qe ? /* @__PURE__ */ O("div", {
+		className: Q.treePopupHeader,
+		children: [Ke ? /* @__PURE__ */ D(i, {
+			onSelectAll: k.onSelectAll,
+			onDeselectAll: k.onDeselectAll,
+			selectAllButtonRef: F
+		}) : null, qe ? /* @__PURE__ */ D(t, {
+			value: B,
+			onChange: V,
+			onClear: () => V(""),
 			placeholder: "Поиск по дереву",
 			onKeyDown: (e) => {
 				e.key !== "Escape" && e.key !== "Tab" && e.stopPropagation();
@@ -504,144 +588,156 @@ function De({ label: n, description: c, disabled: p, placeholder: m, size: y, no
 		}) : null]
 	}) : void 0;
 	g(() => {
-		P.current && !G && $.policy.resetQueryOnClose && z(""), P.current = G;
+		pe.current && !J && $.policy.resetQueryOnClose && V(""), pe.current = J;
 	}, [
-		G,
-		z,
+		J,
+		V,
 		$.policy.resetQueryOnClose
+	]), _(() => {
+		J && T === "columns" && ze();
+	}, [
+		q.signature,
+		J,
+		T,
+		ze
 	]);
-	let Ve = (e) => {
-		de.current = e;
-	}, He = () => {
-		le?.(), z(""), S === "single" && Y();
-	}, Ue = (e) => {
-		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;
+	let Ye = (e) => {
+		P.current = e;
+	}, Xe = () => {
+		ue?.(), V(""), C === "single" && je();
+	}, Ze = (e) => {
+		e.hasChildren && me((t) => {
+			let n = new Map(t), r = t.get(e.node.id) ?? z.has(e.node.codeKey);
+			return n.set(e.node.id, !r), n;
 		});
 	};
-	return /* @__PURE__ */ E(l, {
+	return /* @__PURE__ */ D(l, {
 		label: n,
 		description: c,
 		disabled: p,
 		placeholder: m,
-		size: y,
+		size: b,
 		children: ({ controlId: t, labelId: i, describedBy: o }) => {
 			let c = `${t}-listbox`, l = typeof n == "string" ? n : m;
-			return /* @__PURE__ */ D(ie, { children: [/* @__PURE__ */ E(r, {
-				ref: Ve,
-				rootRef: J,
+			return /* @__PURE__ */ O(ie, { children: [/* @__PURE__ */ D(r, {
+				ref: Ye,
+				rootRef: De,
 				id: t,
 				type: "text",
 				role: "combobox",
 				autoComplete: "off",
-				disabled: p || M,
-				readOnly: k !== "search",
-				value: k === "display" && Fe ? "" : Pe,
-				placeholder: Le ? m : void 0,
+				disabled: p || N,
+				readOnly: A !== "search",
+				value: A === "display" && Ue ? "" : He,
+				placeholder: Ge ? m : void 0,
 				"aria-labelledby": i,
 				"aria-label": i ? void 0 : m,
 				"aria-describedby": o,
-				"aria-haspopup": w === "columns" ? "dialog" : "listbox",
-				"aria-expanded": G,
-				"aria-controls": G ? c : void 0,
-				"aria-autocomplete": w !== "columns" && k === "search" ? "list" : "none",
-				"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
+				"aria-haspopup": T === "columns" ? "dialog" : "listbox",
+				"aria-expanded": J,
+				"aria-controls": J ? c : void 0,
+				"aria-autocomplete": T !== "columns" && A === "search" ? "list" : "none",
+				"aria-activedescendant": T !== "columns" && J && G.length > 0 ? Re(c) : void 0,
+				inputClassName: w(Be && Q.treeSummary, Ue && Q.inputWithOverlay),
+				overlay: Ue ? /* @__PURE__ */ D("div", {
+					className: Q.valueOverlay,
+					children: j
 				}) : void 0,
-				endAdornment: /* @__PURE__ */ D(s, {
-					open: G,
-					disabled: p || M,
+				endAdornment: /* @__PURE__ */ O(s, {
+					open: J,
+					disabled: p || N,
 					onToggleMouseDown: $.handleToggleMouseDown,
 					onToggleClick: $.handleToggleClick,
-					children: [Ie ? A : null, Q && le ? /* @__PURE__ */ E("button", {
+					children: [We ? j : null, Be && ue ? /* @__PURE__ */ D("button", {
 						type: "button",
-						className: X.treeClearButton,
+						className: Q.treeClearButton,
 						onMouseDown: (e) => {
 							e.preventDefault(), e.stopPropagation();
 						},
 						onClick: (e) => {
-							e.preventDefault(), e.stopPropagation(), He();
+							e.preventDefault(), e.stopPropagation(), Xe();
 						},
 						"aria-label": "Очистить выбор",
-						children: /* @__PURE__ */ E(re, {})
+						children: /* @__PURE__ */ D(re, {})
 					}) : null]
 				}),
 				onChange: (e) => {
-					k === "search" && $.handleTriggerInputChange(e.target.value);
+					A === "search" && $.handleTriggerInputChange(e.target.value);
 				},
 				onClick: $.handleTriggerClick,
 				onFocus: (e) => {
 					$.handleTriggerFocus(e.currentTarget);
 				},
 				onKeyDown: (e) => {
-					if (w === "columns" && G && e.key === "Tab" && !e.shiftKey && N.current) {
-						e.preventDefault(), N.current.focus();
+					if (T === "columns" && J && e.key === "Tab" && !e.shiftKey && F.current) {
+						e.preventDefault(), F.current.focus();
 						return;
 					}
-					Ae(e), !e.defaultPrevented && $.handleTriggerKeyDown({
+					Fe(e), !e.defaultPrevented && $.handleTriggerKeyDown({
 						event: e,
 						onActivateWhenOpen: () => {
-							let e = K >= 0 ? W[K] : void 0;
-							e && ke(e);
+							let e = Y >= 0 ? G[Y] : void 0;
+							e && Pe(e);
 						},
-						enableSpaceActivation: k === "display"
+						enableSpaceActivation: A === "display"
 					});
 				}
-			}), /* @__PURE__ */ E(a, {
-				open: G,
-				context: q,
-				floatingStyles: xe,
+			}), /* @__PURE__ */ D(a, {
+				open: J,
+				context: Te,
+				floatingStyles: Ee,
 				listId: c,
 				labelId: i,
 				popupAriaLabel: l,
 				descriptionId: o,
-				activeOptionId: w !== "columns" && W.length > 0 ? Z(c) : void 0,
-				ariaMultiselectable: w !== "columns" && S === "multi",
-				popupRole: w === "columns" ? "dialog" : "listbox",
-				setFloating: Ce,
-				getFloatingProps: Se,
-				onKeyDown: je,
+				activeOptionId: T !== "columns" && G.length > 0 ? Re(c) : void 0,
+				ariaMultiselectable: T !== "columns" && C === "multi",
+				popupRole: T === "columns" ? "dialog" : "listbox",
+				setFloating: Z,
+				getFloatingProps: X,
+				onKeyDown: Ie,
 				className: e.uiPopupOptions,
+				layoutClassName: T === "columns" ? Q.treeColumnsPopupLayout : void 0,
 				bodyClassName: "scrollable",
-				header: Be,
-				children: /* @__PURE__ */ E("div", {
-					className: C(w === "columns" && X.treeColumns),
-					children: W.length === 0 ? /* @__PURE__ */ E(f, {
-						errorState: ue,
-						loadingState: M ? "Загрузка..." : void 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", {
+				header: Je,
+				children: /* @__PURE__ */ D("div", {
+					className: w(T === "columns" && Q.treeColumns),
+					children: G.length === 0 ? /* @__PURE__ */ D(f, {
+						errorState: de,
+						loadingState: N ? "Загрузка..." : void 0,
+						emptyState: !de && !N ? "Нет данных" : void 0
+					}) : G.map((e, t) => {
+						let n = C === "multi" ? H(e.node.id, S, R) : S.has(e.node.id), r = C === "multi" && !n && te.has(e.node.id), i = t === Y, a = e.node.disabled === !0;
+						return /* @__PURE__ */ D("div", {
 							"data-ui": "tree-select-option",
-							id: Me(c, t),
-							ref: (e) => we(t, e),
-							role: w === "columns" ? void 0 : "option",
-							"aria-selected": w === "columns" ? void 0 : n,
+							id: Le(c, t),
+							ref: (e) => Ae(t, e),
+							role: T === "columns" ? void 0 : "option",
+							"aria-selected": T === "columns" ? void 0 : n,
 							"aria-disabled": a || void 0,
-							className: C(X.treeRow, w === "columns" && X.treeColumnRow, a && X.treeRowDisabled, i && X.treeRowActive, n && X.treeRowSelected),
+							className: w(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,
 							onMouseDown: (e) => {
 								e.preventDefault();
 							},
-							onClick: () => ke(e),
-							children: /* @__PURE__ */ E("div", {
-								className: X.treeNodeButton,
-								children: /* @__PURE__ */ E(Ee, {
+							onClick: () => Pe(e),
+							children: /* @__PURE__ */ D("div", {
+								className: Q.treeNodeButton,
+								children: /* @__PURE__ */ D(ke, {
 									node: e.node,
 									level: e.level,
-									highlight: R,
+									highlight: B,
 									hasChildren: e.hasChildren,
 									isExpanded: e.isExpanded,
 									selected: n,
 									partial: r,
-									selectionMode: S,
-									optionsLayout: w,
-									onToggleExpand: () => Ue(e),
-									onToggleSelection: () => ke(e)
+									selectionMode: C,
+									optionsLayout: T,
+									onToggleExpand: () => Ze(e),
+									onToggleSelection: () => Pe(e)
 								})
 							})
 						}, e.node.id);
@@ -653,7 +749,7 @@ function De({ label: n, description: c, disabled: p, placeholder: m, size: y, no
 }
 //#endregion
 //#region src/tree-select/TreeMultiSelect.tsx
-function Oe(e, t) {
+function je(e, t) {
 	if (e.size !== 0) {
 		if (e.size === 1) {
 			let n = t.nodeById.get([...e][0]);
@@ -662,48 +758,49 @@ function Oe(e, t) {
 		return `${e.size} элементов`;
 	}
 }
-function ke(e, t, n) {
-	let r = F(e, n), i = F(t, n);
+function Me(e, t, n) {
+	let r = I(e, n), i = I(t, n);
 	return r.size === i.size && [...r].every((e) => i.has(e));
 }
-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({
+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: h = "tree", defaultExpandedCodeKeys: g }) {
+	let [_, y] = ee(!1), b = v(() => fe(a), [a]), { draftValue: x, setDraftValue: S, prepareOpen: te } = c({
 		value: o,
-		open: g,
+		open: _,
 		onCommit: s,
-		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, {
+		isEqual: (e, t) => Me(e, t, b)
+	}), C = _ ? x : o, w = v(() => I(C, b), [C, b]), T = v(() => ge(w, b), [w, b]), E = v(() => je(w, b), [w, b]);
+	return /* @__PURE__ */ D(Ae, {
 		label: e,
 		description: t,
 		disabled: n,
 		placeholder: r,
 		size: i,
 		nodes: a,
-		selectedIds: w.selectedIds,
-		partialIds: w.partialIds,
+		selectedIds: T.selectedIds,
+		partialIds: T.partialIds,
 		selectionMode: "multi",
 		optionsLayout: h,
-		open: g,
+		defaultExpandedCodeKeys: g,
+		open: _,
 		onOpenChange: (e) => {
-			e && !g && te(), v(e);
+			e && !_ && te(), y(e);
 		},
 		bulkActions: {
 			onSelectAll: () => {
-				x(I(W(y), y));
+				S(me(W(b), b));
 			},
-			onDeselectAll: () => x({})
+			onDeselectAll: () => S({})
 		},
 		triggerMode: "search",
-		selectedSummary: T ? /* @__PURE__ */ E(m, { value: T }) : void 0,
+		selectedSummary: E ? /* @__PURE__ */ D(m, { value: E }) : void 0,
 		query: l,
 		defaultQuery: u,
 		onQuery: d,
 		onNodeActivate: (e) => {
-			x((t) => ge(t, e.id, y));
+			S((t) => _e(t, e.id, b));
 		},
 		onClearSelection: () => {
-			x({}), g || s({});
+			S({}), _ || s({});
 		},
 		isLoading: f,
 		error: p
@@ -711,48 +808,50 @@ function Ae({ label: e, description: t, disabled: n, placeholder: r = "Выбе
 }
 //#endregion
 //#region src/tree-select/ODataTreeMultiSelect.tsx
-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({
+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({
 		odata: d,
 		segments: f,
 		model: p
 	});
-	return /* @__PURE__ */ E(Ae, {
+	return /* @__PURE__ */ D(Ne, {
 		label: e,
 		description: t,
-		disabled: n || m.isLoading,
+		disabled: n || h.isLoading,
 		size: r,
-		placeholder: i ?? m.placeholder,
-		nodes: m.nodes,
+		placeholder: i ?? h.placeholder,
+		nodes: h.nodes,
 		value: l,
 		onChange: u,
 		query: a,
 		defaultQuery: o,
 		onQuery: s,
 		optionsLayout: c,
-		isLoading: m.isLoading,
-		error: m.isError ? "Ошибка загрузки" : void 0
+		defaultExpandedCodeKeys: m,
+		isLoading: h.isLoading,
+		error: h.isError ? "Ошибка загрузки" : void 0
 	});
 }
 //#endregion
 //#region src/tree-select/TreeSelect.tsx
-function Me(e) {
+function Fe(e) {
 	if (e) return e.code && e.code !== e.label ? `${e.label} · ${e.code}` : e.label;
 }
-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, {
+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, {
 		label: e,
 		description: t,
 		disabled: n,
 		placeholder: r,
 		size: i,
 		nodes: a,
-		selectedIds: h ? /* @__PURE__ */ new Set([h]) : /* @__PURE__ */ new Set(),
+		selectedIds: g ? /* @__PURE__ */ new Set([g]) : /* @__PURE__ */ new Set(),
 		partialIds: /* @__PURE__ */ new Set(),
 		selectionMode: "single",
+		defaultExpandedCodeKeys: m,
 		triggerMode: "search",
-		selectedSummaryText: Me(g),
+		selectedSummaryText: Fe(_),
 		query: c,
 		defaultQuery: l,
 		onQuery: u,
@@ -767,30 +866,31 @@ function Z({ label: e, description: t, disabled: n, placeholder: r = "Выбер
 }
 //#endregion
 //#region src/tree-select/ODataTreeSelect.tsx
-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({
+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({
 		odata: u,
 		segments: d,
 		model: f
 	});
-	return /* @__PURE__ */ E(Z, {
+	return /* @__PURE__ */ D(Ie, {
 		label: e,
 		description: t,
-		disabled: n || m.isLoading,
+		disabled: n || h.isLoading,
 		size: r,
-		placeholder: i ?? m.placeholder,
-		nodes: m.nodes,
+		placeholder: i ?? h.placeholder,
+		nodes: h.nodes,
 		value: c,
 		onChange: l,
 		query: a,
 		defaultQuery: o,
 		onQuery: s,
-		isLoading: m.isLoading,
-		error: m.isError ? "Ошибка загрузки" : void 0,
+		defaultExpandedCodeKeys: m,
+		isLoading: h.isLoading,
+		error: h.isError ? "Ошибка загрузки" : void 0,
 		clearable: p
 	});
 }
 //#endregion
-export { je as ODataTreeMultiSelect, Q as ODataTreeSelect, Ae as TreeMultiSelect, Z as TreeSelect, k as treeSelectValueToSelectedFilters };
+export { Pe as ODataTreeMultiSelect, Le as ODataTreeSelect, Ne as TreeMultiSelect, Ie as TreeSelect, k as treeSelectValueToSelectedFilters };
 
 //# sourceMappingURL=index.js.map