schummar-table 1.0.0-beta.5 → 1.0.0-beta.7

package/dist/index.cjs

@@ -269,42 +269,63 @@ function useColumns(props, displaySize) {
 //#region src/state/useExpanded.ts
 function useExpanded(props, itemsById, matching) {
 	const [value, setExpanded, setExpandedInternal] = useControllableState(props.expanded, () => props.defaultExpanded ?? /* @__PURE__ */ new Set(), props.onExpandedChange);
-	return {
-		expanded: useNormalized(value, (0, react.useMemo)(() => {
-			let result = value;
-			const add = (id) => {
-				if (result.has(id)) return;
+	const expandOnlyOne = props.expandOnlyOne && !(props.revealFiltered && matching);
+	const expanded = useNormalized(value, (0, react.useMemo)(() => {
+		let result = value;
+		const add = (id) => {
+			if (result.has(id)) return;
+			if (result === value) result = new Set(value);
+			result.add(id);
+		};
+		if (expandOnlyOne && value.size > 1) {
+			const deepest = [...value].map((id) => itemsById.get(id)).filter((item) => item !== void 0).sort((a, b) => b.depth - a.depth)[0];
+			const branch = deepest ? require_useTheme.getAncestors(itemsById, deepest).add(deepest.id) : /* @__PURE__ */ new Set();
+			if ([...value].some((id) => !branch.has(id))) return branch;
+		}
+		for (const id of value) {
+			const item = itemsById.get(id);
+			if (item) require_useTheme.getAncestors(itemsById, item).forEach(add);
+		}
+		if (props.items !== void 0) {
+			for (const id of value) if (!itemsById.has(id)) {
 				if (result === value) result = new Set(value);
-				result.add(id);
-			};
-			if (props.expandOnlyOne && value.size > 1) {
-				const deepest = [...value].map((id) => itemsById.get(id)).filter((item) => item !== void 0).sort((a, b) => b.depth - a.depth)[0];
-				const branch = deepest ? require_useTheme.getAncestors(itemsById, deepest).add(deepest.id) : /* @__PURE__ */ new Set();
-				if ([...value].some((id) => !branch.has(id))) return branch;
-			}
-			for (const id of value) {
-				const item = itemsById.get(id);
-				if (item) require_useTheme.getAncestors(itemsById, item).forEach(add);
-			}
-			if (props.items !== void 0) {
-				for (const id of value) if (!itemsById.has(id)) {
-					if (result === value) result = new Set(value);
-					result.delete(id);
-				}
+				result.delete(id);
 			}
-			if (props.revealFiltered && matching) for (const id of matching) {
-				const parentId = itemsById.get(id)?.parentId;
-				if (parentId !== void 0 && parentId !== null) add(parentId);
-			}
-			return result;
-		}, [
-			value,
-			itemsById,
-			matching,
-			props.items,
-			props.expandOnlyOne,
-			props.revealFiltered
-		]), setExpanded),
+		}
+		return result;
+	}, [
+		value,
+		itemsById,
+		props.items,
+		expandOnlyOne
+	]), setExpanded);
+	const latest = (0, react.useRef)({
+		expanded,
+		itemsById
+	});
+	(0, react.useEffect)(() => {
+		latest.current = {
+			expanded,
+			itemsById
+		};
+	});
+	(0, react.useEffect)(() => {
+		if (!props.revealFiltered || !matching) return;
+		const { expanded, itemsById } = latest.current;
+		const next = new Set(expanded);
+		for (const id of matching) {
+			const parentId = itemsById.get(id)?.parentId;
+			if (parentId !== void 0 && parentId !== null) next.add(parentId);
+		}
+		if (next.size > expanded.size) setExpanded(next);
+	}, [
+		matching,
+		props.revealFiltered,
+		setExpanded
+	]);
+	return {
+		expanded,
+		expandOnlyOne,
 		setExpanded,
 		setExpandedInternal
 	};
@@ -898,11 +919,11 @@ function useTable(raw, onReset, isReset = false) {
 			setExpanded: (value) => get().expanded.setExpanded(value),
 			toggleExpanded(itemId) {
 				const { state, expanded } = get();
-				const { activeItemsById, props } = state;
+				const { activeItemsById } = state;
 				const item = activeItemsById.get(itemId);
 				const isExpanded = state.expanded.has(itemId);
 				const next = new Set(state.expanded);
-				if (props.expandOnlyOne) {
+				if (expanded.expandOnlyOne) {
 					next.clear();
 					for (const id of item ? require_useTheme.getAncestors(activeItemsById, item) : []) next.add(id);
 				}