@sheinx/hooks 3.6.0-beta.1 → 3.6.0-beta.2

package/cjs/common/use-position-style/index.js

@@ -262,7 +262,7 @@ var usePositionStyle = exports.usePositionStyle = function usePositionStyle(conf
       style: hideStyle
     };
     var rect = context.parentRect;
-    if (scrollElRef !== null && scrollElRef !== void 0 && scrollElRef.current && (_scrollElRef$current = scrollElRef.current) !== null && _scrollElRef$current !== void 0 && _scrollElRef$current.contains(parentElRef.current)) {
+    if (!show && scrollElRef !== null && scrollElRef !== void 0 && scrollElRef.current && (_scrollElRef$current = scrollElRef.current) !== null && _scrollElRef$current !== void 0 && _scrollElRef$current.contains(parentElRef.current)) {
       var _scrollElRef$current2;
       var visibleRect = ((_scrollElRef$current2 = scrollElRef.current) === null || _scrollElRef$current2 === void 0 ? void 0 : _scrollElRef$current2.getBoundingClientRect()) || {};
       if (rect.bottom < visibleRect.top || rect.top > visibleRect.bottom || rect.right < visibleRect.left || rect.left > visibleRect.right) {

package/cjs/components/use-tree/use-tree.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"use-tree.d.ts","sourceRoot":"","sources":["use-tree.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,aAAa,EAKb,SAAS,EACV,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAUjD,eAAO,MAAM,IAAI;IACf;;OAEG;;IAGH;;OAEG;;IAGH;;OAEG;;IAGH;;OAEG;;IAGH;;OAEG;;CAEJ,CAAC;AAEF,QAAA,MAAM,OAAO;;;;;CA4bZ,CAAC;AAEF,eAAe,OAAO,CAAC"}
+{"version":3,"file":"use-tree.d.ts","sourceRoot":"","sources":["use-tree.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,aAAa,EAKb,SAAS,EACV,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAYjD,eAAO,MAAM,IAAI;IACf;;OAEG;;IAGH;;OAEG;;IAGH;;OAEG;;IAGH;;OAEG;;IAGH;;OAEG;;CAEJ,CAAC;AAEF,QAAA,MAAM,OAAO;;;;;CAucZ,CAAC;AAEF,eAAe,OAAO,CAAC"}

package/cjs/components/use-tree/use-tree.js

@@ -26,6 +26,7 @@ function toArray(value) {
   if (!Array.isArray(value)) return [value];
   return value;
 }
+var global_tree_map = new Map();
 var MODE = exports.MODE = {
   /**
    * 返回全选数据，包含父节点和子节点
@@ -345,6 +346,15 @@ var useTree = function useTree(props) {
     return 2;
   };
   var setData = function setData(data) {
+    // if(data && global_tree_map.get(data)){
+    //   context.cachedValue = global_tree_map.get(data)?.cachedValue || []
+    //   context.pathMap = global_tree_map.get(data)?.pathMap || new Map()
+    //   context.dataMap = global_tree_map.get(data)?.dataMap || new Map()
+    //   context.valueMap = global_tree_map.get(data)?.valueMap || new Map()
+    //   context.unmatchedValueMap = global_tree_map.get(data)?.unmatchedValueMap || new Map()
+    //   return
+    // }
+
     var prevValue = context.value || [];
     context.cachedValue = [];
     context.pathMap = new Map();
@@ -356,6 +366,8 @@ var useTree = function useTree(props) {
     initData(context.data, []);
     initValue();
     setValue(prevValue);
+
+    // global_tree_map.set(data, context)
   };
   var set = function set(id, checked, direction) {
     if (!isDisabled(id)) {

package/cjs/components/use-treeselect/use-tiled.d.ts

@@ -5,7 +5,7 @@ declare const useTiled: <DataItem>(props: UseTiledProps<DataItem>) => {
     onFilter: ((text: string, from?: string | undefined) => void) | undefined;
     expandIcons?: undefined;
 } | {
-    data: any[];
+    data: any;
     onFilter: (text: string, from?: string) => void;
     expandIcons: ((item: DataItem) => string | number | boolean | import("react").ReactFragment | JSX.Element | null | undefined)[];
 };

package/cjs/components/use-treeselect/use-tiled.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"use-tiled.d.ts","sourceRoot":"","sources":["use-tiled.tsx"],"names":[],"mappings":";AAGA,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAGjD,QAAA,MAAM,QAAQ;;;;;;qBA4BgB,MAAM,SAAS,MAAM;;CA8ClD,CAAC;AAEF,eAAe,QAAQ,CAAC"}
+{"version":3,"file":"use-tiled.d.ts","sourceRoot":"","sources":["use-tiled.tsx"],"names":[],"mappings":";AAGA,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAGjD,QAAA,MAAM,QAAQ;;;;;;qBAkCgB,MAAM,SAAS,MAAM;;CAyClD,CAAC;AAEF,eAAe,QAAQ,CAAC"}

package/cjs/components/use-treeselect/use-tiled.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _react = require("react");
-var _useTree3 = require("../use-tree");
+var _useTree2 = require("../use-tree");
 var _tree = require("../../utils/tree");
 var _jsxRuntime = require("react/jsx-runtime");
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
@@ -19,7 +19,7 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 var useTiled = function useTiled(props) {
-  var data = props.data,
+  var filterData = props.data,
     keygen = props.keygen,
     _props$childrenKey = props.childrenKey,
     childrenKey = _props$childrenKey === void 0 ? 'children' : _props$childrenKey,
@@ -35,20 +35,20 @@ var useTiled = function useTiled(props) {
     _useState2 = _slicedToArray(_useState, 2),
     tileds = _useState2[0],
     setTileds = _useState2[1];
-  var _useTree = (0, _useTree3.useTree)({
-      data: data,
-      childrenKey: childrenKey,
-      keygen: keygen,
-      isControlled: false
-    }),
-    datum = _useTree.datum;
-  var _useTree2 = (0, _useTree3.useTree)({
+  var _useTree = (0, _useTree2.useTree)({
       data: rawData,
+      datum: props.rawDatum,
       childrenKey: childrenKey,
       keygen: keygen,
       isControlled: false
     }),
-    rawDatum = _useTree2.datum;
+    rawDatum = _useTree.datum;
+  if (!filterText || !onAdvancedFilter) {
+    return {
+      data: filterData,
+      onFilter: onFilter
+    };
+  }
   var handleToggle = function handleToggle(e, key) {
     e.stopPropagation();
     var nextTileds = _toConsumableArray(tileds);
@@ -80,13 +80,7 @@ var useTiled = function useTiled(props) {
       children: moreIcon()
     });
   };
-  if (!filterText || !onAdvancedFilter) {
-    return {
-      data: data,
-      onFilter: onFilter
-    };
-  }
-  var nextData = (0, _tree.mergeFilteredTree)(datum, rawDatum, tileds);
+  var nextData = (0, _tree.mergeFilteredTree)(filterData, rawDatum, tileds);
   return {
     data: nextData,
     onFilter: handleFilter,

package/cjs/components/use-treeselect/use-tiled.type.d.ts

@@ -1,9 +1,11 @@
 import React from 'react';
 import { TreeKeygenType, KeygenResult, ObjectKey } from '../../common/type';
+import { TreeDatum } from '../use-tree/use-tree.type';
 export type FilterFormType = 'blur' | 'edit';
 export interface UseTiledProps<DataItem> {
     data: DataItem[];
     rawData: DataItem[];
+    rawDatum?: TreeDatum<DataItem>;
     onFilter?: (text: string, from?: string) => void;
     keygen: TreeKeygenType<DataItem>;
     childrenKey?: ObjectKey<DataItem>;

package/cjs/components/use-treeselect/use-tiled.type.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"use-tiled.type.d.ts","sourceRoot":"","sources":["use-tiled.type.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAE5E,MAAM,MAAM,cAAc,GAAG,MAAM,GAAG,MAAM,CAAC;AAE7C,MAAM,WAAW,aAAa,CAAC,QAAQ;IACrC,IAAI,EAAE,QAAQ,EAAE,CAAC;IACjB,OAAO,EAAE,QAAQ,EAAE,CAAC;IACpB,QAAQ,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,KAAK,IAAI,CAAC;IACjD,MAAM,EAAE,cAAc,CAAC,QAAQ,CAAC,CAAC;IACjC,WAAW,CAAC,EAAE,SAAS,CAAC,QAAQ,CAAC,CAAC;IAClC,QAAQ,CAAC,EAAE,YAAY,EAAE,CAAC;IAC1B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,KAAK,CAAC,SAAS,CAAC;IAC5B,QAAQ,EAAE,MAAM,KAAK,CAAC,SAAS,CAAC;IAChC,gBAAgB,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,CAAC,IAAI,EAAE,QAAQ,KAAK,OAAO,CAAC;CAClE"}
+{"version":3,"file":"use-tiled.type.d.ts","sourceRoot":"","sources":["use-tiled.type.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAC5E,OAAO,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAC;AAEtD,MAAM,MAAM,cAAc,GAAG,MAAM,GAAG,MAAM,CAAC;AAE7C,MAAM,WAAW,aAAa,CAAC,QAAQ;IACrC,IAAI,EAAE,QAAQ,EAAE,CAAC;IACjB,OAAO,EAAE,QAAQ,EAAE,CAAC;IACpB,QAAQ,CAAC,EAAE,SAAS,CAAC,QAAQ,CAAC,CAAC;IAC/B,QAAQ,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,KAAK,IAAI,CAAC;IACjD,MAAM,EAAE,cAAc,CAAC,QAAQ,CAAC,CAAC;IACjC,WAAW,CAAC,EAAE,SAAS,CAAC,QAAQ,CAAC,CAAC;IAClC,QAAQ,CAAC,EAAE,YAAY,EAAE,CAAC;IAC1B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,KAAK,CAAC,SAAS,CAAC;IAC5B,QAAQ,EAAE,MAAM,KAAK,CAAC,SAAS,CAAC;IAChC,gBAAgB,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,CAAC,IAAI,EAAE,QAAQ,KAAK,OAAO,CAAC;CAClE"}

package/cjs/utils/tree.d.ts

@@ -9,6 +9,6 @@ type FilterDatum<DataItem> = {
     getKey: (node: DataItem) => KeygenResult;
     getDataById: (id: KeygenResult) => DataItem;
 };
-export declare const mergeFilteredTree: (filterDatum: FilterDatum<any>, rawDatum: FilterDatum<any>, tiledId: KeygenResult[]) => any[];
+export declare const mergeFilteredTree: (filterData: any, rawDatum: FilterDatum<any>, tiledId: KeygenResult[]) => any;
 export {};
 //# sourceMappingURL=tree.d.ts.map

package/cjs/utils/tree.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tree.d.ts","sourceRoot":"","sources":["tree.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAG9C,eAAO,MAAM,cAAc,+CAGlB,OAAO,UAkBf,CAAC;AAEF,eAAO,MAAM,aAAa,2CAA4C,YAAY,6EAE5B,OAAO,iCACzC,YAAY,EAAE,GAAG,SAAS,2EAGxB,OAAO,wCACU,IAAI;;yBA4B1C,CAAC;AAEF,KAAK,WAAW,CAAC,QAAQ,IAAI;IAC3B,IAAI,EAAE,QAAQ,EAAE,CAAC;IACjB,WAAW,EAAE,GAAG,CAAC;IACjB,MAAM,EAAE,CAAC,IAAI,EAAE,QAAQ,KAAK,YAAY,CAAC;IACzC,WAAW,EAAE,CAAC,EAAE,EAAE,YAAY,KAAK,QAAQ,CAAC;CAC7C,CAAC;AAEF,eAAO,MAAM,iBAAiB,gBACf,YAAY,GAAG,CAAC,YACnB,YAAY,GAAG,CAAC,WACjB,YAAY,EAAE,UAqBxB,CAAC"}
+{"version":3,"file":"tree.d.ts","sourceRoot":"","sources":["tree.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAG9C,eAAO,MAAM,cAAc,+CAGlB,OAAO,UAkBf,CAAC;AAEF,eAAO,MAAM,aAAa,2CAA4C,YAAY,6EAE5B,OAAO,iCACzC,YAAY,EAAE,GAAG,SAAS,2EAGxB,OAAO,wCACU,IAAI;;yBA4B1C,CAAC;AAEF,KAAK,WAAW,CAAC,QAAQ,IAAI;IAC3B,IAAI,EAAE,QAAQ,EAAE,CAAC;IACjB,WAAW,EAAE,GAAG,CAAC;IACjB,MAAM,EAAE,CAAC,IAAI,EAAE,QAAQ,KAAK,YAAY,CAAC;IACzC,WAAW,EAAE,CAAC,EAAE,EAAE,YAAY,KAAK,QAAQ,CAAC;CAC7C,CAAC;AAEF,eAAO,MAAM,iBAAiB,eAChB,GAAG,YACL,YAAY,GAAG,CAAC,WACjB,YAAY,EAAE,QAexB,CAAC"}

package/cjs/utils/tree.js

@@ -68,19 +68,13 @@ var getFilterTree = exports.getFilterTree = function getFilterTree(treeNodes, fi
     return node;
   });
 };
-var mergeFilteredTree = exports.mergeFilteredTree = function mergeFilteredTree(filterDatum, rawDatum, tiledId) {
-  var filterData = filterDatum.data;
-  var childrenKey = filterDatum.childrenKey;
+var mergeFilteredTree = exports.mergeFilteredTree = function mergeFilteredTree(filterData, rawDatum, tiledId) {
+  var childrenKey = rawDatum.childrenKey;
   if (tiledId.length === 0) return filterData;
   var recursion = function recursion(node) {
-    var nodeKey = filterDatum.getKey(node);
+    var nodeKey = rawDatum.getKey(node);
     if (tiledId.indexOf(nodeKey) >= 0) {
       node[childrenKey] = (0, _clone.deepClone)(rawDatum.getDataById(nodeKey)[childrenKey] || []);
-    } else {
-      var item = filterDatum.getDataById(nodeKey);
-      if (item && item[childrenKey]) {
-        node[childrenKey] = (0, _clone.deepClone)(item[childrenKey] || []);
-      }
     }
     var children = node[childrenKey] || [];
     children.map(recursion);

package/esm/common/use-position-style/index.js

@@ -253,7 +253,7 @@ export var usePositionStyle = function usePositionStyle(config) {
       style: hideStyle
     };
     var rect = context.parentRect;
-    if (scrollElRef !== null && scrollElRef !== void 0 && scrollElRef.current && (_scrollElRef$current = scrollElRef.current) !== null && _scrollElRef$current !== void 0 && _scrollElRef$current.contains(parentElRef.current)) {
+    if (!show && scrollElRef !== null && scrollElRef !== void 0 && scrollElRef.current && (_scrollElRef$current = scrollElRef.current) !== null && _scrollElRef$current !== void 0 && _scrollElRef$current.contains(parentElRef.current)) {
       var _scrollElRef$current2;
       var visibleRect = ((_scrollElRef$current2 = scrollElRef.current) === null || _scrollElRef$current2 === void 0 ? void 0 : _scrollElRef$current2.getBoundingClientRect()) || {};
       if (rect.bottom < visibleRect.top || rect.top > visibleRect.bottom || rect.right < visibleRect.left || rect.left > visibleRect.right) {

package/esm/components/use-tree/use-tree.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"use-tree.d.ts","sourceRoot":"","sources":["use-tree.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,aAAa,EAKb,SAAS,EACV,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAUjD,eAAO,MAAM,IAAI;IACf;;OAEG;;IAGH;;OAEG;;IAGH;;OAEG;;IAGH;;OAEG;;IAGH;;OAEG;;CAEJ,CAAC;AAEF,QAAA,MAAM,OAAO;;;;;CA4bZ,CAAC;AAEF,eAAe,OAAO,CAAC"}
+{"version":3,"file":"use-tree.d.ts","sourceRoot":"","sources":["use-tree.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,aAAa,EAKb,SAAS,EACV,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAYjD,eAAO,MAAM,IAAI;IACf;;OAEG;;IAGH;;OAEG;;IAGH;;OAEG;;IAGH;;OAEG;;IAGH;;OAEG;;CAEJ,CAAC;AAEF,QAAA,MAAM,OAAO;;;;;CAucZ,CAAC;AAEF,eAAe,OAAO,CAAC"}

package/esm/components/use-tree/use-tree.js

@@ -19,6 +19,7 @@ function toArray(value) {
   if (!Array.isArray(value)) return [value];
   return value;
 }
+var global_tree_map = new Map();
 export var MODE = {
   /**
    * 返回全选数据，包含父节点和子节点
@@ -338,6 +339,15 @@ var useTree = function useTree(props) {
     return 2;
   };
   var setData = function setData(data) {
+    // if(data && global_tree_map.get(data)){
+    //   context.cachedValue = global_tree_map.get(data)?.cachedValue || []
+    //   context.pathMap = global_tree_map.get(data)?.pathMap || new Map()
+    //   context.dataMap = global_tree_map.get(data)?.dataMap || new Map()
+    //   context.valueMap = global_tree_map.get(data)?.valueMap || new Map()
+    //   context.unmatchedValueMap = global_tree_map.get(data)?.unmatchedValueMap || new Map()
+    //   return
+    // }
+
     var prevValue = context.value || [];
     context.cachedValue = [];
     context.pathMap = new Map();
@@ -349,6 +359,8 @@ var useTree = function useTree(props) {
     initData(context.data, []);
     initValue();
     setValue(prevValue);
+
+    // global_tree_map.set(data, context)
   };
   var set = function set(id, checked, direction) {
     if (!isDisabled(id)) {

package/esm/components/use-treeselect/use-tiled.d.ts

@@ -5,7 +5,7 @@ declare const useTiled: <DataItem>(props: UseTiledProps<DataItem>) => {
     onFilter: ((text: string, from?: string | undefined) => void) | undefined;
     expandIcons?: undefined;
 } | {
-    data: any[];
+    data: any;
     onFilter: (text: string, from?: string) => void;
     expandIcons: ((item: DataItem) => string | number | boolean | import("react").ReactFragment | JSX.Element | null | undefined)[];
 };

package/esm/components/use-treeselect/use-tiled.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"use-tiled.d.ts","sourceRoot":"","sources":["use-tiled.tsx"],"names":[],"mappings":";AAGA,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAGjD,QAAA,MAAM,QAAQ;;;;;;qBA4BgB,MAAM,SAAS,MAAM;;CA8ClD,CAAC;AAEF,eAAe,QAAQ,CAAC"}
+{"version":3,"file":"use-tiled.d.ts","sourceRoot":"","sources":["use-tiled.tsx"],"names":[],"mappings":";AAGA,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAGjD,QAAA,MAAM,QAAQ;;;;;;qBAkCgB,MAAM,SAAS,MAAM;;CAyClD,CAAC;AAEF,eAAe,QAAQ,CAAC"}

package/esm/components/use-treeselect/use-tiled.js

@@ -13,7 +13,7 @@ import { useTree } from "../use-tree";
 import { mergeFilteredTree } from "../../utils/tree";
 import { jsx as _jsx } from "react/jsx-runtime";
 var useTiled = function useTiled(props) {
-  var data = props.data,
+  var filterData = props.data,
     keygen = props.keygen,
     _props$childrenKey = props.childrenKey,
     childrenKey = _props$childrenKey === void 0 ? 'children' : _props$childrenKey,
@@ -30,19 +30,19 @@ var useTiled = function useTiled(props) {
     tileds = _useState2[0],
     setTileds = _useState2[1];
   var _useTree = useTree({
-      data: data,
-      childrenKey: childrenKey,
-      keygen: keygen,
-      isControlled: false
-    }),
-    datum = _useTree.datum;
-  var _useTree2 = useTree({
       data: rawData,
+      datum: props.rawDatum,
       childrenKey: childrenKey,
       keygen: keygen,
       isControlled: false
     }),
-    rawDatum = _useTree2.datum;
+    rawDatum = _useTree.datum;
+  if (!filterText || !onAdvancedFilter) {
+    return {
+      data: filterData,
+      onFilter: onFilter
+    };
+  }
   var handleToggle = function handleToggle(e, key) {
     e.stopPropagation();
     var nextTileds = _toConsumableArray(tileds);
@@ -74,13 +74,7 @@ var useTiled = function useTiled(props) {
       children: moreIcon()
     });
   };
-  if (!filterText || !onAdvancedFilter) {
-    return {
-      data: data,
-      onFilter: onFilter
-    };
-  }
-  var nextData = mergeFilteredTree(datum, rawDatum, tileds);
+  var nextData = mergeFilteredTree(filterData, rawDatum, tileds);
   return {
     data: nextData,
     onFilter: handleFilter,

package/esm/components/use-treeselect/use-tiled.type.d.ts

@@ -1,9 +1,11 @@
 import React from 'react';
 import { TreeKeygenType, KeygenResult, ObjectKey } from '../../common/type';
+import { TreeDatum } from '../use-tree/use-tree.type';
 export type FilterFormType = 'blur' | 'edit';
 export interface UseTiledProps<DataItem> {
     data: DataItem[];
     rawData: DataItem[];
+    rawDatum?: TreeDatum<DataItem>;
     onFilter?: (text: string, from?: string) => void;
     keygen: TreeKeygenType<DataItem>;
     childrenKey?: ObjectKey<DataItem>;

package/esm/components/use-treeselect/use-tiled.type.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"use-tiled.type.d.ts","sourceRoot":"","sources":["use-tiled.type.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAE5E,MAAM,MAAM,cAAc,GAAG,MAAM,GAAG,MAAM,CAAC;AAE7C,MAAM,WAAW,aAAa,CAAC,QAAQ;IACrC,IAAI,EAAE,QAAQ,EAAE,CAAC;IACjB,OAAO,EAAE,QAAQ,EAAE,CAAC;IACpB,QAAQ,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,KAAK,IAAI,CAAC;IACjD,MAAM,EAAE,cAAc,CAAC,QAAQ,CAAC,CAAC;IACjC,WAAW,CAAC,EAAE,SAAS,CAAC,QAAQ,CAAC,CAAC;IAClC,QAAQ,CAAC,EAAE,YAAY,EAAE,CAAC;IAC1B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,KAAK,CAAC,SAAS,CAAC;IAC5B,QAAQ,EAAE,MAAM,KAAK,CAAC,SAAS,CAAC;IAChC,gBAAgB,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,CAAC,IAAI,EAAE,QAAQ,KAAK,OAAO,CAAC;CAClE"}
+{"version":3,"file":"use-tiled.type.d.ts","sourceRoot":"","sources":["use-tiled.type.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAC5E,OAAO,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAC;AAEtD,MAAM,MAAM,cAAc,GAAG,MAAM,GAAG,MAAM,CAAC;AAE7C,MAAM,WAAW,aAAa,CAAC,QAAQ;IACrC,IAAI,EAAE,QAAQ,EAAE,CAAC;IACjB,OAAO,EAAE,QAAQ,EAAE,CAAC;IACpB,QAAQ,CAAC,EAAE,SAAS,CAAC,QAAQ,CAAC,CAAC;IAC/B,QAAQ,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,KAAK,IAAI,CAAC;IACjD,MAAM,EAAE,cAAc,CAAC,QAAQ,CAAC,CAAC;IACjC,WAAW,CAAC,EAAE,SAAS,CAAC,QAAQ,CAAC,CAAC;IAClC,QAAQ,CAAC,EAAE,YAAY,EAAE,CAAC;IAC1B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,KAAK,CAAC,SAAS,CAAC;IAC5B,QAAQ,EAAE,MAAM,KAAK,CAAC,SAAS,CAAC;IAChC,gBAAgB,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,CAAC,IAAI,EAAE,QAAQ,KAAK,OAAO,CAAC;CAClE"}

package/esm/utils/tree.d.ts

@@ -9,6 +9,6 @@ type FilterDatum<DataItem> = {
     getKey: (node: DataItem) => KeygenResult;
     getDataById: (id: KeygenResult) => DataItem;
 };
-export declare const mergeFilteredTree: (filterDatum: FilterDatum<any>, rawDatum: FilterDatum<any>, tiledId: KeygenResult[]) => any[];
+export declare const mergeFilteredTree: (filterData: any, rawDatum: FilterDatum<any>, tiledId: KeygenResult[]) => any;
 export {};
 //# sourceMappingURL=tree.d.ts.map

package/esm/utils/tree.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tree.d.ts","sourceRoot":"","sources":["tree.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAG9C,eAAO,MAAM,cAAc,+CAGlB,OAAO,UAkBf,CAAC;AAEF,eAAO,MAAM,aAAa,2CAA4C,YAAY,6EAE5B,OAAO,iCACzC,YAAY,EAAE,GAAG,SAAS,2EAGxB,OAAO,wCACU,IAAI;;yBA4B1C,CAAC;AAEF,KAAK,WAAW,CAAC,QAAQ,IAAI;IAC3B,IAAI,EAAE,QAAQ,EAAE,CAAC;IACjB,WAAW,EAAE,GAAG,CAAC;IACjB,MAAM,EAAE,CAAC,IAAI,EAAE,QAAQ,KAAK,YAAY,CAAC;IACzC,WAAW,EAAE,CAAC,EAAE,EAAE,YAAY,KAAK,QAAQ,CAAC;CAC7C,CAAC;AAEF,eAAO,MAAM,iBAAiB,gBACf,YAAY,GAAG,CAAC,YACnB,YAAY,GAAG,CAAC,WACjB,YAAY,EAAE,UAqBxB,CAAC"}
+{"version":3,"file":"tree.d.ts","sourceRoot":"","sources":["tree.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAG9C,eAAO,MAAM,cAAc,+CAGlB,OAAO,UAkBf,CAAC;AAEF,eAAO,MAAM,aAAa,2CAA4C,YAAY,6EAE5B,OAAO,iCACzC,YAAY,EAAE,GAAG,SAAS,2EAGxB,OAAO,wCACU,IAAI;;yBA4B1C,CAAC;AAEF,KAAK,WAAW,CAAC,QAAQ,IAAI;IAC3B,IAAI,EAAE,QAAQ,EAAE,CAAC;IACjB,WAAW,EAAE,GAAG,CAAC;IACjB,MAAM,EAAE,CAAC,IAAI,EAAE,QAAQ,KAAK,YAAY,CAAC;IACzC,WAAW,EAAE,CAAC,EAAE,EAAE,YAAY,KAAK,QAAQ,CAAC;CAC7C,CAAC;AAEF,eAAO,MAAM,iBAAiB,eAChB,GAAG,YACL,YAAY,GAAG,CAAC,WACjB,YAAY,EAAE,QAexB,CAAC"}

package/esm/utils/tree.js

@@ -62,19 +62,13 @@ export var getFilterTree = function getFilterTree(treeNodes, filterFunc, filterE
     return node;
   });
 };
-export var mergeFilteredTree = function mergeFilteredTree(filterDatum, rawDatum, tiledId) {
-  var filterData = filterDatum.data;
-  var childrenKey = filterDatum.childrenKey;
+export var mergeFilteredTree = function mergeFilteredTree(filterData, rawDatum, tiledId) {
+  var childrenKey = rawDatum.childrenKey;
   if (tiledId.length === 0) return filterData;
   var recursion = function recursion(node) {
-    var nodeKey = filterDatum.getKey(node);
+    var nodeKey = rawDatum.getKey(node);
     if (tiledId.indexOf(nodeKey) >= 0) {
       node[childrenKey] = deepClone(rawDatum.getDataById(nodeKey)[childrenKey] || []);
-    } else {
-      var item = filterDatum.getDataById(nodeKey);
-      if (item && item[childrenKey]) {
-        node[childrenKey] = deepClone(item[childrenKey] || []);
-      }
     }
     var children = node[childrenKey] || [];
     children.map(recursion);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sheinx/hooks",
-  "version": "3.6.0-beta.1",
+  "version": "3.6.0-beta.2",
   "description": "",
   "keywords": [],
   "license": "MIT",