@infinite-table/infinite-react 6.0.6 → 6.0.8

package/index.d.ts

@@ -2222,6 +2222,7 @@ declare class DataSourceCache<DataType, PrimaryKeyType = string> {
     getMutations: () => Map<PrimaryKeyType, DataSourceMutation<DataType>[]>;
     getTreeMutations: () => DeepMap<NodePath$1<any>, DataSourceMutation<DataType>[]>;
     getMutationsArray: () => DataSourceMutation<DataType>[];
+    getTreeMutationsArray: () => DataSourceMutation<DataType>[];
 }
 
 declare type TreeExpandStateApi<T> = {
@@ -2608,7 +2609,10 @@ interface DataSourceApi<T> {
     updateData(data: Partial<T>, options?: DataSourceCRUDParam): Promise<any>;
     updateDataByNodePath(data: Partial<T>, nodePath: NodePath$1, options?: DataSourceUpdateParam): Promise<any>;
     updateDataArray(data: Partial<T>[], options?: DataSourceCRUDParam): Promise<any>;
-    updateDataArrayByNodePath(data: Partial<T>[], nodePaths: NodePath$1[], options?: DataSourceUpdateParam): Promise<any>;
+    updateDataArrayByNodePath(updateInfo: {
+        data: Partial<T>;
+        nodePath: NodePath$1;
+    }[], options?: DataSourceUpdateParam): Promise<any>;
     flush(): Promise<any>;
     removeDataByPrimaryKey(id: any, options?: DataSourceCRUDParam): Promise<any>;
     removeDataByNodePath(nodePath: NodePath$1, options?: DataSourceCRUDParam): Promise<any>;

package/index.dev.js

@@ -10660,8 +10660,11 @@ var Indexer = class {
         arr = arr.concat();
       }
       if (!arr.length && cache) {
-        const cacheInfo = cache.getMutationsArray();
-        if (cacheInfo && cacheInfo.length) {
+        if (!cache.isEmpty()) {
+          const cacheInfo = [
+            ...cache.getMutationsArray(),
+            ...cache.getTreeMutationsArray()
+          ];
           for (let cacheIndex = 0, cacheLength = cacheInfo.length; cacheIndex < cacheLength; cacheIndex++) {
             const info = cacheInfo[cacheIndex];
             if (info.type === "insert") {
@@ -12099,9 +12102,9 @@ function getRowInfoArray(getState) {
 }
 
 // src/components/DataSource/TreeApi.ts
-function cloneTreeSelection(treeSelection, stateOrGetState) {
+function cloneTreeSelection(treeSelection2, stateOrGetState) {
   return new TreeSelectionState(
-    treeSelection,
+    treeSelection2,
     treeSelectionStateConfigGetter(stateOrGetState)
   );
 }
@@ -12116,7 +12119,7 @@ function treeSelectionStateConfigGetter(stateOrStateGetter) {
 var TreeApiImpl = class {
   constructor(param) {
     this.setNodeSelection = (nodePath, selected) => {
-      const { treeSelectionState: treeSelection, selectionMode } = this.getState();
+      const { treeSelectionState: treeSelection2, selectionMode } = this.getState();
       if (selectionMode === "single-row") {
         this.actions.treeSelection = selected ? nodePath[nodePath.length - 1] : null;
         return;
@@ -12124,11 +12127,11 @@ var TreeApiImpl = class {
       if (selectionMode !== "multi-row") {
         throw "Selection mode is not multi-row or single-row";
       }
-      if (!(treeSelection instanceof TreeSelectionState)) {
+      if (!(treeSelection2 instanceof TreeSelectionState)) {
         throw "Invalid tree selection";
       }
       const treeSelectionState = new TreeSelectionState(
-        treeSelection,
+        treeSelection2,
         treeSelectionStateConfigGetter(this.getState)
       );
       treeSelectionState.setNodeSelection(nodePath, selected);
@@ -12251,15 +12254,15 @@ var TreeApiImpl = class {
     return null;
   }
   selectAll() {
-    const { treeSelectionState: treeSelection, selectionMode } = this.getState();
+    const { treeSelectionState: treeSelection2, selectionMode } = this.getState();
     if (selectionMode !== "multi-row") {
       throw "Selection mode is not multi-row";
     }
-    if (!(treeSelection instanceof TreeSelectionState)) {
+    if (!(treeSelection2 instanceof TreeSelectionState)) {
       throw "Invalid node selection";
     }
     const treeSelectionState = new TreeSelectionState(
-      treeSelection,
+      treeSelection2,
       treeSelectionStateConfigGetter(this.getState)
     );
     treeSelectionState.selectAll();
@@ -12267,15 +12270,15 @@ var TreeApiImpl = class {
     this.actions.treeSelection = treeSelectionState;
   }
   deselectAll() {
-    const { treeSelectionState: treeSelection, selectionMode } = this.getState();
+    const { treeSelectionState: treeSelection2, selectionMode } = this.getState();
     if (selectionMode !== "multi-row") {
       throw "Selection mode is not multi-row";
     }
-    if (!(treeSelection instanceof TreeSelectionState)) {
+    if (!(treeSelection2 instanceof TreeSelectionState)) {
       throw "Invalid node selection";
     }
     const treeSelectionState = new TreeSelectionState(
-      treeSelection,
+      treeSelection2,
       treeSelectionStateConfigGetter(this.getState)
     );
     treeSelectionState.deselectAll();
@@ -12283,21 +12286,25 @@ var TreeApiImpl = class {
     this.actions.treeSelection = treeSelectionState;
   }
   isNodeSelected(nodePath) {
-    const { treeSelection, selectionMode } = this.getState();
+    const {
+      treeSelectionState,
+      treeSelection: singleTreeSelection,
+      selectionMode
+    } = this.getState();
     if (selectionMode === "single-row") {
       const pk = nodePath[nodePath.length - 1];
-      if (Array.isArray(treeSelection)) {
+      if (Array.isArray(singleTreeSelection)) {
         return treeSelection.join(",") === nodePath.join(",");
       }
-      return treeSelection === pk;
+      return singleTreeSelection === pk;
     }
     if (selectionMode !== "multi-row") {
       throw "Selection mode is not multi-row or single-row";
     }
-    if (!(treeSelection instanceof TreeSelectionState)) {
+    if (!(treeSelectionState instanceof TreeSelectionState)) {
       throw "Invalid tree selection";
     }
-    return treeSelection.isNodeSelected(nodePath);
+    return treeSelectionState.isNodeSelected(nodePath);
   }
   selectNode(nodePath) {
     this.setNodeSelection(nodePath, true);
@@ -12817,10 +12824,10 @@ function getMappedCallbacks() {
         ]
       };
     },
-    treeSelection: (treeSelection, state) => {
+    treeSelection: (treeSelection2, state) => {
       if (state.selectionMode === "single-row") {
         const callbackParams2 = [
-          treeSelection,
+          treeSelection2,
           { selectionMode: "single-row" }
         ];
         return {
@@ -12828,7 +12835,7 @@ function getMappedCallbacks() {
         };
       }
       const callbackParams = [
-        treeSelection.getState(),
+        treeSelection2.getState(),
         {
           selectionMode: "multi-row",
           lastUpdatedNodePath: state.lastSelectionUpdatedNodePathRef.current,
@@ -13141,6 +13148,9 @@ var DataSourceCache = class {
     this.getMutationsArray = () => {
       return Array.from(this.primaryKeyToData.values()).flat();
     };
+    this.getTreeMutationsArray = () => {
+      return Array.from(this.nodePathToData.values()).flat();
+    };
   }
   static clone(cache, { light = false } = {}) {
     const clone = new DataSourceCache();
@@ -13278,9 +13288,23 @@ var DataSourceApiImpl = class {
       return result;
     };
     this.updateDataByNodePath = (data, nodePath, options) => {
-      return this.updateDataArrayByNodePath([data], [nodePath], options);
+      return this.updateDataArrayByNodePath(
+        [
+          {
+            data,
+            nodePath
+          }
+        ],
+        options
+      );
     };
-    this.updateDataArrayByNodePath = (data, nodePaths, options) => {
+    this.updateDataArrayByNodePath = (updateInfo, options) => {
+      const data = [];
+      const nodePaths = [];
+      updateInfo.forEach((info) => {
+        data.push(info.data);
+        nodePaths.push(info.nodePath);
+      });
       const result = this.batchOperation({
         type: "update",
         array: data,
@@ -15559,7 +15583,8 @@ function getColumnRenderParam(options) {
       all: null,
       value: typeof value === "boolean" ? `${value}` : value,
       selectionCheckBox: null,
-      groupIcon: null
+      groupIcon: null,
+      treeIcon: null
     },
     selectCurrentRow: () => {
       if (rowInfo.isTreeNode) {
@@ -16106,6 +16131,14 @@ function InfiniteTableColumnCellFn(props) {
         typeof renderFunctions.renderTreeIcon === "function" ? renderFunctions.renderTreeIcon : isParentNode && renderFunctions.renderTreeIcon === true ? defaultRenderTreeIcon : void 0;
         if (fn === true) {
           fn = defaultRenderTreeIcon;
+        } else if (fn) {
+          renderParam.renderBag.treeIcon = /* @__PURE__ */ React38.createElement(
+            RenderCellHookComponent,
+            {
+              render: defaultRenderTreeIcon,
+              renderParam
+            }
+          );
         }
         if (fn) {
           renderParam.renderBag.treeIcon = /* @__PURE__ */ React38.createElement(
@@ -22141,7 +22174,7 @@ var useLicense = (licenseKey = "") => {
     }
     let valid2 = isValidLicense(licenseKey, {
       publishedAt: 1624970570587,
-      version: "6.0.6"
+      version: "6.0.8"
     });
     if (!licenseKey && !valid2 && isInsidePlayground) {
       return true;
@@ -22693,7 +22726,7 @@ function handleKeyboardSelection(context, keyboardEvent) {
     selectionMode,
     groupBy,
     rowSelection,
-    treeSelectionState: treeSelection,
+    treeSelectionState: treeSelection2,
     isTree
   } = dataSourceState;
   if (keyboardSelection === false) {
@@ -22712,9 +22745,9 @@ function handleKeyboardSelection(context, keyboardEvent) {
     return false;
   }
   if (key === "a" && (ctrlKey || metaKey)) {
-    if (isTree && treeSelection) {
+    if (isTree && treeSelection2) {
       const treeSelectionState = cloneTreeSelection2(
-        treeSelection
+        treeSelection2
       );
       treeSelectionState.selectAll();
       dataSourceActions.treeSelection = treeSelectionState;
@@ -23116,8 +23149,8 @@ async function onKeyDown(context, event) {
     cloneRowSelection: (rowSelection) => {
       return cloneRowSelection(rowSelection, context.getDataSourceState);
     },
-    cloneTreeSelection: (treeSelection) => {
-      return cloneTreeSelection(treeSelection, context.getDataSourceState);
+    cloneTreeSelection: (treeSelection2) => {
+      return cloneTreeSelection(treeSelection2, context.getDataSourceState);
     }
   };
   if (handleKeyboardSelection(keyboardHandlerContext, event)) {
@@ -23196,8 +23229,8 @@ function useEventHandlersContext() {
       actions,
       getDataSourceState,
       dataSourceActions,
-      cloneTreeSelection: (treeSelection) => {
-        return cloneTreeSelection(treeSelection, getDataSourceState);
+      cloneTreeSelection: (treeSelection2) => {
+        return cloneTreeSelection(treeSelection2, getDataSourceState);
       },
       cloneRowSelection: (rowSelection) => {
         return cloneRowSelection(rowSelection, getDataSourceState);

package/index.dev.mjs

@@ -10609,8 +10609,11 @@ var Indexer = class {
         arr = arr.concat();
       }
       if (!arr.length && cache) {
-        const cacheInfo = cache.getMutationsArray();
-        if (cacheInfo && cacheInfo.length) {
+        if (!cache.isEmpty()) {
+          const cacheInfo = [
+            ...cache.getMutationsArray(),
+            ...cache.getTreeMutationsArray()
+          ];
           for (let cacheIndex = 0, cacheLength = cacheInfo.length; cacheIndex < cacheLength; cacheIndex++) {
             const info = cacheInfo[cacheIndex];
             if (info.type === "insert") {
@@ -12048,9 +12051,9 @@ function getRowInfoArray(getState) {
 }
 
 // src/components/DataSource/TreeApi.ts
-function cloneTreeSelection(treeSelection, stateOrGetState) {
+function cloneTreeSelection(treeSelection2, stateOrGetState) {
   return new TreeSelectionState(
-    treeSelection,
+    treeSelection2,
     treeSelectionStateConfigGetter(stateOrGetState)
   );
 }
@@ -12065,7 +12068,7 @@ function treeSelectionStateConfigGetter(stateOrStateGetter) {
 var TreeApiImpl = class {
   constructor(param) {
     this.setNodeSelection = (nodePath, selected) => {
-      const { treeSelectionState: treeSelection, selectionMode } = this.getState();
+      const { treeSelectionState: treeSelection2, selectionMode } = this.getState();
       if (selectionMode === "single-row") {
         this.actions.treeSelection = selected ? nodePath[nodePath.length - 1] : null;
         return;
@@ -12073,11 +12076,11 @@ var TreeApiImpl = class {
       if (selectionMode !== "multi-row") {
         throw "Selection mode is not multi-row or single-row";
       }
-      if (!(treeSelection instanceof TreeSelectionState)) {
+      if (!(treeSelection2 instanceof TreeSelectionState)) {
         throw "Invalid tree selection";
       }
       const treeSelectionState = new TreeSelectionState(
-        treeSelection,
+        treeSelection2,
         treeSelectionStateConfigGetter(this.getState)
       );
       treeSelectionState.setNodeSelection(nodePath, selected);
@@ -12200,15 +12203,15 @@ var TreeApiImpl = class {
     return null;
   }
   selectAll() {
-    const { treeSelectionState: treeSelection, selectionMode } = this.getState();
+    const { treeSelectionState: treeSelection2, selectionMode } = this.getState();
     if (selectionMode !== "multi-row") {
       throw "Selection mode is not multi-row";
     }
-    if (!(treeSelection instanceof TreeSelectionState)) {
+    if (!(treeSelection2 instanceof TreeSelectionState)) {
       throw "Invalid node selection";
     }
     const treeSelectionState = new TreeSelectionState(
-      treeSelection,
+      treeSelection2,
       treeSelectionStateConfigGetter(this.getState)
     );
     treeSelectionState.selectAll();
@@ -12216,15 +12219,15 @@ var TreeApiImpl = class {
     this.actions.treeSelection = treeSelectionState;
   }
   deselectAll() {
-    const { treeSelectionState: treeSelection, selectionMode } = this.getState();
+    const { treeSelectionState: treeSelection2, selectionMode } = this.getState();
     if (selectionMode !== "multi-row") {
       throw "Selection mode is not multi-row";
     }
-    if (!(treeSelection instanceof TreeSelectionState)) {
+    if (!(treeSelection2 instanceof TreeSelectionState)) {
       throw "Invalid node selection";
     }
     const treeSelectionState = new TreeSelectionState(
-      treeSelection,
+      treeSelection2,
       treeSelectionStateConfigGetter(this.getState)
     );
     treeSelectionState.deselectAll();
@@ -12232,21 +12235,25 @@ var TreeApiImpl = class {
     this.actions.treeSelection = treeSelectionState;
   }
   isNodeSelected(nodePath) {
-    const { treeSelection, selectionMode } = this.getState();
+    const {
+      treeSelectionState,
+      treeSelection: singleTreeSelection,
+      selectionMode
+    } = this.getState();
     if (selectionMode === "single-row") {
       const pk = nodePath[nodePath.length - 1];
-      if (Array.isArray(treeSelection)) {
+      if (Array.isArray(singleTreeSelection)) {
         return treeSelection.join(",") === nodePath.join(",");
       }
-      return treeSelection === pk;
+      return singleTreeSelection === pk;
     }
     if (selectionMode !== "multi-row") {
       throw "Selection mode is not multi-row or single-row";
     }
-    if (!(treeSelection instanceof TreeSelectionState)) {
+    if (!(treeSelectionState instanceof TreeSelectionState)) {
       throw "Invalid tree selection";
     }
-    return treeSelection.isNodeSelected(nodePath);
+    return treeSelectionState.isNodeSelected(nodePath);
   }
   selectNode(nodePath) {
     this.setNodeSelection(nodePath, true);
@@ -12766,10 +12773,10 @@ function getMappedCallbacks() {
         ]
       };
     },
-    treeSelection: (treeSelection, state) => {
+    treeSelection: (treeSelection2, state) => {
       if (state.selectionMode === "single-row") {
         const callbackParams2 = [
-          treeSelection,
+          treeSelection2,
           { selectionMode: "single-row" }
         ];
         return {
@@ -12777,7 +12784,7 @@ function getMappedCallbacks() {
         };
       }
       const callbackParams = [
-        treeSelection.getState(),
+        treeSelection2.getState(),
         {
           selectionMode: "multi-row",
           lastUpdatedNodePath: state.lastSelectionUpdatedNodePathRef.current,
@@ -13095,6 +13102,9 @@ var DataSourceCache = class {
     this.getMutationsArray = () => {
       return Array.from(this.primaryKeyToData.values()).flat();
     };
+    this.getTreeMutationsArray = () => {
+      return Array.from(this.nodePathToData.values()).flat();
+    };
   }
   static clone(cache, { light = false } = {}) {
     const clone = new DataSourceCache();
@@ -13232,9 +13242,23 @@ var DataSourceApiImpl = class {
       return result;
     };
     this.updateDataByNodePath = (data, nodePath, options) => {
-      return this.updateDataArrayByNodePath([data], [nodePath], options);
+      return this.updateDataArrayByNodePath(
+        [
+          {
+            data,
+            nodePath
+          }
+        ],
+        options
+      );
     };
-    this.updateDataArrayByNodePath = (data, nodePaths, options) => {
+    this.updateDataArrayByNodePath = (updateInfo, options) => {
+      const data = [];
+      const nodePaths = [];
+      updateInfo.forEach((info) => {
+        data.push(info.data);
+        nodePaths.push(info.nodePath);
+      });
       const result = this.batchOperation({
         type: "update",
         array: data,
@@ -15513,7 +15537,8 @@ function getColumnRenderParam(options) {
       all: null,
       value: typeof value === "boolean" ? `${value}` : value,
       selectionCheckBox: null,
-      groupIcon: null
+      groupIcon: null,
+      treeIcon: null
     },
     selectCurrentRow: () => {
       if (rowInfo.isTreeNode) {
@@ -16060,6 +16085,14 @@ function InfiniteTableColumnCellFn(props) {
         typeof renderFunctions.renderTreeIcon === "function" ? renderFunctions.renderTreeIcon : isParentNode && renderFunctions.renderTreeIcon === true ? defaultRenderTreeIcon : void 0;
         if (fn === true) {
           fn = defaultRenderTreeIcon;
+        } else if (fn) {
+          renderParam.renderBag.treeIcon = /* @__PURE__ */ React38.createElement(
+            RenderCellHookComponent,
+            {
+              render: defaultRenderTreeIcon,
+              renderParam
+            }
+          );
         }
         if (fn) {
           renderParam.renderBag.treeIcon = /* @__PURE__ */ React38.createElement(
@@ -22099,7 +22132,7 @@ var useLicense = (licenseKey = "") => {
     }
     let valid2 = isValidLicense(licenseKey, {
       publishedAt: 1624970570587,
-      version: "6.0.6"
+      version: "6.0.8"
     });
     if (!licenseKey && !valid2 && isInsidePlayground) {
       return true;
@@ -22651,7 +22684,7 @@ function handleKeyboardSelection(context, keyboardEvent) {
     selectionMode,
     groupBy,
     rowSelection,
-    treeSelectionState: treeSelection,
+    treeSelectionState: treeSelection2,
     isTree
   } = dataSourceState;
   if (keyboardSelection === false) {
@@ -22670,9 +22703,9 @@ function handleKeyboardSelection(context, keyboardEvent) {
     return false;
   }
   if (key === "a" && (ctrlKey || metaKey)) {
-    if (isTree && treeSelection) {
+    if (isTree && treeSelection2) {
       const treeSelectionState = cloneTreeSelection2(
-        treeSelection
+        treeSelection2
       );
       treeSelectionState.selectAll();
       dataSourceActions.treeSelection = treeSelectionState;
@@ -23074,8 +23107,8 @@ async function onKeyDown(context, event) {
     cloneRowSelection: (rowSelection) => {
       return cloneRowSelection(rowSelection, context.getDataSourceState);
     },
-    cloneTreeSelection: (treeSelection) => {
-      return cloneTreeSelection(treeSelection, context.getDataSourceState);
+    cloneTreeSelection: (treeSelection2) => {
+      return cloneTreeSelection(treeSelection2, context.getDataSourceState);
     }
   };
   if (handleKeyboardSelection(keyboardHandlerContext, event)) {
@@ -23154,8 +23187,8 @@ function useEventHandlersContext() {
       actions,
       getDataSourceState,
       dataSourceActions,
-      cloneTreeSelection: (treeSelection) => {
-        return cloneTreeSelection(treeSelection, getDataSourceState);
+      cloneTreeSelection: (treeSelection2) => {
+        return cloneTreeSelection(treeSelection2, getDataSourceState);
       },
       cloneRowSelection: (rowSelection) => {
         return cloneRowSelection(rowSelection, getDataSourceState);

package/index.js

@@ -10660,8 +10660,11 @@ var Indexer = class {
         arr = arr.concat();
       }
       if (!arr.length && cache) {
-        const cacheInfo = cache.getMutationsArray();
-        if (cacheInfo && cacheInfo.length) {
+        if (!cache.isEmpty()) {
+          const cacheInfo = [
+            ...cache.getMutationsArray(),
+            ...cache.getTreeMutationsArray()
+          ];
           for (let cacheIndex = 0, cacheLength = cacheInfo.length; cacheIndex < cacheLength; cacheIndex++) {
             const info = cacheInfo[cacheIndex];
             if (info.type === "insert") {
@@ -12099,9 +12102,9 @@ function getRowInfoArray(getState) {
 }
 
 // src/components/DataSource/TreeApi.ts
-function cloneTreeSelection(treeSelection, stateOrGetState) {
+function cloneTreeSelection(treeSelection2, stateOrGetState) {
   return new TreeSelectionState(
-    treeSelection,
+    treeSelection2,
     treeSelectionStateConfigGetter(stateOrGetState)
   );
 }
@@ -12116,7 +12119,7 @@ function treeSelectionStateConfigGetter(stateOrStateGetter) {
 var TreeApiImpl = class {
   constructor(param) {
     this.setNodeSelection = (nodePath, selected) => {
-      const { treeSelectionState: treeSelection, selectionMode } = this.getState();
+      const { treeSelectionState: treeSelection2, selectionMode } = this.getState();
       if (selectionMode === "single-row") {
         this.actions.treeSelection = selected ? nodePath[nodePath.length - 1] : null;
         return;
@@ -12124,11 +12127,11 @@ var TreeApiImpl = class {
       if (selectionMode !== "multi-row") {
         throw "Selection mode is not multi-row or single-row";
       }
-      if (!(treeSelection instanceof TreeSelectionState)) {
+      if (!(treeSelection2 instanceof TreeSelectionState)) {
         throw "Invalid tree selection";
       }
       const treeSelectionState = new TreeSelectionState(
-        treeSelection,
+        treeSelection2,
         treeSelectionStateConfigGetter(this.getState)
       );
       treeSelectionState.setNodeSelection(nodePath, selected);
@@ -12251,15 +12254,15 @@ var TreeApiImpl = class {
     return null;
   }
   selectAll() {
-    const { treeSelectionState: treeSelection, selectionMode } = this.getState();
+    const { treeSelectionState: treeSelection2, selectionMode } = this.getState();
     if (selectionMode !== "multi-row") {
       throw "Selection mode is not multi-row";
     }
-    if (!(treeSelection instanceof TreeSelectionState)) {
+    if (!(treeSelection2 instanceof TreeSelectionState)) {
       throw "Invalid node selection";
     }
     const treeSelectionState = new TreeSelectionState(
-      treeSelection,
+      treeSelection2,
       treeSelectionStateConfigGetter(this.getState)
     );
     treeSelectionState.selectAll();
@@ -12267,15 +12270,15 @@ var TreeApiImpl = class {
     this.actions.treeSelection = treeSelectionState;
   }
   deselectAll() {
-    const { treeSelectionState: treeSelection, selectionMode } = this.getState();
+    const { treeSelectionState: treeSelection2, selectionMode } = this.getState();
     if (selectionMode !== "multi-row") {
       throw "Selection mode is not multi-row";
     }
-    if (!(treeSelection instanceof TreeSelectionState)) {
+    if (!(treeSelection2 instanceof TreeSelectionState)) {
       throw "Invalid node selection";
     }
     const treeSelectionState = new TreeSelectionState(
-      treeSelection,
+      treeSelection2,
       treeSelectionStateConfigGetter(this.getState)
     );
     treeSelectionState.deselectAll();
@@ -12283,21 +12286,25 @@ var TreeApiImpl = class {
     this.actions.treeSelection = treeSelectionState;
   }
   isNodeSelected(nodePath) {
-    const { treeSelection, selectionMode } = this.getState();
+    const {
+      treeSelectionState,
+      treeSelection: singleTreeSelection,
+      selectionMode
+    } = this.getState();
     if (selectionMode === "single-row") {
       const pk = nodePath[nodePath.length - 1];
-      if (Array.isArray(treeSelection)) {
+      if (Array.isArray(singleTreeSelection)) {
         return treeSelection.join(",") === nodePath.join(",");
       }
-      return treeSelection === pk;
+      return singleTreeSelection === pk;
     }
     if (selectionMode !== "multi-row") {
       throw "Selection mode is not multi-row or single-row";
     }
-    if (!(treeSelection instanceof TreeSelectionState)) {
+    if (!(treeSelectionState instanceof TreeSelectionState)) {
       throw "Invalid tree selection";
     }
-    return treeSelection.isNodeSelected(nodePath);
+    return treeSelectionState.isNodeSelected(nodePath);
   }
   selectNode(nodePath) {
     this.setNodeSelection(nodePath, true);
@@ -12817,10 +12824,10 @@ function getMappedCallbacks() {
         ]
       };
     },
-    treeSelection: (treeSelection, state) => {
+    treeSelection: (treeSelection2, state) => {
       if (state.selectionMode === "single-row") {
         const callbackParams2 = [
-          treeSelection,
+          treeSelection2,
           { selectionMode: "single-row" }
         ];
         return {
@@ -12828,7 +12835,7 @@ function getMappedCallbacks() {
         };
       }
       const callbackParams = [
-        treeSelection.getState(),
+        treeSelection2.getState(),
         {
           selectionMode: "multi-row",
           lastUpdatedNodePath: state.lastSelectionUpdatedNodePathRef.current,
@@ -13141,6 +13148,9 @@ var DataSourceCache = class {
     this.getMutationsArray = () => {
       return Array.from(this.primaryKeyToData.values()).flat();
     };
+    this.getTreeMutationsArray = () => {
+      return Array.from(this.nodePathToData.values()).flat();
+    };
   }
   static clone(cache, { light = false } = {}) {
     const clone = new DataSourceCache();
@@ -13278,9 +13288,23 @@ var DataSourceApiImpl = class {
       return result;
     };
     this.updateDataByNodePath = (data, nodePath, options) => {
-      return this.updateDataArrayByNodePath([data], [nodePath], options);
+      return this.updateDataArrayByNodePath(
+        [
+          {
+            data,
+            nodePath
+          }
+        ],
+        options
+      );
     };
-    this.updateDataArrayByNodePath = (data, nodePaths, options) => {
+    this.updateDataArrayByNodePath = (updateInfo, options) => {
+      const data = [];
+      const nodePaths = [];
+      updateInfo.forEach((info) => {
+        data.push(info.data);
+        nodePaths.push(info.nodePath);
+      });
       const result = this.batchOperation({
         type: "update",
         array: data,
@@ -15559,7 +15583,8 @@ function getColumnRenderParam(options) {
       all: null,
       value: typeof value === "boolean" ? `${value}` : value,
       selectionCheckBox: null,
-      groupIcon: null
+      groupIcon: null,
+      treeIcon: null
     },
     selectCurrentRow: () => {
       if (rowInfo.isTreeNode) {
@@ -16106,6 +16131,14 @@ function InfiniteTableColumnCellFn(props) {
         typeof renderFunctions.renderTreeIcon === "function" ? renderFunctions.renderTreeIcon : isParentNode && renderFunctions.renderTreeIcon === true ? defaultRenderTreeIcon : void 0;
         if (fn === true) {
           fn = defaultRenderTreeIcon;
+        } else if (fn) {
+          renderParam.renderBag.treeIcon = /* @__PURE__ */ React38.createElement(
+            RenderCellHookComponent,
+            {
+              render: defaultRenderTreeIcon,
+              renderParam
+            }
+          );
         }
         if (fn) {
           renderParam.renderBag.treeIcon = /* @__PURE__ */ React38.createElement(
@@ -22141,7 +22174,7 @@ var useLicense = (licenseKey = "") => {
     }
     let valid2 = isValidLicense(licenseKey, {
       publishedAt: 1624970570587,
-      version: "6.0.6"
+      version: "6.0.8"
     });
     if (!licenseKey && !valid2 && isInsidePlayground) {
       return true;
@@ -22693,7 +22726,7 @@ function handleKeyboardSelection(context, keyboardEvent) {
     selectionMode,
     groupBy,
     rowSelection,
-    treeSelectionState: treeSelection,
+    treeSelectionState: treeSelection2,
     isTree
   } = dataSourceState;
   if (keyboardSelection === false) {
@@ -22712,9 +22745,9 @@ function handleKeyboardSelection(context, keyboardEvent) {
     return false;
   }
   if (key === "a" && (ctrlKey || metaKey)) {
-    if (isTree && treeSelection) {
+    if (isTree && treeSelection2) {
       const treeSelectionState = cloneTreeSelection2(
-        treeSelection
+        treeSelection2
       );
       treeSelectionState.selectAll();
       dataSourceActions.treeSelection = treeSelectionState;
@@ -23116,8 +23149,8 @@ async function onKeyDown(context, event) {
     cloneRowSelection: (rowSelection) => {
       return cloneRowSelection(rowSelection, context.getDataSourceState);
     },
-    cloneTreeSelection: (treeSelection) => {
-      return cloneTreeSelection(treeSelection, context.getDataSourceState);
+    cloneTreeSelection: (treeSelection2) => {
+      return cloneTreeSelection(treeSelection2, context.getDataSourceState);
     }
   };
   if (handleKeyboardSelection(keyboardHandlerContext, event)) {
@@ -23196,8 +23229,8 @@ function useEventHandlersContext() {
       actions,
       getDataSourceState,
       dataSourceActions,
-      cloneTreeSelection: (treeSelection) => {
-        return cloneTreeSelection(treeSelection, getDataSourceState);
+      cloneTreeSelection: (treeSelection2) => {
+        return cloneTreeSelection(treeSelection2, getDataSourceState);
       },
       cloneRowSelection: (rowSelection) => {
         return cloneRowSelection(rowSelection, getDataSourceState);

package/index.mjs

@@ -10609,8 +10609,11 @@ var Indexer = class {
         arr = arr.concat();
       }
       if (!arr.length && cache) {
-        const cacheInfo = cache.getMutationsArray();
-        if (cacheInfo && cacheInfo.length) {
+        if (!cache.isEmpty()) {
+          const cacheInfo = [
+            ...cache.getMutationsArray(),
+            ...cache.getTreeMutationsArray()
+          ];
           for (let cacheIndex = 0, cacheLength = cacheInfo.length; cacheIndex < cacheLength; cacheIndex++) {
             const info = cacheInfo[cacheIndex];
             if (info.type === "insert") {
@@ -12048,9 +12051,9 @@ function getRowInfoArray(getState) {
 }
 
 // src/components/DataSource/TreeApi.ts
-function cloneTreeSelection(treeSelection, stateOrGetState) {
+function cloneTreeSelection(treeSelection2, stateOrGetState) {
   return new TreeSelectionState(
-    treeSelection,
+    treeSelection2,
     treeSelectionStateConfigGetter(stateOrGetState)
   );
 }
@@ -12065,7 +12068,7 @@ function treeSelectionStateConfigGetter(stateOrStateGetter) {
 var TreeApiImpl = class {
   constructor(param) {
     this.setNodeSelection = (nodePath, selected) => {
-      const { treeSelectionState: treeSelection, selectionMode } = this.getState();
+      const { treeSelectionState: treeSelection2, selectionMode } = this.getState();
       if (selectionMode === "single-row") {
         this.actions.treeSelection = selected ? nodePath[nodePath.length - 1] : null;
         return;
@@ -12073,11 +12076,11 @@ var TreeApiImpl = class {
       if (selectionMode !== "multi-row") {
         throw "Selection mode is not multi-row or single-row";
       }
-      if (!(treeSelection instanceof TreeSelectionState)) {
+      if (!(treeSelection2 instanceof TreeSelectionState)) {
         throw "Invalid tree selection";
       }
       const treeSelectionState = new TreeSelectionState(
-        treeSelection,
+        treeSelection2,
         treeSelectionStateConfigGetter(this.getState)
       );
       treeSelectionState.setNodeSelection(nodePath, selected);
@@ -12200,15 +12203,15 @@ var TreeApiImpl = class {
     return null;
   }
   selectAll() {
-    const { treeSelectionState: treeSelection, selectionMode } = this.getState();
+    const { treeSelectionState: treeSelection2, selectionMode } = this.getState();
     if (selectionMode !== "multi-row") {
       throw "Selection mode is not multi-row";
     }
-    if (!(treeSelection instanceof TreeSelectionState)) {
+    if (!(treeSelection2 instanceof TreeSelectionState)) {
       throw "Invalid node selection";
     }
     const treeSelectionState = new TreeSelectionState(
-      treeSelection,
+      treeSelection2,
       treeSelectionStateConfigGetter(this.getState)
     );
     treeSelectionState.selectAll();
@@ -12216,15 +12219,15 @@ var TreeApiImpl = class {
     this.actions.treeSelection = treeSelectionState;
   }
   deselectAll() {
-    const { treeSelectionState: treeSelection, selectionMode } = this.getState();
+    const { treeSelectionState: treeSelection2, selectionMode } = this.getState();
     if (selectionMode !== "multi-row") {
       throw "Selection mode is not multi-row";
     }
-    if (!(treeSelection instanceof TreeSelectionState)) {
+    if (!(treeSelection2 instanceof TreeSelectionState)) {
       throw "Invalid node selection";
     }
     const treeSelectionState = new TreeSelectionState(
-      treeSelection,
+      treeSelection2,
       treeSelectionStateConfigGetter(this.getState)
     );
     treeSelectionState.deselectAll();
@@ -12232,21 +12235,25 @@ var TreeApiImpl = class {
     this.actions.treeSelection = treeSelectionState;
   }
   isNodeSelected(nodePath) {
-    const { treeSelection, selectionMode } = this.getState();
+    const {
+      treeSelectionState,
+      treeSelection: singleTreeSelection,
+      selectionMode
+    } = this.getState();
     if (selectionMode === "single-row") {
       const pk = nodePath[nodePath.length - 1];
-      if (Array.isArray(treeSelection)) {
+      if (Array.isArray(singleTreeSelection)) {
         return treeSelection.join(",") === nodePath.join(",");
       }
-      return treeSelection === pk;
+      return singleTreeSelection === pk;
     }
     if (selectionMode !== "multi-row") {
       throw "Selection mode is not multi-row or single-row";
     }
-    if (!(treeSelection instanceof TreeSelectionState)) {
+    if (!(treeSelectionState instanceof TreeSelectionState)) {
       throw "Invalid tree selection";
     }
-    return treeSelection.isNodeSelected(nodePath);
+    return treeSelectionState.isNodeSelected(nodePath);
   }
   selectNode(nodePath) {
     this.setNodeSelection(nodePath, true);
@@ -12766,10 +12773,10 @@ function getMappedCallbacks() {
         ]
       };
     },
-    treeSelection: (treeSelection, state) => {
+    treeSelection: (treeSelection2, state) => {
       if (state.selectionMode === "single-row") {
         const callbackParams2 = [
-          treeSelection,
+          treeSelection2,
           { selectionMode: "single-row" }
         ];
         return {
@@ -12777,7 +12784,7 @@ function getMappedCallbacks() {
         };
       }
       const callbackParams = [
-        treeSelection.getState(),
+        treeSelection2.getState(),
         {
           selectionMode: "multi-row",
           lastUpdatedNodePath: state.lastSelectionUpdatedNodePathRef.current,
@@ -13095,6 +13102,9 @@ var DataSourceCache = class {
     this.getMutationsArray = () => {
       return Array.from(this.primaryKeyToData.values()).flat();
     };
+    this.getTreeMutationsArray = () => {
+      return Array.from(this.nodePathToData.values()).flat();
+    };
   }
   static clone(cache, { light = false } = {}) {
     const clone = new DataSourceCache();
@@ -13232,9 +13242,23 @@ var DataSourceApiImpl = class {
       return result;
     };
     this.updateDataByNodePath = (data, nodePath, options) => {
-      return this.updateDataArrayByNodePath([data], [nodePath], options);
+      return this.updateDataArrayByNodePath(
+        [
+          {
+            data,
+            nodePath
+          }
+        ],
+        options
+      );
     };
-    this.updateDataArrayByNodePath = (data, nodePaths, options) => {
+    this.updateDataArrayByNodePath = (updateInfo, options) => {
+      const data = [];
+      const nodePaths = [];
+      updateInfo.forEach((info) => {
+        data.push(info.data);
+        nodePaths.push(info.nodePath);
+      });
       const result = this.batchOperation({
         type: "update",
         array: data,
@@ -15513,7 +15537,8 @@ function getColumnRenderParam(options) {
       all: null,
       value: typeof value === "boolean" ? `${value}` : value,
       selectionCheckBox: null,
-      groupIcon: null
+      groupIcon: null,
+      treeIcon: null
     },
     selectCurrentRow: () => {
       if (rowInfo.isTreeNode) {
@@ -16060,6 +16085,14 @@ function InfiniteTableColumnCellFn(props) {
         typeof renderFunctions.renderTreeIcon === "function" ? renderFunctions.renderTreeIcon : isParentNode && renderFunctions.renderTreeIcon === true ? defaultRenderTreeIcon : void 0;
         if (fn === true) {
           fn = defaultRenderTreeIcon;
+        } else if (fn) {
+          renderParam.renderBag.treeIcon = /* @__PURE__ */ React38.createElement(
+            RenderCellHookComponent,
+            {
+              render: defaultRenderTreeIcon,
+              renderParam
+            }
+          );
         }
         if (fn) {
           renderParam.renderBag.treeIcon = /* @__PURE__ */ React38.createElement(
@@ -22099,7 +22132,7 @@ var useLicense = (licenseKey = "") => {
     }
     let valid2 = isValidLicense(licenseKey, {
       publishedAt: 1624970570587,
-      version: "6.0.6"
+      version: "6.0.8"
     });
     if (!licenseKey && !valid2 && isInsidePlayground) {
       return true;
@@ -22651,7 +22684,7 @@ function handleKeyboardSelection(context, keyboardEvent) {
     selectionMode,
     groupBy,
     rowSelection,
-    treeSelectionState: treeSelection,
+    treeSelectionState: treeSelection2,
     isTree
   } = dataSourceState;
   if (keyboardSelection === false) {
@@ -22670,9 +22703,9 @@ function handleKeyboardSelection(context, keyboardEvent) {
     return false;
   }
   if (key === "a" && (ctrlKey || metaKey)) {
-    if (isTree && treeSelection) {
+    if (isTree && treeSelection2) {
       const treeSelectionState = cloneTreeSelection2(
-        treeSelection
+        treeSelection2
       );
       treeSelectionState.selectAll();
       dataSourceActions.treeSelection = treeSelectionState;
@@ -23074,8 +23107,8 @@ async function onKeyDown(context, event) {
     cloneRowSelection: (rowSelection) => {
       return cloneRowSelection(rowSelection, context.getDataSourceState);
     },
-    cloneTreeSelection: (treeSelection) => {
-      return cloneTreeSelection(treeSelection, context.getDataSourceState);
+    cloneTreeSelection: (treeSelection2) => {
+      return cloneTreeSelection(treeSelection2, context.getDataSourceState);
     }
   };
   if (handleKeyboardSelection(keyboardHandlerContext, event)) {
@@ -23154,8 +23187,8 @@ function useEventHandlersContext() {
       actions,
       getDataSourceState,
       dataSourceActions,
-      cloneTreeSelection: (treeSelection) => {
-        return cloneTreeSelection(treeSelection, getDataSourceState);
+      cloneTreeSelection: (treeSelection2) => {
+        return cloneTreeSelection(treeSelection2, getDataSourceState);
       },
       cloneRowSelection: (rowSelection) => {
         return cloneRowSelection(rowSelection, getDataSourceState);

package/package.json

@@ -25,7 +25,7 @@
   "bugs": {
     "url": "https://github.com/infinite-table/infinite-react/issues"
   },
-  "version": "6.0.6",
+  "version": "6.0.8",
   "main": "index.js",
   "module": "index.mjs",
   "typings": "index.d.ts",
@@ -34,5 +34,5 @@
   },
   "license": "Commercial & Open Source",
   "//": "will be updated at build time",
-  "publishedAt": 1730214481492
+  "publishedAt": 1730286088785
 }