@camstack/ui-library 1.2.53 → 1.2.55

package/dist/composites/device-list/group.d.ts

@@ -31,4 +31,15 @@ export interface GroupDevicesOptions {
      *  `display.hidden` flag. A future "show hidden" toggle flips this one prop. */
     readonly includeHidden?: boolean;
 }
+/**
+ * Re-order top-level rows so an ADOPTED device sits immediately after its
+ * parent row (a camera adopted by a `Home hub` is a primary row by design,
+ * but a primary row whose family is scattered across the table reads as a
+ * bug — the operator saw a standalone camera WEDGED between a hub and its
+ * two children). Pure and stable: parents/standalone keep their incoming
+ * relative order, siblings keep theirs, and a child whose parent is not a
+ * top-level row keeps its own position (emitted in the leftover pass —
+ * never dropped).
+ */
+export declare function orderAdoptedAfterParent(rows: readonly DeviceItemDevice[]): readonly DeviceItemDevice[];
 export declare function groupTopLevelAndAccessories(devices: readonly DeviceItemDevice[], options?: GroupDevicesOptions): GroupedDevices;

package/dist/index.cjs

@@ -42026,6 +42026,43 @@ function countableDevices(devices) {
 	});
 }
 var PARENT_AS_OWNER_TYPES = new Set(["hub", "nvr"]);
+/**
+* Re-order top-level rows so an ADOPTED device sits immediately after its
+* parent row (a camera adopted by a `Home hub` is a primary row by design,
+* but a primary row whose family is scattered across the table reads as a
+* bug — the operator saw a standalone camera WEDGED between a hub and its
+* two children). Pure and stable: parents/standalone keep their incoming
+* relative order, siblings keep theirs, and a child whose parent is not a
+* top-level row keeps its own position (emitted in the leftover pass —
+* never dropped).
+*/
+function orderAdoptedAfterParent(rows) {
+	const topIds = new Set(rows.map((d) => d.id));
+	const childrenOf = /* @__PURE__ */ new Map();
+	const roots = [];
+	for (const d of rows) {
+		const parentId = d.parentDeviceId;
+		if (parentId !== null && parentId !== void 0 && parentId !== d.id && topIds.has(parentId)) {
+			const list = childrenOf.get(parentId);
+			if (list) list.push(d);
+			else childrenOf.set(parentId, [d]);
+			continue;
+		}
+		roots.push(d);
+	}
+	const ordered = [];
+	const emitted = /* @__PURE__ */ new Set();
+	const emit = (device) => {
+		if (emitted.has(device.id)) return;
+		emitted.add(device.id);
+		ordered.push(device);
+		const kids = childrenOf.get(device.id);
+		if (kids) for (const kid of kids) emit(kid);
+	};
+	for (const root of roots) emit(root);
+	for (const d of rows) emit(d);
+	return ordered;
+}
 function groupTopLevelAndAccessories(devices, options) {
 	const includeHidden = options?.includeHidden ?? false;
 	const byId = /* @__PURE__ */ new Map();
@@ -42054,7 +42091,7 @@ function groupTopLevelAndAccessories(devices, options) {
 		else accessoriesByParent.set(parentId, [d]);
 	}
 	return {
-		topLevel,
+		topLevel: orderAdoptedAfterParent(topLevel),
 		accessoriesByParent
 	};
 }
@@ -42959,13 +42996,13 @@ function sortRows(rows, sort) {
 	if (sort === null) return [...rows];
 	const compare = ascComparator(sort.columnId);
 	const factor = sort.dir === "asc" ? 1 : -1;
-	return [...rows].toSorted((a, b) => {
+	return orderAdoptedAfterParent([...rows].toSorted((a, b) => {
 		if (sort.columnId === "manufacturer") {
 			const aHas = hasManufacturer(a);
 			if (aHas !== hasManufacturer(b)) return aHas ? -1 : 1;
 		}
 		return factor * compare(a, b);
-	});
+	}));
 }
 //#endregion
 //#region src/composites/device-list/device-mode.tsx

package/dist/index.js

@@ -42002,6 +42002,43 @@ function countableDevices(devices) {
 	});
 }
 var PARENT_AS_OWNER_TYPES = new Set(["hub", "nvr"]);
+/**
+* Re-order top-level rows so an ADOPTED device sits immediately after its
+* parent row (a camera adopted by a `Home hub` is a primary row by design,
+* but a primary row whose family is scattered across the table reads as a
+* bug — the operator saw a standalone camera WEDGED between a hub and its
+* two children). Pure and stable: parents/standalone keep their incoming
+* relative order, siblings keep theirs, and a child whose parent is not a
+* top-level row keeps its own position (emitted in the leftover pass —
+* never dropped).
+*/
+function orderAdoptedAfterParent(rows) {
+	const topIds = new Set(rows.map((d) => d.id));
+	const childrenOf = /* @__PURE__ */ new Map();
+	const roots = [];
+	for (const d of rows) {
+		const parentId = d.parentDeviceId;
+		if (parentId !== null && parentId !== void 0 && parentId !== d.id && topIds.has(parentId)) {
+			const list = childrenOf.get(parentId);
+			if (list) list.push(d);
+			else childrenOf.set(parentId, [d]);
+			continue;
+		}
+		roots.push(d);
+	}
+	const ordered = [];
+	const emitted = /* @__PURE__ */ new Set();
+	const emit = (device) => {
+		if (emitted.has(device.id)) return;
+		emitted.add(device.id);
+		ordered.push(device);
+		const kids = childrenOf.get(device.id);
+		if (kids) for (const kid of kids) emit(kid);
+	};
+	for (const root of roots) emit(root);
+	for (const d of rows) emit(d);
+	return ordered;
+}
 function groupTopLevelAndAccessories(devices, options) {
 	const includeHidden = options?.includeHidden ?? false;
 	const byId = /* @__PURE__ */ new Map();
@@ -42030,7 +42067,7 @@ function groupTopLevelAndAccessories(devices, options) {
 		else accessoriesByParent.set(parentId, [d]);
 	}
 	return {
-		topLevel,
+		topLevel: orderAdoptedAfterParent(topLevel),
 		accessoriesByParent
 	};
 }
@@ -42935,13 +42972,13 @@ function sortRows(rows, sort) {
 	if (sort === null) return [...rows];
 	const compare = ascComparator(sort.columnId);
 	const factor = sort.dir === "asc" ? 1 : -1;
-	return [...rows].toSorted((a, b) => {
+	return orderAdoptedAfterParent([...rows].toSorted((a, b) => {
 		if (sort.columnId === "manufacturer") {
 			const aHas = hasManufacturer(a);
 			if (aHas !== hasManufacturer(b)) return aHas ? -1 : 1;
 		}
 		return factor * compare(a, b);
-	});
+	}));
 }
 //#endregion
 //#region src/composites/device-list/device-mode.tsx

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@camstack/ui-library",
-  "version": "1.2.53",
+  "version": "1.2.55",
   "type": "module",
   "main": "dist/index.cjs",
   "module": "dist/index.js",