@oscarpalmer/tabela 0.11.0 → 0.13.0

package/src/managers/selection.manager.ts

@@ -1,59 +1,70 @@
 import {isKey} from '@oscarpalmer/atoms/is';
 import type {Key} from '@oscarpalmer/atoms/models';
-import {findAncestor, type EventPosition} from '@oscarpalmer/toretto';
 import {setAttribute} from '@oscarpalmer/toretto/attribute';
 import {getPosition, on} from '@oscarpalmer/toretto/event';
+import {findAncestor} from '@oscarpalmer/toretto/find';
+import type {EventPosition} from '@oscarpalmer/toretto/models';
+import {GroupComponent} from '../components/group.component';
 import {createElement} from '../helpers/dom.helpers';
 import {getKey} from '../helpers/misc.helpers';
-import {dragStyling} from '../helpers/style.helper';
-import type {TabelaSelection, TabelaState} from '../models/tabela.model';
+import {preventSelection} from '../helpers/style.helper';
+import type {TabelaSelection} from '../models/selection.model';
+import {
+	CSS_TABELA_ROW_BODY,
+	CSS_TABELA_ROW_SELECTED,
+	CSS_TABELA_SELECTION,
+} from '../models/style.model';
+import type {State} from '../models/tabela.model';
 
 export class SelectionManager {
 	handlers = Object.freeze({
+		add: keys => this.add(keys),
 		clear: () => this.clear(),
-		deselect: keys => this.deselect(keys),
-		select: keys => this.select(keys),
+		remove: keys => this.remove(keys),
+		set: keys => this.set(keys),
 		toggle: () => this.toggle(),
-	} as TabelaSelection);
+	} satisfies TabelaSelection);
 
 	items = new Set<Key>();
 
 	last: Key | undefined;
 
