@infinite-table/infinite-react 0.0.7 → 0.0.8

package/index.js

@@ -482,14 +482,14 @@ var require_browser = __commonJS({
         } else {
           exports.storage.removeItem("debug");
         }
-      } catch (error3) {
+      } catch (error2) {
       }
     }
     function load() {
       let r;
       try {
         r = exports.storage.getItem("debug");
-      } catch (error3) {
+      } catch (error2) {
       }
       if (!r && typeof process !== "undefined" && "env" in process) {
         r = process.env.DEBUG;
@@ -499,7 +499,7 @@ var require_browser = __commonJS({
     function localstorage() {
       try {
         return localStorage;
-      } catch (error3) {
+      } catch (error2) {
       }
     }
     module2.exports = require_common()(exports);
@@ -507,8 +507,8 @@ var require_browser = __commonJS({
     formatters.j = function(v) {
       try {
         return JSON.stringify(v);
-      } catch (error3) {
-        return "[UnexpectedJSONParseError]: " + error3.message;
+      } catch (error2) {
+        return "[UnexpectedJSONParseError]: " + error2.message;
       }
     };
   }
@@ -793,6 +793,15 @@ function computeColumnGroupsDepths(columnGroups) {
 }
 
 // src/components/InfiniteTable/state/getInitialState.ts
+function toMap(mapOrObject) {
+  if (!mapOrObject) {
+    return new Map();
+  }
+  if (mapOrObject instanceof Map) {
+    return mapOrObject;
+  }
+  return new Map(Object.entries(mapOrObject));
+}
 function initSetupState() {
   const columnsGeneratedForGrouping = new Map();
   return {
@@ -822,7 +831,10 @@ function initSetupState() {
 }
 var forwardProps = () => {
   return {
-    columns: 1,
+    columns: (columns) => {
+      var _a;
+      return (_a = toMap(columns)) != null ? _a : new Map();
+    },
     components: 1,
     loadingText: 1,
     pivotColumns: 1,
@@ -848,15 +860,16 @@ var forwardProps = () => {
     pivotColumn: 1,
     pivotRowLabelsColumn: 1,
     pivotColumnGroups: 1,
+    viewportReservedWidth: (viewportReservedWidth) => viewportReservedWidth != null ? viewportReservedWidth : 0,
     activeIndex: (activeIndex) => activeIndex != null ? activeIndex : 0,
     columnMinWidth: (columnMinWidth) => columnMinWidth != null ? columnMinWidth : 30,
     columnMaxWidth: (columnMaxWidth) => columnMaxWidth != null ? columnMaxWidth : 2e3,
-    columnDefaultWidth: (columnDefaultWidth) => columnDefaultWidth != null ? columnDefaultWidth : 300,
+    columnDefaultWidth: (columnDefaultWidth) => columnDefaultWidth != null ? columnDefaultWidth : 200,
     draggableColumns: (draggableColumns) => draggableColumns != null ? draggableColumns : true,
     sortable: (sortable) => sortable != null ? sortable : true,
     hideEmptyGroupColumns: (hideEmptyGroupColumns) => hideEmptyGroupColumns != null ? hideEmptyGroupColumns : false,
     pivotTotalColumnPosition: (pivotTotalColumnPosition) => pivotTotalColumnPosition != null ? pivotTotalColumnPosition : "end",
-    licenseKey: (licenseKey) => licenseKey || globalThis.InfiniteTableLicenseKey || "",
+    licenseKey: (licenseKey) => licenseKey || "",
     columnOrder: (columnOrder) => columnOrder != null ? columnOrder : true,
     header: (header) => header != null ? header : true,
     showZebraRows: (showZebraRows) => showZebraRows != null ? showZebraRows : true,
@@ -866,6 +879,14 @@ var forwardProps = () => {
     headerHeight: (headerHeight) => typeof headerHeight === "number" ? headerHeight : 0,
     columnVisibility: (columnVisibility) => columnVisibility != null ? columnVisibility : new Map(),
     columnPinning: (columnPinning) => columnPinning != null ? columnPinning : new Map(),
+    columnSizing: (columnSizing) => {
+      var _a;
+      return (_a = toMap(columnSizing)) != null ? _a : new Map();
+    },
+    columnTypes: (columnTypes) => {
+      var _a;
+      return (_a = toMap(columnTypes)) != null ? _a : new Map();
+    },
     columnAggregations: (columnAggregations) => columnAggregations != null ? columnAggregations : new Map(),
     collapsedColumnGroups: (collapsedColumnGroups) => collapsedColumnGroups != null ? collapsedColumnGroups : new Map(),
     columnGroups: (columnGroups) => columnGroups != null ? columnGroups : new Map()
@@ -900,7 +921,7 @@ var mapPropsToState = (params) => {
   return {
     groupRenderStrategy,
     groupRowsBy,
-    computedColumns: state.computedPivotColumns || state.columnsWhenGrouping || state.columnsWhenInlineGroupRenderStrategy || props.columns,
+    computedColumns: state.computedPivotColumns || state.columnsWhenGrouping || state.columnsWhenInlineGroupRenderStrategy || state.columns,
     virtualizeHeader,
     columnGroupsDepthsMap,
     columnGroupsMaxDepth: columnGroupsDepthsMap != state.columnGroupsDepthsMap ? Math.max(...columnGroupsDepthsMap.values(), 0) : state.columnGroupsMaxDepth,
@@ -1032,7 +1053,7 @@ var computeFlex = (params) => {
   items.forEach((item, i) => {
     var _a, _b, _c, _d, _e, _f;
     let maxSize = (_b = (_a = item.maxSize) != null ? _a : defaultMaxSize) != null ? _b : void 0;
-    let minSize = (_d = (_c = item.maxSize) != null ? _c : defaultMinSize) != null ? _d : void 0;
+    let minSize = (_d = (_c = item.minSize) != null ? _c : defaultMinSize) != null ? _d : void 0;
     if (item.size != null) {
       if (maxSize != null && item.size > maxSize) {
         item.size = maxSize;
@@ -1060,7 +1081,7 @@ var computeFlex = (params) => {
     if (item.flex != null) {
       const approxFlexSize = sizePerFlex * item.flex;
       let maxSize = (_b = (_a = item.maxSize) != null ? _a : defaultMaxSize) != null ? _b : void 0;
-      let minSize = (_d = (_c = item.maxSize) != null ? _c : defaultMinSize) != null ? _d : void 0;
+      let minSize = (_d = (_c = item.minSize) != null ? _c : defaultMinSize) != null ? _d : void 0;
       let constrained = false;
       let substractSize = 0;
       if (maxSize != null && approxFlexSize > maxSize) {
@@ -1195,8 +1216,52 @@ var Logger = class {
   }
 };
 
+// src/utils/getGlobal.ts
+function getGlobal() {
+  return globalThis;
+}
+
+// src/components/utils/getScrollbarWidth.ts
+var scrollbarWidth;
+function getScrollbarWidth() {
+  var _a, _b;
+  if (scrollbarWidth != null) {
+    return scrollbarWidth;
+  }
+  const doc = (_a = getGlobal().document) != null ? _a : null;
+  if (!doc) {
+    return 0;
+  }
+  const outer = doc.createElement("div");
+  outer.style.visibility = "hidden";
+  outer.style.overflow = "scroll";
+  doc.body.appendChild(outer);
+  const inner = doc.createElement("div");
+  outer.appendChild(inner);
+  scrollbarWidth = outer.offsetWidth - inner.offsetWidth;
+  (_b = outer.parentNode) == null ? void 0 : _b.removeChild(outer);
+  return scrollbarWidth;
+}
+
+// src/components/InfiniteTable/utils/getColumnComputedType.ts
+var emptyType = Object.freeze({});
+function getColumnComputedType(column, columnTypes) {
+  const defaultType = columnTypes.get("default") || emptyType;
+  if (column.type === void 0) {
+    return defaultType;
+  }
+  if (column.type === null) {
+    return emptyType;
+  }
+  if (typeof column.type === "string") {
+    const type = columnTypes.get(column.type) || emptyType;
+    return type;
+  }
+  return column.type.reduce((acc, columnType) => Object.assign(acc, columnTypes.get(columnType)), {});
+}
+
 // src/components/InfiniteTable/utils/getComputedVisibleColumns.ts
-var error = err("getComputedVisibleColumns");
+var logError = err("getComputedVisibleColumns");
 var isColumnVisible = (columnVisibility, _columnVisibilityAssumeVisible, colId) => {
   return !columnVisibility.has(colId) || columnVisibility.get(colId) !== false;
 };
@@ -1217,22 +1282,26 @@ var getComputedVisibleColumns = ({
   sortInfo,
   setSortInfo,
   multiSort,
+  viewportReservedWidth,
   draggableColumns,
   columnOrder,
   columnPinning,
+  columnSizing,
+  columnTypes,
   columnVisibility,
   columnVisibilityAssumeVisible
 }) => {
   let computedOffset = 0;
   const normalizedColumnOrder = adjustColumnOrderForPinning(columnOrder === true ? [...columns.keys()] : columnOrder, columnPinning);
-  const visibleColumnOrder = normalizedColumnOrder.filter(isColumnVisible.bind(null, columnVisibility, columnVisibilityAssumeVisible));
-  const columnsArray = visibleColumnOrder.map((columnId) => {
-    let col = columns.get(columnId);
+  const visibleColumnOrder = normalizedColumnOrder.filter((colId) => {
+    let col = columns.get(colId);
     if (!col) {
-      error(`Column with id "${columnId}" specified in columnOrder array cannot be found in the columns map.`);
+      logError(`Column with id "${colId}" specified in columnOrder array cannot be found in the columns map.`);
+      return false;
     }
-    return col;
-  }).filter(Boolean);
+    return isColumnVisible(columnVisibility, columnVisibilityAssumeVisible, colId);
+  });
+  const columnsArray = visibleColumnOrder.map((columnId) => columns.get(columnId)).filter(Boolean);
   const sortedMap = (sortInfo != null ? sortInfo : []).reduce((acc, info, index) => {
     if (info.id) {
       acc[info.id] = { sortInfo: info, index };
@@ -1246,20 +1315,39 @@ var getComputedVisibleColumns = ({
     return acc;
   }, {});
   const flexResult = computeFlex({
-    availableSize: bodySize.width,
+    availableSize: Math.max(bodySize.width - (viewportReservedWidth != null ? viewportReservedWidth : 0) - getScrollbarWidth(), 0),
     maxSize: columnMaxWidth,
     minSize: columnMinWidth,
-    items: columnsArray.map((col) => {
-      var _a, _b;
-      let size = col.flex != null ? void 0 : (_a = col.width) != null ? _a : columnDefaultWidth;
-      if (!size && col.flex == null) {
-        size = (_b = col.minWidth) != null ? _b : columnMinWidth;
+    items: visibleColumnOrder.map((colId) => {
+      var _a, _b, _c, _d;
+      const column = columns.get(colId);
+      const colType = getColumnComputedType(column, columnTypes);
+      const colTypeSizing = {
+        minWidth: colType == null ? void 0 : colType.minWidth,
+        maxWidth: colType == null ? void 0 : colType.maxWidth,
+        width: colType == null ? void 0 : colType.width,
+        flex: colType == null ? void 0 : colType.flex
+      };
+      let colSizing = columnSizing.get(colId) || {};
+      if (colSizing.width != null) {
+        delete colTypeSizing.flex;
+      }
+      if (colSizing.flex != null) {
+        delete colTypeSizing.width;
+      }
+      colSizing = Object.assign(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;
+      if (!size && colFlex == void 0) {
+        size = colMinWidth;
       }
       return {
         size,
-        flex: col.flex,
-        minSize: col.minWidth,
-        maxSize: col.maxWidth
+        flex: colFlex,
+        minSize: colMinWidth,
+        maxSize: colMaxWidth
       };
     })
   });
@@ -1294,6 +1382,7 @@ var getComputedVisibleColumns = ({
     var _a, _b, _c, _d, _e, _f, _g, _h, _i;
     const id = visibleColumnOrder[i];
     const nextColumnId = visibleColumnOrder[i + 1];
+    const colType = getColumnComputedType(c, columnTypes);
     const sortingInfo = sortedMap[id] ? sortedMap[id] : c.field ? (_a = sortedMap[c.field]) != null ? _a : null : null;
     const computedSortInfo = (_b = sortingInfo == null ? void 0 : sortingInfo.sortInfo) != null ? _b : null;
     const computedSorted = !!computedSortInfo;
@@ -1349,8 +1438,10 @@ var getComputedVisibleColumns = ({
     const computedFirstInCategory = computedPinned !== prevPinned;
     const computedLastInCategory = computedLast || computedPinned !== getComputedPinned(nextColumnId, columnPinning);
     const result2 = __spreadProps(__spreadValues({
-      align: "start",
-      verticalAlign: "center"
+      align: colType.align,
+      verticalAlign: colType.verticalAlign,
+      renderValue: colType.renderValue,
+      render: colType.render
     }, c), {
       computedWidth,
       computedAbsoluteOffset,
@@ -1512,11 +1603,16 @@ var useComputedVisibleColumns = ({
   setSortInfo,
   columnOrder,
   columnPinning,
+  columnTypes,
   pinnedEndMaxWidth,
   pinnedStartMaxWidth,
+  viewportReservedWidth,
   columnVisibility,
-  columnVisibilityAssumeVisible
+  columnVisibilityAssumeVisible,
+  columnSizing
 }) => {
+  const columnsSizingRenderId = useRerenderOnKeyChange(columnSizing);
+  const columnTypesRenderId = useRerenderOnKeyChange(columnTypes);
   const columnsRenderId = useRerenderOnKeyChange(columns);
   const visibilityRenderId = useRerenderOnKeyChange(columnVisibility);
   const pinningRenderId = useRerenderOnKeyChange(columnPinning);
@@ -1542,6 +1638,7 @@ var useComputedVisibleColumns = ({
       columnMinWidth,
       columnMaxWidth,
       columnDefaultWidth,
+      viewportReservedWidth,
       sortable,
       sortInfo,
       setSortInfo,
@@ -1551,6 +1648,8 @@ var useComputedVisibleColumns = ({
       draggableColumns,
       columnOrder,
       columnPinning,
+      columnSizing,
+      columnTypes,
       columnVisibility,
       columnVisibilityAssumeVisible: columnVisibilityAssumeVisible != null ? columnVisibilityAssumeVisible : true
     });
@@ -1572,7 +1671,9 @@ var useComputedVisibleColumns = ({
     columnPinning,
     columnsRenderId,
     visibilityRenderId,
-    pinningRenderId
+    columnsSizingRenderId,
+    pinningRenderId,
+    columnTypesRenderId
   ]);
   const result = {
     columns,
@@ -2972,15 +3073,17 @@ function enhancedFlatten(param) {
 }
 
 // src/utils/multisort/sortTypes.ts
+var numberComparator = function(first, second) {
+  return first - second;
+};
+var stringComparator = function(first, second) {
+  first = `${first}`;
+  second = `${second}`;
+  return first.localeCompare(second);
+};
 var sortTypes = {
-  number: function(first, second) {
-    return first - second;
-  },
-  string: function(first, second) {
-    first = `${first}`;
-    second = `${second}`;
-    return first.localeCompare(second);
-  }
+  number: numberComparator,
+  string: stringComparator
 };
 var sortTypes_default = sortTypes;
 
@@ -3535,20 +3638,22 @@ function getColumnsWhenGrouping(params) {
   const computedColumns = new Map();
   if (groupRenderStrategy === "multi-column") {
     groupRowsBy.forEach((groupByForColumn, groupIndexForColumn, arr) => {
-      computedColumns.set(`group-by-${groupByForColumn.field}`, getColumnForGroupBy({
+      const generatedGroupColumn = getColumnForGroupBy({
         groupByForColumn,
         groupRowsBy,
         groupIndexForColumn,
         groupCount: arr.length,
         groupRenderStrategy
-      }, toggleGroupRow, groupColumn));
+      }, toggleGroupRow, groupColumn);
+      computedColumns.set(generatedGroupColumn.id || `group-by-${groupByForColumn.field}`, generatedGroupColumn);
     });
   } else if (groupRenderStrategy === "single-column") {
-    computedColumns.set("group-by", getSingleGroupColumn({
+    const singleGroupColumn = getSingleGroupColumn({
       groupCount: groupRowsBy.length,
       groupRowsBy,
       groupRenderStrategy
-    }, toggleGroupRow, groupColumn));
+    }, toggleGroupRow, groupColumn);
+    computedColumns.set(singleGroupColumn.id || "group-by", singleGroupColumn);
   }
   columns.forEach((col, colId) => {
     computedColumns.set(colId, col);
@@ -3564,7 +3669,14 @@ function useComputed() {
     componentActions: dataSourceActions,
     componentState: dataSourceState
   } = useDataSourceContextValue();
-  const { columnOrder, columnVisibility, columnPinning, bodySize } = componentState;
+  const {
+    columnOrder,
+    columnVisibility,
+    columnPinning,
+    columnSizing,
+    columnTypes,
+    bodySize
+  } = componentState;
   (0, import_react19.useState)(() => {
     componentState.onRowHeightCSSVarChange.onChange((rowHeight) => {
       if (rowHeight) {
@@ -3609,6 +3721,7 @@ function useComputed() {
     pinnedStartMaxWidth: componentState.pinnedStartMaxWidth,
     pinnedEndMaxWidth: componentState.pinnedEndMaxWidth,
     bodySize,
+    viewportReservedWidth: componentState.viewportReservedWidth,
     sortable: componentState.sortable,
     draggableColumns: componentState.draggableColumns,
     sortInfo: (_a = dataSourceState.sortInfo) != null ? _a : void 0,
@@ -3617,7 +3730,9 @@ function useComputed() {
     columnOrder,
     columnVisibility,
     columnVisibilityAssumeVisible: true,
-    columnPinning
+    columnPinning,
+    columnSizing,
+    columnTypes
   });
   const unpinnedColumnWidths = computedUnpinnedColumns.map((c) => c.computedWidth);
   let sortedUnpinnedColumnWidths = [...unpinnedColumnWidths].sort(sortAscending);
@@ -3688,33 +3803,6 @@ var InfiniteTableBody = React10.forwardRef(function InfiniteTableBody2(props, re
 // src/components/InfiniteTable/components/InfiniteTableHeader/InfiniteTableHeaderWrapper.tsx
 var React22 = __toModule(require("react"));
 
-// src/utils/getGlobal.ts
-function getGlobal() {
-  return globalThis;
-}
-
-// src/components/utils/getScrollbarWidth.ts
-var scrollbarWidth;
-function getScrollbarWidth() {
-  var _a, _b;
-  if (scrollbarWidth != null) {
-    return scrollbarWidth;
-  }
-  const doc = (_a = getGlobal().document) != null ? _a : null;
-  if (!doc) {
-    return 0;
-  }
-  const outer = doc.createElement("div");
-  outer.style.visibility = "hidden";
-  outer.style.overflow = "scroll";
-  doc.body.appendChild(outer);
-  const inner = doc.createElement("div");
-  outer.appendChild(inner);
-  scrollbarWidth = outer.offsetWidth - inner.offsetWidth;
-  (_b = outer.parentNode) == null ? void 0 : _b.removeChild(outer);
-  return scrollbarWidth;
-}
-
 // src/components/InfiniteTable/components/ScrollbarPlaceholder.tsx
 var React11 = __toModule(require("react"));
 function HorizontalScrollbarPlaceholderFn(props) {
@@ -6875,11 +6963,11 @@ var SANDBOX_REGEX = /(https):\/\/\d+\-\d+\-\d\-(sandpack\.codesandbox\.io)/g;
 var origin = typeof window !== "undefined" ? window.location.origin : "";
 var [_fullUrl, protocol, sandboxUrl] = Array.from(SANDBOX_REGEX.exec(origin) || []);
 var isInsideSandbox = protocol === "https" && sandboxUrl === "sandpack.codesandbox.io";
-var useLicense = (licenseKey) => {
+var useLicense = (licenseKey = "") => {
   const valid = (0, import_react43.useMemo)(() => {
     let valid2 = isValidLicense(licenseKey, {
       publishedAt: 1624970570587,
-      version: "0.0.7"
+      version: "0.0.8"
     });
     if (!licenseKey && !valid2 && isInsideSandbox) {
       return true;
@@ -6892,7 +6980,7 @@ var useLicense = (licenseKey) => {
 // src/components/CSSVariableWatch.tsx
 var React34 = __toModule(require("react"));
 var import_react44 = __toModule(require("react"));
-var error2 = err("CSSVariableWatch");
+var error = err("CSSVariableWatch");
 var debug5 = dbg("CSSVariableWatch");
 var WRAPPER_STYLE = {
   position: "absolute",
@@ -6919,7 +7007,7 @@ var useCSSVariableWatch = (params) => {
       debug5(`Variable ${params.varName} found and equals ${value}.`);
       params.onChange(value);
     } else {
-      error2(`Specified variable ${params.varName} not found or does not have a numeric value.`);
+      error(`Specified variable ${params.varName} not found or does not have a numeric value.`);
     }
   }, []);
 };

package/package.json

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