@infinite-table/infinite-react 0.2.9 → 0.2.10

package/index.d.ts

@@ -441,6 +441,8 @@ declare type InfiniteTableBaseColumn<T> = {
     valueGetter?: InfiniteTableColumnValueGetter<T>;
     defaultWidth?: number;
     defaultFlex?: number;
+    minWidth?: number;
+    maxWidth?: number;
 };
 declare type InfiniteTableColumn<T> = {} & InfiniteTableBaseColumn<T> & InfiniteTableColumnWithRenderOrRenderValueOrFieldOrValueGetter<T>;
 declare type InfiniteTableGeneratedGroupColumn<T> = InfiniteTableColumn<T> & {
@@ -637,16 +639,14 @@ declare type InfiniteTableColumnType<T> = {
     render?: InfiniteTableColumn<T>['render'];
     valueGetter?: InfiniteTableColumn<T>['valueGetter'];
 };
-declare type InfiniteTablePropColumnTypesMap<T> = Map<'default' | string, InfiniteTableColumnType<T>>;
-declare type InfiniteTablePropColumnTypes<T> = InfiniteTablePropColumnTypesMap<T> | Record<'default' | string, InfiniteTableColumnType<T>>;
+declare type InfiniteTablePropColumnTypes<T> = Record<'default' | string, InfiniteTableColumnType<T>>;
 declare type InfiniteTableColumnSizingOptions = {
     flex?: number;
     width?: number;
     minWidth?: number;
     maxWidth?: number;
 };
-declare type InfiniteTablePropColumnSizingMap = Map<string, InfiniteTableColumnSizingOptions>;
-declare type InfiniteTablePropColumnSizing = InfiniteTablePropColumnSizingMap | Record<string, InfiniteTableColumnSizingOptions>;
+declare type InfiniteTablePropColumnSizing = Record<string, InfiniteTableColumnSizingOptions>;
 declare type InfiniteTableImperativeApi<T> = {
     setColumnOrder: (columnOrder: InfiniteTablePropColumnOrder) => void;
     setColumnVisibility: (columnVisibility: InfiniteTablePropColumnVisibility) => void;
@@ -861,8 +861,8 @@ interface InfiniteTableMappedState<T> {
     licenseKey: NonUndefined<InfiniteTableProps<T>['licenseKey']>;
     columnVisibility: InfiniteTablePropColumnVisibility;
     columnPinning: InfiniteTablePropColumnPinningMap;
-    columnSizing: InfiniteTablePropColumnSizingMap;
-    columnTypes: InfiniteTablePropColumnTypesMap<T>;
+    columnSizing: InfiniteTablePropColumnSizing;
+    columnTypes: InfiniteTablePropColumnTypes<T>;
     columnGroups: InfiniteTablePropColumnGroupsMap;
     collapsedColumnGroups: NonUndefined<InfiniteTableProps<T>['collapsedColumnGroups']>;
     pivotTotalColumnPosition: NonUndefined<InfiniteTableProps<T>['pivotTotalColumnPosition']>;
@@ -958,4 +958,4 @@ declare function interceptMap<K, V>(map: Map<K, V>, fns: InterceptedMapFns<K, V>
 
 declare function useEffectWithChanges(fn: (changes: Record<string, any>, prevValues: Record<string, any>) => void | (() => void), deps: Record<string, any>): void;
 
-export { DataSource, DataSourceAction, DataSourceActionType, DataSourceAggregationReducer, DataSourceComponentActions, DataSourceContextValue, DataSourceData, DataSourceDataParams, DataSourceDataParamsChanges, DataSourceDerivedState, DataSourceExpandedAndCollapsedGroupRows, DataSourceGroupBy, DataSourceGroupRowsList, DataSourceLivePaginationCursorFn, DataSourceLivePaginationCursorParams, DataSourceLivePaginationCursorValue, DataSourceMappedState, DataSourceMappings, DataSourcePivotBy, DataSourcePropAggregationReducers, DataSourcePropGroupBy, DataSourcePropLivePaginationCursor, DataSourcePropPivotBy, DataSourceProps, DataSourceReducer, DataSourceRemoteData, DataSourceSetupState, DataSourceSingleSortInfo, DataSourceSortInfo, DataSourceState, GroupRowsState, InfiniteTable, InfiniteTableAction, InfiniteTableActionType, InfiniteTableClassName, InfiniteTableColumn, InfiniteTableColumnAggregator, InfiniteTableColumnComparer, InfiniteTableColumnGroup, InfiniteTableColumnRenderParam, InfiniteTableColumnRenderValueParam, InfiniteTableColumnRowspanParam, InfiniteTableColumnSizingOptions, InfiniteTableComponent, InfiniteTableComputedColumn, InfiniteTableComputedValues, InfiniteTableContextValue, InfiniteTableGroupColumnBase, InfiniteTableGroupColumnFunction, InfiniteTableGroupColumnGetterOptions, InfiniteTableImperativeApi, InfiniteTablePropColumnGroups, InfiniteTablePropColumnOrder, InfiniteTablePropColumnPinning, InfiniteTablePropColumnSizing, InfiniteTablePropColumnSizingMap, InfiniteTablePropColumnTypes, InfiniteTablePropColumnTypesMap, InfiniteTablePropColumnVisibility, InfiniteTablePropColumns, InfiniteTablePropColumnsMap, InfiniteTablePropComponents, InfiniteTablePropGroupColumn, InfiniteTablePropGroupRenderStrategy, InfiniteTablePropRowClassName, InfiniteTablePropRowStyle, InfiniteTableProps, InfiniteTableRowClassNameFn, InfiniteTableRowInfo, InfiniteTableRowStyleFn, InfiniteTableState, LazyGroupDataDeepMap, LazyGroupDataItem, LazyGroupRowInfo, Scrollbars, flatten, getComponentStateRoot, group, interceptMap, multisort, useComponentState, useDataSource, useEffectWithChanges };
+export { DataSource, DataSourceAction, DataSourceActionType, DataSourceAggregationReducer, DataSourceComponentActions, DataSourceContextValue, DataSourceData, DataSourceDataParams, DataSourceDataParamsChanges, DataSourceDerivedState, DataSourceExpandedAndCollapsedGroupRows, DataSourceGroupBy, DataSourceGroupRowsList, DataSourceLivePaginationCursorFn, DataSourceLivePaginationCursorParams, DataSourceLivePaginationCursorValue, DataSourceMappedState, DataSourceMappings, DataSourcePivotBy, DataSourcePropAggregationReducers, DataSourcePropGroupBy, DataSourcePropLivePaginationCursor, DataSourcePropPivotBy, DataSourceProps, DataSourceReducer, DataSourceRemoteData, DataSourceSetupState, DataSourceSingleSortInfo, DataSourceSortInfo, DataSourceState, GroupRowsState, InfiniteTable, InfiniteTableAction, InfiniteTableActionType, InfiniteTableClassName, InfiniteTableColumn, InfiniteTableColumnAggregator, InfiniteTableColumnComparer, InfiniteTableColumnGroup, InfiniteTableColumnRenderParam, InfiniteTableColumnRenderValueParam, InfiniteTableColumnRowspanParam, InfiniteTableColumnSizingOptions, InfiniteTableComponent, InfiniteTableComputedColumn, InfiniteTableComputedValues, InfiniteTableContextValue, InfiniteTableGroupColumnBase, InfiniteTableGroupColumnFunction, InfiniteTableGroupColumnGetterOptions, InfiniteTableImperativeApi, InfiniteTablePropColumnGroups, InfiniteTablePropColumnOrder, InfiniteTablePropColumnPinning, InfiniteTablePropColumnSizing, InfiniteTablePropColumnTypes, InfiniteTablePropColumnVisibility, InfiniteTablePropColumns, InfiniteTablePropColumnsMap, InfiniteTablePropComponents, InfiniteTablePropGroupColumn, InfiniteTablePropGroupRenderStrategy, InfiniteTablePropRowClassName, InfiniteTablePropRowStyle, InfiniteTableProps, InfiniteTableRowClassNameFn, InfiniteTableRowInfo, InfiniteTableRowStyleFn, InfiniteTableState, LazyGroupDataDeepMap, LazyGroupDataItem, LazyGroupRowInfo, Scrollbars, flatten, getComponentStateRoot, group, interceptMap, multisort, useComponentState, useDataSource, useEffectWithChanges };

package/index.esm.js

@@ -822,8 +822,8 @@ var forwardProps = (setupState) => {
     columns: (columns) => toMap(columns, setupState.propsCache.get("columns")),
     columnVisibility: (columnVisibility) => columnVisibility != null ? columnVisibility : {},
     columnPinning: (columnPinning) => toMap(columnPinning, setupState.propsCache.get("columnPinning")),
-    columnSizing: (columnSizing) => toMap(columnSizing, setupState.propsCache.get("columnSizing")),
-    columnTypes: (columnTypes) => toMap(columnTypes, setupState.propsCache.get("columnTypes")),
+    columnSizing: (columnSizing) => columnSizing || {},
+    columnTypes: (columnTypes) => columnTypes || {},
     collapsedColumnGroups: (collapsedColumnGroups) => collapsedColumnGroups != null ? collapsedColumnGroups : new Map(),
     columnGroups: (columnGroups) => toMap(columnGroups, setupState.propsCache.get("columnGroups"))
   };
@@ -1192,7 +1192,7 @@ function getScrollbarWidth() {
 // src/components/InfiniteTable/utils/getColumnComputedType.ts
 var emptyType = Object.freeze({});
 function getColumnComputedType(column, columnTypes) {
-  const defaultType = columnTypes.get("default") || emptyType;
+  const defaultType = columnTypes["default"] || emptyType;
   if (column.type === void 0) {
     return defaultType;
   }
@@ -1200,10 +1200,26 @@ function getColumnComputedType(column, columnTypes) {
     return emptyType;
   }
   if (typeof column.type === "string") {
-    const type = columnTypes.get(column.type) || emptyType;
+    const type = columnTypes[column.type] || emptyType;
     return type;
   }
-  return column.type.reduce((acc, columnType) => Object.assign(acc, columnTypes.get(columnType)), {});
+  return column.type.reduce((acc, columnType) => Object.assign(acc, columnTypes[columnType]), {});
+}
+
+// src/components/InfiniteTable/utils/assignFiltered.ts
+function assignFiltered(filterFn, target, ...rest) {
+  let result = target;
+  rest.forEach((obj) => {
+    for (const key in obj) {
+      if (obj.hasOwnProperty(key) && filterFn(obj[key], key)) {
+        result[key] = obj[key];
+      }
+    }
+  });
+  return result;
+}
+function assignNonNull(target, ...rest) {
+  return assignFiltered((value) => value != null, target, ...rest);
 }
 
 // src/components/InfiniteTable/utils/getComputedVisibleColumns.ts
@@ -1266,7 +1282,7 @@ var getComputedVisibleColumns = ({
     maxSize: columnMaxWidth,
     minSize: columnMinWidth,
     items: visibleColumnOrder.map((colId) => {
-      var _a, _b, _c, _d;
+      var _a, _b, _c, _d, _e, _f;
       const column = columns.get(colId);
       const colType = getColumnComputedType(column, columnTypes);
       const colTypeSizing = {
@@ -1275,21 +1291,23 @@ var getComputedVisibleColumns = ({
         width: colType == null ? void 0 : colType.defaultWidth,
         flex: colType == null ? void 0 : colType.defaultFlex
       };
-      let colSizing = columnSizing.get(colId) || {
+      let colSizing = assignNonNull({
         width: column == null ? void 0 : column.defaultWidth,
-        flex: column == null ? void 0 : column.defaultFlex
-      };
+        flex: column == null ? void 0 : column.defaultFlex,
+        minWidth: column == null ? void 0 : column.minWidth,
+        maxWidth: column == null ? void 0 : column.maxWidth
+      }, columnSizing[colId]);
       if (colSizing.width != null) {
         delete colTypeSizing.flex;
       }
       if (colSizing.flex != null) {
         delete colTypeSizing.width;
       }
-      colSizing = Object.assign(colTypeSizing, colSizing);
+      colSizing = assignNonNull(colTypeSizing, colSizing);
       let colFlex = (_a = colSizing.flex) != null ? _a : void 0;
-      const colMinWidth = (_b = colSizing.minWidth) != null ? _b : columnMinWidth;
-      const colMaxWidth = (_c = colSizing.maxWidth) != null ? _c : columnMaxWidth;
-      let size = colFlex != void 0 ? void 0 : (_d = colSizing.width) != null ? _d : columnDefaultWidth;
+      const colMinWidth = (_c = (_b = colSizing.minWidth) != null ? _b : column == null ? void 0 : column.minWidth) != null ? _c : columnMinWidth;
+      const colMaxWidth = (_e = (_d = colSizing.maxWidth) != null ? _d : column == null ? void 0 : column.maxWidth) != null ? _e : columnMaxWidth;
+      let size = colFlex != void 0 ? void 0 : (_f = colSizing.width) != null ? _f : columnDefaultWidth;
       if (!size && colFlex == void 0) {
         size = colMinWidth;
       }
@@ -1563,8 +1581,6 @@ var useComputedVisibleColumns = ({
   columnVisibilityAssumeVisible,
   columnSizing
 }) => {
-  const columnsSizingRenderId = useRerenderOnKeyChange(columnSizing);
-  const columnTypesRenderId = useRerenderOnKeyChange(columnTypes);
   const columnsRenderId = useRerenderOnKeyChange(columns);
   const pinningRenderId = useRerenderOnKeyChange(columnPinning);
   const {
@@ -1621,9 +1637,7 @@ var useComputedVisibleColumns = ({
     pinnedStartMaxWidth,
     columnPinning,
     columnsRenderId,
-    columnsSizingRenderId,
-    pinningRenderId,
-    columnTypesRenderId
+    pinningRenderId
   ]);
   const result = {
     columns,
@@ -5499,7 +5513,9 @@ function InfiniteTableHeaderFn(props) {
   }, [computedVisibleColumnsMap, columns, repaintId, headerHeight]);
   useEffect14(() => {
     const onScroll = (scrollPosition) => {
-      domRef.current.style.transform = `translate3d(-${scrollPosition.scrollLeft}px, 0px, 0px)`;
+      if (domRef.current) {
+        domRef.current.style.transform = `translate3d(-${scrollPosition.scrollLeft}px, 0px, 0px)`;
+      }
     };
     const removeOnScroll = brain.onScroll(onScroll);
     return removeOnScroll;
@@ -5777,7 +5793,9 @@ function InfiniteTableHeaderUnvirtualizedFn(props) {
       return;
     }
     const onScroll = (scrollPosition) => {
-      UPDATE_SCROLL(domRef.current, scrollPosition);
+      if (domRef.current) {
+        UPDATE_SCROLL(domRef.current, scrollPosition);
+      }
     };
     const removeOnScroll = scroller.onScroll(onScroll);
     return removeOnScroll;
@@ -7833,7 +7851,7 @@ var useLicense = (licenseKey = "") => {
   const valid = useMemo13(() => {
     let valid2 = isValidLicense(licenseKey, {
       publishedAt: 1624970570587,
-      version: "0.2.9"
+      version: "0.2.10"
     });
     if (!licenseKey && !valid2 && isInsidePlayground) {
       return true;

package/index.js

@@ -839,8 +839,8 @@ var forwardProps = (setupState) => {
     columns: (columns) => toMap(columns, setupState.propsCache.get("columns")),
     columnVisibility: (columnVisibility) => columnVisibility != null ? columnVisibility : {},
     columnPinning: (columnPinning) => toMap(columnPinning, setupState.propsCache.get("columnPinning")),
-    columnSizing: (columnSizing) => toMap(columnSizing, setupState.propsCache.get("columnSizing")),
-    columnTypes: (columnTypes) => toMap(columnTypes, setupState.propsCache.get("columnTypes")),
+    columnSizing: (columnSizing) => columnSizing || {},
+    columnTypes: (columnTypes) => columnTypes || {},
     collapsedColumnGroups: (collapsedColumnGroups) => collapsedColumnGroups != null ? collapsedColumnGroups : new Map(),
     columnGroups: (columnGroups) => toMap(columnGroups, setupState.propsCache.get("columnGroups"))
   };
@@ -1201,7 +1201,7 @@ function getScrollbarWidth() {
 // src/components/InfiniteTable/utils/getColumnComputedType.ts
 var emptyType = Object.freeze({});
 function getColumnComputedType(column, columnTypes) {
-  const defaultType = columnTypes.get("default") || emptyType;
+  const defaultType = columnTypes["default"] || emptyType;
   if (column.type === void 0) {
     return defaultType;
   }
@@ -1209,10 +1209,26 @@ function getColumnComputedType(column, columnTypes) {
     return emptyType;
   }
   if (typeof column.type === "string") {
-    const type = columnTypes.get(column.type) || emptyType;
+    const type = columnTypes[column.type] || emptyType;
     return type;
   }
-  return column.type.reduce((acc, columnType) => Object.assign(acc, columnTypes.get(columnType)), {});
+  return column.type.reduce((acc, columnType) => Object.assign(acc, columnTypes[columnType]), {});
+}
+
+// src/components/InfiniteTable/utils/assignFiltered.ts
+function assignFiltered(filterFn, target, ...rest) {
+  let result = target;
+  rest.forEach((obj) => {
+    for (const key in obj) {
+      if (obj.hasOwnProperty(key) && filterFn(obj[key], key)) {
+        result[key] = obj[key];
+      }
+    }
+  });
+  return result;
+}
+function assignNonNull(target, ...rest) {
+  return assignFiltered((value) => value != null, target, ...rest);
 }
 
 // src/components/InfiniteTable/utils/getComputedVisibleColumns.ts
@@ -1275,7 +1291,7 @@ var getComputedVisibleColumns = ({
     maxSize: columnMaxWidth,
     minSize: columnMinWidth,
     items: visibleColumnOrder.map((colId) => {
-      var _a, _b, _c, _d;
+      var _a, _b, _c, _d, _e, _f;
       const column = columns.get(colId);
       const colType = getColumnComputedType(column, columnTypes);
       const colTypeSizing = {
@@ -1284,21 +1300,23 @@ var getComputedVisibleColumns = ({
         width: colType == null ? void 0 : colType.defaultWidth,
         flex: colType == null ? void 0 : colType.defaultFlex
       };
-      let colSizing = columnSizing.get(colId) || {
+      let colSizing = assignNonNull({
         width: column == null ? void 0 : column.defaultWidth,
-        flex: column == null ? void 0 : column.defaultFlex
-      };
+        flex: column == null ? void 0 : column.defaultFlex,
+        minWidth: column == null ? void 0 : column.minWidth,
+        maxWidth: column == null ? void 0 : column.maxWidth
+      }, columnSizing[colId]);
       if (colSizing.width != null) {
         delete colTypeSizing.flex;
       }
       if (colSizing.flex != null) {
         delete colTypeSizing.width;
       }
-      colSizing = Object.assign(colTypeSizing, colSizing);
+      colSizing = assignNonNull(colTypeSizing, colSizing);
       let colFlex = (_a = colSizing.flex) != null ? _a : void 0;
-      const colMinWidth = (_b = colSizing.minWidth) != null ? _b : columnMinWidth;
-      const colMaxWidth = (_c = colSizing.maxWidth) != null ? _c : columnMaxWidth;
-      let size = colFlex != void 0 ? void 0 : (_d = colSizing.width) != null ? _d : columnDefaultWidth;
+      const colMinWidth = (_c = (_b = colSizing.minWidth) != null ? _b : column == null ? void 0 : column.minWidth) != null ? _c : columnMinWidth;
+      const colMaxWidth = (_e = (_d = colSizing.maxWidth) != null ? _d : column == null ? void 0 : column.maxWidth) != null ? _e : columnMaxWidth;
+      let size = colFlex != void 0 ? void 0 : (_f = colSizing.width) != null ? _f : columnDefaultWidth;
       if (!size && colFlex == void 0) {
         size = colMinWidth;
       }
@@ -1572,8 +1590,6 @@ var useComputedVisibleColumns = ({
   columnVisibilityAssumeVisible,
   columnSizing
 }) => {
-  const columnsSizingRenderId = useRerenderOnKeyChange(columnSizing);
-  const columnTypesRenderId = useRerenderOnKeyChange(columnTypes);
   const columnsRenderId = useRerenderOnKeyChange(columns);
   const pinningRenderId = useRerenderOnKeyChange(columnPinning);
   const {
@@ -1630,9 +1646,7 @@ var useComputedVisibleColumns = ({
     pinnedStartMaxWidth,
     columnPinning,
     columnsRenderId,
-    columnsSizingRenderId,
-    pinningRenderId,
-    columnTypesRenderId
+    pinningRenderId
   ]);
   const result = {
     columns,
@@ -5452,7 +5466,9 @@ function InfiniteTableHeaderFn(props) {
   }, [computedVisibleColumnsMap, columns, repaintId, headerHeight]);
   (0, import_react26.useEffect)(() => {
     const onScroll = (scrollPosition) => {
-      domRef.current.style.transform = `translate3d(-${scrollPosition.scrollLeft}px, 0px, 0px)`;
+      if (domRef.current) {
+        domRef.current.style.transform = `translate3d(-${scrollPosition.scrollLeft}px, 0px, 0px)`;
+      }
     };
     const removeOnScroll = brain.onScroll(onScroll);
     return removeOnScroll;
@@ -5721,7 +5737,9 @@ function InfiniteTableHeaderUnvirtualizedFn(props) {
       return;
     }
     const onScroll = (scrollPosition) => {
-      UPDATE_SCROLL(domRef.current, scrollPosition);
+      if (domRef.current) {
+        UPDATE_SCROLL(domRef.current, scrollPosition);
+      }
     };
     const removeOnScroll = scroller.onScroll(onScroll);
     return removeOnScroll;
@@ -7740,7 +7758,7 @@ var useLicense = (licenseKey = "") => {
   const valid = (0, import_react43.useMemo)(() => {
     let valid2 = isValidLicense(licenseKey, {
       publishedAt: 1624970570587,
-      version: "0.2.9"
+      version: "0.2.10"
     });
     if (!licenseKey && !valid2 && isInsidePlayground) {
       return true;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@infinite-table/infinite-react",
   "description": "Infinite Table for React",
-  "version": "0.2.9",
+  "version": "0.2.10",
   "main": "index.js",
   "module": "index.esm.js",
   "typings": "index.d.ts",
@@ -14,5 +14,5 @@
   },
   "license": "Commercial & Open Source",
   "//": "will be updated at build time",
-  "publishedAt": 1646311895842
+  "publishedAt": 1646346500550
 }