@v-c/tree 1.1.3 → 1.2.1

package/dist/Tree.js

@@ -197,6 +197,7 @@ var Tree = /* @__PURE__ */ defineComponent((props, { slots, attrs, expose }) =>
 		return flattenNodes.value.find(({ key }) => key === activeKey.value) || null;
 	});
 	const scrollTo = (scroll) => {
+		if (scroll && typeof scroll === "object" && "autoExpand" in scroll && scroll.autoExpand && props.expandedKeys === void 0) setExpandedKeys(arrAdd(expandedKeys.value, scroll.key));
 		listRef.value?.scrollTo(scroll);
 	};
 	expose({

package/dist/TreeNode.js

@@ -27,6 +27,7 @@ var TreeNode = /* @__PURE__ */ defineComponent((props, { attrs }) => {
 		if (typeof props.selectable === "boolean") return props.selectable;
 		return context.selectable;
 	});
+	const isUnselectable = computed(() => !context.checkable && !isSelectable.value);
 	const hasChildren = computed(() => {
 		const { children } = getEntity(context.keyEntities, props.eventKey) || {};
 		return Boolean((children || []).length);
@@ -74,10 +75,10 @@ var TreeNode = /* @__PURE__ */ defineComponent((props, { attrs }) => {
 	const onDragStart = (e) => {
 		e.stopPropagation();
 		dragNodeHighlight.value = true;
-		context.onNodeDragStart(e, props);
 		try {
 			e.dataTransfer?.setData("text/plain", "");
 		} catch {}
+		context.onNodeDragStart(e, props);
 	};
 	const onDragEnter = (e) => {
 		e.preventDefault();
@@ -225,6 +226,7 @@ var TreeNode = /* @__PURE__ */ defineComponent((props, { attrs }) => {
 			"aria-disabled": isDisabled.value,
 			"class": clsx(props.className, `${context.prefixCls}-treenode`, context.classNames?.item, {
 				[`${context.prefixCls}-treenode-disabled`]: isDisabled.value,
+				[`${context.prefixCls}-treenode-unselectable`]: isUnselectable.value,
 				[`${context.prefixCls}-treenode-switcher-${props.expanded ? "open" : "close"}`]: !memoizedIsLeaf.value,
 				[`${context.prefixCls}-treenode-checkbox-checked`]: props.checked,
 				[`${context.prefixCls}-treenode-checkbox-indeterminate`]: props.halfChecked,

package/dist/hooks/useTree.d.ts

@@ -0,0 +1,9 @@
+import { MaybeRefOrGetter } from 'vue';
+import { BasicDataNode, DataEntity, DataNode, FieldNames, Key } from '../interface';
+export interface UseTreeConfig {
+    fieldNames?: MaybeRefOrGetter<FieldNames | undefined>;
+}
+export interface TreeInstance<TreeDataType extends DataNode | BasicDataNode = DataNode> {
+    getPath: (key: Key) => DataEntity<TreeDataType>[];
+}
+export default function useTree<TreeDataType extends DataNode | BasicDataNode = DataNode>(treeData: MaybeRefOrGetter<TreeDataType[]>, config?: UseTreeConfig): TreeInstance<TreeDataType>;

package/dist/hooks/useTree.js

@@ -0,0 +1,23 @@
+import getEntity from "../utils/keyUtil.js";
+import { convertDataToEntities } from "../utils/treeUtil.js";
+import { computed, toValue } from "vue";
+//#region src/hooks/useTree.ts
+function useTree(treeData, config = {}) {
+	const { fieldNames } = config;
+	const keyEntities = computed(() => {
+		const { keyEntities } = convertDataToEntities(toValue(treeData), { fieldNames: toValue(fieldNames) });
+		return keyEntities;
+	});
+	const getPath = (key) => {
+		const path = [];
+		let entity = getEntity(keyEntities.value, key);
+		while (entity) {
+			path.unshift(entity);
+			entity = entity.parent;
+		}
+		return path;
+	};
+	return { getPath };
+}
+//#endregion
+export { useTree as default };

package/dist/index.d.ts

@@ -1,12 +1,13 @@
+import { TreeInstance, UseTreeConfig, default as useTree } from './hooks/useTree';
 import { BasicDataNode, DataEntity, DataNode, EventDataNode, FieldNames, FlattenNode, IconType, Key, KeyEntities, ScrollTo, TreeNodeProps } from './interface';
 import { ExpandAction, TreeProps, TreeRef, default as Tree } from './Tree';
 import { default as TreeNode } from './TreeNode';
 export { UnstableContextKey } from './contextTypes';
-export { TreeNode };
+export { TreeNode, useTree };
 export { arrAdd, arrDel, calcDropPosition, calcSelectedKeys, conductExpandParent, getDragChildrenKeys, isFirstChild, isLastChild, parseCheckedKeys, posToArr } from './util.ts';
 export { conductCheck } from './utils/conductUtil';
 export { convertDataToEntities, convertTreeToData, fillFieldNames, flattenTreeData } from './utils/treeUtil';
-export type { BasicDataNode, DataEntity, DataNode, EventDataNode, ExpandAction, FieldNames, FlattenNode, IconType, Key, KeyEntities, ScrollTo, TreeNodeProps, TreeProps, TreeRef, };
+export type { BasicDataNode, DataEntity, DataNode, EventDataNode, ExpandAction, FieldNames, FlattenNode, IconType, Key, KeyEntities, ScrollTo, TreeInstance, TreeNodeProps, TreeProps, TreeRef, UseTreeConfig, };
 type TreeType = typeof Tree & {
     TreeNode: typeof TreeNode;
 };

package/dist/index.js

@@ -4,8 +4,9 @@ import TreeNode from "./TreeNode.js";
 import { arrAdd, arrDel, calcDropPosition, calcSelectedKeys, conductExpandParent, getDragChildrenKeys, isFirstChild, isLastChild, parseCheckedKeys, posToArr } from "./util.js";
 import { conductCheck } from "./utils/conductUtil.js";
 import Tree from "./Tree.js";
+import useTree from "./hooks/useTree.js";
 //#region src/index.ts
 var ExportTree = Tree;
 ExportTree.TreeNode = TreeNode;
 //#endregion
-export { TreeNode, UnstableContextKey, arrAdd, arrDel, calcDropPosition, calcSelectedKeys, conductCheck, conductExpandParent, convertDataToEntities, convertTreeToData, ExportTree as default, fillFieldNames, flattenTreeData, getDragChildrenKeys, isFirstChild, isLastChild, parseCheckedKeys, posToArr };
+export { TreeNode, UnstableContextKey, arrAdd, arrDel, calcDropPosition, calcSelectedKeys, conductCheck, conductExpandParent, convertDataToEntities, convertTreeToData, ExportTree as default, fillFieldNames, flattenTreeData, getDragChildrenKeys, isFirstChild, isLastChild, parseCheckedKeys, posToArr, useTree };

package/dist/interface.d.ts

@@ -1,8 +1,18 @@
 import { MouseEventHandler } from '@v-c/util/dist/EventInterface';
 import { Key as VCKey, VueNode } from '@v-c/util/dist/type';
+import { ScrollTo as VirtualListScrollTo } from '@v-c/virtual-list';
 import { CSSProperties, VNode } from 'vue';
-export type { ScrollTo } from '@v-c/virtual-list';
 export type Key = VCKey;
+type VirtualListScrollConfig = Exclude<NonNullable<Parameters<VirtualListScrollTo>[0]>, number>;
+type ScrollTarget = Extract<VirtualListScrollConfig, {
+    key: Key;
+}>;
+type TreeScrollConfig = (Exclude<VirtualListScrollConfig, ScrollTarget> & {
+    autoExpand?: never;
+}) | (ScrollTarget & {
+    autoExpand?: boolean;
+});
+export type ScrollTo = (scroll?: number | TreeScrollConfig | null) => void;
 /**
  * Typescript not support `bigint` as index type yet.
  * We use this to mark the `bigint` type is for `Key` usage.
@@ -120,3 +130,4 @@ export interface FieldNames {
     key?: string;
     children?: string;
 }
+export {};

package/dist/util.js

@@ -45,7 +45,8 @@ function calcDropPosition(event, dragNodeProps, targetNodeProps, indent, startMo
 	const rawDropLevelOffset = ((direction === "rtl" ? -1 : 1) * ((startMousePosition?.x || 0) - clientX) - 12) / indent;
 	const filteredExpandKeys = expandKeys.filter((key) => (getEntity(keyEntities, key)?.children || []).length);
 	let abstractDropNodeEntity = getEntity(keyEntities, targetNodeProps.eventKey);
-	if (clientY < top + height / 2) {
+	const dropBeforeTarget = clientY < top + height / 2 && isFirstChild(abstractDropNodeEntity);
+	if (clientY < top + height / 2 && !dropBeforeTarget) {
 		const nodeIndex = flattenedNodes.findIndex(({ key }) => key === abstractDropNodeEntity.key);
 		const prevNodeKey = flattenedNodes[nodeIndex <= 0 ? 0 : nodeIndex - 1].key;
 		abstractDropNodeEntity = getEntity(keyEntities, prevNodeKey);
@@ -62,7 +63,7 @@ function calcDropPosition(event, dragNodeProps, targetNodeProps, indent, startMo
 	const abstractDragDataNode = dragNodeProps.data;
 	const abstractDropDataNode = abstractDropNodeEntity.node;
 	let dropAllowed = true;
-	if (isFirstChild(abstractDropNodeEntity) && abstractDropNodeEntity.level === 0 && clientY < top + height / 2 && allowDrop({
+	if (dropBeforeTarget && allowDrop({
 		dragNode: abstractDragDataNode,
 		dropNode: abstractDropDataNode,
 		dropPosition: -1

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@v-c/tree",
   "type": "module",
-  "version": "1.1.3",
+  "version": "1.2.1",
   "description": "",
   "publishConfig": {
     "access": "public"
@@ -35,7 +35,7 @@
   },
   "dependencies": {
     "@v-c/util": "^1.1.0",
-    "@v-c/virtual-list": "^1.1.0"
+    "@v-c/virtual-list": "^1.1.1"
   },
   "scripts": {
     "build": "vite build",