@neovici/cosmoz-omnitable 12.22.0 → 12.23.0

package/cosmoz-omnitable-column-autocomplete.js

@@ -7,12 +7,10 @@ import { when } from 'lit-html/directives/when.js';
 
 import { columnMixin, getString } from './cosmoz-omnitable-column-mixin.js';
 import {
-	computeSource,
 	listColumnMixin,
 	onChange,
 	onFocus,
 	onText,
-	toAutocompleteSource,
 } from './cosmoz-omnitable-column-list-mixin';
 import { prop, strProp } from '@neovici/cosmoz-utils/object';
 import { array } from '@neovici/cosmoz-utils/array';
@@ -80,11 +78,7 @@ class OmnitableColumnAutocomplete extends listColumnMixin(
 			?keep-query=${column.keepQuery}
 			.textual=${column.textual}
 			.label=${column.title}
-			.source=${toAutocompleteSource(
-				source,
-				column.valueProperty,
-				column.textProperty
-			)}
+			.source=${source}
 			.textProperty=${column.textProperty}
 			.valueProperty=${column.valueProperty}
 			.itemRenderer=${column[columnSymbol]?.itemRenderer}
@@ -108,12 +102,6 @@ class OmnitableColumnAutocomplete extends listColumnMixin(
 	getComparableValue(column, item) {
 		return getComparableValue(column, item);
 	}
-
-	computeSource(column, data) {
-		return column.externalValues || typeof column.values === 'function'
-			? column.values
-			: computeSource(column, data);
-	}
 }
 customElements.define(
 	'cosmoz-omnitable-column-autocomplete',

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

@@ -1,5 +1,6 @@
 import { prop } from '@neovici/cosmoz-utils/object';
 import { array } from '@neovici/cosmoz-utils/array';
+import { invoke } from '@neovici/cosmoz-utils/function';
 import { get } from '@polymer/polymer/lib/utils/path';
 import { valuesFrom } from './lib/utils-data';
 
@@ -89,26 +90,17 @@ const unique = (values, valueProperty) => {
 		setState((state) => ({ ...state, headerFocused: focused })),
 	onText = (setState) => (text) =>
 		setState((state) => ({ ...state, query: text })),
-	computeSource = (
-		{
-			valuePath,
-			valueProperty,
-			textProperty,
-			emptyLabel,
-			emptyValue,
-			emptyProperty,
-		},
-		data
+	computeValues = (
+		{ emptyValue, emptyLabel, emptyProperty, textProperty, valueProperty },
+		rawSource
 	) => {
-		const values = valuesFrom(data, valuePath),
-			source = toAutocompleteSource(values, valueProperty, textProperty);
-
+		const source = toAutocompleteSource(rawSource, valueProperty, textProperty);
 		if (
 			!emptyLabel ||
 			emptyValue === undefined ||
 			!textProperty ||
 			!(emptyProperty || valueProperty) ||
-			source.length < 0
+			!source
 		) {
 			return source;
 		}
@@ -120,6 +112,8 @@ const unique = (values, valueProperty) => {
 			...source,
 		];
 	},
+	computeSource = (column, data) =>
+		computeValues(column, valuesFrom(data, column.valuePath)),
 	listColumnMixin = (base) =>
 		class extends base {
 			static get properties() {
@@ -180,7 +174,7 @@ const unique = (values, valueProperty) => {
 
 			computeSource(column, data) {
 				return column.externalValues || typeof column.values === 'function'
-					? column.values
+					? (...args) => computeValues(column, invoke(column.values, ...args))
 					: computeSource(column, data);
 			}
 		};

package/lib/use-hash-state.js

@@ -1,7 +1,6 @@
 import { useCallback, useState } from 'haunted';
 import { navigate } from '@neovici/cosmoz-router';
-import { identity } from '@neovici/cosmoz-utils/function';
-import { invoke } from './invoke';
+import { identity, invoke } from '@neovici/cosmoz-utils/function';
 
 const
 	hashUrl = () => new URL(location.hash.replace(/^#!?/iu, '').replace('%23', '#'), location.origin),

package/lib/use-processed-items.js

@@ -1,6 +1,6 @@
 import { useCallback, useEffect, useMemo } from 'haunted';
+import { invoke } from '@neovici/cosmoz-utils/function';
 import { genericSorter } from './generic-sorter';
-import { invoke } from './invoke';
 import { columnSymbol } from './use-dom-columns';
 import { useHashState } from './use-hash-state';
 import { indexSymbol } from './utils';

package/package.json

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

package/lib/invoke.js

@@ -1 +0,0 @@
-export const invoke = (fn, ...args) => typeof fn === 'function' ? fn(...args) : fn;