@neovici/cosmoz-omnitable 7.0.6 → 7.0.7

package/cosmoz-omnitable.js

@@ -301,7 +301,7 @@ class Omnitable extends hauntedPolymer(useOmnitable)(mixin({ isEmpty }, translat
 			groupOnDescending: {
 				type: Boolean,
 				value: false,
-				observer: '_debounceGroupItems'
+				observer: '_debounceProcessItems'
 			},
 			/**
 		 * The column name to group on.
@@ -327,7 +327,6 @@ class Omnitable extends hauntedPolymer(useOmnitable)(mixin({ isEmpty }, translat
 		 */
 			filteredItems: {
 				type: Array,
-				observer: '_debounceGroupItems',
 				value: () => []
 			},
 
@@ -418,8 +417,8 @@ class Omnitable extends hauntedPolymer(useOmnitable)(mixin({ isEmpty }, translat
 
 	static get observers() {
 		return [
-			'_dataChanged(data.*)',
-			'_debounceSortItems(sortOn, descending, filteredGroupedItems)',
+			'_dataChanged(data.splices)',
+			'_debounceProcessItems(sortOn, descending)',
 			'_selectedItemsChanged(selectedItems.*)',
 			'renderFastLayoutCss(layoutCss, $.layoutStyle)'
 		];
@@ -430,7 +429,7 @@ class Omnitable extends hauntedPolymer(useOmnitable)(mixin({ isEmpty }, translat
 
 		this.debouncers = {};
 		this._updateColumns = this._updateColumns.bind(this);
-		this._filterItems = this._filterItems.bind(this);
+		this._processItems = this._processItems.bind(this);
 		this._groupItems = this._groupItems.bind(this);
 		this._sortFilteredGroupedItems = this._sortFilteredGroupedItems.bind(this);
 		this._onKey = this._onKey.bind(this);
@@ -479,16 +478,8 @@ class Omnitable extends hauntedPolymer(useOmnitable)(mixin({ isEmpty }, translat
 			this.debouncers._updateColumnsDebouncer.flush();
 		}
 
-		if (this.debouncers._filterItemsDebouncer) {
-			this.debouncers._filterItemsDebouncer.flush();
-		}
-
-		if (this.debouncers._groupItemsDebouncer) {
-			this.debouncers._groupItemsDebouncer.flush();
-		}
-
-		if (this.debouncers._sortItemsDebouncer) {
-			this.debouncers._sortItemsDebouncer.flush();
+		if (this.debouncers._processItemsDebouncer) {
+			this.debouncers._processItemsDebouncer.flush();
 		}
 	}
 
@@ -596,70 +587,12 @@ class Omnitable extends hauntedPolymer(useOmnitable)(mixin({ isEmpty }, translat
 		requestAnimationFrame(() => requestAnimationFrame(() => this.$.groupedList.$.list._render()));
 	}
 
-	_getItemUpdateEffects(splices) {
-		return splices.reduce((acc, splice) => {
-			if (acc.refilter) {
-				return acc;
-			}
-			const itemsReplaced = splice.type === 'splice' && splice.addedCount === splice.removed.length;
-			if (!itemsReplaced) {
-				acc.refilter = true;
-				return acc;
-			}
-			const filterFunctions = this.columns
-					.map(col => col.getFilterFn())
-					.filter(fn => fn !== undefined),
-				comparer = (oldItem, newItem, path) =>
-					this.get(path, oldItem) !== this.get(path, newItem);
-
-			splice.removed.some((oldItem, index) => {
-				const newItem = splice.object[splice.index + index];
-				if (!acc.refilter) {
-					const wasFiltered = this.filteredItems.includes(oldItem),
-						isFiltered = filterFunctions.every(filterFn => filterFn(newItem));
-					acc.refilter = wasFiltered !== isFiltered;
-					if (acc.refilter) {
-						return true;
-					}
-				}
-				acc.regroup = acc.regroup || !!this.groupOnColumn && comparer(oldItem, newItem, this.groupOnColumn.valuePath);
-				acc.resort = acc.regroup || acc.resort || !!this.sortOnColumn && comparer(oldItem, newItem, this.sortOnColumn.valuePath);
-				return false;
-			});
-			return acc;
-		}, {
-			refilter: false,
-			regroup: false,
-			resort: false
-		});
-	}
-
-	_dataChanged(notify) {
-		if (!Array.isArray(this.columns) || notify == null || notify.path === 'data.length') {
+	_dataChanged() {
+		if (!Array.isArray(this.columns)) {
 			return;
 		}
 		this._setColumnValues();
-
-		if (notify.path !== 'data.splices') {
-			this._debounceFilterItems();
-			return;
-		}
-		const effects = this._getItemUpdateEffects(notify.value.indexSplices);
-		if (effects.refilter) {
-			this._debounceFilterItems();
-		} else if (effects.regroup) {
-			this._debounceGroupItems();
-		} else if (effects.resort) {
-			this._debounceSortItems();
-		} else if (notify.value.indexSplices.length === 1 && notify.value.indexSplices[0].addedCount === 1 && notify.value.indexSplices[0].removed.length === 1) {
-			// one item was replaced, but it did not affect the filtering, grouping and sorting
-			// replace the old item in the sortedFilteredGroupedItems directly
-			const indexInVisibleData = this.sortedFilteredGroupedItems.indexOf(notify.value.indexSplices[0].removed[0]);
-			if (indexInVisibleData === -1) {
-				return;
-			}
-			this.splice('sortedFilteredGroupedItems', indexInVisibleData, 1, notify.value.indexSplices[0].object[notify.value.indexSplices[0].index]);
-		}
+		this._debounceProcessItems();
 	}
 
 	_debounceUpdateColumns() {
@@ -723,7 +656,7 @@ class Omnitable extends hauntedPolymer(useOmnitable)(mixin({ isEmpty }, translat
 		this._updateParamsFromHash();
 
 		if (Array.isArray(this.data)) {
-			this._debounceFilterItems();
+			this._debounceProcessItems();
 		}
 	}
 
@@ -808,12 +741,26 @@ class Omnitable extends hauntedPolymer(useOmnitable)(mixin({ isEmpty }, translat
 		if (!Array.isArray(this.columns) || this.columns.length < 1 || this.columns.indexOf(detail.column) < 0) {
 			return;
 		}
-		this._debounceFilterItems();
+		this._debounceProcessItems();
 		this._filterForRouteChanged(detail.column);
 	}
 
-	_debounceFilterItems() {
-		this._debounce('_filterItemsDebouncer', this._filterItems);
+	_groupOnColumnChanged(column) {
+		if (column && column.hasFilter()) {
+			column.resetFilter();
+		} else {
+			this._debounceProcessItems();
+		}
+	}
+
+	_debounceProcessItems() {
+		this._debounce('_processItemsDebouncer', this._processItems);
+	}
+
+	_processItems() {
+		this._filterItems();
+		this._groupItems();
+		this._sortFilteredGroupedItems();
 	}
 
 	_filterItems() {
@@ -838,21 +785,6 @@ class Omnitable extends hauntedPolymer(useOmnitable)(mixin({ isEmpty }, translat
 		}
 	}
 
-	_groupOnColumnChanged(column) {
-		if (column && column.hasFilter()) {
-			column.resetFilter();
-		} else {
-			this._debounce('_groupItemsDebouncer', this._groupItems);
-		}
-	}
-
-	_debounceGroupItems() {
-		if (!this.isConnected || !Array.isArray(this.filteredItems)) {
-			return;
-		}
-		this._debounce('_groupItemsDebouncer', this._groupItems);
-	}
-
 	/* eslint-disable-next-line max-statements */
 	_groupItems() {
 		// do not attempt to group items if no columns are defined
@@ -912,14 +844,6 @@ class Omnitable extends hauntedPolymer(useOmnitable)(mixin({ isEmpty }, translat
 		this.filteredGroupedItems = groups;
 	}
 
-	_debounceSortItems() {
-		if (!Array.isArray(this.data) || this.data.length < 1 || !Array.isArray(this.columns)) {
-			return;
-		}
-		this._debounce('_sortItemsDebouncer', this._sortFilteredGroupedItems);
-	}
-
-
 	/* eslint-disable-next-line max-statements */
 	_genericSorter(a, b) {
 		if (a === b) {
@@ -1005,7 +929,6 @@ class Omnitable extends hauntedPolymer(useOmnitable)(mixin({ isEmpty }, translat
 			return;
 		}
 
-
 		// No grouping
 		this.filteredGroupedItems.sort(sorter);
 		if (this.descending) {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@neovici/cosmoz-omnitable",
-	"version": "7.0.6",
+	"version": "7.0.7",
 	"description": "[![Build Status](https://travis-ci.org/Neovici/cosmoz-omnitable.svg?branch=master)](https://travis-ci.org/Neovici/cosmoz-omnitable)",
 	"keywords": [
 		"web-components"