@serkonda7/solid-components 0.0.3 → 0.0.4

package/README.md

@@ -1,7 +1,7 @@
 # @serkonda7/solid-components
 [![CI][ci-badge]][ci-status]
 [![npm version][npm-badge]][npm-link]
-[![npm updated][npm-date-badge]][npm-link]
+[![npm updated and downloads][npm-date-dl-badge]][npm-link]
 
 Reusable components for [SolidJS](https://www.solidjs.com/).
 
@@ -37,5 +37,5 @@ This repo is licensed under the [MIT License](LICENSE.txt).
 [ci-badge]: https://github.com/serkonda7/solid-components/actions/workflows/ci.yml/badge.svg
 [ci-status]: https://github.com/serkonda7/solid-components/actions/workflows/ci.yml
 [npm-badge]: https://nodei.co/npm/@serkonda7/solid-components.png?style=shields&data=v&color=blue
-[npm-date-badge]: https://nodei.co/npm/@serkonda7/solid-components.png?style=shields&data=u&color=blue
+[npm-date-dl-badge]: https://nodei.co/npm/@serkonda7/solid-components.png?style=shields&data=u,d&color=blue
 [npm-link]: https://www.npmjs.com/package/@serkonda7/solid-components

package/dist/data-table.d.ts

@@ -1,9 +1,14 @@
 import type { Accessor, JSX } from 'solid-js';
 export type DataTableSortDirection = 'asc' | 'desc';
+export interface DataTableSort {
+    key: string;
+    direction: DataTableSortDirection;
+}
 export interface DataTableColumn<TRow> {
     key: string;
     label: string;
     sortable?: boolean;
+    sortValue?: (row: TRow) => unknown;
     class?: string;
     ariaLabel?: string;
     getValue?: (row: TRow) => JSX.Element;
@@ -23,7 +28,10 @@ export interface DataTableProps<TRow> {
     selectionLabel?: string;
     sortKey?: string | Accessor<string | undefined>;
     sortDirection?: DataTableSortDirection | Accessor<DataTableSortDirection>;
+    defaultSort?: DataTableSort;
     onSort?: (key: string) => void;
+    onSortClear?: () => void;
+    onSortChange?: (sort: DataTableSort | undefined) => void;
     visibleColumns?: string[] | Accessor<string[]>;
     defaultVisibleColumns?: string[];
     onVisibleColumnsChange?: (visibleKeys: string[]) => void;

package/dist/index.d.ts

@@ -4,4 +4,4 @@
  * Add components here as they are implemented so consumers can import them
  * from the package root.
  */
-export { DataTable, type DataTableColumn, type DataTableProps, type DataTableSortDirection, } from './data-table';
+export { DataTable, type DataTableColumn, type DataTableProps, type DataTableSort, type DataTableSortDirection, } from './data-table';

package/dist/index.js

@@ -1,36 +1,60 @@
 import { className as e, createComponent as t, delegateEvents as n, effect as r, insert as i, memo as a, setAttribute as o, template as s, use as c } from "solid-js/web";
 import { For as l, Show as u, createEffect as d, createMemo as f, createSignal as p, createUniqueId as m, onCleanup as h } from "solid-js";
 //#region src/data-table.tsx
-var g = /*#__PURE__*/ s("<div role=dialog class=data-table-customizer-panel><p class=data-table-customizer-title></p><ul class=data-table-customizer-list></ul><div class=data-table-customizer-actions><button type=button></button><button type=button>"), _ = /*#__PURE__*/ s("<div class=data-table-toolbar><div class=data-table-customizer><button type=button class=data-table-customizer-button aria-haspopup=dialog><span aria-hidden=true>⚙</span> "), v = /*#__PURE__*/ s("<th class=data-table-checkbox><span class=data-table-visually-hidden>Select rows</span><input type=checkbox>"), y = /*#__PURE__*/ s("<th>Actions"), b = /*#__PURE__*/ s("<div><div class=data-table-scroll><table class=data-table><thead><tr></tr></thead><tbody>"), x = /*#__PURE__*/ s("<li><label class=data-table-customizer-option><input type=checkbox>"), S = /*#__PURE__*/ s("<button type=button class=data-table-sort>"), C = /*#__PURE__*/ s("<th>"), ee = /*#__PURE__*/ s("<td class=data-table-checkbox><input type=checkbox>"), w = /*#__PURE__*/ s("<td>"), T = /*#__PURE__*/ s("<tr>"), E = /*#__PURE__*/ s("<p class=data-table-status>Loading…"), D = /*#__PURE__*/ s("<p class=data-table-status>No results.");
-function O(e) {
+var g = /*#__PURE__*/ s("<div role=dialog class=data-table-customizer-panel><p class=data-table-customizer-title></p><ul class=data-table-customizer-list></ul><div class=data-table-customizer-actions><button type=button></button><button type=button>"), ee = /*#__PURE__*/ s("<div class=data-table-toolbar><div class=data-table-customizer><button type=button class=data-table-customizer-button aria-haspopup=dialog><span aria-hidden=true>⚙</span> "), _ = /*#__PURE__*/ s("<th class=data-table-checkbox><span class=data-table-visually-hidden>Select rows</span><input type=checkbox>"), te = /*#__PURE__*/ s("<th>Actions"), v = /*#__PURE__*/ s("<div><div class=data-table-scroll><table class=data-table><thead><tr></tr></thead><tbody>"), y = /*#__PURE__*/ s("<li><label class=data-table-customizer-option><input type=checkbox>"), b = /*#__PURE__*/ s("<button type=button class=data-table-sort>"), ne = /*#__PURE__*/ s("<button type=button class=data-table-sort-clear aria-label=\"Clear sorting\"title=\"Clear sorting\">×"), re = /*#__PURE__*/ s("<th>"), ie = /*#__PURE__*/ s("<td class=data-table-checkbox><input type=checkbox>"), x = /*#__PURE__*/ s("<td>"), ae = /*#__PURE__*/ s("<tr>"), S = /*#__PURE__*/ s("<p class=data-table-status>Loading…"), C = /*#__PURE__*/ s("<p class=data-table-status>No results.");
+function w(e) {
 	return typeof e == "function" ? e() : e;
 }
-function k(n) {
-	let s = f(() => O(n.rows)), k = () => O(n.loading ?? !1), A = () => O(n.selected ?? []), j = () => O(n.sortKey ?? void 0), M = () => O(n.sortDirection ?? "asc"), N = () => O(n.showColumnCustomizer ?? !1), P = () => n.selected !== void 0 && n.onSelectionChange !== void 0, F = () => {
-		let e = A();
+function T(n) {
+	let s = f(() => w(n.rows)), T = () => w(n.loading ?? !1), E = () => w(n.selected ?? []), D = n.sortKey !== void 0 || n.sortDirection !== void 0, [O, k] = p(n.defaultSort), A = () => D ? w(n.sortKey ?? void 0) : O()?.key, j = () => D ? w(n.sortDirection ?? "asc") : O()?.direction ?? "asc", M = () => w(n.showColumnCustomizer ?? !1), N = () => n.selected !== void 0 && n.onSelectionChange !== void 0, P = () => {
+		let e = E();
 		return s().length > 0 && s().every((t) => e.includes(n.getRowId(t)));
-	}, I = f(() => n.defaultVisibleColumns ?? n.columns.filter((e) => e.defaultVisible !== !1).map((e) => e.key)), [L, R] = p(void 0), z = () => n.visibleColumns === void 0 ? L() ?? I() : O(n.visibleColumns), B = f(() => new Set(z())), V = f(() => n.columns.filter((e) => e.toggleable === !1 || B().has(e.key))), H = f(() => n.columns.filter((e) => e.toggleable !== !1)), U = f(() => H().map((e) => e.key));
-	function W(e) {
+	}, F = f(() => n.defaultVisibleColumns ?? n.columns.filter((e) => e.defaultVisible !== !1).map((e) => e.key)), [I, L] = p(void 0), R = () => n.visibleColumns === void 0 ? I() ?? F() : w(n.visibleColumns), z = f(() => new Set(R())), B = f(() => n.columns.filter((e) => e.toggleable === !1 || z().has(e.key))), V = f(() => n.columns.filter((e) => e.toggleable !== !1)), H = f(() => V().map((e) => e.key));
+	function U(e, t) {
+		return t.sortValue ? t.sortValue(e) : e[t.key];
+	}
+	function W(e, t) {
+		return e === t ? 0 : e == null ? -1 : t == null ? 1 : typeof e == "number" && typeof t == "number" ? e - t : String(e).localeCompare(String(t), void 0, { numeric: !0 });
+	}
+	let G = f(() => {
+		let e = s(), t = A();
+		if (D || !t) return e;
+		let r = n.columns.find((e) => e.key === t);
+		if (!r) return e;
+		let i = j() === "asc" ? 1 : -1;
+		return [...e].sort((e, t) => i * W(U(e, r), U(t, r)));
+	});
+	function K(e) {
+		let t = {
+			key: e,
+			direction: A() === e && j() === "asc" ? "desc" : "asc"
+		};
+		D || k(t), n.onSort?.(e), n.onSortChange?.(t);
+	}
+	function q() {
+		D || k(void 0), n.onSortClear?.(), n.onSortChange?.(void 0);
+	}
+	function oe(e) {
 		let t = new Map(n.columns.map((e, t) => [e.key, t]));
 		return [...e].sort((e, n) => (t.get(e) ?? 0) - (t.get(n) ?? 0));
 	}
-	function G(e) {
-		let t = W(e);
-		n.visibleColumns === void 0 && R(t), n.onVisibleColumnsChange?.(t);
+	function J(e) {
+		let t = oe(e);
+		n.visibleColumns === void 0 && L(t), n.onVisibleColumnsChange?.(t);
 	}
-	function K(e, t) {
-		let n = new Set(z());
-		t ? n.add(e) : n.delete(e), G(U().filter((e) => n.has(e)));
+	function se(e, t) {
+		let n = new Set(R());
+		t ? n.add(e) : n.delete(e), J(H().filter((e) => n.has(e)));
 	}
-	function q() {
-		G(U());
+	function ce() {
+		J(H());
 	}
-	function J() {
-		G(I());
+	function le() {
+		J(F());
 	}
 	let Y = `${m()}-panel`, [X, Z] = p(!1), Q;
 	d(() => {
-		if (!X() || !N()) return;
+		if (!X() || !M()) return;
 		function e(e) {
 			Q && !Q.contains(e.target) && Z(!1);
 		}
@@ -43,32 +67,32 @@ function k(n) {
 	});
 	let $;
 	d(() => {
-		$ && ($.indeterminate = A().length > 0 && !F());
+		$ && ($.indeterminate = E().length > 0 && !P());
 	});
-	function te(e) {
+	function ue(e) {
 		n.onSelectionChange?.(e ? s().map(n.getRowId) : []);
 	}
-	function ne(e, t) {
-		let r = n.getRowId(e), i = A(), a = t ? [...i, r] : i.filter((e) => e !== r);
+	function de(e, t) {
+		let r = n.getRowId(e), i = E(), a = t ? [...i, r] : i.filter((e) => e !== r);
 		n.onSelectionChange?.(a);
 	}
-	function re(e) {
-		return A().includes(n.getRowId(e));
+	function fe(e) {
+		return E().includes(n.getRowId(e));
 	}
-	function ie(e) {
-		return e.toggleable === !1 || B().has(e.key);
+	function pe(e) {
+		return e.toggleable === !1 || z().has(e.key);
 	}
-	function ae(e, t) {
+	function me(e, t) {
 		return n.getCell?.(e, t) ?? t.getValue?.(e) ?? null;
 	}
 	return (() => {
-		var d = b(), f = d.firstChild, p = f.firstChild.firstChild, m = p.firstChild, h = p.nextSibling;
+		var d = v(), f = d.firstChild, p = f.firstChild.firstChild, m = p.firstChild, h = p.nextSibling;
 		return i(d, t(u, {
 			get when() {
-				return N();
+				return M();
 			},
 			get children() {
-				var e = _(), a = e.firstChild, s = a.firstChild;
+				var e = ee(), a = e.firstChild, s = a.firstChild;
 				s.firstChild.nextSibling;
 				var d = Q;
 				return typeof d == "function" ? c(d, a) : Q = a, s.$$click = () => Z((e) => !e), o(s, "aria-controls", Y), i(s, () => n.columnCustomizerLabel ?? "Columns", null), i(a, t(u, {
@@ -82,29 +106,29 @@ function k(n) {
 								return n.columns;
 							},
 							children: (e) => (() => {
-								var t = x(), n = t.firstChild, a = n.firstChild;
-								return a.addEventListener("change", (t) => K(e.key, t.currentTarget.checked)), i(n, () => e.ariaLabel ?? e.label, null), r(() => a.disabled = e.toggleable === !1), r(() => a.checked = ie(e)), t;
+								var t = y(), n = t.firstChild, a = n.firstChild;
+								return a.addEventListener("change", (t) => se(e.key, t.currentTarget.checked)), i(n, () => e.ariaLabel ?? e.label, null), r(() => a.disabled = e.toggleable === !1), r(() => a.checked = pe(e)), t;
 							})()
-						})), c.$$click = q, i(c, () => n.columnCustomizerShowAllLabel ?? "Show all"), u.$$click = J, i(u, () => n.columnCustomizerResetLabel ?? "Reset"), r(() => o(e, "aria-label", n.columnCustomizerTitle ?? "Customize columns")), e;
+						})), c.$$click = ce, i(c, () => n.columnCustomizerShowAllLabel ?? "Show all"), u.$$click = le, i(u, () => n.columnCustomizerResetLabel ?? "Reset"), r(() => o(e, "aria-label", n.columnCustomizerTitle ?? "Customize columns")), e;
 					}
 				}), null), r(() => o(s, "aria-expanded", X())), e;
 			}
 		}), f), i(m, t(u, {
 			get when() {
-				return P();
+				return N();
 			},
 			get children() {
-				var e = v(), t = e.firstChild.nextSibling;
-				t.addEventListener("change", (e) => te(e.currentTarget.checked));
+				var e = _(), t = e.firstChild.nextSibling;
+				t.addEventListener("change", (e) => ue(e.currentTarget.checked));
 				var i = $;
-				return typeof i == "function" ? c(i, t) : $ = t, r(() => o(t, "aria-label", n.selectionLabel ?? "Select all rows")), r(() => t.checked = F()), e;
+				return typeof i == "function" ? c(i, t) : $ = t, r(() => o(t, "aria-label", n.selectionLabel ?? "Select all rows")), r(() => t.checked = P()), e;
 			}
 		}), null), i(m, t(l, {
 			get each() {
-				return V();
+				return B();
 			},
 			children: (s) => (() => {
-				var c = C();
+				var c = re();
 				return i(c, t(u, {
 					get when() {
 						return a(() => !!s.sortable)() && n.onSort;
@@ -113,14 +137,24 @@ function k(n) {
 						return s.label;
 					},
 					get children() {
-						var e = S();
-						return e.$$click = () => n.onSort?.(s.key), i(e, () => s.label, null), i(e, (() => {
-							var e = a(() => j() === s.key);
-							return () => e() ? M() === "asc" ? " ▲" : " ▼" : "";
-						})(), null), e;
+						return [(() => {
+							var e = b();
+							return e.$$click = () => K(s.key), i(e, () => s.label, null), i(e, (() => {
+								var e = a(() => A() === s.key);
+								return () => e() ? j() === "asc" ? " ▲" : " ▼" : "";
+							})(), null), e;
+						})(), t(u, {
+							get when() {
+								return a(() => A() === s.key)() && (!D || n.onSortClear || n.onSortChange);
+							},
+							get children() {
+								var e = ne();
+								return e.$$click = q, e;
+							}
+						})];
 					}
 				})), r((t) => {
-					var n = s.class, r = s.sortable ? j() === s.key ? M() === "asc" ? "ascending" : "descending" : "none" : void 0;
+					var n = s.class, r = s.sortable ? A() === s.key ? j() === "asc" ? "ascending" : "descending" : "none" : void 0;
 					return n !== t.e && e(c, t.e = n), r !== t.t && o(c, "aria-sort", t.t = r), t;
 				}, {
 					e: void 0,
@@ -132,57 +166,57 @@ function k(n) {
 				return n.rowActions;
 			},
 			get children() {
-				return y();
+				return te();
 			}
 		}), null), i(h, t(l, {
 			get each() {
-				return s();
+				return G();
 			},
 			children: (a) => (() => {
-				var s = T();
+				var s = ae();
 				return i(s, t(u, {
 					get when() {
-						return P();
+						return N();
 					},
 					get children() {
-						var e = ee(), t = e.firstChild;
-						return t.addEventListener("change", (e) => ne(a, e.currentTarget.checked)), r(() => o(t, "aria-label", `Select row ${n.getRowId(a)}`)), r(() => t.checked = re(a)), e;
+						var e = ie(), t = e.firstChild;
+						return t.addEventListener("change", (e) => de(a, e.currentTarget.checked)), r(() => o(t, "aria-label", `Select row ${n.getRowId(a)}`)), r(() => t.checked = fe(a)), e;
 					}
 				}), null), i(s, t(l, {
 					get each() {
-						return V();
+						return B();
 					},
 					children: (t) => (() => {
-						var n = w();
-						return i(n, () => ae(a, t)), r(() => e(n, t.class)), n;
+						var n = x();
+						return i(n, () => me(a, t)), r(() => e(n, t.class)), n;
 					})()
 				}), null), i(s, t(u, {
 					get when() {
 						return n.rowActions;
 					},
 					get children() {
-						var e = w();
+						var e = x();
 						return i(e, () => n.rowActions?.(a)), e;
 					}
 				}), null), s;
 			})()
 		})), i(d, t(u, {
 			get when() {
-				return k();
+				return T();
 			},
 			get children() {
-				return n.loadingContent ?? E();
+				return n.loadingContent ?? S();
 			}
 		}), null), i(d, t(u, {
 			get when() {
-				return a(() => !k())() && (n.empty === void 0 ? s().length === 0 : O(n.empty));
+				return a(() => !T())() && (n.empty === void 0 ? s().length === 0 : w(n.empty));
 			},
 			get children() {
-				return n.emptyContent ?? D();
+				return n.emptyContent ?? C();
 			}
 		}), null), r(() => e(d, `data-table-wrap${n.class ? ` ${n.class}` : ""}`)), d;
 	})();
 }
 n(["click"]);
 //#endregion
-export { k as DataTable };
+export { T as DataTable };

package/dist/styles.css

@@ -118,6 +118,22 @@
 	text-decoration: underline;
 }
 
+.data-table-sort-clear {
+	margin-left: 0.25rem;
+	padding: 0;
+	border: none;
+	background: transparent;
+	color: inherit;
+	font: inherit;
+	line-height: 1;
+	cursor: pointer;
+}
+
+.data-table-sort-clear:hover {
+	color: var(--data-table-sort-clear-hover, currentColor);
+	opacity: 0.7;
+}
+
 .data-table-status {
 	color: var(--text-secondary, #616161);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@serkonda7/solid-components",
-  "version": "0.0.3",
+  "version": "0.0.4",
   "description": "Reusable components for SolidJS",
   "license": "MIT",
   "author": "serkonda7",