@neovici/cosmoz-omnitable 8.5.1 → 8.5.2

package/cosmoz-omnitable.js

@@ -134,7 +134,7 @@ class Omnitable extends hauntedPolymer(useOmnitable)(mixin({ isEmpty }, translat
 						label="[[ _('Group on', t) ]] [[ _computeSortDirection(groupOnDescending, t) ]]" placeholder="[[ _('No grouping', t) ]]"
 						source="[[ _onCompleteValues(columns, 'groupOn', groupOnColumn) ]]" value="[[ groupOnColumn ]]" limit="1" text-property="title"
 						always-float-label item-height="48" item-limit="8"
-						class="footer-control" on-change="[[ _onCompleteChange('groupOn') ]]" default-index="-1" show-single show-selection
+						class="footer-control" on-select="[[ _onCompleteChange('groupOn') ]]" default-index="-1" show-single
 					>
 						<svg slot="suffix" viewBox="0 0 24 24" preserveAspectRatio="xMidYMid meet" focusable="false" width="24" fill="currentColor"><path d="M7 10l5 5 5-5z"></path></svg>
 					</cosmoz-autocomplete>
@@ -142,7 +142,7 @@ class Omnitable extends hauntedPolymer(useOmnitable)(mixin({ isEmpty }, translat
 						label="[[ _('Sort on', t) ]] [[ _computeSortDirection(descending, t) ]]" placeholder="[[ _('No sorting', t) ]]"
 						source="[[ _onCompleteValues(columns, 'sortOn', sortOnColumn) ]]" value="[[ sortOnColumn ]]" limit="1" text-property="title"
 						always-float-label item-height="48" item-limit="8"
-						class="footer-control" on-change="[[ _onCompleteChange('sortOn') ]]" default-index="-1" show-single show-selection
+						class="footer-control" on-select="[[ _onCompleteChange('sortOn') ]]" default-index="-1" show-single
 					>
 						<svg slot="suffix" viewBox="0 0 24 24" preserveAspectRatio="xMidYMid meet" focusable="false" width="24" fill="currentColor"><path d="M7 10l5 5 5-5z"></path></svg>
 					</cosmoz-autocomplete>
@@ -521,7 +521,7 @@ class Omnitable extends hauntedPolymer(useOmnitable)(mixin({ isEmpty }, translat
 	}
 
 	_onCompleteChange(type) {
-		return (val, close) => {
+		return (val, {setClosed}) => {
 			const value = (val[0] ?? val)?.name ?? '',
 				setter = type === 'groupOn' ? this.setGroupOn : this.setSortOn,
 				directionSetter = type === 'groupOn' ? this.setGroupOnDescending : this.setDescending;
@@ -535,7 +535,7 @@ class Omnitable extends hauntedPolymer(useOmnitable)(mixin({ isEmpty }, translat
 				return value;
 			});
 
-			value && close(); /* eslint-disable-line no-unused-expressions */
+			value && setClosed(true); /* eslint-disable-line no-unused-expressions */
 		};
 	}
 

package/lib/use-omnitable.js

@@ -14,8 +14,7 @@ export const useOmnitable = host => {
 		sortAndGroupOptions = useSortAndGroupOptions(
 			columns,
 			hashParam,
-			host.sortOn,
-			host.groupOn
+			host
 		),
 		{ groupOnColumn, groupOnDescending, sortOnColumn, descending } = sortAndGroupOptions,
 		{ data, resizeSpeedFactor, settingsId } = host,

package/lib/use-sort-and-group-options.js

@@ -1,18 +1,33 @@
 import { useMemo } from 'haunted';
 import { useHashState } from './use-hash-state';
 
-const
-	parseBool = bool => [true, 'true', 1, 'yes', 'on'].includes(bool),
-	boolParam = p => p === '' || parseBool(p);
+const parseBool = (bool) => [true, 'true', 1, 'yes', 'on'].includes(bool),
+	boolParam = (p) => p === '' || (p == null ? undefined : parseBool(p));
 
-export const useSortAndGroupOptions = (columns, hashParam, initialSortOn, initialGroupOn) => {
-	const
-		[sortOn, setSortOn] = useHashState(initialSortOn, hashParam, { suffix: '-sortOn' }),
-		[descending, setDescending] = useHashState(false, hashParam, { suffix: '-descending', read: boolParam }),
-		[groupOn, setGroupOn] = useHashState(initialGroupOn, hashParam, { suffix: '-groupOn' }),
-		[groupOnDescending, setGroupOnDescending] = useHashState(false, hashParam, { suffix: '-groupOnDescending', read: boolParam }),
-		sortOnColumn = useMemo(() => columns.find(column => column.name === sortOn), [columns, sortOn]),
-		groupOnColumn = useMemo(() => columns.find(column => column.name === groupOn), [columns, groupOn]);
+export const useSortAndGroupOptions = (columns, hashParam, initial) => {
+	const [sortOn, setSortOn] = useHashState(initial.sortOn, hashParam, {
+			suffix: '-sortOn',
+		}),
+		[descending, setDescending] = useHashState(initial.descending, hashParam, {
+			suffix: '-descending',
+			read: boolParam,
+		}),
+		[groupOn, setGroupOn] = useHashState(initial.groupOn, hashParam, {
+			suffix: '-groupOn',
+		}),
+		[groupOnDescending, setGroupOnDescending] = useHashState(
+			initial.groupOnDescending,
+			hashParam,
+			{ suffix: '-groupOnDescending', read: boolParam }
+		),
+		sortOnColumn = useMemo(
+			() => columns.find((column) => column.name === sortOn),
+			[columns, sortOn]
+		),
+		groupOnColumn = useMemo(
+			() => columns.find((column) => column.name === groupOn),
+			[columns, groupOn]
+		);
 
 	return {
 		groupOn,
@@ -25,6 +40,6 @@ export const useSortAndGroupOptions = (columns, hashParam, initialSortOn, initia
 		setSortOn,
 		sortOnColumn,
 		descending,
-		setDescending
+		setDescending,
 	};
 };

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@neovici/cosmoz-omnitable",
-	"version": "8.5.1",
+	"version": "8.5.2",
 	"description": "[![Build Status](https://travis-ci.org/Neovici/cosmoz-omnitable.svg?branch=master)](https://travis-ci.org/Neovici/cosmoz-omnitable)",
 	"keywords": [
 		"web-components"
@@ -52,7 +52,7 @@
 		]
 	},
 	"dependencies": {
-		"@neovici/cosmoz-autocomplete": "^3.0.0",
+		"@neovici/cosmoz-autocomplete": "^3.1.0",
 		"@neovici/cosmoz-bottom-bar": "^5.0.0",
 		"@neovici/cosmoz-datetime-input": "^3.0.3",
 		"@neovici/cosmoz-dropdown": "^1.5.0",