@headless-tree/core 1.0.1 → 1.2.0

package/src/features/sync-data-loader/feature.ts

@@ -3,6 +3,12 @@ import { makeStateUpdater } from "../../utils";
 import { throwError } from "../../utilities/errors";
 
 const promiseErrorMessage = "sync dataLoader returned promise";
+const unpromise = <T>(data: T | Promise<T>): T => {
+  if (!data || (typeof data === "object" && "then" in data)) {
+    throw throwError(promiseErrorMessage);
+  }
+  return data;
+};
 
 export const syncDataLoaderFeature: FeatureImplementation = {
   key: "sync-data-loader",
@@ -29,20 +35,21 @@ export const syncDataLoaderFeature: FeatureImplementation = {
     waitForItemChildrenLoaded: async () => {},
 
     retrieveItemData: ({ tree }, itemId) => {
-      const data = tree.getConfig().dataLoader.getItem(itemId);
-      if (typeof data === "object" && "then" in data) {
-        throw throwError(promiseErrorMessage);
-      }
-      return data;
+      return unpromise(tree.getConfig().dataLoader.getItem(itemId));
     },
 
     retrieveChildrenIds: ({ tree }, itemId) => {
-      const data = tree.getConfig().dataLoader.getChildren(itemId);
-      if (typeof data === "object" && "then" in data) {
-        throw throwError(promiseErrorMessage);
+      const { dataLoader } = tree.getConfig();
+      if ("getChildren" in dataLoader) {
+        return unpromise(dataLoader.getChildren(itemId));
       }
-      return data;
+      return unpromise(dataLoader.getChildrenWithData(itemId)).map(
+        (c) => c.data,
+      );
     },
+
+    loadItemData: ({ tree }, itemId) => tree.retrieveItemData(itemId),
+    loadChildrenIds: ({ tree }, itemId) => tree.retrieveChildrenIds(itemId),
   },
 
   itemInstance: {

package/src/features/sync-data-loader/types.ts

@@ -1,7 +1,14 @@
-export interface TreeDataLoader<T> {
-  getItem: (itemId: string) => T | Promise<T>;
-  getChildren: (itemId: string) => string[] | Promise<string[]>;
-}
+export type TreeDataLoader<T> =
+  | {
+      getItem: (itemId: string) => T | Promise<T>;
+      getChildren: (itemId: string) => string[] | Promise<string[]>;
+    }
+  | {
+      getItem: (itemId: string) => T | Promise<T>;
+      getChildrenWithData: (
+        itemId: string,
+      ) => { id: string; data: T }[] | Promise<{ id: string; data: T }[]>;
+    };
 
 export type SyncDataLoaderFeatureDef<T> = {
   state: {};

package/src/features/tree/feature.ts

@@ -126,6 +126,7 @@ export const treeFeature: FeatureImplementation<any> = {
       item.getElement()?.scrollIntoView(scrollIntoViewArg);
     },
     getId: ({ itemId }) => itemId,
+    getKey: ({ itemId }) => itemId, // TODO apply to all stories to use
     getProps: ({ item, prev }) => {
       const itemMeta = item.getItemMeta();
       return {

package/src/features/tree/types.ts

@@ -44,6 +44,7 @@ export type TreeFeatureDef<T> = {
   };
   itemInstance: {
     getId: () => string;
+    getKey: () => string;
     getProps: () => Record<string, any>;
     getItemName: () => string;
     getItemData: () => T;

package/src/index.ts

@@ -31,3 +31,6 @@ export * from "./utilities/remove-items-from-parents";
 
 export * from "./core/build-proxified-instance";
 export * from "./core/build-static-instance";
+
+export { makeStateUpdater } from "./utils";
+export { isOrderedDragTarget } from "./features/drag-and-drop/utils";

package/src/test-utils/test-tree-expect.ts

@@ -82,6 +82,7 @@ export class TestTreeExpect<T> {
       top: 0,
     });
     expect(this.tree.instance.getDragLineStyle(0, 0)).toEqual({
+      position: "absolute",
       left: `${indent * 20}px`,
       pointerEvents: "none",
       top: "0px",

package/src/test-utils/test-tree.ts

@@ -78,6 +78,7 @@ export class TestTree<T = string> {
   get instance() {
     if (!this.treeInstance) {
       this.treeInstance = createTree(this.config);
+      this.treeInstance.rebuildTree();
     }
     return this.treeInstance;
   }