@neovici/cosmoz-omnitable 10.1.0 → 11.1.0

package/cosmoz-omnitable.js

@@ -21,12 +21,12 @@ import { html as litHtml } from 'lit-html';
 
 import { translatable } from '@neovici/cosmoz-i18next';
 import { mixin, hauntedPolymer } from '@neovici/cosmoz-utils';
-import { isEmpty } from '@neovici/cosmoz-utils/lib/template.js';
+import { isEmpty } from '@neovici/cosmoz-utils/template';
 import { useOmnitable } from './lib/use-omnitable';
 import { saveAsCsvAction } from './lib/save-as-csv-action';
 import { saveAsXlsxAction } from './lib/save-as-xlsx-action';
 import { defaultPlacement } from '@neovici/cosmoz-dropdown';
-import { without } from '@neovici/cosmoz-utils/lib/array';
+import { without } from '@neovici/cosmoz-utils/array';
 import { indexSymbol } from './lib/utils';
 
 /**

package/lib/cosmoz-omnitable-date-input-mixin.js

@@ -1,4 +1,4 @@
-import { toLocalISOString } from '@neovici/cosmoz-utils/lib/date';
+import { toLocalISOString } from '@neovici/cosmoz-utils/date';
 import { rangeInputMixin } from './cosmoz-omnitable-range-input-mixin';
 
 /**

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

@@ -1,7 +1,7 @@
 import { html, component } from 'haunted';
 import { nothing } from 'lit-html';
 import { _ } from '@neovici/cosmoz-i18next';
-import { isEmpty } from '@neovici/cosmoz-utils/lib/template';
+import { isEmpty } from '@neovici/cosmoz-utils/template';
 import { defaultPlacement } from '@neovici/cosmoz-dropdown';
 import '@neovici/cosmoz-collapse';
 import sort from './cosmoz-omnitable-sort';

package/lib/settings/drivers/context.js

@@ -0,0 +1,13 @@
+import { createContext, useContext, useMemo } from 'haunted';
+import local from './local';
+
+export const DriverContext = createContext(local),
+	useDriver = () => {
+		const driver = useContext(DriverContext);
+		return useMemo(() => driver(), [driver]);
+	},
+	registerProvider = () =>
+		customElements.define(
+			'omnitable-settings-driver-provider',
+			DriverContext.Provider
+		);

package/lib/settings/drivers/index.js

@@ -0,0 +1,3 @@
+export * from './context';
+export { default as local } from './local';
+export { default as remote } from './remote';

package/lib/settings/drivers/local.js

@@ -0,0 +1,29 @@
+export default ({ prefix = 'omnitable-' } = {}) => {
+	const read = async (settingsId) => {
+		if (!settingsId) {
+			return;
+		}
+		try {
+			return JSON.parse(localStorage.getItem(prefix + settingsId));
+		} catch (e) {
+			// eslint-disable-next-line no-console
+			console.error(e);
+		}
+	};
+	return {
+		write: async (settingsId, settings) => {
+			const key = prefix + settingsId;
+			try {
+				if (settings) {
+					localStorage.setItem(key, JSON.stringify(settings));
+				} else {
+					localStorage.removeItem(key);
+				}
+			} catch (e) {
+				// eslint-disable-next-line no-console
+				console.error(e);
+			}
+		},
+		read,
+	};
+};

package/lib/settings/drivers/remote.js

@@ -0,0 +1,22 @@
+export default ({ prefix = '', get$, post$ } = {}) => {
+	const read = async (settingsId) => {
+		try {
+			return await get$(prefix + settingsId);
+		} catch (e) {
+			// eslint-disable-next-line no-console
+			console.error(e);
+		}
+	};
+	return {
+		write: async (settingsId, settings) => {
+			const key = prefix + settingsId;
+			try {
+				await post$(key, settings);
+			} catch (e) {
+				// eslint-disable-next-line no-console
+				console.error(e);
+			}
+		},
+		read,
+	};
+};

package/lib/settings/normalize.js

@@ -1,5 +1,5 @@
 /* eslint-disable import/group-exports */
-import { props } from '@neovici/cosmoz-utils/lib/object';
+import { props } from '@neovici/cosmoz-utils/object';
 
 export const sgProps = ['sortOn', 'descending', 'groupOn', 'groupOnDescending'];
 

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

@@ -1,62 +1,44 @@
-import { useCallback, useMemo, useState } from 'haunted';
+import { useCallback, useEffect, useState } from 'haunted';
 import { normalizeStore } from './normalize';
+import { useDriver } from './drivers';
 
