@neovici/cosmoz-omnitable 12.7.0 → 12.7.2

package/cosmoz-omnitable-column-boolean.js

@@ -8,7 +8,7 @@ import {
 	html, nothing
 } from 'lit-html';
 import { get } from '@polymer/polymer/lib/utils/path';
-import { memooize } from './lib/memoize';
+import { memooize } from '@neovici/cosmoz-utils/memoize';
 
 const
 	computeValue = (value, source) =>

package/lib/settings/cosmoz-omnitable-settings.js

@@ -49,7 +49,6 @@ const placement = ['bottom-right', ...defaultPlacement],
 					.checked=${checked}
 					@click=${onToggle}
 					.indeterminate=${indeterminate}
-					.windeterminate=${indeterminate}
 				/>
 			</div>`;
 		},

package/lib/settings/use-settings-ui.js

@@ -9,8 +9,9 @@ const parseIndex = (str) => {
 // eslint-disable-next-line max-lines-per-function
 export default (host) => {
 	const { config } = host,
-		{ settings, setSettings } = config,
+		{ settings, setSettings, collapsed } = config,
 		meta = useMeta({
+			collapsed,
 			settings: settings.columns,
 			setSettings: useCallback(
 				(columns) =>
@@ -105,19 +106,21 @@ export default (host) => {
 
 		onToggle: useCallback(
 			(e) => {
-				const checked = e.target.checked,
-					idx = parseIndex(e.target.closest('[data-index]')?.dataset.index),
-					{ settings, setSettings } = meta,
-					newSettings = settings.slice(),
-					setting = settings[idx],
-					priority = e.target.windeterminate
-						? settings.reduce((acc, s) => Math.max(acc, s.priority), 0) + 1
-						: setting.priority;
+				const { settings, setSettings } = meta,
+					newSettings = settings.map((column) => ({
+						...column,
+						disabled:
+							column.disabled ||
+							meta.collapsed?.some((c) => c.name === column.name),
+					})),
+					idx = parseIndex(e.target.closest('[data-index]')?.dataset.index);
 
 				newSettings.splice(idx, 1, {
 					...settings[idx],
-					disabled: !checked,
-					priority,
+					disabled: !e.target.checked,
+					priority: e.target.checked
+						? settings.reduce((acc, s) => Math.max(acc, s.priority), 0) + 1
+						: settings[idx].priority,
 				});
 				setSettings(newSettings);
 			},

package/lib/use-dom-columns.js

@@ -1,5 +1,5 @@
 import { useEffect, useLayoutEffect, useState } from 'haunted';
-import { memooize } from './memoize';
+import { memooize } from '@neovici/cosmoz-utils/memoize';
 
 const columnSymbol = Symbol('column'),
 	verifyColumnSetup = (columns) => {

package/lib/utils-number.js

@@ -1,6 +1,6 @@
 
 import { get } from '@polymer/polymer/lib/utils/path';
-import { memoooize } from './memoize';
+import { memoooize } from '@neovici/cosmoz-utils/memoize';
 
 export const
 	/**

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@neovici/cosmoz-omnitable",
-	"version": "12.7.0",
+	"version": "12.7.2",
 	"description": "[![Build Status](https://travis-ci.org/Neovici/cosmoz-omnitable.svg?branch=master)](https://travis-ci.org/Neovici/cosmoz-omnitable)",
 	"keywords": [
 		"web-components"
@@ -67,7 +67,7 @@
 		"@neovici/cosmoz-grouped-list": "^6.0.0",
 		"@neovici/cosmoz-i18next": "^3.1.1",
 		"@neovici/cosmoz-router": "^10.0.0",
-		"@neovici/cosmoz-utils": "^5.0.0",
+		"@neovici/cosmoz-utils": "^5.12.1",
 		"@neovici/nullxlsx": "^3.0.0",
 		"@polymer/iron-icon": "^3.0.0",
 		"@polymer/iron-icons": "^3.0.0",

package/lib/memoize.js

@@ -1,54 +0,0 @@
-export const
-	memoize = fn => {
-		let
-			lastArg,
-			lastResult;
-		return function (arg) {
-			if (lastArg === arg) {
-				return lastResult;
-			}
-
-			const result = fn(arg);
-			lastResult = result;
-			lastArg = arg;
-			return result;
-		};
-	},
-
-	memooize = fn => {
-		let
-			lastArg1,
-			lastArg2,
-			lastResult;
-		return function (arg1, arg2) {
-			if (lastArg1 === arg1 && lastArg2 === arg2) {
-				return lastResult;
-			}
-
-			const result = fn(arg1, arg2);
-			lastResult = result;
-			lastArg1 = arg1;
-			lastArg2 = arg2;
-			return result;
-		};
-	},
-
-	memoooize = fn => {
-		let
-			lastArg1,
-			lastArg2,
-			lastArg3,
-			lastResult;
-		return function (arg1, arg2, arg3) {
-			if (lastArg1 === arg1 && lastArg2 === arg2 && lastArg3 === arg3) {
-				return lastResult;
-			}
-
-			const result = fn(arg1, arg2, arg3);
-			lastResult = result;
-			lastArg1 = arg1;
-			lastArg2 = arg2;
-			lastArg3 = arg3;
-			return result;
-		};
-	};