@infinite-table/infinite-react 6.0.3 → 6.0.5

package/index.d.ts

@@ -89,6 +89,7 @@ declare class DeepMap<KeyType, ValueType> {
     fill(initial?: [KeyType[], ValueType][]): void;
     getValuesStartingWith(keys: KeyType[], excludeSelf?: boolean, depthLimit?: number): ValueType[];
     getEntriesStartingWith(keys: KeyType[], excludeSelf?: boolean, depthLimit?: number): [KeyType[], ValueType][];
+    getUnnestedKeysStartingWith(keys: KeyType[], excludeSelf?: boolean, depthLimit?: number): KeyType[][];
     getKeysStartingWith(keys: KeyType[], excludeSelf?: boolean, depthLimit?: number): KeyType[][];
     private getStartingWith;
     private getMapAt;

package/index.dev.js

@@ -215,7 +215,7 @@ var DeepMap = class {
           depthLimit !== void 0 ? depthLimit - 1 : void 0
         ) : void 0;
         if (pair.hasOwnProperty("value")) {
-          fn(pair.value, keys, i, next);
+          fn(pair.value, keys, i, next, pair);
           i++;
         } else {
           next?.();
@@ -269,6 +269,57 @@ var DeepMap = class {
     );
     return result;
   }
+  getUnnestedKeysStartingWith(keys, excludeSelf, depthLimit) {
+    const pairs = [];
+    const fn = (pair2) => {
+      pairs.push(pair2);
+    };
+    let currentMap = this.map;
+    let pair;
+    let stop = false;
+    if (keys.length) {
+      for (let i = 0, len = keys.length; i < len; i++) {
+        const key = keys[i];
+        pair = currentMap.get(key);
+        if (!pair || !pair.map) {
+          stop = true;
+          if (i === len - 1) {
+            stop = true;
+            break;
+          } else {
+            return [];
+          }
+        }
+        currentMap = pair.map;
+      }
+    } else {
+      if (!excludeSelf) {
+        const hasEmptyKey = currentMap.has(this.emptyKey);
+        if (hasEmptyKey) {
+          return [[]];
+        }
+      }
+    }
+    if (pair && pair.value !== void 0) {
+      if (!excludeSelf) {
+        fn({ ...pair, keys });
+        stop = true;
+      }
+    }
+    if (stop) {
+      return pairs.sort(SORT_ASC_REVISION).map((pair2) => pair2.keys);
+    }
+    this.visitWithNext(
+      keys,
+      (_value, keys2, _i, _next, pair2) => {
+        fn({ ...pair2, keys: keys2 });
+      },
+      currentMap,
+      depthLimit,
+      excludeSelf
+    );
+    return pairs.sort(SORT_ASC_REVISION).map((pair2) => pair2.keys);
+  }
   getKeysStartingWith(keys, excludeSelf, depthLimit) {
     const result = [];
     this.getStartingWith(
@@ -14618,7 +14669,7 @@ var TreeSelectionState = class {
     const leafCount = this.getLeafNodesCount(nodePath);
     let currentSelectionState = this.isSelfSelected(nodePath);
     const { selectionMap } = this;
-    const childPaths = selectionMap.getKeysStartingWith(nodePath, true).sort(shortestToLongest);
+    const childPaths = selectionMap.getUnnestedKeysStartingWith(nodePath, true).sort(shortestToLongest);
     if (!childPaths.length) {
       if (currentSelectionState !== null) {
         const res2 = leafCount ? currentSelectionState : (
@@ -17312,6 +17363,7 @@ function deriveStateFromProps(params) {
     });
     return acc;
   }, {});
+  const treeProps = props;
   let selectionMode = props.selectionMode;
   if (selectionMode === void 0) {
     if (props.cellSelection !== void 0 || props.defaultCellSelection !== void 0) {
@@ -17325,6 +17377,12 @@ function deriveStateFromProps(params) {
           selectionMode = "single-row";
         }
       }
+      if (!selectionMode) {
+        const treeSelectionProp = treeProps.treeSelection ?? treeProps.defaultTreeSelection;
+        if (treeSelectionProp !== void 0) {
+          selectionMode = typeof treeSelectionProp === "object" ? "multi-row" : "single-row";
+        }
+      }
       selectionMode = selectionMode ?? false;
     }
   }
@@ -17379,7 +17437,6 @@ function deriveStateFromProps(params) {
   }
   const primaryKeyDescriptor = state.primaryKey;
   const toPrimaryKey = typeof primaryKeyDescriptor === "function" ? (data) => primaryKeyDescriptor(data) : (data) => data[primaryKeyDescriptor];
-  const treeProps = props;
   let treeExpandState = treeProps.treeExpandState || state.treeExpandState || treeProps.defaultTreeExpandState;
   if (treeExpandState && !(treeExpandState instanceof TreeExpandState)) {
     const instance = weakMap.get(treeExpandState) ?? new TreeExpandState(treeExpandState);
@@ -22063,7 +22120,7 @@ var useLicense = (licenseKey = "") => {
     }
     let valid2 = isValidLicense(licenseKey, {
       publishedAt: 1624970570587,
-      version: "6.0.3"
+      version: "6.0.5"
     });
     if (!licenseKey && !valid2 && isInsidePlayground) {
       return true;

package/index.dev.mjs

@@ -145,7 +145,7 @@ var DeepMap = class {
           depthLimit !== void 0 ? depthLimit - 1 : void 0
         ) : void 0;
         if (pair.hasOwnProperty("value")) {
-          fn(pair.value, keys, i, next);
+          fn(pair.value, keys, i, next, pair);
           i++;
         } else {
           next?.();
@@ -199,6 +199,57 @@ var DeepMap = class {
     );
     return result;
   }
+  getUnnestedKeysStartingWith(keys, excludeSelf, depthLimit) {
+    const pairs = [];
+    const fn = (pair2) => {
+      pairs.push(pair2);
+    };
+    let currentMap = this.map;
+    let pair;
+    let stop = false;
+    if (keys.length) {
+      for (let i = 0, len = keys.length; i < len; i++) {
+        const key = keys[i];
+        pair = currentMap.get(key);
+        if (!pair || !pair.map) {
+          stop = true;
+          if (i === len - 1) {
+            stop = true;
+            break;
+          } else {
+            return [];
+          }
+        }
+        currentMap = pair.map;
+      }
+    } else {
+      if (!excludeSelf) {
+        const hasEmptyKey = currentMap.has(this.emptyKey);
+        if (hasEmptyKey) {
+          return [[]];
+        }
+      }
+    }
+    if (pair && pair.value !== void 0) {
+      if (!excludeSelf) {
+        fn({ ...pair, keys });
+        stop = true;
+      }
+    }
+    if (stop) {
+      return pairs.sort(SORT_ASC_REVISION).map((pair2) => pair2.keys);
+    }
+    this.visitWithNext(
+      keys,
+      (_value, keys2, _i, _next, pair2) => {
+        fn({ ...pair2, keys: keys2 });
+      },
+      currentMap,
+      depthLimit,
+      excludeSelf
+    );
+    return pairs.sort(SORT_ASC_REVISION).map((pair2) => pair2.keys);
+  }
   getKeysStartingWith(keys, excludeSelf, depthLimit) {
     const result = [];
     this.getStartingWith(
@@ -14567,7 +14618,7 @@ var TreeSelectionState = class {
     const leafCount = this.getLeafNodesCount(nodePath);
     let currentSelectionState = this.isSelfSelected(nodePath);
     const { selectionMap } = this;
-    const childPaths = selectionMap.getKeysStartingWith(nodePath, true).sort(shortestToLongest);
+    const childPaths = selectionMap.getUnnestedKeysStartingWith(nodePath, true).sort(shortestToLongest);
     if (!childPaths.length) {
       if (currentSelectionState !== null) {
         const res2 = leafCount ? currentSelectionState : (
@@ -17261,6 +17312,7 @@ function deriveStateFromProps(params) {
     });
     return acc;
   }, {});
+  const treeProps = props;
   let selectionMode = props.selectionMode;
   if (selectionMode === void 0) {
     if (props.cellSelection !== void 0 || props.defaultCellSelection !== void 0) {
@@ -17274,6 +17326,12 @@ function deriveStateFromProps(params) {
           selectionMode = "single-row";
         }
       }
+      if (!selectionMode) {
+        const treeSelectionProp = treeProps.treeSelection ?? treeProps.defaultTreeSelection;
+        if (treeSelectionProp !== void 0) {
+          selectionMode = typeof treeSelectionProp === "object" ? "multi-row" : "single-row";
+        }
+      }
       selectionMode = selectionMode ?? false;
     }
   }
@@ -17328,7 +17386,6 @@ function deriveStateFromProps(params) {
   }
   const primaryKeyDescriptor = state.primaryKey;
   const toPrimaryKey = typeof primaryKeyDescriptor === "function" ? (data) => primaryKeyDescriptor(data) : (data) => data[primaryKeyDescriptor];
-  const treeProps = props;
   let treeExpandState = treeProps.treeExpandState || state.treeExpandState || treeProps.defaultTreeExpandState;
   if (treeExpandState && !(treeExpandState instanceof TreeExpandState)) {
     const instance = weakMap.get(treeExpandState) ?? new TreeExpandState(treeExpandState);
@@ -22021,7 +22078,7 @@ var useLicense = (licenseKey = "") => {
     }
     let valid2 = isValidLicense(licenseKey, {
       publishedAt: 1624970570587,
-      version: "6.0.3"
+      version: "6.0.5"
     });
     if (!licenseKey && !valid2 && isInsidePlayground) {
       return true;

package/index.js

@@ -215,7 +215,7 @@ var DeepMap = class {
           depthLimit !== void 0 ? depthLimit - 1 : void 0
         ) : void 0;
         if (pair.hasOwnProperty("value")) {
-          fn(pair.value, keys, i, next);
+          fn(pair.value, keys, i, next, pair);
           i++;
         } else {
           next?.();
@@ -269,6 +269,57 @@ var DeepMap = class {
     );
     return result;
   }
+  getUnnestedKeysStartingWith(keys, excludeSelf, depthLimit) {
+    const pairs = [];
+    const fn = (pair2) => {
+      pairs.push(pair2);
+    };
+    let currentMap = this.map;
+    let pair;
+    let stop = false;
+    if (keys.length) {
+      for (let i = 0, len = keys.length; i < len; i++) {
+        const key = keys[i];
+        pair = currentMap.get(key);
+        if (!pair || !pair.map) {
+          stop = true;
+          if (i === len - 1) {
+            stop = true;
+            break;
+          } else {
+            return [];
+          }
+        }
+        currentMap = pair.map;
+      }
+    } else {
+      if (!excludeSelf) {
+        const hasEmptyKey = currentMap.has(this.emptyKey);
+        if (hasEmptyKey) {
+          return [[]];
+        }
+      }
+    }
+    if (pair && pair.value !== void 0) {
+      if (!excludeSelf) {
+        fn({ ...pair, keys });
+        stop = true;
+      }
+    }
+    if (stop) {
+      return pairs.sort(SORT_ASC_REVISION).map((pair2) => pair2.keys);
+    }
+    this.visitWithNext(
+      keys,
+      (_value, keys2, _i, _next, pair2) => {
+        fn({ ...pair2, keys: keys2 });
+      },
+      currentMap,
+      depthLimit,
+      excludeSelf
+    );
+    return pairs.sort(SORT_ASC_REVISION).map((pair2) => pair2.keys);
+  }
   getKeysStartingWith(keys, excludeSelf, depthLimit) {
     const result = [];
     this.getStartingWith(
@@ -14618,7 +14669,7 @@ var TreeSelectionState = class {
     const leafCount = this.getLeafNodesCount(nodePath);
     let currentSelectionState = this.isSelfSelected(nodePath);
     const { selectionMap } = this;
-    const childPaths = selectionMap.getKeysStartingWith(nodePath, true).sort(shortestToLongest);
+    const childPaths = selectionMap.getUnnestedKeysStartingWith(nodePath, true).sort(shortestToLongest);
     if (!childPaths.length) {
       if (currentSelectionState !== null) {
         const res2 = leafCount ? currentSelectionState : (
@@ -17312,6 +17363,7 @@ function deriveStateFromProps(params) {
     });
     return acc;
   }, {});
+  const treeProps = props;
   let selectionMode = props.selectionMode;
   if (selectionMode === void 0) {
     if (props.cellSelection !== void 0 || props.defaultCellSelection !== void 0) {
@@ -17325,6 +17377,12 @@ function deriveStateFromProps(params) {
           selectionMode = "single-row";
         }
       }
+      if (!selectionMode) {
+        const treeSelectionProp = treeProps.treeSelection ?? treeProps.defaultTreeSelection;
+        if (treeSelectionProp !== void 0) {
+          selectionMode = typeof treeSelectionProp === "object" ? "multi-row" : "single-row";
+        }
+      }
       selectionMode = selectionMode ?? false;
     }
   }
@@ -17379,7 +17437,6 @@ function deriveStateFromProps(params) {
   }
   const primaryKeyDescriptor = state.primaryKey;
   const toPrimaryKey = typeof primaryKeyDescriptor === "function" ? (data) => primaryKeyDescriptor(data) : (data) => data[primaryKeyDescriptor];
-  const treeProps = props;
   let treeExpandState = treeProps.treeExpandState || state.treeExpandState || treeProps.defaultTreeExpandState;
   if (treeExpandState && !(treeExpandState instanceof TreeExpandState)) {
     const instance = weakMap.get(treeExpandState) ?? new TreeExpandState(treeExpandState);
@@ -22063,7 +22120,7 @@ var useLicense = (licenseKey = "") => {
     }
     let valid2 = isValidLicense(licenseKey, {
       publishedAt: 1624970570587,
-      version: "6.0.3"
+      version: "6.0.5"
     });
     if (!licenseKey && !valid2 && isInsidePlayground) {
       return true;

package/index.mjs

@@ -145,7 +145,7 @@ var DeepMap = class {
           depthLimit !== void 0 ? depthLimit - 1 : void 0
         ) : void 0;
         if (pair.hasOwnProperty("value")) {
-          fn(pair.value, keys, i, next);
+          fn(pair.value, keys, i, next, pair);
           i++;
         } else {
           next?.();
@@ -199,6 +199,57 @@ var DeepMap = class {
     );
     return result;
   }
+  getUnnestedKeysStartingWith(keys, excludeSelf, depthLimit) {
+    const pairs = [];
+    const fn = (pair2) => {
+      pairs.push(pair2);
+    };
+    let currentMap = this.map;
+    let pair;
+    let stop = false;
+    if (keys.length) {
+      for (let i = 0, len = keys.length; i < len; i++) {
+        const key = keys[i];
+        pair = currentMap.get(key);
+        if (!pair || !pair.map) {
+          stop = true;
+          if (i === len - 1) {
+            stop = true;
+            break;
+          } else {
+            return [];
+          }
+        }
+        currentMap = pair.map;
+      }
+    } else {
+      if (!excludeSelf) {
+        const hasEmptyKey = currentMap.has(this.emptyKey);
+        if (hasEmptyKey) {
+          return [[]];
+        }
+      }
+    }
+    if (pair && pair.value !== void 0) {
+      if (!excludeSelf) {
+        fn({ ...pair, keys });
+        stop = true;
+      }
+    }
+    if (stop) {
+      return pairs.sort(SORT_ASC_REVISION).map((pair2) => pair2.keys);
+    }
+    this.visitWithNext(
+      keys,
+      (_value, keys2, _i, _next, pair2) => {
+        fn({ ...pair2, keys: keys2 });
+      },
+      currentMap,
+      depthLimit,
+      excludeSelf
+    );
+    return pairs.sort(SORT_ASC_REVISION).map((pair2) => pair2.keys);
+  }
   getKeysStartingWith(keys, excludeSelf, depthLimit) {
     const result = [];
     this.getStartingWith(
@@ -14567,7 +14618,7 @@ var TreeSelectionState = class {
     const leafCount = this.getLeafNodesCount(nodePath);
     let currentSelectionState = this.isSelfSelected(nodePath);
     const { selectionMap } = this;
-    const childPaths = selectionMap.getKeysStartingWith(nodePath, true).sort(shortestToLongest);
+    const childPaths = selectionMap.getUnnestedKeysStartingWith(nodePath, true).sort(shortestToLongest);
     if (!childPaths.length) {
       if (currentSelectionState !== null) {
         const res2 = leafCount ? currentSelectionState : (
@@ -17261,6 +17312,7 @@ function deriveStateFromProps(params) {
     });
     return acc;
   }, {});
+  const treeProps = props;
   let selectionMode = props.selectionMode;
   if (selectionMode === void 0) {
     if (props.cellSelection !== void 0 || props.defaultCellSelection !== void 0) {
@@ -17274,6 +17326,12 @@ function deriveStateFromProps(params) {
           selectionMode = "single-row";
         }
       }
+      if (!selectionMode) {
+        const treeSelectionProp = treeProps.treeSelection ?? treeProps.defaultTreeSelection;
+        if (treeSelectionProp !== void 0) {
+          selectionMode = typeof treeSelectionProp === "object" ? "multi-row" : "single-row";
+        }
+      }
       selectionMode = selectionMode ?? false;
     }
   }
@@ -17328,7 +17386,6 @@ function deriveStateFromProps(params) {
   }
   const primaryKeyDescriptor = state.primaryKey;
   const toPrimaryKey = typeof primaryKeyDescriptor === "function" ? (data) => primaryKeyDescriptor(data) : (data) => data[primaryKeyDescriptor];
-  const treeProps = props;
   let treeExpandState = treeProps.treeExpandState || state.treeExpandState || treeProps.defaultTreeExpandState;
   if (treeExpandState && !(treeExpandState instanceof TreeExpandState)) {
     const instance = weakMap.get(treeExpandState) ?? new TreeExpandState(treeExpandState);
@@ -22021,7 +22078,7 @@ var useLicense = (licenseKey = "") => {
     }
     let valid2 = isValidLicense(licenseKey, {
       publishedAt: 1624970570587,
-      version: "6.0.3"
+      version: "6.0.5"
     });
     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.3",
+  "version": "6.0.5",
   "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": 1730129049591
+  "publishedAt": 1730204782243
 }