-const storagePrefix = 'omnitable-',
-	read = (settingsId) => {
-		if (!settingsId) {
-			return [];
-		}
-		try {
-			return JSON.parse(localStorage.getItem(storagePrefix + settingsId)) ?? [];
-		} catch (e) {
-			return [];
-		}
-	};
 // eslint-disable-next-line max-lines-per-function
 export default (settingsId, settings, setSettings, onReset) => {
-	const [counter, setCounter] = useState(0),
-		savedSettings = useMemo(() => read(settingsId), [settingsId, counter]);
+	const [savedSettings, setSavedSettings] = useState(),
+		{ read, write } = useDriver();
+
+	useEffect(async () => {
+		if (!settingsId) {
+			return;
+		}
+		setSavedSettings(await read(settingsId));
+	}, [settingsId, read]);
 
 	return {
 		settingsId,
 		savedSettings,
 
-		onSave: useCallback(() => {
+		onSave: useCallback(async () => {
 			if (!settingsId) {
 				return;
 			}
-
-			try {
-				const current = read(settingsId);
-				localStorage.setItem(
-					storagePrefix + settingsId,
-					JSON.stringify(normalizeStore(settings, current))
-				);
-				setSettings();
-				setCounter((counter) => counter + 1);
-			} catch (e) {
-				// eslint-disable-next-line no-console
-				console.error(e);
-			}
-		}, [settings]),
+			const newSettings = normalizeStore(settings, savedSettings);
+			await write(settingsId, newSettings);
+			setSettings();
+			setSavedSettings(newSettings);
+		}, [settings, savedSettings]),
 
 		onReset: useCallback(
-			(e) => {
+			async (e) => {
 				setSettings();
-
 				if (e.shiftKey) {
-					try {
-						localStorage.removeItem(storagePrefix + settingsId);
-						setCounter((counter) => counter + 1);
-					} catch (err) {
-						// ignore error
-					}
+					await write(settingsId);
+					setSavedSettings();
 				}
 				onReset?.();
 			},
 			[onReset]
 		),
-
 		hasChanges: settings != null,
 	};
 };

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

@@ -1,5 +1,5 @@
 import { useCallback } from 'haunted';
-import { useMeta } from '@neovici/cosmoz-utils/lib/hooks/use-meta';
+import { useMeta } from '@neovici/cosmoz-utils/hooks/use-meta';
 
 const parseIndex = (str) => {
 	const idx = parseInt(str, 10);
@@ -47,6 +47,7 @@ export default (host) => {
 				meta.handle = null;
 				e.dataTransfer.effectAllowed = 'move';
 				e.dataTransfer.setData('omnitable/sort-index', index);
+				e.dataTransfer.setData('text/plain', index);
 				setTimeout(() => target.classList.add('drag'), 0);
 				target.addEventListener(
 					'dragend',

package/lib/use-hash-state.js

@@ -1,6 +1,6 @@
 import { useCallback, useState } from 'haunted';
 import { navigate } from '@neovici/cosmoz-router';
-import { identity } from '@neovici/cosmoz-utils/lib/function';
+import { identity } from '@neovici/cosmoz-utils/function';
 import { invoke } from './invoke';
 
 const

package/lib/use-omnitable.js

@@ -5,7 +5,7 @@ import { useSettings } from './settings';
 import { useDOMColumns } from './use-dom-columns';
 import { useSortAndGroupOptions } from './use-sort-and-group-options';
 import { onItemChange } from './utils-data';
-import { useNotifyProperty } from '@neovici/cosmoz-utils/lib/hooks/use-notify-property';
+import { useNotifyProperty } from '@neovici/cosmoz-utils/hooks/use-notify-property';
 
 // eslint-disable-next-line max-lines-per-function
 export const useOmnitable = (host) => {

package/lib/utils-date.js

@@ -1,4 +1,4 @@
-import { toLocalISOString, ensureDate } from '@neovici/cosmoz-utils/lib/date';
+import { toLocalISOString, ensureDate } from '@neovici/cosmoz-utils/date';
 import { get } from '@polymer/polymer/lib/utils/path';
 import { toNumber } from './utils-number';
 

package/lib/utils-datetime.js

@@ -1,4 +1,4 @@
-import { toLocalISOString } from '@neovici/cosmoz-utils/lib/date';
+import { toLocalISOString } from '@neovici/cosmoz-utils/date';
 import { get } from '@polymer/polymer/lib/utils/path';
 import { renderValue, toDate } from './utils-date';
 

package/lib/utils-time.js

@@ -1,4 +1,4 @@
-import { toLocalISOString } from '@neovici/cosmoz-utils/lib/date';
+import { toLocalISOString } from '@neovici/cosmoz-utils/date';
 import { get } from '@polymer/polymer/lib/utils/path';
 import { getAbsoluteISOString, renderValue, toDate as superToDate } from './utils-date';
 import { toNumber } from './utils-number';

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@neovici/cosmoz-omnitable",
-	"version": "10.1.0",
+	"version": "11.1.0",
 	"description": "[![Build Status](https://travis-ci.org/Neovici/cosmoz-omnitable.svg?branch=master)](https://travis-ci.org/Neovici/cosmoz-omnitable)",
 	"keywords": [
 		"web-components"
@@ -59,15 +59,15 @@
 		}
 	},
 	"dependencies": {
-		"@neovici/cosmoz-autocomplete": "^4.0.0",
+		"@neovici/cosmoz-autocomplete": "^5.0.0",
 		"@neovici/cosmoz-bottom-bar": "^6.0.0",
 		"@neovici/cosmoz-collapse": "^1.1.0",
 		"@neovici/cosmoz-datetime-input": "^3.0.3",
-		"@neovici/cosmoz-dropdown": "^2.0.0",
-		"@neovici/cosmoz-grouped-list": "^5.0.0",
+		"@neovici/cosmoz-dropdown": "^3.0.0",
+		"@neovici/cosmoz-grouped-list": "^6.0.0",
 		"@neovici/cosmoz-i18next": "^3.1.1",
 		"@neovici/cosmoz-router": "^10.0.0",
-		"@neovici/cosmoz-utils": "^4.0.0",
+		"@neovici/cosmoz-utils": "^5.0.0",
 		"@neovici/nullxlsx": "^3.0.0",
 		"@polymer/iron-icon": "^3.0.0",
 		"@polymer/iron-icons": "^3.0.0",