ka-table - npm Package Compare versions

Comparing version 3.3.2 to 3.4.1

enums.js

@@ -28,3 +28,2 @@ export var DataType;
     ActionType["ShowLoading"] = "ShowLoading";
-    ActionType["UpdatePageIndex"] = "UpdatePageIndex";
     ActionType["UpdateCellValue"] = "UpdateCellValue";
@@ -35,2 +34,3 @@ ActionType["UpdateData"] = "UpdateData";
     ActionType["UpdateGroupsExpanded"] = "UpdateGroupsExpanded";
+    ActionType["UpdatePageIndex"] = "UpdatePageIndex";
     ActionType["UpdateSortDirection"] = "UpdateSortDirection";
@@ -37,0 +37,0 @@ ActionType["UpdateVirtualScrolling"] = "UpdateVirtualScrolling";

enums.ts

@@ -27,3 +27,2 @@ export enum DataType {
   ShowLoading = 'ShowLoading',
-  UpdatePageIndex = 'UpdatePageIndex',
   UpdateCellValue = 'UpdateCellValue',
@@ -34,2 +33,3 @@ UpdateData = 'UpdateData',
   UpdateGroupsExpanded = 'UpdateGroupsExpanded',
+  UpdatePageIndex = 'UpdatePageIndex',
   UpdateSortDirection = 'UpdateSortDirection',
@@ -36,0 +36,0 @@ UpdateVirtualScrolling = 'UpdateVirtualScrolling',

package.json

 {
   "name": "ka-table",
-  "version": "3.3.2",
+  "version": "3.4.1",
   "license": "MIT",
@@ -5,0 +5,0 @@ "repository": "github:komarovalexander/ka-table",

utils.js

 import * as columnUtils from './Utils/ColumnUtils';
 import * as dateUtils from './Utils/DateUtils';
+import * as kaPropsUtils from './Utils/PropsUtils';
 import * as typeUtils from './Utils/TypeUtils';
-export { columnUtils, typeUtils, dateUtils, };
+// TODO: add ka prefix in 4.0.0
+export { columnUtils, dateUtils, kaPropsUtils, typeUtils, };

utils.ts

 
 import * as columnUtils from './Utils/ColumnUtils';
 import * as dateUtils from './Utils/DateUtils';
+import * as kaPropsUtils from './Utils/PropsUtils';
 import * as typeUtils from './Utils/TypeUtils';
 
+// TODO: add ka prefix in 4.0.0
 export {
   columnUtils,
+  dateUtils,
+  kaPropsUtils,
   typeUtils,
-  dateUtils,
 };

Utils/PropsUtils.js

@@ -12,2 +12,9 @@ var __assign = (this && this.__assign) || function () {
 };
+var __spreadArrays = (this && this.__spreadArrays) || function () {
+    for (var s = 0, i = 0, il = arguments.length; i < il; i++) s += arguments[i].length;
+    for (var r = Array(s), k = 0, i = 0; i < il; i++)
+        for (var a = arguments[i], j = 0, jl = a.length; j < jl; j++, k++)
+            r[k] = a[j];
+    return r;
+};
 import { isFunction } from 'util';
@@ -54,5 +61,6 @@ import { filterData, searchData } from './FilterUtils';
 };
-export var prepareTableOptions = function (props) {
-    var extendedFilter = props.extendedFilter, groups = props.groups, groupsExpanded = props.groupsExpanded, paging = props.paging, search = props.search;
-    var columns = props.columns, _a = props.data, data = _a === void 0 ? [] : _a;
+export var getData = function (props) {
+    var extendedFilter = props.extendedFilter, columns = props.columns, groups = props.groups, groupsExpanded = props.groupsExpanded, paging = props.paging, search = props.search;
+    var _a = props.data, data = _a === void 0 ? [] : _a;
+    data = __spreadArrays(data);
     data = extendedFilter ? extendedFilter(data) : data;
@@ -63,2 +71,11 @@ data = search ? searchData(columns, data, search) : data;
     data = sortData(columns, data);
+    var groupedColumns = groups ? columns.filter(function (c) { return groups.some(function (g) { return g.columnKey === c.key; }); }) : [];
+    var groupedData = groups ? getGroupedData(data, groups, groupedColumns, groupsExpanded) : data;
+    data = getPageData(groupedData, paging);
+    return data;
+};
+export var prepareTableOptions = function (props) {
+    var _a = props.data, data = _a === void 0 ? [] : _a, groups = props.groups, paging = props.paging;
+    var columns = props.columns;
+    var groupedData = getData(props);
     var groupColumnsCount = 0;
@@ -71,8 +88,6 @@ var groupedColumns = [];
     }
-    var groupedAllData = groups ? getGroupedData(data, groups, groupedColumns, groupsExpanded) : data;
-    var pagesCount = getPagesCount(groupedAllData, paging);
-    var groupedData = getPageData(groupedAllData, paging);
+    var pagesCount = getPagesCount(data, paging);
     return {
         columns: columns,
-        data: data,
+        data: groupedData,
         groupColumnsCount: groupColumnsCount,
@@ -79,0 +94,0 @@ groupedColumns: groupedColumns,

Utils/PropsUtils.ts

@@ -60,5 +60,6 @@ import { HTMLAttributes } from 'react';
 
-export const prepareTableOptions = (props: ITableProps) => {
+export const getData = (props: ITableProps) => {
   const {
     extendedFilter,
+    columns,
     groups,
@@ -70,13 +71,30 @@ groupsExpanded,
   let {
-    columns,
     data = [],
   } = props;
+  data = [...data];
   data = extendedFilter ? extendedFilter(data) : data;
   data = search ? searchData(columns, data, search) : data;
-
   data = convertToColumnTypes(data, columns);
-
   data = filterData(data, columns);
   data = sortData(columns, data);
 
+  const groupedColumns: Column[] = groups ? columns.filter((c) => groups.some((g) => g.columnKey === c.key)) : [];
+  const groupedData = groups ? getGroupedData(data, groups, groupedColumns, groupsExpanded) : data;
+  data = getPageData(groupedData, paging);
+
+  return data;
+};
+
+export const prepareTableOptions = (props: ITableProps) => {
+  const {
+    data = [],
+    groups,
+    paging,
+  } = props;
+  let {
+    columns,
+  } = props;
+
+  const groupedData = getData(props);
+
   let groupColumnsCount = 0;
@@ -89,10 +107,6 @@ let groupedColumns: Column[] = [];
   }
-
-  const groupedAllData = groups ? getGroupedData(data, groups, groupedColumns, groupsExpanded) : data;
-  const pagesCount = getPagesCount(groupedAllData, paging);
-  const groupedData = getPageData(groupedAllData, paging);
-
+  const pagesCount = getPagesCount(data, paging);
   return {
     columns,
-    data,
+    data: groupedData, // TODO: deprecate it in 4.0.0
     groupColumnsCount,
@@ -99,0 +113,0 @@ groupedColumns,

No alert changes

Improved metrics

Total package byte prevSize

214604

increased by0.6%

Lines of code

4193

increased by0.82%

No dependency changes