@neovici/cosmoz-omnitable 8.0.0-beta.6 → 8.0.0-beta.7

package/cosmoz-omnitable-column-amount.js

@@ -7,7 +7,7 @@ import { PolymerElement } from '@polymer/polymer/polymer-element';
 import { html } from 'lit-html';
 
 import { columnMixin } from './cosmoz-omnitable-column-mixin';
-import { valuesFrom } from './lib/utils-data';
+import { defaultComputeSource } from './lib/utils-data';
 import './lib/cosmoz-omnitable-amount-range-input';
 import { getComparableValue, getCurrency, applySingleFilter, getString, getInputString, toAmount, toHashString, fromHashString } from './lib/utils-amount';
 import { get } from '@polymer/polymer/lib/utils/path';
@@ -134,8 +134,8 @@ class OmnitableColumnAmount extends columnMixin(PolymerElement) {
 		></cosmoz-omnitable-amount-range-input>`;
 	}
 
-	computeSource({ valuePath }, data) {
-		return valuesFrom(data, valuePath);
+	computeSource(column, data) {
+		return defaultComputeSource(column, data);
 	}
 }
 

package/cosmoz-omnitable-column-autocomplete.js

@@ -68,7 +68,9 @@ class OmnitableColumnAutocomplete extends listColumnMixin(columnMixin(PolymerEle
 	}
 
 	computeSource(column, data) {
-		return computeSource(column, data);
+		return column.externalValues || typeof column.values === 'function'
+			? column.values
+			: computeSource(column, data);
 	}
 
 }

package/cosmoz-omnitable-column-date.js

@@ -9,7 +9,7 @@ import { html } from 'lit-html';
 
 import { columnMixin } from './cosmoz-omnitable-column-mixin';
 import './lib/cosmoz-omnitable-date-range-input';
-import { valuesFrom } from './lib/utils-data';
+import { defaultComputeSource } from './lib/utils-data';
 import { getString, getComparableValue, toDate, toHashString, toXlsxValue, applySingleFilter, getInputString, fromInputString } from './lib/utils-date';
 
 class OmnitableColumnDate extends columnMixin(PolymerElement) {
@@ -117,8 +117,8 @@ class OmnitableColumnDate extends columnMixin(PolymerElement) {
 		></cosmoz-omnitable-date-range-input>`;
 	}
 
-	computeSource({ valuePath }, data) {
-		return valuesFrom(data, valuePath);
+	computeSource(column, data) {
+		return defaultComputeSource(column, data);
 	}
 }
 customElements.define('cosmoz-omnitable-column-date', OmnitableColumnDate);

package/cosmoz-omnitable-column-datetime.js

@@ -8,7 +8,7 @@ import { PolymerElement } from '@polymer/polymer/polymer-element';
 import { html } from 'lit-html';
 import { fromHashString, getString, toHashString, toXlsxValue } from './lib/utils-datetime';
 import { applySingleFilter, fromInputString, getComparableValue, toDate } from './lib/utils-date';
-import { valuesFrom } from './lib/utils-data';
+import { defaultComputeSource } from './lib/utils-data';
 import './lib/cosmoz-omnitable-datetime-range-input';
 
 /**
@@ -123,8 +123,8 @@ class OmnitableColumnDatetime extends columnMixin(PolymerElement) {
 		></cosmoz-omnitable-datetime-range-input>`;
 	}
 
-	computeSource({ valuePath }, data) {
-		return valuesFrom(data, valuePath);
+	computeSource(column, data) {
+		return defaultComputeSource(column, data);
 	}
 }
 

package/cosmoz-omnitable-column-list-mixin.js

@@ -160,7 +160,9 @@ const
 		}
 
 		computeSource(column, data) {
-			return computeSource(column, data);
+			return column.externalValues || typeof column.values === 'function'
+				? column.values
+				: computeSource(column, data);
 		}
 	};
 

package/cosmoz-omnitable-column-number.js

@@ -8,7 +8,7 @@ import { html } from 'lit-html';
 import { columnMixin } from './cosmoz-omnitable-column-mixin';
 
 import './lib/cosmoz-omnitable-number-range-input';
-import { valuesFrom } from './lib/utils-data';
+import { defaultComputeSource } from './lib/utils-data';
 import { applySingleFilter, getComparableValue, getInputString, getString, toHashString, toNumber } from './lib/utils-number';
 import { get } from '@polymer/polymer/lib/utils/path';
 
@@ -127,8 +127,8 @@ class OmnitableColumnNumber extends columnMixin(PolymerElement) {
 		></cosmoz-omnitable-number-range-input>`;
 	}
 
-	computeSource({ valuePath }, data) {
-		return valuesFrom(data, valuePath);
+	computeSource(column, data) {
+		return defaultComputeSource(column, data);
 	}
 }
 customElements.define('cosmoz-omnitable-column-number', OmnitableColumnNumber);

package/cosmoz-omnitable-column-time.js

@@ -10,7 +10,7 @@ import { html } from 'lit-html';
 import { columnMixin } from './cosmoz-omnitable-column-mixin';
 import { getComparableValue, getString, toXlsxValue, applySingleFilter, toDate, toHashString, fromHashString } from './lib/utils-time';
 import './lib/cosmoz-omnitable-time-range-input';
-import { valuesFrom } from './lib/utils-data';
+import { defaultComputeSource } from './lib/utils-data';
 
 /**
  * @polymer
@@ -124,8 +124,8 @@ class OmnitableColumnTime extends columnMixin(PolymerElement) {
 		></cosmoz-omnitable-time-range-input>`;
 	}
 
-	computeSource({ valuePath }, data) {
-		return valuesFrom(data, valuePath);
+	computeSource(column, data) {
+		return defaultComputeSource(column, data);
 	}
 }
 customElements.define('cosmoz-omnitable-column-time', OmnitableColumnTime);

package/lib/use-dom-columns.js

@@ -41,6 +41,7 @@ const
 			?	domColumns.filter(column => enabledColumns.includes(column.name))
 			: domColumns.filter(column => !column.disabled);
 
+		// eslint-disable-next-line max-lines-per-function
 		return columns.map(column => ({
 			name: column.name,
 			title: column.title,
@@ -66,14 +67,13 @@ const
 			renderGroup: column.renderGroup,
 			cellTitleFn: column.cellTitleFn,
 			getFilterFn: column.getFilterFn,
+			headerCellClass: column.headerCellClass,
 			cellClass: column.cellClass,
 
 			editable: column.editable,
 
 			values: column.values,
-			source: memooize((column, data) => column.externalValues || typeof column.values === 'function'
-				? column.values
-				: column.computeSource(column, data)),
+			source: memooize(column.computeSource),
 
 			// @deprecated
 			loading: column.loading,
@@ -107,7 +107,6 @@ const
 
 			// treenode columns
 			ownerTree: column.ownerTree,
-			showMaxNodes: column.showMaxNodes,
 			keyProperty: column.keyProperty,
 
 			[columnSymbol]: column

package/lib/utils-data.js

@@ -8,6 +8,11 @@ export const
 			value != null && self.indexOf(value) === index
 		),
 
+	defaultComputeSource = ({ externalValues, values, valuePath }, data) =>
+		externalValues || typeof values === 'function'
+			? values
+			: valuesFrom(data, valuePath),
+
 	onItemChange = (host, column, item, value) => {
 		const
 			{ valuePath } = column,

package/package.json

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