fix typing

Author: lytc

docs/api/globals.html

@@ -675,7 +675,7 @@ <h4 class="tsd-returns-title">Returns <span class="tsd-signature-type">null</spa
 					<a name="flatten" class="tsd-anchor"></a>
 					<h3><span class="tsd-flag ts-flagConst">Const</span> flatten</h3>
 					<ul class="tsd-signatures tsd-kind-function tsd-has-type-parameter tsd-is-not-exported">
-						<li class="tsd-signature tsd-kind-icon">flatten&lt;T&gt;<span class="tsd-signature-symbol">(</span>items<span class="tsd-signature-symbol">: </span><span class="tsd-signature-type">T</span><span class="tsd-signature-symbol">[]</span><span class="tsd-signature-symbol">)</span><span class="tsd-signature-symbol">: </span><span class="tsd-signature-symbol">(</span><span class="tsd-signature-type">T</span><span class="tsd-signature-symbol"> &amp; </span><span class="tsd-signature-type">object</span><span class="tsd-signature-symbol">)</span><span class="tsd-signature-symbol">[]</span></li>
+						<li class="tsd-signature tsd-kind-icon">flatten&lt;T&gt;<span class="tsd-signature-symbol">(</span>items<span class="tsd-signature-symbol">: </span><span class="tsd-signature-type">T</span><span class="tsd-signature-symbol">[]</span><span class="tsd-signature-symbol">)</span><span class="tsd-signature-symbol">: </span><span class="tsd-signature-symbol">(</span><span class="tsd-signature-type">object</span><span class="tsd-signature-symbol"> &amp; </span><span class="tsd-signature-type">object</span><span class="tsd-signature-symbol">)</span><span class="tsd-signature-symbol">[]</span></li>
 					</ul>
 					<ul class="tsd-descriptions">
 						<li class="tsd-description">
@@ -696,7 +696,7 @@ <h4 class="tsd-parameters-title">Parameters</h4>
 									<h5>items: <span class="tsd-signature-type">T</span><span class="tsd-signature-symbol">[]</span></h5>
 								</li>
 							</ul>
-							<h4 class="tsd-returns-title">Returns <span class="tsd-signature-symbol">(</span><span class="tsd-signature-type">T</span><span class="tsd-signature-symbol"> &amp; </span><span class="tsd-signature-type">object</span><span class="tsd-signature-symbol">)</span><span class="tsd-signature-symbol">[]</span></h4>
+							<h4 class="tsd-returns-title">Returns <span class="tsd-signature-symbol">(</span><span class="tsd-signature-type">object</span><span class="tsd-signature-symbol"> &amp; </span><span class="tsd-signature-type">object</span><span class="tsd-signature-symbol">)</span><span class="tsd-signature-symbol">[]</span></h4>
 						</li>
 					</ul>
 				</section>

packages/react-sortly/src/utils.ts

@@ -246,7 +246,7 @@ const remove = <T extends ItemData>(items: T[], index: number) => {
   });
 };
 
-const convert = <T extends ObjectLiteral & { id: ID; parentId: null | ID; index: number }>(
+const convert = <T extends ObjectLiteral & { id: ID; parentId?: null | ID; index: number }>(
   items: T[],
   parentId?: null | ID,
   depth?: number,
@@ -292,7 +292,7 @@ const buildTree = <T extends ObjectLiteral>(
   return tree;
 };
 
-const flatten = <T extends ItemData>(items: T[]): (T & { parentId: ID; index: number })[] => (
+const flatten = <T extends ItemData>(items: T[]) => (
   items.map((item, index) => {
     const { depth, ...data } = item;
     const parent = findParent(items, index);
@@ -302,7 +302,7 @@ const flatten = <T extends ItemData>(items: T[]): (T & { parentId: ID; index: nu
       ...data,
       index: siblings.indexOf(item),
       parentId: parent ? parent.id : 0
-    } as (T & { parentId: ID; index: number });
+    };
   })
 );