@infinite-table/infinite-react 6.0.9 → 6.0.11

package/index.d.ts

@@ -2578,7 +2578,7 @@ declare type DataSourcePropIsRowSelected<T> = (rowInfo: InfiniteTableRowInfo<T>,
 declare type DataSourcePropIsNodeReadOnly<T> = (rowInfo: InfiniteTable_Tree_RowInfoParentNode<T>) => boolean;
 declare type DataSourcePropIsNodeSelected<T> = (rowInfo: InfiniteTable_Tree_RowInfoNode<T>, treeSelectionState: TreeSelectionState, selectionMode: 'multi-row') => boolean | null;
 declare type DataSourcePropIsNodeSelectable<T> = (rowInfo: InfiniteTable_Tree_RowInfoNode<T>) => boolean;
-declare type DataSourcePropIsNodeExpanded<T> = (rowInfo: InfiniteTable_Tree_RowInfoParentNode<T>) => boolean;
+declare type DataSourcePropIsNodeExpanded<T> = (rowInfo: InfiniteTable_Tree_RowInfoParentNode<T>, treeExpandState: TreeExpandState) => boolean;
 declare type DataSourcePropSortFn<T> = (sortInfo: MultisortInfoAllowMultipleFields<T>[], array: T[], get?: (item: any) => T) => T[];
 declare type DataSourceCRUDParam = {
     flush?: boolean;

package/index.dev.js

@@ -8112,10 +8112,13 @@ function ExpandCollapseIcon(props) {
       setExpanded(props.expanded);
     }
   }, [props.expanded]);
+  const currentState = expanded ? "expanded" : "collapsed";
   return /* @__PURE__ */ React30.createElement(
     "svg",
     {
       "data-name": "expand-collapse-icon",
+      "data-state": currentState,
+      "data-disabled": disabled,
       xmlns: "http://www.w3.org/2000/svg",
       height: `${size}px`,
       viewBox: "0 0 24 24",
@@ -8132,7 +8135,7 @@ function ExpandCollapseIcon(props) {
         }),
         `${InfiniteIconClassName}`,
         `${THIS_ICON}`,
-        `${THIS_ICON}--${expanded ? "expanded" : "collapsed"}`,
+        `${THIS_ICON}--${currentState}`,
         `${THIS_ICON}--${direction === "end" ? "end" : "start"}`,
         disabled ? `${THIS_ICON}--disabled` : ""
       )
@@ -9184,7 +9187,7 @@ function InfiniteTableColumnCellFn(props) {
     },
     [rowIndex, rowDisabled, column.computedVisibleIndex, keyboardNavigation]
   );
-  const { selectionMode, cellSelection } = dataSourceState;
+  const { selectionMode, cellSelection, isNodeReadOnly: isNodeReadOnly2 } = dataSourceState;
   const cellSelected = renderParam.cellSelected;
   renderParam.domRef = domRef;
   renderParam.htmlElementRef = htmlElementRef;
