From 79ebde3e698ab399ff9c111b3668ce6d41ee2468 Mon Sep 17 00:00:00 2001
From: Rob Pilling <robpilling@gmail.com>
Date: Fri, 27 Jan 2023 23:10:03 +0000
Subject: [PATCH] layout.d.ts: ExtractIds gives back { id: T }

---
 typescript/types/layout.d.ts | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/typescript/types/layout.d.ts b/typescript/types/layout.d.ts
index f8bd040bd..31d57ff3c 100644
--- a/typescript/types/layout.d.ts
+++ b/typescript/types/layout.d.ts
@@ -3,7 +3,9 @@ type Prev = [never, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9];
 type ExtractIds<T extends Layout_.Hierarchy, Depth extends Prev[number] = 9> =
 	[Depth] extends [never]
 	? never
-	: (T extends { id: infer Id extends string } ? Id : never)
+	: (T extends { id: infer Id extends string }
+		? { [k in Id]: T }
+		: never)
 	|
 	(
 		T extends { c: Array<infer Sub extends Layout_.Hierarchy> }
@@ -13,9 +15,9 @@ type ExtractIds<T extends Layout_.Hierarchy, Depth extends Prev[number] = 9> =
 
 declare module Layout_ {
 	type Layouter<T extends Hierarchy> =
+		ExtractIds<T>
+		&
 		{
-			[k in ExtractIds<T>]: number;
-		} & {
 			// these actually change T
 			render(l?: T): void;
 			layout(l: T): void;