@devexpress/dx-grid-core - npm Package Compare versions

Comparing version 1.1.0-beta.2 to 1.1.0-beta.3

dist/dx-grid-core.es.js

 /**
  * Bundle of @devexpress/dx-grid-core
- * Generated: 2018-03-02
- * Version: 1.1.0-beta.2
+ * Generated: 2018-03-07
+ * Version: 1.1.0-beta.3
  * License: https://js.devexpress.com/Licensing
@@ -571,2 +571,17 @@ */
 
+var pushFilterExpression = function pushFilterExpression(filters) {
+  return function (_ref2) {
+    var filterExpression = _ref2.filterExpression;
+
+    var selfFilterExpr = { operator: 'and', filters: filters };
+    if (!filterExpression) {
+      return selfFilterExpr;
+    }
+    return {
+      operator: 'and',
+      filters: [filterExpression, selfFilterExpr]
+    };
+  };
+};
+
 var getColumnFilterConfig = function getColumnFilterConfig(filters, columnName) {
@@ -588,2 +603,20 @@ if (!filters.length) {
 
+var AND = function AND(predicates) {
+  return function (row) {
+    return predicates.reduce(function (acc, predicate) {
+      return acc && predicate(row);
+    }, true);
+  };
+};
+
+var OR = function OR(predicates) {
+  return function (row) {
+    return predicates.reduce(function (acc, predicate) {
+      return acc || predicate(row);
+    }, false);
+  };
+};
+
+var operators = { or: OR, and: AND };
+
 var toLowerCase = function toLowerCase(value) {
@@ -625,9 +658,3 @@ return String(value).toLowerCase();
   var filteredTree = filterTree(tree, function (row) {
-    if (isGroupRow(row)) {
-      if (row.collapsedRows) {
-        return row.collapsedRows.findIndex(predicate) > -1;
-      }
-      return false;
-    }
-    return predicate(row);
+    return isGroupRow(row) ? row.collapsedRows && row.collapsedRows.findIndex(predicate) > -1 : predicate(row);
   });
@@ -638,25 +665,34 @@
 
-var filteredRows = function filteredRows(rows, filters, getCellValue, getColumnPredicate, isGroupRow, getRowLevelKey) {
-  if (!filters.length || !rows.length) return rows;
+var buildPredicate = function buildPredicate(initialFilterExpression, getCellValue, getColumnPredicate) {
+  var getSimplePredicate = function getSimplePredicate(filterExpression) {
+    var columnName = filterExpression.columnName;
 
-  var predicate = filters.reduce(function (prevPredicate, filter) {
-    var columnName = filter.columnName,
-        filterConfig = objectWithoutProperties(filter, ['columnName']);
-
     var customPredicate = getColumnPredicate && getColumnPredicate(columnName);
-    var columnPredicate = customPredicate || defaultPredicate;
-
+    var predicate = customPredicate || defaultPredicate;
     return function (row) {
-      var result = columnPredicate(getCellValue(row, columnName), filterConfig, row);
-      return result && prevPredicate(row);
+      return predicate(getCellValue(row, columnName), filterExpression, row);
     };
-  }, function () {
-    return true;
-  });
+  };
 
-  if (!getRowLevelKey) {
-    return rows.filter(predicate);
+  var getOperatorPredicate = function getOperatorPredicate(filterExpression) {
+    var build = operators[toLowerCase(filterExpression.operator)];
+    // eslint-disable-next-line no-use-before-define
+    return build && build(filterExpression.filters.map(getPredicate));
+  };
+
+  var getPredicate = function getPredicate(filterExpression) {
+    return getOperatorPredicate(filterExpression) || getSimplePredicate(filterExpression);
+  };
+
+  return getPredicate(initialFilterExpression);
+};
+
+var filteredRows = function filteredRows(rows, filterExpression, getCellValue, getColumnPredicate, isGroupRow, getRowLevelKey) {
+  if (!(filterExpression && Object.keys(filterExpression).length && rows.length)) {
+    return rows;
   }
 
-  return filterHierarchicalRows(rows, predicate, getRowLevelKey, isGroupRow);
+  var predicate = buildPredicate(filterExpression, getCellValue, getColumnPredicate);
+
+  return getRowLevelKey ? filterHierarchicalRows(rows, predicate, getRowLevelKey, isGroupRow) : rows.filter(predicate);
 };
@@ -1603,2 +1639,26 @@
 
+var changeSearchValue = function changeSearchValue(prevSearchValue, searchValue) {
+  return searchValue;
+};
+
+var pushSearchFilterExpression = function pushSearchFilterExpression(searchValue) {
+  return function (_ref) {
+    var filterExpression = _ref.filterExpression,
+        columns = _ref.columns;
+
+    var filters = columns.map(function (_ref2) {
+      var name = _ref2.name;
+      return { columnName: name, value: searchValue };
+    });
+    var selfFilterExpression = { operator: 'or', filters: filters };
+    if (!filterExpression) {
+      return selfFilterExpression;
+    }
+    return {
+      operator: 'and',
+      filters: [filterExpression, selfFilterExpression]
+    };
+  };
+};
+
 var getTargetColumnGeometries = function getTargetColumnGeometries(columnGeometries, sourceIndex) {
@@ -1820,3 +1880,3 @@ var sourceWidth = columnGeometries[sourceIndex].right - columnGeometries[sourceIndex].left;
 
-export { getColumnExtension, getColumnExtensionValueGetter, getTableRowColumnsWithColSpan, getTableColumnGeometries, getTableTargetColumnIndex, getAnimations, filterActiveAnimations, evalAnimations, getGroupCellTargetIndex, getMessagesFormatter, rowIdGetter, cellValueGetter, changeColumnSorting, getColumnSortingDirection, getPersistentSortedColumns, calculateKeepOther, sortedRows, changeColumnFilter, getColumnFilterConfig, filteredRows, GROUP_KEY_SEPARATOR, changeColumnGrouping, toggleExpandedGroups, draftColumnGrouping, cancelColumnGroupingDraft, groupRowChecker, groupRowLevelKeyGetter, groupedRows, expandedGroupRows, customGroupedRows, customGroupingRowIdGetter, groupingPanelItems, setCurrentPage, setPageSize, paginatedRows, rowsWithPageHeaders, pageCount, rowCount, firstRowOnPage, lastRowOnPage, toggleSelection, rowsWithAvailableToSelect, someSelected, allSelected, unwrapSelectedRows, startEditRows, stopEditRows, addRow, changeAddedRow, cancelAddedRows, changeRow, cancelChanges, deleteRows, cancelDeletedRows, changedRowsByIds, addedRowsByIds, createRowChangeGetter, getRowChange, TABLE_REORDERING_TYPE, changeColumnOrder, orderedColumns, tableHeaderRowsWithReordering, draftOrder, tableColumnsWithWidths, changeTableColumnWidth, draftTableColumnWidth, cancelTableColumnWidthDraft, TABLE_EDIT_COMMAND_TYPE, isHeadingEditCommandsTableCell, isEditCommandsTableCell, tableColumnsWithEditing, TABLE_ADDED_TYPE, TABLE_EDIT_TYPE, isEditTableCell, isAddedTableRow, isEditTableRow, tableRowsWithEditing, TABLE_FILTER_TYPE, isFilterTableCell, isFilterTableRow, tableHeaderRowsWithFilter, TABLE_GROUP_TYPE, isGroupTableCell, isGroupIndentTableCell, isGroupTableRow, tableColumnsWithGrouping, tableRowsWithGrouping, TABLE_HEADING_TYPE, isHeadingTableCell, isHeadingTableRow, tableRowsWithHeading, TABLE_DETAIL_TYPE, isDetailRowExpanded, isDetailToggleTableCell, isDetailTableRow, toggleDetailRowExpanded, tableRowsWithExpandedDetail, tableColumnsWithDetail, TABLE_SELECT_TYPE, isSelectTableCell, isSelectAllTableCell, tableColumnsWithSelection, TABLE_DATA_TYPE, TABLE_NODATA_TYPE, isNoDataTableRow, isDataTableCell, isHeaderStubTableCell, isDataTableRow, tableColumnsWithDataRows, tableRowsWithDataRows, visibleTableColumns, tableDataColumnsExist, columnChooserItems, toggleColumn };
+export { getColumnExtension, getColumnExtensionValueGetter, getTableRowColumnsWithColSpan, getTableColumnGeometries, getTableTargetColumnIndex, getAnimations, filterActiveAnimations, evalAnimations, getGroupCellTargetIndex, getMessagesFormatter, rowIdGetter, cellValueGetter, changeColumnSorting, getColumnSortingDirection, getPersistentSortedColumns, calculateKeepOther, sortedRows, changeColumnFilter, pushFilterExpression, getColumnFilterConfig, filteredRows, GROUP_KEY_SEPARATOR, changeColumnGrouping, toggleExpandedGroups, draftColumnGrouping, cancelColumnGroupingDraft, groupRowChecker, groupRowLevelKeyGetter, groupedRows, expandedGroupRows, customGroupedRows, customGroupingRowIdGetter, groupingPanelItems, setCurrentPage, setPageSize, paginatedRows, rowsWithPageHeaders, pageCount, rowCount, firstRowOnPage, lastRowOnPage, toggleSelection, rowsWithAvailableToSelect, someSelected, allSelected, unwrapSelectedRows, startEditRows, stopEditRows, addRow, changeAddedRow, cancelAddedRows, changeRow, cancelChanges, deleteRows, cancelDeletedRows, changedRowsByIds, addedRowsByIds, createRowChangeGetter, getRowChange, TABLE_REORDERING_TYPE, changeColumnOrder, orderedColumns, tableHeaderRowsWithReordering, draftOrder, tableColumnsWithWidths, changeTableColumnWidth, draftTableColumnWidth, cancelTableColumnWidthDraft, TABLE_EDIT_COMMAND_TYPE, isHeadingEditCommandsTableCell, isEditCommandsTableCell, tableColumnsWithEditing, TABLE_ADDED_TYPE, TABLE_EDIT_TYPE, isEditTableCell, isAddedTableRow, isEditTableRow, tableRowsWithEditing, TABLE_FILTER_TYPE, isFilterTableCell, isFilterTableRow, tableHeaderRowsWithFilter, TABLE_GROUP_TYPE, isGroupTableCell, isGroupIndentTableCell, isGroupTableRow, tableColumnsWithGrouping, tableRowsWithGrouping, TABLE_HEADING_TYPE, isHeadingTableCell, isHeadingTableRow, tableRowsWithHeading, TABLE_DETAIL_TYPE, isDetailRowExpanded, isDetailToggleTableCell, isDetailTableRow, toggleDetailRowExpanded, tableRowsWithExpandedDetail, tableColumnsWithDetail, TABLE_SELECT_TYPE, isSelectTableCell, isSelectAllTableCell, tableColumnsWithSelection, TABLE_DATA_TYPE, TABLE_NODATA_TYPE, isNoDataTableRow, isDataTableCell, isHeaderStubTableCell, isDataTableRow, tableColumnsWithDataRows, tableRowsWithDataRows, visibleTableColumns, tableDataColumnsExist, columnChooserItems, toggleColumn, changeSearchValue, pushSearchFilterExpression };
 //# sourceMappingURL=dx-grid-core.es.js.map

dist/dx-grid-core.umd.js

 /**
  * Bundle of @devexpress/dx-grid-core
- * Generated: 2018-03-02
- * Version: 1.1.0-beta.2
+ * Generated: 2018-03-07
+ * Version: 1.1.0-beta.3
  * License: https://js.devexpress.com/Licensing
@@ -575,2 +575,17 @@ */
 
+var pushFilterExpression = function pushFilterExpression(filters) {
+  return function (_ref2) {
+    var filterExpression = _ref2.filterExpression;
+
+    var selfFilterExpr = { operator: 'and', filters: filters };
+    if (!filterExpression) {
+      return selfFilterExpr;
+    }
+    return {
+      operator: 'and',
+      filters: [filterExpression, selfFilterExpr]
+    };
+  };
+};
+
 var getColumnFilterConfig = function getColumnFilterConfig(filters, columnName) {
@@ -592,2 +607,20 @@ if (!filters.length) {
 
+var AND = function AND(predicates) {
+  return function (row) {
+    return predicates.reduce(function (acc, predicate) {
+      return acc && predicate(row);
+    }, true);
+  };
+};
+
+var OR = function OR(predicates) {
+  return function (row) {
+    return predicates.reduce(function (acc, predicate) {
+      return acc || predicate(row);
+    }, false);
+  };
+};
+
+var operators = { or: OR, and: AND };
+
 var toLowerCase = function toLowerCase(value) {
@@ -629,9 +662,3 @@ return String(value).toLowerCase();
   var filteredTree = filterTree(tree, function (row) {
-    if (isGroupRow(row)) {
-      if (row.collapsedRows) {
-        return row.collapsedRows.findIndex(predicate) > -1;
-      }
-      return false;
-    }
-    return predicate(row);
+    return isGroupRow(row) ? row.collapsedRows && row.collapsedRows.findIndex(predicate) > -1 : predicate(row);
   });
@@ -642,25 +669,34 @@
 
-var filteredRows = function filteredRows(rows, filters, getCellValue, getColumnPredicate, isGroupRow, getRowLevelKey) {
-  if (!filters.length || !rows.length) return rows;
+var buildPredicate = function buildPredicate(initialFilterExpression, getCellValue, getColumnPredicate) {
+  var getSimplePredicate = function getSimplePredicate(filterExpression) {
+    var columnName = filterExpression.columnName;
 
-  var predicate = filters.reduce(function (prevPredicate, filter) {
-    var columnName = filter.columnName,
-        filterConfig = objectWithoutProperties(filter, ['columnName']);
-
     var customPredicate = getColumnPredicate && getColumnPredicate(columnName);
-    var columnPredicate = customPredicate || defaultPredicate;
-
+    var predicate = customPredicate || defaultPredicate;
     return function (row) {
-      var result = columnPredicate(getCellValue(row, columnName), filterConfig, row);
-      return result && prevPredicate(row);
+      return predicate(getCellValue(row, columnName), filterExpression, row);
     };
-  }, function () {
-    return true;
-  });
+  };
 
-  if (!getRowLevelKey) {
-    return rows.filter(predicate);
+  var getOperatorPredicate = function getOperatorPredicate(filterExpression) {
+    var build = operators[toLowerCase(filterExpression.operator)];
+    // eslint-disable-next-line no-use-before-define
+    return build && build(filterExpression.filters.map(getPredicate));
+  };
+
+  var getPredicate = function getPredicate(filterExpression) {
+    return getOperatorPredicate(filterExpression) || getSimplePredicate(filterExpression);
+  };
+
+  return getPredicate(initialFilterExpression);
+};
+
+var filteredRows = function filteredRows(rows, filterExpression, getCellValue, getColumnPredicate, isGroupRow, getRowLevelKey) {
+  if (!(filterExpression && Object.keys(filterExpression).length && rows.length)) {
+    return rows;
   }
 
-  return filterHierarchicalRows(rows, predicate, getRowLevelKey, isGroupRow);
+  var predicate = buildPredicate(filterExpression, getCellValue, getColumnPredicate);
+
+  return getRowLevelKey ? filterHierarchicalRows(rows, predicate, getRowLevelKey, isGroupRow) : rows.filter(predicate);
 };
@@ -1607,2 +1643,26 @@
 
+var changeSearchValue = function changeSearchValue(prevSearchValue, searchValue) {
+  return searchValue;
+};
+
+var pushSearchFilterExpression = function pushSearchFilterExpression(searchValue) {
+  return function (_ref) {
+    var filterExpression = _ref.filterExpression,
+        columns = _ref.columns;
+
+    var filters = columns.map(function (_ref2) {
+      var name = _ref2.name;
+      return { columnName: name, value: searchValue };
+    });
+    var selfFilterExpression = { operator: 'or', filters: filters };
+    if (!filterExpression) {
+      return selfFilterExpression;
+    }
+    return {
+      operator: 'and',
+      filters: [filterExpression, selfFilterExpression]
+    };
+  };
+};
+
 var getTargetColumnGeometries = function getTargetColumnGeometries(columnGeometries, sourceIndex) {
@@ -1842,2 +1902,3 @@ var sourceWidth = columnGeometries[sourceIndex].right - columnGeometries[sourceIndex].left;
 exports.changeColumnFilter = changeColumnFilter;
+exports.pushFilterExpression = pushFilterExpression;
 exports.getColumnFilterConfig = getColumnFilterConfig;
@@ -1939,2 +2000,4 @@ exports.filteredRows = filteredRows;
 exports.toggleColumn = toggleColumn;
+exports.changeSearchValue = changeSearchValue;
+exports.pushSearchFilterExpression = pushSearchFilterExpression;
 
@@ -1941,0 +2004,0 @@ Object.defineProperty(exports, '__esModule', { value: true });

package.json

 {
   "name": "@devexpress/dx-grid-core",
-  "version": "1.1.0-beta.2",
+  "version": "1.1.0-beta.3",
   "description": "Core library for the DevExtreme Reactive Grid component",
@@ -42,3 +42,3 @@ "author": {
   "devDependencies": {
-    "@devexpress/dx-core": "1.1.0-beta.2",
+    "@devexpress/dx-core": "1.1.0-beta.3",
     "babel-core": "^6.26.0",
@@ -62,4 +62,4 @@ "babel-jest": "^22.4.1",
   "peerDependencies": {
-    "@devexpress/dx-core": "1.1.0-beta.1"
+    "@devexpress/dx-core": "1.1.0-beta.3"
   }
 }

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

New author

Supply chain risk

A new npm collaborator published a version of the package for the first time. New collaborators are usually benign additions to a project, but do indicate a change to the security surface area of a package.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

318839

increased by3.4%

Lines of code

3182

increased by3.35%

Worsened metrics

Number of medium supply chain risk alerts

1

increased byInfinity%

No dependency changes