react-arborist 3.0.0 → 3.0.2

package/jest.config.js

@@ -0,0 +1,5 @@
+/** @type {import('ts-jest').JestConfigWithTsJest} */
+module.exports = {
+  preset: 'ts-jest',
+  testEnvironment: 'node',
+};

package/package.json

@@ -1,12 +1,26 @@
 {
   "name": "react-arborist",
-  "version": "3.0.0",
+  "version": "3.0.2",
   "license": "MIT",
   "source": "src/index.ts",
   "main": "dist/index.js",
   "module": "dist/module.js",
   "types": "dist/index.d.ts",
-  "repository": "github:brimdata/react-arborist",
+  "scripts": {
+    "start": "run-p 'watch:**'",
+    "build": "npm-run-all clean -p 'build:**'",
+    "test": "jest",
+    "build:js": "parcel build --target main --target module",
+    "build:types": "tsc --outDir dist",
+    "clean": "rimraf dist",
+    "start:js": "parcel watch --target main --target module --no-hmr --no-cache",
+    "start:types": "tsc --outDir dist --watch",
+    "prepack": "yarn build"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/brimdata/react-arborist.git"
+  },
   "homepage": "https://react-arborist.netlify.app",
   "bugs": "https://github.com/brimdata/react-arborist/issues",
   "keywords": [
@@ -27,15 +41,6 @@
     "redux": "^4.1.1",
     "use-sync-external-store": "^1.2.0"
   },
-  "scripts": {
-    "build": "run-p 'build:**'",
-    "build:js": "parcel build --target main --target module",
-    "build:types": "tsc --outDir dist",
-    "watch:js": "parcel watch --target main --target module --no-hmr --no-cache",
-    "watch:types": "tsc --outDir dist --watch",
-    "watch": "run-p 'watch:**'",
-    "prepack": "yarn build"
-  },
   "peerDependencies": {
     "react": ">= 16.14",
     "react-dom": ">= 16.14"
@@ -46,9 +51,11 @@
     "@types/react": "^18.0.0",
     "@types/react-window": "^1.8.5",
     "@types/use-sync-external-store": "^0.0.3",
-    "jest": "^27.5.1",
+    "jest": "^29.4.1",
     "npm-run-all": "^4.1.5",
     "parcel": "^2.3.2",
+    "rimraf": "^4.1.2",
+    "ts-jest": "^29.0.5",
     "typescript": "^4.6.2"
   }
 }

package/src/components/tree.tsx

@@ -8,7 +8,7 @@ import { TreeProps } from "../types/tree-props";
 import { IdObj } from "../types/utils";
 import { useValidatedProps } from "../hooks/use-validated-props";
 
-export const Tree = forwardRef(function Tree<T>(
+function TreeComponent<T>(
   props: TreeProps<T>,
   ref: React.Ref<TreeApi<T> | undefined>
 ) {
@@ -21,4 +21,8 @@ export const Tree = forwardRef(function Tree<T>(
       <DragPreviewContainer />
     </TreeProvider>
   );
-});
+}
+
+export const Tree = forwardRef(TreeComponent) as <T>(
+  props: TreeProps<T> & { ref?: React.ForwardedRef<TreeApi<T> | undefined> }
+) => ReturnType<typeof TreeComponent>;

package/src/interfaces/tree-api.test.ts

@@ -0,0 +1,15 @@
+import { createStore } from "redux";
+import { rootReducer } from "../state/root-reducer";
+import { TreeProps } from "../types/tree-props";
+import { TreeApi } from "./tree-api";
+
+function setupApi(props: TreeProps<any>) {
+  const store = createStore(rootReducer);
+  return new TreeApi(store, props, { current: null }, { current: null });
+}
+
+test("tree.canDrop()", () => {
+  expect(setupApi({ disableDrop: true }).canDrop()).toBe(false);
+  expect(setupApi({ disableDrop: () => false }).canDrop()).toBe(true);
+  expect(setupApi({ disableDrop: false }).canDrop()).toBe(true);
+});

package/src/interfaces/tree-api.ts

@@ -408,7 +408,7 @@ export class TreeApi<T> {
     if (this.isFiltered) return false;
     const parentNode = this.get(this.state.dnd.parentId) ?? this.root;
     const dragNodes = this.dragNodes;
-    const check = this.props.disableDrop;
+    const isDisabled = this.props.disableDrop;
 
     for (const drag of dragNodes) {
       if (!drag) return false;
@@ -417,17 +417,17 @@ export class TreeApi<T> {
     }
 
     // Allow the user to insert their own logic
-    if (typeof check == "function") {
-      return check({
+    if (typeof isDisabled == "function") {
+      return !isDisabled({
         parentNode,
         dragNodes: this.dragNodes,
         index: this.state.dnd.index,
       });
-    } else if (typeof check == "string") {
+    } else if (typeof isDisabled == "string") {
       // @ts-ignore
-      return !!parentNode.data[check];
-    } else if (typeof check === "boolean") {
-      return check;
+      return !parentNode.data[isDisabled];
+    } else if (typeof isDisabled === "boolean") {
+      return !isDisabled;
     } else {
       return true;
     }