@infinite-table/infinite-react 3.0.9 → 3.0.11

package/index.d.ts

@@ -154,6 +154,8 @@ declare function useInfiniteColumnFilterEditor<T>(): {
     filterTypeKey: string;
     filtered: boolean;
     setValue: (filterValue: any) => void;
+    clearValue: () => void;
+    removeColumnFilter: () => void;
     ariaLabel: string;
     className: string;
 };
@@ -1924,6 +1926,7 @@ declare type DataSourceFilterOperator<T> = {
         Icon?: (props: any) => JSX.Element | null;
     };
     fn: DataSourceFilterOperatorFunction<T>;
+    defaultFilterValue?: any;
 };
 declare type DataSourceFilterOperatorFunction<T> = (filterOperatorFunctionParam: DataSourceFilterOperatorFunctionParam<T>) => boolean;
 declare type DataSourceFilterOperatorFunctionParam<T> = {
@@ -2611,7 +2614,15 @@ interface InfiniteTableApi<T> {
     toggleSortingForColumn: (columnId: string, options?: MultiSortBehaviorOptions) => void;
     setColumnFilter: (columnId: string, filterValue: any) => void;
     setColumnFilterOperator: (columnId: string, operator: string) => void;
+    /**
+     * Clears the filter for the given column to a default value. The column will still have a
+     * corresponding filterValue, though set to the empty filter value, so it's not considered filtered.
+     */
     clearColumnFilter: (columnId: string) => void;
+    /**
+     * Removes the filter for the column altogether. The column will no longer have a corresponding entry in the filterValue prop.
+     */
+    removeColumnFilter: (columnId: string) => void;
     isColumnSortable: (columnId: string) => boolean;
     setFilterValueForColumn: (columnId: string, filterValue: DataSourceFilterValueItem<T>) => void;
     setPinningForColumn: (columnId: string, pinning: InfiniteTableColumnPinnedValues) => void;

package/index.dev.js

@@ -6416,6 +6416,12 @@ function useInfiniteColumnFilterEditor() {
     },
     [filterContextValue.onChange]
   );
+  const clearValue = React28.useCallback(() => {
+    context.api.clearColumnFilter(column.id);
+  }, [column.id]);
+  const removeColumnFilter = React28.useCallback(() => {
+    context.api.removeColumnFilter(column.id);
+  }, [column.id]);
   (0, import_react20.useEffect)(() => {
     if (columnFilterValue) {
       if (theValue !== columnFilterValue.filter.value) {
@@ -6446,6 +6452,8 @@ function useInfiniteColumnFilterEditor() {
     filterTypeKey: columnFilterType,
     filtered: column.computedFiltered,
     setValue: onInputChange,
+    clearValue,
+    removeColumnFilter,
     ariaLabel: `Filter for ${columnLabel}`,
     className: `${HeaderFilterEditorCls} ${InfiniteTableColumnHeaderFilterInputClassName}`
   };
@@ -7668,27 +7676,20 @@ function getGroupColumnRender({
     const { rowInfo, renderBag, column, align: align2 } = renderOptions;
     let { value: valueToRender, groupIcon, selectionCheckBox } = renderBag;
     const groupRowInfo = rowInfo;
+    const className = join(
+      display.flex,
+      column.align === "end" ? flexFlow.rowReverse : flexFlow.row,
+      alignItems.center,
+      `${InfiniteTableColumnCellClassName}Expander`,
+      groupRenderStrategy === "single-column" || groupRenderStrategy === "multi-column" && (!rowInfo.isGroupRow || selectionCheckBox) ? GroupRowExpanderCls({ align: align2 }) : null
+    );
     if (groupRenderStrategy === "multi-column") {
       if (groupIndexForColumn + 1 !== groupRowInfo.groupNesting && groupRowInfo.isGroupRow) {
-        return null;
+        return selectionCheckBox ? /* @__PURE__ */ React32.createElement("div", { className }, selectionCheckBox) : null;
       }
     } else if (groupRenderStrategy === "single-column" && !groupRowInfo.isGroupRow) {
     }
-    return /* @__PURE__ */ React32.createElement(
-      "div",
-      {
-        className: join(
-          display.flex,
-          column.align === "end" ? flexFlow.rowReverse : flexFlow.row,
-          alignItems.center,
-          `${InfiniteTableColumnCellClassName}Expander`,
-          groupRenderStrategy === "single-column" || groupRenderStrategy === "multi-column" && !rowInfo.isGroupRow ? GroupRowExpanderCls({ align: align2 }) : null
-        )
-      },
-      groupIcon,
-      selectionCheckBox,
-      /* @__PURE__ */ React32.createElement("div", { className: cssEllipsisClassName }, valueToRender != null ? valueToRender : null)
-    );
+    return /* @__PURE__ */ React32.createElement("div", { className }, groupIcon, selectionCheckBox, /* @__PURE__ */ React32.createElement("div", { className: cssEllipsisClassName }, valueToRender != null ? valueToRender : null));
   };
 }
 function getGroupColumnRenderGroupIcon({
@@ -8310,7 +8311,6 @@ var defaultRenderSelectionCheckBox = (params) => {
     column
   } = params;
   if (rowInfo.isGroupRow && !column.groupByForColumn) {
-    return null;
   }
   return /* @__PURE__ */ React36.createElement(
     InfiniteCheckBox,
@@ -15435,16 +15435,15 @@ var InfiniteTableApiImpl = class {
       };
       if (col.field || typeof col.groupByForColumn === "string") {
         filterValueForColumn.field = col.field || col.groupByForColumn;
-      } else {
-        filterValueForColumn.id = col.id;
       }
       newFilterValueForColumn = filterValueForColumn;
     }
+    newFilterValueForColumn.id = col.id;
     newFilterValueForColumn.filter.value = filterValue;
     this.setFilterValueForColumn(columnId, newFilterValueForColumn);
   }
   setColumnFilterOperator(columnId, newOperator) {
-    var _a, _b;
+    var _a;
     const col = this.getComputed().computedColumnsMap.get(columnId);
     if (!col) {
       return;
@@ -15452,29 +15451,37 @@ var InfiniteTableApiImpl = class {
     const dataSourceState = this.getDataSourceState();
     const { filterTypes } = dataSourceState;
     const filterType = col.computedFilterType;
-    const operator = (_b = (_a = filterTypes[filterType].operators.find((op) => op.name === newOperator)) == null ? void 0 : _a.name) != null ? _b : filterTypes[filterType].defaultOperator;
+    const filterTypeOperators = filterTypes[filterType].operators;
+    const operator = (_a = filterTypeOperators.find(
+      (op) => op.name === newOperator
+    )) != null ? _a : filterTypeOperators.find(
+      (op) => op.name === filterTypes[filterType].defaultOperator
+    );
+    const operatorName = operator.name;
     let newFilterValueForColumn;
     if (col.computedFilterValue) {
       newFilterValueForColumn = __spreadProps(__spreadValues({}, col.computedFilterValue), {
         filter: __spreadProps(__spreadValues({}, col.computedFilterValue.filter), {
-          operator
+          operator: operatorName
         })
       });
+      if (operator.defaultFilterValue !== void 0) {
+        newFilterValueForColumn.filter.value = operator.defaultFilterValue;
+      }
     } else {
       newFilterValueForColumn = {
         filter: {
-          operator,
+          operator: operatorName,
           type: filterType,
-          value: [...filterTypes[filterType].emptyValues.values()][0]
+          value: operator.defaultFilterValue !== void 0 ? operator.defaultFilterValue : [...filterTypes[filterType].emptyValues.values()][0]
         },
         valueGetter: col.valueGetter
       };
       if (col.field) {
         newFilterValueForColumn.field = col.field;
-      } else {
-        newFilterValueForColumn.id = col.id;
       }
     }
+    newFilterValueForColumn.id = col.id;
     this.setFilterValueForColumn(columnId, newFilterValueForColumn);
   }
   setFilterValueForColumn(columnId, filterValue) {
@@ -15498,7 +15505,7 @@ var InfiniteTableApiImpl = class {
     }
     this.dataSourceActions.filterValue = newFilterValue;
   }
-  clearColumnFilter(columnId) {
+  removeColumnFilter(columnId) {
     var _a;
     const column = this.getComputed().computedColumnsMap.get(columnId);
     if (!column) {
@@ -15518,6 +15525,47 @@ var InfiniteTableApiImpl = class {
       this.dataSourceActions.filterValue = newFilterValue;
     }
   }
+  clearColumnFilter(columnId) {
+    var _a;
+    const column = this.getComputed().computedColumnsMap.get(columnId);
+    if (!column) {
+      return;
+    }
+    const state = this.getDataSourceState();
+    let newFilterValue = (_a = state.filterValue) != null ? _a : [];
+    let found = false;
+    newFilterValue = newFilterValue.map((currentFilterValue) => {
+      var _a2, _b, _c;
+      if (currentFilterValue === column.computedFilterValue) {
+        const filterTypeName = column.computedFilterValue.filter.type;
+        const operators = state.operatorsByFilterType[filterTypeName];
+        const filterType = state.filterTypes[filterTypeName];
+        found = true;
+        if (!filterType) {
+          return null;
+        }
+        const operatorName = (_a2 = currentFilterValue.filter.operator) != null ? _a2 : filterType == null ? void 0 : filterType.defaultOperator;
+        const operator = operators[operatorName];
+        const value = (
+          // first try the default value of the operator
+          (_c = (_b = operator.defaultFilterValue) != null ? _b : (
+            // then the first empty value
+            (filterType.emptyValues || [])[0]
+          )) != null ? _c : void 0
+        );
+        return __spreadProps(__spreadValues({}, currentFilterValue), {
+          filter: __spreadProps(__spreadValues({}, currentFilterValue.filter), {
+            operator: operatorName,
+            value
+          })
+        });
+      }
+      return currentFilterValue;
+    }).filter(notNullable);
+    if (found) {
+      this.dataSourceActions.filterValue = newFilterValue;
+    }
+  }
   setVisibilityForColumn(columnId, visible) {
     const columnVisibility = __spreadValues({}, this.getState().columnVisibility);
     if (visible) {
@@ -17663,7 +17711,7 @@ var useLicense = (licenseKey = "") => {
   const valid = (0, import_react50.useMemo)(() => {
     let valid2 = isValidLicense(licenseKey, {
       publishedAt: 1624970570587,
-      version: "3.0.9"
+      version: "3.0.11"
     });
     if (!licenseKey && !valid2 && isInsidePlayground) {
       return true;
@@ -20634,8 +20682,8 @@ function getFilterOperatorMenuForColumn(columnId, context, onHideIntent) {
       }
     },
     {
-      key: "clear",
-      label: "Clear",
+      key: "reset",
+      label: "Reset",
       icon: /* @__PURE__ */ React62.createElement(ClearIcon, null),
       disabled: !column.computedFiltered,
       onAction: () => {

package/index.dev.mjs

@@ -6401,6 +6401,12 @@ function useInfiniteColumnFilterEditor() {
     },
     [filterContextValue.onChange]
   );
+  const clearValue = React28.useCallback(() => {
+    context.api.clearColumnFilter(column.id);
+  }, [column.id]);
+  const removeColumnFilter = React28.useCallback(() => {
+    context.api.removeColumnFilter(column.id);
+  }, [column.id]);
   useEffect11(() => {
     if (columnFilterValue) {
       if (theValue !== columnFilterValue.filter.value) {
@@ -6431,6 +6437,8 @@ function useInfiniteColumnFilterEditor() {
     filterTypeKey: columnFilterType,
     filtered: column.computedFiltered,
     setValue: onInputChange,
+    clearValue,
+    removeColumnFilter,
     ariaLabel: `Filter for ${columnLabel}`,
     className: `${HeaderFilterEditorCls} ${InfiniteTableColumnHeaderFilterInputClassName}`
   };
@@ -7653,27 +7661,20 @@ function getGroupColumnRender({
     const { rowInfo, renderBag, column, align: align2 } = renderOptions;
     let { value: valueToRender, groupIcon, selectionCheckBox } = renderBag;
     const groupRowInfo = rowInfo;
+    const className = join(
+      display.flex,
+      column.align === "end" ? flexFlow.rowReverse : flexFlow.row,
+      alignItems.center,
+      `${InfiniteTableColumnCellClassName}Expander`,
+      groupRenderStrategy === "single-column" || groupRenderStrategy === "multi-column" && (!rowInfo.isGroupRow || selectionCheckBox) ? GroupRowExpanderCls({ align: align2 }) : null
+    );
     if (groupRenderStrategy === "multi-column") {
       if (groupIndexForColumn + 1 !== groupRowInfo.groupNesting && groupRowInfo.isGroupRow) {
-        return null;
+        return selectionCheckBox ? /* @__PURE__ */ React32.createElement("div", { className }, selectionCheckBox) : null;
       }
     } else if (groupRenderStrategy === "single-column" && !groupRowInfo.isGroupRow) {
     }
-    return /* @__PURE__ */ React32.createElement(
-      "div",
-      {
-        className: join(
-          display.flex,
-          column.align === "end" ? flexFlow.rowReverse : flexFlow.row,
-          alignItems.center,
-          `${InfiniteTableColumnCellClassName}Expander`,
-          groupRenderStrategy === "single-column" || groupRenderStrategy === "multi-column" && !rowInfo.isGroupRow ? GroupRowExpanderCls({ align: align2 }) : null
-        )
-      },
-      groupIcon,
-      selectionCheckBox,
-      /* @__PURE__ */ React32.createElement("div", { className: cssEllipsisClassName }, valueToRender != null ? valueToRender : null)
-    );
+    return /* @__PURE__ */ React32.createElement("div", { className }, groupIcon, selectionCheckBox, /* @__PURE__ */ React32.createElement("div", { className: cssEllipsisClassName }, valueToRender != null ? valueToRender : null));
   };
 }
 function getGroupColumnRenderGroupIcon({
@@ -8295,7 +8296,6 @@ var defaultRenderSelectionCheckBox = (params) => {
     column
   } = params;
   if (rowInfo.isGroupRow && !column.groupByForColumn) {
-    return null;
   }
   return /* @__PURE__ */ React36.createElement(
     InfiniteCheckBox,
@@ -15420,16 +15420,15 @@ var InfiniteTableApiImpl = class {
       };
       if (col.field || typeof col.groupByForColumn === "string") {
         filterValueForColumn.field = col.field || col.groupByForColumn;
-      } else {
-        filterValueForColumn.id = col.id;
       }
       newFilterValueForColumn = filterValueForColumn;
     }
+    newFilterValueForColumn.id = col.id;
     newFilterValueForColumn.filter.value = filterValue;
     this.setFilterValueForColumn(columnId, newFilterValueForColumn);
   }
   setColumnFilterOperator(columnId, newOperator) {
-    var _a, _b;
+    var _a;
     const col = this.getComputed().computedColumnsMap.get(columnId);
     if (!col) {
       return;
@@ -15437,29 +15436,37 @@ var InfiniteTableApiImpl = class {
     const dataSourceState = this.getDataSourceState();
     const { filterTypes } = dataSourceState;
     const filterType = col.computedFilterType;
-    const operator = (_b = (_a = filterTypes[filterType].operators.find((op) => op.name === newOperator)) == null ? void 0 : _a.name) != null ? _b : filterTypes[filterType].defaultOperator;
+    const filterTypeOperators = filterTypes[filterType].operators;
+    const operator = (_a = filterTypeOperators.find(
+      (op) => op.name === newOperator
+    )) != null ? _a : filterTypeOperators.find(
+      (op) => op.name === filterTypes[filterType].defaultOperator
+    );
+    const operatorName = operator.name;
     let newFilterValueForColumn;
     if (col.computedFilterValue) {
       newFilterValueForColumn = __spreadProps(__spreadValues({}, col.computedFilterValue), {
         filter: __spreadProps(__spreadValues({}, col.computedFilterValue.filter), {
-          operator
+          operator: operatorName
         })
       });
+      if (operator.defaultFilterValue !== void 0) {
+        newFilterValueForColumn.filter.value = operator.defaultFilterValue;
+      }
     } else {
       newFilterValueForColumn = {
         filter: {
-          operator,
+          operator: operatorName,
           type: filterType,
-          value: [...filterTypes[filterType].emptyValues.values()][0]
+          value: operator.defaultFilterValue !== void 0 ? operator.defaultFilterValue : [...filterTypes[filterType].emptyValues.values()][0]
         },
         valueGetter: col.valueGetter
       };
       if (col.field) {
         newFilterValueForColumn.field = col.field;
-      } else {
-        newFilterValueForColumn.id = col.id;
       }
     }
+    newFilterValueForColumn.id = col.id;
     this.setFilterValueForColumn(columnId, newFilterValueForColumn);
   }
   setFilterValueForColumn(columnId, filterValue) {
@@ -15483,7 +15490,7 @@ var InfiniteTableApiImpl = class {
     }
     this.dataSourceActions.filterValue = newFilterValue;
   }
-  clearColumnFilter(columnId) {
+  removeColumnFilter(columnId) {
     var _a;
     const column = this.getComputed().computedColumnsMap.get(columnId);
     if (!column) {
@@ -15503,6 +15510,47 @@ var InfiniteTableApiImpl = class {
       this.dataSourceActions.filterValue = newFilterValue;
     }
   }
+  clearColumnFilter(columnId) {
+    var _a;
+    const column = this.getComputed().computedColumnsMap.get(columnId);
+    if (!column) {
+      return;
+    }
+    const state = this.getDataSourceState();
+    let newFilterValue = (_a = state.filterValue) != null ? _a : [];
+    let found = false;
+    newFilterValue = newFilterValue.map((currentFilterValue) => {
+      var _a2, _b, _c;
+      if (currentFilterValue === column.computedFilterValue) {
+        const filterTypeName = column.computedFilterValue.filter.type;
+        const operators = state.operatorsByFilterType[filterTypeName];
+        const filterType = state.filterTypes[filterTypeName];
+        found = true;
+        if (!filterType) {
+          return null;
+        }
+        const operatorName = (_a2 = currentFilterValue.filter.operator) != null ? _a2 : filterType == null ? void 0 : filterType.defaultOperator;
+        const operator = operators[operatorName];
+        const value = (
+          // first try the default value of the operator
+          (_c = (_b = operator.defaultFilterValue) != null ? _b : (
+            // then the first empty value
+            (filterType.emptyValues || [])[0]
+          )) != null ? _c : void 0
+        );
+        return __spreadProps(__spreadValues({}, currentFilterValue), {
+          filter: __spreadProps(__spreadValues({}, currentFilterValue.filter), {
+            operator: operatorName,
+            value
+          })
+        });
+      }
+      return currentFilterValue;
+    }).filter(notNullable);
+    if (found) {
+      this.dataSourceActions.filterValue = newFilterValue;
+    }
+  }
   setVisibilityForColumn(columnId, visible) {
     const columnVisibility = __spreadValues({}, this.getState().columnVisibility);
     if (visible) {
@@ -17652,7 +17700,7 @@ var useLicense = (licenseKey = "") => {
   const valid = useMemo11(() => {
     let valid2 = isValidLicense(licenseKey, {
       publishedAt: 1624970570587,
-      version: "3.0.9"
+      version: "3.0.11"
     });
     if (!licenseKey && !valid2 && isInsidePlayground) {
       return true;
@@ -20633,8 +20681,8 @@ function getFilterOperatorMenuForColumn(columnId, context, onHideIntent) {
       }
     },
     {
-      key: "clear",
-      label: "Clear",
+      key: "reset",
+      label: "Reset",
       icon: /* @__PURE__ */ React62.createElement(ClearIcon, null),
       disabled: !column.computedFiltered,
       onAction: () => {