@neovici/cosmoz-omnitable 11.0.1 → 11.1.1

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/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.js

@@ -33,9 +33,9 @@ export default ({ settingsId, initial: ini, ...thru }) => {
 		),
 		normalizedColumns = useMemo(
 			() =>
-				normalizedSettings.columns.map((s) =>
-					columns.find((c) => c.name === s.name)
-				),
+				normalizedSettings.columns
+					.map((s) => columns.find((c) => c.name === s.name))
+					.filter(Boolean),
 			[columns, ...normalizedSettings.columns.map((s) => s.name)]
 		);
 

package/package.json

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