-	constructor(public state: TabelaState) {
+	constructor(public state: State) {
 		mapped.set(state.element, this);
 	}
 
-	clear(): void {
-		if (this.items.size === 0) {
-			return;
-		}
-
-		const removed = [...this.items];
-
-		this.items.clear();
-
-		this.update(removed);
-	}
-
-	deselect(keys: Key[]): void {
+	add(keys: Key[]): void {
 		const {length} = keys;
 
-		const removed: Key[] = [];
+		let update = false;
 
 		for (let index = 0; index < length; index += 1) {
 			const key = keys[index];
 
-			if (this.items.delete(key)) {
-				removed.push(key);
+			if (!this.items.has(key)) {
+				this.items.add(key);
+
+				update = true;
 			}
 		}
 
-		if (removed.length > 0) {
-			this.update(removed);
+		if (update) {
+			this.update([]);
 		}
 	}
 
+	clear(): void {
+		if (this.items.size === 0) {
+			return;
+		}
+
+		const removed = [...this.items];
+
+		this.items.clear();
+
+		this.update(removed);
+	}
+
 	destroy(): void {
 		mapped.delete(this.state.element);
 
@@ -88,9 +99,9 @@ export class SelectionManager {
 
 		if (event.ctrlKey || event.metaKey) {
 			if (items.has(key)) {
-				this.deselect([key]);
+				this.remove([key]);
 			} else {
-				this.select([key]);
+				this.add([key]);
 			}
 
 			return;
@@ -111,7 +122,7 @@ export class SelectionManager {
 			return;
 		}
 
-		const keys = state.managers.data.values.keys.active ?? state.managers.data.values.keys.original;
+		const {items} = state.managers.data;
 
 		const fromIndex = state.managers.data.getIndex(fromKey);
 		const toIndex = state.managers.data.getIndex(toKey);
@@ -125,11 +136,15 @@ export class SelectionManager {
 		const selected: Key[] = [];
 
 		for (let index = start; index <= end; index += 1) {
-			selected.push(keys[index]);
+			const item = items[index];
+
+			if (!(item instanceof GroupComponent)) {
+				selected.push(item as Key);
+			}
 		}
 
 		if (keyed) {
-			this.select(selected);
+			this.add(selected);
 		} else {
 			this.set(selected);
 		}
@@ -139,23 +154,21 @@ export class SelectionManager {
 		this.state.managers.navigation.setActive(toKey, false);
 	}
 
-	select(keys: Key[]): void {
+	remove(keys: Key[]): void {
 		const {length} = keys;
 
-		let update = false;
+		const removed: Key[] = [];
 
 		for (let index = 0; index < length; index += 1) {
 			const key = keys[index];
 
-			if (!this.items.has(key)) {
-				this.items.add(key);
-
-				update = true;
+			if (this.items.delete(key)) {
+				removed.push(key);
 			}
 		}
 
-		if (update) {
-			this.update([]);
+		if (removed.length > 0) {
+			this.update(removed);
 		}
 	}
 
@@ -176,39 +189,40 @@ export class SelectionManager {
 
 	toggle(): void {
 		const {items, state} = this;
+		const data = state.managers.data.items;
 
-		const all = state.managers.data.values.keys.active ?? state.managers.data.values.keys.original;
-
-		if (items.size === all.length) {
+		if (items.size === data.length - state.managers.group.items.length) {
 			this.clear();
 		} else {
-			this.select(all);
+			this.set(data.filter(key => !(key instanceof GroupComponent)) as Key[]);
 		}
 	}
 
 	update(removed: Key[]): void {
+		const {state} = this;
+
 		const items = [
 			...removed.map(key => ({key, removed: true})),
 			...[...this.items].map(key => ({key, removed: false})),
 		];
 
-		const {length} = items;
+		let {length} = items;
 
 		for (let index = 0; index < length; index += 1) {
 			const {key, removed} = items[index];
 
-			const row = this.state.managers.row.get(key);
+			const element = state.managers.row.get(key, false)?.element;
 
-			if (row == null || row.element == null) {
+			if (element == null) {
 				continue;
 			}
 
-			setAttribute(row.element, 'aria-selected', String(!removed));
+			setAttribute(element, 'aria-selected', String(!removed));
 
 			if (removed) {
-				row.element.classList.remove('tabela__row--selected');
+				element.classList.remove(CSS_TABELA_ROW_SELECTED);
 			} else {
-				row.element.classList.add('tabela__row--selected');
+				element.classList.add(CSS_TABELA_ROW_SELECTED);
 			}
 		}
 	}
@@ -218,7 +232,7 @@ function getPlaceholder(): HTMLElement {
 	placeholder ??= createElement(
 		'div',
 		{
-			className: 'tabela__selection--placeholder',
+			className: CSS_TABELA_SELECTION,
 		},
 		{},
 		{},
@@ -229,7 +243,7 @@ function getPlaceholder(): HTMLElement {
 
 function onMouseDown(event: MouseEvent): void {
 	if (shifted) {
-		const row = findAncestor(event.target as HTMLElement, '.tabela__row--body');
+		const row = findAncestor(event.target as HTMLElement, `.${CSS_TABELA_ROW_BODY}`);
 
 		if (!(row instanceof HTMLElement)) {
 			return;
@@ -238,7 +252,7 @@ function onMouseDown(event: MouseEvent): void {
 		startElement = row;
 		startPosition = getPosition(event)!;
 
-		dragStyling.set();
+		preventSelection.set();
 	}
 }
 
@@ -279,7 +293,7 @@ function onMouseUp(event: MouseEvent): void {
 	if (!event.shiftKey) {
 		shifted = false;
 
-		dragStyling.remove();
+		preventSelection.remove();
 	}
 
 	getPlaceholder().remove();
@@ -289,8 +303,8 @@ function onMouseUp(event: MouseEvent): void {
 	if (row instanceof HTMLElement) {
 		endElement = row;
 
-		const endTable = findAncestor(endElement, '.tabela');
-		const startTable = findAncestor(startElement, '.tabela');
+		const endTable = findAncestor(endElement, '.tabela__table');
+		const startTable = findAncestor(startElement, '.tabela__table');
 
 		if (startTable != null && startTable === endTable) {
 			mapped.get(startTable)?.range(startElement, endElement);

package/src/managers/sort.manager.ts

@@ -1,8 +1,12 @@
-import {sort, type ArrayKeySorter} from '@oscarpalmer/atoms/array';
+import {sort} from '@oscarpalmer/atoms/array';
 import type {Key, PlainObject} from '@oscarpalmer/atoms/models';
+import {compare} from '@oscarpalmer/atoms/value/compare';
+import {getValue} from '@oscarpalmer/atoms/value/handle';
 import {setAttribute, setAttributes} from '@oscarpalmer/toretto/attribute';
-import type {SortDirection, SortItem} from '../models/sort.model';
-import type {TabelaSort, TabelaState} from '../models/tabela.model';
+import {GroupComponent} from '../components/group.component';
+import type {DataItem} from '../models/data.model';
+import type {TabelaSort, TabelaSortDirection, TabelaSortItem} from '../models/sort.model';
+import type {State} from '../models/tabela.model';
 
 export class SortManager {
 	handlers = Object.freeze({
@@ -13,11 +17,11 @@ export class SortManager {
 		set: items => this.set(items),
 	} satisfies TabelaSort);
 
-	items: ArrayKeySorter<PlainObject>[] = [];
+	items: PlainObject[] = [];
 
-	constructor(public state: TabelaState) {}
+	constructor(public state: State) {}
 
-	add(field: string, direction?: SortDirection): void {
+	add(field: string, direction?: TabelaSortDirection): void {
 		const index = this.items.findIndex(item => item.key === field);
 
 		if (index > -1) {
@@ -84,7 +88,7 @@ export class SortManager {
 		}
 	}
 
-	set(items: SortItem[]): void {
+	set(items: TabelaSortItem[]): void {
 		this.items.splice(
 			0,
 			this.items.length,
@@ -118,15 +122,8 @@ export class SortManager {
 			);
 		}
 
-		state.managers.data.values.keys.active =
-			items.length === 0
-				? undefined
-				: (sort(
-						state.managers.data.values.keys.active?.map(
-							key => state.managers.data.values.objects.mapped.get(key)!,
-						) ?? state.managers.data.values.objects.array,
-						items,
-					).map(row => row[state.key]) as Key[]);
+		state.managers.data.state.items.active =
+			items.length === 0 ? undefined : getSortedItems(state, items);
 
 		state.managers.render.update(true, true);
 	}
@@ -147,3 +144,71 @@ export class SortManager {
 		}
 	}
 }
+
+function getSortedItems(state: State, sorters: PlainObject[]): DataItem[] {
+	const data =
+		state.managers.data.state.items.active?.map(key =>
+			key instanceof GroupComponent ? key : state.managers.data.state.values.mapped.get(key)!,
+		) ?? state.managers.data.state.values.array.slice();
+
+	if (!state.managers.group.enabled) {
+		return sort(data as PlainObject[], sorters as never).map(
+			item => getValue(item, state.key) as Key,
+		);
+	}
+
+	return sortWithGroups(state, data, sorters).map(item =>
+		item instanceof GroupComponent ? item : (getValue(item, state.key) as Key),
+	);
+}
+
+export function sortWithGroups(
+	state: State,
+	data: Array<GroupComponent | PlainObject>,
+	sorters: PlainObject[],
+): Array<GroupComponent | PlainObject> {
+	const {length} = sorters;
+
+	return data.sort((first, second) => {
+		const firstValue =
+			first instanceof GroupComponent
+				? first.value.stringified
+				: getValue(first, state.managers.group.field);
+
+		const secondValue =
+			second instanceof GroupComponent
+				? second.value.stringified
+				: getValue(second, state.managers.group.field);
+
+		const firstOrder = state.managers.group.order[firstValue as never];
+		const secondOrder = state.managers.group.order[secondValue as never];
+
+		const groupComparison = compare(firstOrder, secondOrder);
+
+		if (groupComparison !== 0) {
+			return groupComparison;
+		}
+
+		const firstIsGroup = first instanceof GroupComponent;
+		const secondIsGroup = second instanceof GroupComponent;
+
+		if (firstIsGroup || secondIsGroup) {
+			return firstIsGroup && secondIsGroup ? 0 : firstIsGroup ? -1 : 1;
+		}
+
+		for (let index = 0; index < length; index += 1) {
+			const sorter = sorters[index];
+
+			const comparison = compare(
+				getValue(first, (sorter as any).key),
+				getValue(second, (sorter as any).key),
+			);
+
+			if (comparison !== 0) {
+				return comparison * (sorter.direction === 'ascending' ? 1 : -1);
+			}
+		}
+
+		return 0;
+	});
+}

package/src/managers/style.manager.ts

@@ -0,0 +1,156 @@
+import type {State} from '../models/tabela.model';
+
+export class StyleManager {
+	constructor(readonly state: State) {
+		if (appended) {
+			return;
+		}
+
+		appended = true;
+
+		const style = document.createElement('style');
+
+		style.textContent = styling;
+
+		document.head.appendChild(style);
+	}
+}
+
+const styling = //css
+	`/** Table */
+
+:where(.tabela) {
+	flex: 1;
+	position: relative;
+	background-color: var(--oui-absolute);
+	border: 1px solid grey;
+}
+
+:where(.tabela__table) {
+	min-height: 24em;
+	display: flex;
+	flex-flow: column nowrap;
+	flex: 1;
+	overflow: auto;
+	position: absolute;
+	inset: 0;
+}
+
+/** Row group */
+
+:where(.tabela__rowgroup--header),
+:where(.tabela__rowgroup--footer) {
+	background-color: white;
+	position: sticky;
+	left: 0;
+	z-index: 10;
+}
+
+:where(.tabela__rowgroup--header) {
+	top: 0;
+}
+
+:where(.tabela__rowgroup--footer) {
+	bottom: 0;
+}
+
+:where(.tabela__rowgroup--body) {
+	display: flex;
+	flex-flow: column nowrap;
+	flex: 1;
+}
+
+:where(.tabela__rowgroup--body:focus) {
+	outline: none;
+}
+
+:where(.tabela:has(.tabela__rowgroup--body:focus-visible)) {
+	outline: 2px solid var(--oui-blue-6);
+	outline-offset: 2px;
+}
+
+/** Row */
+
+:where(.tabela__row) {
+	width: 100%;
+	display: flex;
+	flex-flow: row nowrap;
+}
+
+:where(.tabela__row:last-child .tabela__cell) {
+	border-bottom-width: 0;
+}
+
+:where(.tabela__row--body),
+:where(.tabela__row--group) {
+	flex: 1;
+	position: absolute;
+}
+
+:where(.tabela__row--selected) {
+	background-color: var(--oui-blue-1);
+	color: var(--oui-blue-9);
+}
+
+:where(.tabela:has(.tabela__rowgroup--body:focus-visible) .tabela__row[data-active="true"]) {
+	outline: 2px solid var(--oui-blue-6);
+	outline-offset: 2px;
+}
+
+/** Cells */
+
+:where(.tabela__cell),
+:where(.tabela__heading) {
+	padding: 0.5em;
+	border-color: gray;
+	border-style: solid;
+	border-width: 0 1px 1px 0;
+	line-height: 1;
+}
+
+:where(.tabela__row .tabela__cell:last-child),
+:where(.tabela__row .tabela__heading:last-child) {
+	flex: 1;
+	border-right-width: 0;
+}
+
+:where(.tabela__cell) {
+	overflow: hidden;
+	text-overflow: ellipsis;
+	white-space: nowrap;
+}
+
+:where(.tabela__cell--footer) {
+	border-top-width: 1px;
+	border-bottom-width: 0;
+}
+
+:where(.tabela__cell--group) {
+	padding: 0;
+	display: flex;
+	flex-flow: row nowrap;
+	align-items: center;
+	gap: 0.5em;
+}
+
+:where(.tabela__cell--group .tabela__button) {
+	margin: 0 0 0 .25rem;
+}
+
+/** Misc. */
+
+:where(.tabela__button) {
+	font-size: .75rem;
+	font-weight: bold;
+}
+
+:where(.tabela__selection) {
+	background-color: color-mix(in oklch, var(--oui-blue-6), transparent);
+	border: 1px solid var(--oui-blue-6);
+	border-radius: .25rem;
+	position: fixed;
+	z-index: 1000;
+}
+`.replace(/^\s+|\s+|\s+$/g, ' ');
+
+let appended = false;

package/src/models/column.model.ts

@@ -1,11 +1,11 @@
-export type TabelaColumn = {
+export type Column = {
 	field: string;
 	title: string;
 	type: TabelaColumnType;
 	width: number;
 };
 
-export type TabelaColumnOptions = {
+export type TabelaColumn = {
 	field: string;
 	title: string;
 	type: TabelaColumnType;

package/src/models/data.model.ts

@@ -1,16 +1,30 @@
 import type {Key, PlainObject} from '@oscarpalmer/atoms/models';
+import type {GroupComponent} from '../components/group.component';
+import type {State} from './tabela.model';
 
-export type DataValues = {
-	keys: DataValuesKeys;
-	objects: DataValuesObjects;
-};
+export type DataItem = GroupComponent | Key;
 
-type DataValuesKeys = {
-	active?: Key[];
-	original: Key[];
+type DataItems = {
+	active?: Array<DataItem>;
+	original: Array<DataItem>;
 };
 
-type DataValuesObjects = {
-	array: PlainObject[];
+export type DataState = {
+	items: DataItems;
+	values: DataValues;
+} & State;
+
+type DataValues = {
+	array: Array<GroupComponent | PlainObject>;
 	mapped: Map<Key, PlainObject>;
 };
+
+export type TabelaData = {
+	add(data: PlainObject[]): void;
+	clear(): void;
+	get(active?: boolean): PlainObject[];
+	remove(keys: Key[]): void;
+	remove(data: PlainObject[]): void;
+	synchronize(data: PlainObject[], remove?: boolean): void;
+	update(data: PlainObject[]): void;
+};

package/src/models/filter.model.ts

@@ -1,4 +1,12 @@
-export type FilterComparison =
+export type TabelaFilter = {
+	add(item: TabelaFilterItem): void;
+	clear(): void;
+	remove(field: string): void;
+	remove(item: TabelaFilterItem): void;
+	set(items: TabelaFilterItem[]): void;
+};
+
+export type TabelaFilterComparison =
 	| 'contains'
 	| 'ends-with'
 	| 'equals'
@@ -10,8 +18,8 @@ export type FilterComparison =
 	| 'not-equals'
 	| 'starts-with';
 
-export type FilterItem = {
-	comparison: FilterComparison;
+export type TabelaFilterItem = {
+	comparison: TabelaFilterComparison;
 	field: string;
 	value: unknown;
 };

package/src/models/group.model.ts

@@ -0,0 +1,8 @@
+export type GroupValue = {
+	original: unknown;
+	stringified: string;
+};
+
+export type TabelaGroup = {
+	set(group?: string): void;
+};

package/src/models/render.model.ts

@@ -1,4 +1,4 @@
-import type {TabelaState} from './tabela.model';
+import type {State} from './tabela.model';
 
 export type RenderElementPool = {
 	cells: Record<string, HTMLDivElement[]>;
@@ -13,4 +13,4 @@ export type RenderRange = {
 export type RenderState = {
 	active: boolean;
 	top: number;
-} & TabelaState;
+} & State;

package/src/models/selection.model.ts

@@ -0,0 +1,9 @@
+import type {Key} from '@oscarpalmer/atoms/models';
+
+export type TabelaSelection = {
+	add(keys: Key[]): void;
+	clear(): void;
+	remove(keys: Key[]): void;
+	set(keys: Key[]): void;
+	toggle(): void;
+};

package/src/models/sort.model.ts

@@ -1,6 +1,14 @@
-export type SortDirection = 'ascending' | 'descending';
+export type TabelaSort = {
+	add(field: string, direction?: TabelaSortDirection): void;
+	clear(): void;
+	flip(field: string): void;
+	remove(field: string): void;
+	set(items: TabelaSortItem[]): void;
+};
+
+export type TabelaSortDirection = 'ascending' | 'descending';
 
-export type SortItem = {
-	direction: SortDirection;
+export type TabelaSortItem = {
+	direction: TabelaSortDirection;
 	field: string;
 };