@infinite-table/infinite-react 2.0.1 → 2.0.3

package/index.d.ts

@@ -1375,14 +1375,17 @@ declare type RenderRange = {
 declare type DataSourceMutation<T> = {
     type: 'delete';
     primaryKey: any;
+    originalData: T;
 } | {
     type: 'update';
     primaryKey: any;
     data: Partial<T>;
+    originalData: T;
 } | {
     type: 'insert';
     primaryKey: any;
     position: 'before' | 'after';
+    originalData: null;
     data: T;
 };
 declare class DataSourceCache<DataType, PrimaryKeyType = string> {
@@ -1393,9 +1396,9 @@ declare class DataSourceCache<DataType, PrimaryKeyType = string> {
         light?: boolean;
     }): DataSourceCache<DataType, PrimaryKeyType>;
     getAffectedFields: () => true | Set<keyof DataType>;
-    delete: (primaryKey: PrimaryKeyType) => void;
+    delete: (primaryKey: PrimaryKeyType, originalData: DataType) => void;
     insert: (primaryKey: PrimaryKeyType, data: DataType, position: 'before' | 'after') => void;
-    update: (primaryKey: PrimaryKeyType, data: Partial<DataType>) => void;
+    update: (primaryKey: PrimaryKeyType, data: Partial<DataType>, originalData: DataType) => void;
     clear: () => void;
     isEmpty: () => boolean;
     removeInfo: (primaryKey: PrimaryKeyType) => void;
@@ -1537,7 +1540,7 @@ declare type DataSourceRawReducer<T, RESULT_TYPE> = {
 declare type DataSourceAggregationReducer<T, AggregationResultType> = {
     name?: string;
     field?: keyof T;
-    initialValue?: AggregationResultType;
+    initialValue?: AggregationResultType | (() => any);
     getter?: (data: T) => any;
     reducer: string | ((accumulator: any, value: any, data: T, index: number, groupKeys: any[] | undefined) => AggregationResultType | any);
     done?: (accumulatedValue: AggregationResultType | any, array: T[]) => AggregationResultType;
@@ -1667,6 +1670,9 @@ declare type DataSourceRowInfoReducer<T> = DataSourceRawReducer<InfiniteTableRow
 declare type DataSourceProps<T> = {
     children: React$1.ReactNode | ((contextData: DataSourceState<T>) => React$1.ReactNode);
     primaryKey: keyof T | ((data: T) => string);
+    /**
+     * @deprecated for now
+     */
     fields?: (keyof T)[];
     refetchKey?: number | string | object;
     rowInfoReducers?: DataSourcePropRowInfoReducers<T>;
@@ -1704,7 +1710,8 @@ declare type DataSourceProps<T> = {
     onSortInfoChange?: ((sortInfo: DataSourceSingleSortInfo<T> | null) => void) | ((sortInfo: DataSourceSingleSortInfo<T>[]) => void);
     onDataParamsChange?: (dataParamsChange: DataSourceDataParams<T>) => void;
     onDataArrayChange?: (dataArray: DataSourceState<T>['originalDataArray'], info: DataSourceState<T>['originalDataArrayChangedInfo']) => void;
-    onDataMutations?: ({ dataArray, timestamp, mutations, }: {
+    onDataMutations?: ({ dataArray, timestamp, mutations, primaryKeyField, }: {
+        primaryKeyField: undefined | keyof T;
         dataArray: DataSourceState<T>['originalDataArray'];
         timestamp: number;
         mutations: NonUndefined<DataSourceState<T>['originalDataArrayChangedInfo']['mutations']>;
@@ -1890,6 +1897,7 @@ declare type InfiniteTable_HasGrouping_RowInfoNormal<T> = {
 declare type InfiniteTable_HasGrouping_RowInfoGroup<T> = {
     dataSourceHasGrouping: true;
     data: Partial<T> | null;
+    reducerData?: Partial<Record<keyof T, any>>;
     isGroupRow: true;
     /**
      * This array contains all the (uncollapsed, so visible) row infos under this group, at any level of nesting,

package/index.dev.js

@@ -8034,6 +8034,9 @@ function getRawValueForCell(column, rowInfo) {
   let value = isGroupRow && groupBy && column.groupByForColumn && // if this is a multi-group column we're good
   (Array.isArray(column.groupByForColumn) || // or it has to be a group column for the current group row
   column.groupByForColumn === groupBy[groupBy.length - 1]) ? rowInfo.value : isColumnWithField(column) ? data == null ? void 0 : data[column.field] : null;
+  if (column.field && rowInfo.isGroupRow && rowInfo.reducerData && rowInfo.reducerData[column.field] != null) {
+    value = rowInfo.reducerData[column.field];
+  }
   if (column.valueGetter) {
     if (!rowInfo.isGroupRow && rowInfo.data) {
       value = column.valueGetter({ data: rowInfo.data, field: column.field });
@@ -10574,12 +10577,17 @@ function getEnhancedGroupData(options, deepMapValue) {
     commonData
   } = deepMapValue;
   let data = commonData != null ? commonData : null;
+  let reducerData;
   if (Object.keys(reducerResults).length > 0) {
     data = __spreadValues({}, commonData);
+    reducerData = {};
     for (const key in reducers)
       if (reducers.hasOwnProperty(key)) {
         const reducer = reducers[key];
         const field = reducer.field;
+        if (field) {
+          reducerData[field] = reducerResults[key];
+        }
         if (field && data[field] == null) {
           data[field] = reducerResults[key];
         }
@@ -10604,6 +10612,7 @@ function getEnhancedGroupData(options, deepMapValue) {
   }
   const enhancedGroupData = {
     data,
+    reducerData,
     groupCount: groupItems.length,
     groupData: groupItems,
     groupKeys,
@@ -10919,13 +10928,14 @@ var DataSourceCache = class {
       }
       return this.affectedFields;
     };
-    this.delete = (primaryKey) => {
+    this.delete = (primaryKey, originalData) => {
       this.allFieldsAffected = true;
       const pk = `${primaryKey}`;
       const value = this.primaryKeyToData.get(pk) || [];
       value.push({
         type: "delete",
-        primaryKey
+        primaryKey,
+        originalData
       });
       this.primaryKeyToData.set(pk, value);
     };
@@ -10937,11 +10947,12 @@ var DataSourceCache = class {
         type: "insert",
         primaryKey,
         data,
-        position: position2
+        position: position2,
+        originalData: null
       });
       this.primaryKeyToData.set(pk, value);
     };
-    this.update = (primaryKey, data) => {
+    this.update = (primaryKey, data, originalData) => {
       if (!this.allFieldsAffected) {
         const keys = Object.keys(data);
         keys.forEach((key) => this.affectedFields.add(key));
@@ -10951,7 +10962,8 @@ var DataSourceCache = class {
       value.push({
         type: "update",
         primaryKey,
-        data
+        data,
+        originalData
       });
       this.primaryKeyToData.set(`${primaryKey}`, value);
     };
@@ -11022,13 +11034,20 @@ var DataSourceApiImpl = class {
     operations.forEach((operation) => {
       switch (operation.type) {
         case "update":
-          operation.array.forEach((d, index) => {
-            cache.update(operation.primaryKeys[index], d);
+          operation.array.forEach((data, index) => {
+            const key = operation.primaryKeys[index];
+            const rowInfo = this.getRowInfoByPrimaryKey(key);
+            if (rowInfo && !rowInfo.isGroupRow) {
+              cache.update(operation.primaryKeys[index], data, rowInfo.data);
+            }
           });
           break;
         case "delete":
           operation.primaryKeys.forEach((key) => {
-            cache.delete(key);
+            const rowInfo = this.getRowInfoByPrimaryKey(key);
+            if (rowInfo && !rowInfo.isGroupRow) {
+              cache.delete(key, rowInfo.data);
+            }
           });
           break;
         case "insert":
@@ -13967,6 +13986,7 @@ function DataSourceCmp({ children }) {
     );
     if (componentState.onDataMutations && componentState.originalDataArrayChangedInfo.mutations) {
       componentState.onDataMutations({
+        primaryKeyField: typeof componentState.primaryKey === "string" ? componentState.primaryKey : void 0,
         dataArray: componentState.originalDataArray,
         mutations: componentState.originalDataArrayChangedInfo.mutations,
         timestamp: componentState.originalDataArrayChangedInfo.timestamp
@@ -14088,9 +14108,14 @@ var InfiniteTableApiImpl = class {
         if (!params.column.field) {
           return value;
         }
-        return this.context.dataSourceApi.updateData(__spreadProps(__spreadValues({}, params.data), {
+        const primaryKey = this.getDataSourceState().primaryKey;
+        const newData = params.data && typeof primaryKey === "string" ? {
+          [primaryKey]: params.data[primaryKey],
           [params.column.field]: valueToPersist
-        }));
+        } : __spreadProps(__spreadValues({}, params.data), {
+          [params.column.field]: valueToPersist
+        });
+        return this.context.dataSourceApi.updateData(newData);
       };
       let response;
       try {
@@ -16756,7 +16781,7 @@ var useLicense = (licenseKey = "") => {
   const valid = (0, import_react49.useMemo)(() => {
     let valid2 = isValidLicense(licenseKey, {
       publishedAt: 1624970570587,
-      version: "2.0.1"
+      version: "2.0.3"
     });
     if (!licenseKey && !valid2 && isInsidePlayground) {
       return true;

package/index.dev.mjs

@@ -8020,6 +8020,9 @@ function getRawValueForCell(column, rowInfo) {
   let value = isGroupRow && groupBy && column.groupByForColumn && // if this is a multi-group column we're good
   (Array.isArray(column.groupByForColumn) || // or it has to be a group column for the current group row
   column.groupByForColumn === groupBy[groupBy.length - 1]) ? rowInfo.value : isColumnWithField(column) ? data == null ? void 0 : data[column.field] : null;
+  if (column.field && rowInfo.isGroupRow && rowInfo.reducerData && rowInfo.reducerData[column.field] != null) {
+    value = rowInfo.reducerData[column.field];
+  }
   if (column.valueGetter) {
     if (!rowInfo.isGroupRow && rowInfo.data) {
       value = column.valueGetter({ data: rowInfo.data, field: column.field });
@@ -10560,12 +10563,17 @@ function getEnhancedGroupData(options, deepMapValue) {
     commonData
   } = deepMapValue;
   let data = commonData != null ? commonData : null;
+  let reducerData;
   if (Object.keys(reducerResults).length > 0) {
     data = __spreadValues({}, commonData);
+    reducerData = {};
     for (const key in reducers)
       if (reducers.hasOwnProperty(key)) {
         const reducer = reducers[key];
         const field = reducer.field;
+        if (field) {
+          reducerData[field] = reducerResults[key];
+        }
         if (field && data[field] == null) {
           data[field] = reducerResults[key];
         }
@@ -10590,6 +10598,7 @@ function getEnhancedGroupData(options, deepMapValue) {
   }
   const enhancedGroupData = {
     data,
+    reducerData,
     groupCount: groupItems.length,
     groupData: groupItems,
     groupKeys,
@@ -10905,13 +10914,14 @@ var DataSourceCache = class {
       }
       return this.affectedFields;
     };
-    this.delete = (primaryKey) => {
+    this.delete = (primaryKey, originalData) => {
       this.allFieldsAffected = true;
       const pk = `${primaryKey}`;
       const value = this.primaryKeyToData.get(pk) || [];
       value.push({
         type: "delete",
-        primaryKey
+        primaryKey,
+        originalData
       });
       this.primaryKeyToData.set(pk, value);
     };
@@ -10923,11 +10933,12 @@ var DataSourceCache = class {
         type: "insert",
         primaryKey,
         data,
-        position: position2
+        position: position2,
+        originalData: null
       });
       this.primaryKeyToData.set(pk, value);
     };
-    this.update = (primaryKey, data) => {
+    this.update = (primaryKey, data, originalData) => {
       if (!this.allFieldsAffected) {
         const keys = Object.keys(data);
         keys.forEach((key) => this.affectedFields.add(key));
@@ -10937,7 +10948,8 @@ var DataSourceCache = class {
       value.push({
         type: "update",
         primaryKey,
-        data
+        data,
+        originalData
       });
       this.primaryKeyToData.set(`${primaryKey}`, value);
     };
@@ -11008,13 +11020,20 @@ var DataSourceApiImpl = class {
     operations.forEach((operation) => {
       switch (operation.type) {
         case "update":
-          operation.array.forEach((d, index) => {
-            cache.update(operation.primaryKeys[index], d);
+          operation.array.forEach((data, index) => {
+            const key = operation.primaryKeys[index];
+            const rowInfo = this.getRowInfoByPrimaryKey(key);
+            if (rowInfo && !rowInfo.isGroupRow) {
+              cache.update(operation.primaryKeys[index], data, rowInfo.data);
+            }
           });
           break;
         case "delete":
           operation.primaryKeys.forEach((key) => {
-            cache.delete(key);
+            const rowInfo = this.getRowInfoByPrimaryKey(key);
+            if (rowInfo && !rowInfo.isGroupRow) {
+              cache.delete(key, rowInfo.data);
+            }
           });
           break;
         case "insert":
@@ -13953,6 +13972,7 @@ function DataSourceCmp({ children }) {
     );
     if (componentState.onDataMutations && componentState.originalDataArrayChangedInfo.mutations) {
       componentState.onDataMutations({
+        primaryKeyField: typeof componentState.primaryKey === "string" ? componentState.primaryKey : void 0,
         dataArray: componentState.originalDataArray,
         mutations: componentState.originalDataArrayChangedInfo.mutations,
         timestamp: componentState.originalDataArrayChangedInfo.timestamp
@@ -14074,9 +14094,14 @@ var InfiniteTableApiImpl = class {
         if (!params.column.field) {
           return value;
         }
-        return this.context.dataSourceApi.updateData(__spreadProps(__spreadValues({}, params.data), {
+        const primaryKey = this.getDataSourceState().primaryKey;
+        const newData = params.data && typeof primaryKey === "string" ? {
+          [primaryKey]: params.data[primaryKey],
           [params.column.field]: valueToPersist
-        }));
+        } : __spreadProps(__spreadValues({}, params.data), {
+          [params.column.field]: valueToPersist
+        });
+        return this.context.dataSourceApi.updateData(newData);
       };
       let response;
       try {
@@ -16746,7 +16771,7 @@ var useLicense = (licenseKey = "") => {
   const valid = useMemo11(() => {
     let valid2 = isValidLicense(licenseKey, {
       publishedAt: 1624970570587,
-      version: "2.0.1"
+      version: "2.0.3"
     });
     if (!licenseKey && !valid2 && isInsidePlayground) {
       return true;