@@ -9377,6 +9380,7 @@ function InfiniteTableColumnCellFn(props) {
       hidden,
       inEdit,
       rowDetailState,
+      column.renderTreeIcon || column.renderTreeIconForParentNode ? isNodeReadOnly2 : false,
       ...objectValuesExcept(renderParam, {
         renderBag: true,
         selectCell: true,
@@ -14902,10 +14906,10 @@ var TreeApiImpl = class {
         return false;
       }
       if (isNodeCollapsed) {
-        return !isNodeExpanded(rowInfo);
+        return !isNodeExpanded(rowInfo, treeExpandState);
       }
       if (isNodeExpanded) {
-        return isNodeExpanded(rowInfo);
+        return isNodeExpanded(rowInfo, treeExpandState);
       }
     }
     return treeExpandState.isNodeExpanded(nodePath);
@@ -15680,18 +15684,18 @@ var DataSourceApiImpl = class {
         case "delete":
           if (operation.primaryKeys) {
             operation.primaryKeys.forEach((key) => {
-              const rowInfo = this.getRowInfoByPrimaryKey(key);
-              if (rowInfo && !rowInfo.isGroupRow) {
-                cache.delete(key, rowInfo.data, operation.metadata);
+              const originalData = this.getDataByPrimaryKey(key);
+              if (originalData) {
+                cache.delete(key, originalData, operation.metadata);
               }
             });
           } else if (operation.nodePaths) {
             operation.nodePaths.forEach((nodePath2) => {
-              const rowInfo = this.getRowInfoByNodePath(nodePath2);
-              if (rowInfo && !rowInfo.isGroupRow) {
+              const originalData = this.getDataByNodePath(nodePath2);
+              if (originalData) {
                 cache.deleteNodePath(
                   nodePath2,
-                  rowInfo.data,
+                  originalData,
                   operation.metadata
                 );
               }
@@ -16213,15 +16217,15 @@ function concludeReducer(params) {
       state.selectionMode
     );
   }
-  let isNodeExpanded = state.isNodeExpanded;
+  let isNodeExpanded;
+  if (state.isNodeExpanded) {
+    isNodeExpanded = (rowInfo) => state.isNodeExpanded(rowInfo, treeExpandState);
+  }
   if (state.isNodeCollapsed) {
-    isNodeExpanded = (rowInfo) => !state.isNodeExpanded(rowInfo);
+    isNodeExpanded = (rowInfo) => !state.isNodeExpanded(rowInfo, treeExpandState);
   }
   if (!isNodeExpanded) {
     const defaultIsRowExpanded = (rowInfo) => {
-      if (!rowInfo.isTreeNode || !rowInfo.isParentNode) {
-        return false;
-      }
       return treeExpandState.isNodeExpanded(rowInfo.nodePath);
     };
     isNodeExpanded = defaultIsRowExpanded;
@@ -19831,7 +19835,7 @@ function useCellRendering(param) {
     componentActions: dataSourceActions,
     api: dataSourceApi
   } = useDataSourceContextValue();
-  const { dataArray } = dataSourceState;
+  const { dataArray, isNodeReadOnly: isNodeReadOnly2 } = dataSourceState;
   const getData = useLatest(dataArray);
   const {
     rowHeight,
@@ -20005,6 +20009,7 @@ function useCellRendering(param) {
       showZebraRows,
       brain,
       repaintId,
+      isNodeReadOnly2,
       rowStyle,
       rowClassName,
       cellClassName,
@@ -22197,7 +22202,7 @@ var useLicense = (licenseKey = "") => {
     }
     let valid2 = isValidLicense(licenseKey, {
       publishedAt: 1624970570587,
-      version: "6.0.9"
+      version: "6.0.11"
     });
     if (!licenseKey && !valid2 && isInsidePlayground) {
       return true;

package/index.dev.mjs

@@ -8061,10 +8061,13 @@ function ExpandCollapseIcon(props) {
       setExpanded(props.expanded);
     }
   }, [props.expanded]);
+  const currentState = expanded ? "expanded" : "collapsed";
   return /* @__PURE__ */ React30.createElement(
     "svg",
     {
       "data-name": "expand-collapse-icon",
+      "data-state": currentState,
+      "data-disabled": disabled,
       xmlns: "http://www.w3.org/2000/svg",
       height: `${size}px`,
       viewBox: "0 0 24 24",
@@ -8081,7 +8084,7 @@ function ExpandCollapseIcon(props) {
         }),
         `${InfiniteIconClassName}`,
         `${THIS_ICON}`,
-        `${THIS_ICON}--${expanded ? "expanded" : "collapsed"}`,
+        `${THIS_ICON}--${currentState}`,
         `${THIS_ICON}--${direction === "end" ? "end" : "start"}`,
         disabled ? `${THIS_ICON}--disabled` : ""
       )
@@ -9133,7 +9136,7 @@ function InfiniteTableColumnCellFn(props) {
     },
     [rowIndex, rowDisabled, column.computedVisibleIndex, keyboardNavigation]
   );
-  const { selectionMode, cellSelection } = dataSourceState;
+  const { selectionMode, cellSelection, isNodeReadOnly: isNodeReadOnly2 } = dataSourceState;
   const cellSelected = renderParam.cellSelected;
   renderParam.domRef = domRef;
   renderParam.htmlElementRef = htmlElementRef;
@@ -9326,6 +9329,7 @@ function InfiniteTableColumnCellFn(props) {
       hidden,
       inEdit,
       rowDetailState,
+      column.renderTreeIcon || column.renderTreeIconForParentNode ? isNodeReadOnly2 : false,
       ...objectValuesExcept(renderParam, {
         renderBag: true,
         selectCell: true,
@@ -14851,10 +14855,10 @@ var TreeApiImpl = class {
         return false;
       }
       if (isNodeCollapsed) {
-        return !isNodeExpanded(rowInfo);
+        return !isNodeExpanded(rowInfo, treeExpandState);
       }
       if (isNodeExpanded) {
-        return isNodeExpanded(rowInfo);
+        return isNodeExpanded(rowInfo, treeExpandState);
       }
     }
     return treeExpandState.isNodeExpanded(nodePath);
@@ -15629,18 +15633,18 @@ var DataSourceApiImpl = class {
         case "delete":
           if (operation.primaryKeys) {
             operation.primaryKeys.forEach((key) => {
-              const rowInfo = this.getRowInfoByPrimaryKey(key);
-              if (rowInfo && !rowInfo.isGroupRow) {
-                cache.delete(key, rowInfo.data, operation.metadata);
+              const originalData = this.getDataByPrimaryKey(key);
+              if (originalData) {
+                cache.delete(key, originalData, operation.metadata);
               }
             });
           } else if (operation.nodePaths) {
             operation.nodePaths.forEach((nodePath2) => {
-              const rowInfo = this.getRowInfoByNodePath(nodePath2);
-              if (rowInfo && !rowInfo.isGroupRow) {
+              const originalData = this.getDataByNodePath(nodePath2);
+              if (originalData) {
                 cache.deleteNodePath(
                   nodePath2,
-                  rowInfo.data,
+                  originalData,
                   operation.metadata
                 );
               }
@@ -16162,15 +16166,15 @@ function concludeReducer(params) {
       state.selectionMode
     );
   }
-  let isNodeExpanded = state.isNodeExpanded;
+  let isNodeExpanded;
+  if (state.isNodeExpanded) {
+    isNodeExpanded = (rowInfo) => state.isNodeExpanded(rowInfo, treeExpandState);
+  }
   if (state.isNodeCollapsed) {
-    isNodeExpanded = (rowInfo) => !state.isNodeExpanded(rowInfo);
+    isNodeExpanded = (rowInfo) => !state.isNodeExpanded(rowInfo, treeExpandState);
   }
   if (!isNodeExpanded) {
     const defaultIsRowExpanded = (rowInfo) => {
-      if (!rowInfo.isTreeNode || !rowInfo.isParentNode) {
-        return false;
-      }
       return treeExpandState.isNodeExpanded(rowInfo.nodePath);
     };
     isNodeExpanded = defaultIsRowExpanded;
@@ -19789,7 +19793,7 @@ function useCellRendering(param) {
     componentActions: dataSourceActions,
     api: dataSourceApi
   } = useDataSourceContextValue();
-  const { dataArray } = dataSourceState;
+  const { dataArray, isNodeReadOnly: isNodeReadOnly2 } = dataSourceState;
   const getData = useLatest(dataArray);
   const {
     rowHeight,
@@ -19963,6 +19967,7 @@ function useCellRendering(param) {
       showZebraRows,
       brain,
       repaintId,
+      isNodeReadOnly2,
       rowStyle,
       rowClassName,
       cellClassName,
@@ -22155,7 +22160,7 @@ var useLicense = (licenseKey = "") => {
     }
     let valid2 = isValidLicense(licenseKey, {
       publishedAt: 1624970570587,
-      version: "6.0.9"
+      version: "6.0.11"
     });
     if (!licenseKey && !valid2 && isInsidePlayground) {
       return true;

package/index.js

@@ -8112,10 +8112,13 @@ function ExpandCollapseIcon(props) {
       setExpanded(props.expanded);
     }
   }, [props.expanded]);
+  const currentState = expanded ? "expanded" : "collapsed";
   return /* @__PURE__ */ React30.createElement(
     "svg",
     {
       "data-name": "expand-collapse-icon",
+      "data-state": currentState,
+      "data-disabled": disabled,
       xmlns: "http://www.w3.org/2000/svg",
       height: `${size}px`,
       viewBox: "0 0 24 24",
@@ -8132,7 +8135,7 @@ function ExpandCollapseIcon(props) {
         }),
         `${InfiniteIconClassName}`,
         `${THIS_ICON}`,
-        `${THIS_ICON}--${expanded ? "expanded" : "collapsed"}`,
+        `${THIS_ICON}--${currentState}`,
         `${THIS_ICON}--${direction === "end" ? "end" : "start"}`,
         disabled ? `${THIS_ICON}--disabled` : ""
       )
@@ -9184,7 +9187,7 @@ function InfiniteTableColumnCellFn(props) {
     },
     [rowIndex, rowDisabled, column.computedVisibleIndex, keyboardNavigation]
   );
-  const { selectionMode, cellSelection } = dataSourceState;
+  const { selectionMode, cellSelection, isNodeReadOnly: isNodeReadOnly2 } = dataSourceState;
   const cellSelected = renderParam.cellSelected;
   renderParam.domRef = domRef;
   renderParam.htmlElementRef = htmlElementRef;
@@ -9377,6 +9380,7 @@ function InfiniteTableColumnCellFn(props) {
       hidden,
       inEdit,
       rowDetailState,
+      column.renderTreeIcon || column.renderTreeIconForParentNode ? isNodeReadOnly2 : false,
       ...objectValuesExcept(renderParam, {
         renderBag: true,
         selectCell: true,
@@ -14902,10 +14906,10 @@ var TreeApiImpl = class {
         return false;
       }
       if (isNodeCollapsed) {
-        return !isNodeExpanded(rowInfo);
+        return !isNodeExpanded(rowInfo, treeExpandState);
       }
       if (isNodeExpanded) {
-        return isNodeExpanded(rowInfo);
+        return isNodeExpanded(rowInfo, treeExpandState);
       }
     }
     return treeExpandState.isNodeExpanded(nodePath);
@@ -15680,18 +15684,18 @@ var DataSourceApiImpl = class {
         case "delete":
           if (operation.primaryKeys) {
             operation.primaryKeys.forEach((key) => {
-              const rowInfo = this.getRowInfoByPrimaryKey(key);
-              if (rowInfo && !rowInfo.isGroupRow) {
-                cache.delete(key, rowInfo.data, operation.metadata);
+              const originalData = this.getDataByPrimaryKey(key);
+              if (originalData) {
+                cache.delete(key, originalData, operation.metadata);
               }
             });
           } else if (operation.nodePaths) {
             operation.nodePaths.forEach((nodePath2) => {
-              const rowInfo = this.getRowInfoByNodePath(nodePath2);
-              if (rowInfo && !rowInfo.isGroupRow) {
+              const originalData = this.getDataByNodePath(nodePath2);
+              if (originalData) {
                 cache.deleteNodePath(
                   nodePath2,
-                  rowInfo.data,
+                  originalData,
                   operation.metadata
                 );
               }
@@ -16213,15 +16217,15 @@ function concludeReducer(params) {
       state.selectionMode
     );
   }
-  let isNodeExpanded = state.isNodeExpanded;
+  let isNodeExpanded;
+  if (state.isNodeExpanded) {
+    isNodeExpanded = (rowInfo) => state.isNodeExpanded(rowInfo, treeExpandState);
+  }
   if (state.isNodeCollapsed) {
-    isNodeExpanded = (rowInfo) => !state.isNodeExpanded(rowInfo);
+    isNodeExpanded = (rowInfo) => !state.isNodeExpanded(rowInfo, treeExpandState);
   }
   if (!isNodeExpanded) {
     const defaultIsRowExpanded = (rowInfo) => {
-      if (!rowInfo.isTreeNode || !rowInfo.isParentNode) {
-        return false;
-      }
       return treeExpandState.isNodeExpanded(rowInfo.nodePath);
     };
     isNodeExpanded = defaultIsRowExpanded;
@@ -19831,7 +19835,7 @@ function useCellRendering(param) {
     componentActions: dataSourceActions,
     api: dataSourceApi
   } = useDataSourceContextValue();
-  const { dataArray } = dataSourceState;
+  const { dataArray, isNodeReadOnly: isNodeReadOnly2 } = dataSourceState;
   const getData = useLatest(dataArray);
   const {
     rowHeight,
@@ -20005,6 +20009,7 @@ function useCellRendering(param) {
       showZebraRows,
       brain,
       repaintId,
+      isNodeReadOnly2,
       rowStyle,
       rowClassName,
       cellClassName,
@@ -22197,7 +22202,7 @@ var useLicense = (licenseKey = "") => {
     }
     let valid2 = isValidLicense(licenseKey, {
       publishedAt: 1624970570587,
-      version: "6.0.9"
+      version: "6.0.11"
     });
     if (!licenseKey && !valid2 && isInsidePlayground) {
       return true;

package/index.mjs

@@ -8061,10 +8061,13 @@ function ExpandCollapseIcon(props) {
       setExpanded(props.expanded);
     }
   }, [props.expanded]);
+  const currentState = expanded ? "expanded" : "collapsed";
   return /* @__PURE__ */ React30.createElement(
     "svg",
     {
       "data-name": "expand-collapse-icon",
+      "data-state": currentState,
+      "data-disabled": disabled,
       xmlns: "http://www.w3.org/2000/svg",
       height: `${size}px`,
       viewBox: "0 0 24 24",
@@ -8081,7 +8084,7 @@ function ExpandCollapseIcon(props) {
         }),
         `${InfiniteIconClassName}`,
         `${THIS_ICON}`,
-        `${THIS_ICON}--${expanded ? "expanded" : "collapsed"}`,
+        `${THIS_ICON}--${currentState}`,
         `${THIS_ICON}--${direction === "end" ? "end" : "start"}`,
         disabled ? `${THIS_ICON}--disabled` : ""
       )
@@ -9133,7 +9136,7 @@ function InfiniteTableColumnCellFn(props) {
     },
     [rowIndex, rowDisabled, column.computedVisibleIndex, keyboardNavigation]
   );
-  const { selectionMode, cellSelection } = dataSourceState;
+  const { selectionMode, cellSelection, isNodeReadOnly: isNodeReadOnly2 } = dataSourceState;
   const cellSelected = renderParam.cellSelected;
   renderParam.domRef = domRef;
   renderParam.htmlElementRef = htmlElementRef;
@@ -9326,6 +9329,7 @@ function InfiniteTableColumnCellFn(props) {
       hidden,
       inEdit,
       rowDetailState,
+      column.renderTreeIcon || column.renderTreeIconForParentNode ? isNodeReadOnly2 : false,
       ...objectValuesExcept(renderParam, {
         renderBag: true,
         selectCell: true,
@@ -14851,10 +14855,10 @@ var TreeApiImpl = class {
         return false;
       }
       if (isNodeCollapsed) {
-        return !isNodeExpanded(rowInfo);
+        return !isNodeExpanded(rowInfo, treeExpandState);
       }
       if (isNodeExpanded) {
-        return isNodeExpanded(rowInfo);
+        return isNodeExpanded(rowInfo, treeExpandState);
       }
     }
     return treeExpandState.isNodeExpanded(nodePath);
@@ -15629,18 +15633,18 @@ var DataSourceApiImpl = class {
         case "delete":
           if (operation.primaryKeys) {
             operation.primaryKeys.forEach((key) => {
-              const rowInfo = this.getRowInfoByPrimaryKey(key);
-              if (rowInfo && !rowInfo.isGroupRow) {
-                cache.delete(key, rowInfo.data, operation.metadata);
+              const originalData = this.getDataByPrimaryKey(key);
+              if (originalData) {
+                cache.delete(key, originalData, operation.metadata);
               }
             });
           } else if (operation.nodePaths) {
             operation.nodePaths.forEach((nodePath2) => {
-              const rowInfo = this.getRowInfoByNodePath(nodePath2);
-              if (rowInfo && !rowInfo.isGroupRow) {
+              const originalData = this.getDataByNodePath(nodePath2);
+              if (originalData) {
                 cache.deleteNodePath(
                   nodePath2,
-                  rowInfo.data,
+                  originalData,
                   operation.metadata
                 );
               }
@@ -16162,15 +16166,15 @@ function concludeReducer(params) {
       state.selectionMode
     );
   }
-  let isNodeExpanded = state.isNodeExpanded;
+  let isNodeExpanded;
+  if (state.isNodeExpanded) {
+    isNodeExpanded = (rowInfo) => state.isNodeExpanded(rowInfo, treeExpandState);
+  }
   if (state.isNodeCollapsed) {
-    isNodeExpanded = (rowInfo) => !state.isNodeExpanded(rowInfo);
+    isNodeExpanded = (rowInfo) => !state.isNodeExpanded(rowInfo, treeExpandState);
   }
   if (!isNodeExpanded) {
     const defaultIsRowExpanded = (rowInfo) => {
-      if (!rowInfo.isTreeNode || !rowInfo.isParentNode) {
-        return false;
-      }
       return treeExpandState.isNodeExpanded(rowInfo.nodePath);
     };
     isNodeExpanded = defaultIsRowExpanded;
@@ -19789,7 +19793,7 @@ function useCellRendering(param) {
     componentActions: dataSourceActions,
     api: dataSourceApi
   } = useDataSourceContextValue();
-  const { dataArray } = dataSourceState;
+  const { dataArray, isNodeReadOnly: isNodeReadOnly2 } = dataSourceState;
   const getData = useLatest(dataArray);
   const {
     rowHeight,
@@ -19963,6 +19967,7 @@ function useCellRendering(param) {
       showZebraRows,
       brain,
       repaintId,
+      isNodeReadOnly2,
       rowStyle,
       rowClassName,
       cellClassName,
@@ -22155,7 +22160,7 @@ var useLicense = (licenseKey = "") => {
     }
     let valid2 = isValidLicense(licenseKey, {
       publishedAt: 1624970570587,
-      version: "6.0.9"
+      version: "6.0.11"
     });
     if (!licenseKey && !valid2 && isInsidePlayground) {
       return true;

package/package.json

@@ -25,7 +25,7 @@
   "bugs": {
     "url": "https://github.com/infinite-table/infinite-react/issues"
   },
-  "version": "6.0.9",
+  "version": "6.0.11",
   "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": 1730467344103
+  "publishedAt": 1730473416383
 }