@oscarpalmer/tabela 0.12.0 → 0.14.0

package/src/managers/filter.manager.ts

@@ -3,17 +3,30 @@ import {getNumber} from '@oscarpalmer/atoms/number';
 import {getString} from '@oscarpalmer/atoms/string';
 import {endsWith, includes, startsWith} from '@oscarpalmer/atoms/string/match';
 import {equal} from '@oscarpalmer/atoms/value/equal';
-import type {TabelaFilter, TabelaFilterComparison, TabelaFilterItem} from '../models/filter.model';
+import {isGroupKey} from '../helpers/misc.helpers';
+import {
+	FILTER_CONTAINS,
+	FILTER_ENDS_WITH,
+	FILTER_EQUALS,
+	FILTER_GREATER_THAN,
+	FILTER_GREATER_THAN_OR_EQUAL,
+	FILTER_LESS_THAN,
+	FILTER_LESS_THAN_OR_EQUAL,
+	FILTER_NOT_CONTAINS,
+	FILTER_NOT_EQUALS,
+	FILTER_STARTS_WITH,
+	type TabelaFilter,
+	type TabelaFilterItem,
+} from '../models/filter.model';
 import type {State} from '../models/tabela.model';
-import {GroupComponent} from '../components/group.component';
 
 export class FilterManager {
-	handlers = Object.freeze({
+	handlers: TabelaFilter = {
 		add: item => this.add(item),
 		clear: () => this.clear(),
 		remove: value => this.remove(value),
 		set: items => this.set(items),
-	} satisfies TabelaFilter);
+	};
 
 	items: Record<string, TabelaFilterItem[]> = {};
 
@@ -25,7 +38,7 @@ export class FilterManager {
 		} else {
 			const index = this.items[item.field].findIndex(existing => equal(existing, item));
 
-			if (index !== -1) {
+			if (index > -1) {
 				return;
 			}
 		}
@@ -52,21 +65,21 @@ export class FilterManager {
 	filter(): void {
 		const {state} = this;
 
-		const filtered: Array<GroupComponent | Key> = [];
+		const filtered: Key[] = [];
 		const filters = Object.entries(this.items);
 
-		const keysLength = state.managers.data.values.keys.original.length;
+		const itemsLength = state.managers.data.state.keys.original.length;
 
-		rowLoop: for (let keyIndex = 0; keyIndex < keysLength; keyIndex += 1) {
-			const key = state.managers.data.values.keys.original[keyIndex];
+		rowLoop: for (let itemIndex = 0; itemIndex < itemsLength; itemIndex += 1) {
+			const item = state.managers.data.state.keys.original[itemIndex];
 
-			if (key instanceof GroupComponent) {
-				filtered.push(key);
+			if (isGroupKey(item)) {
+				filtered.push(item);
 
 				continue;
 			}
 
-			const row = state.managers.data.values.objects.mapped.get(key);
+			const row = state.managers.data.state.values.mapped.get(item);
 
 			if (row == null) {
 				continue;
@@ -88,10 +101,10 @@ export class FilterManager {
 				continue rowLoop;
 			}
 
-			filtered.push(key);
+			filtered.push(item);
 		}
 
-		state.managers.data.values.keys.active = filtered;
+		state.managers.data.state.keys.active = filtered;
 
 		if (state.managers.sort.items.length > 0) {
 			state.managers.sort.sort();
@@ -108,6 +121,17 @@ export class FilterManager {
 
 			const keyed: Record<string, TabelaFilterItem[]> = {};
 
+			const filters = Object.keys(this.items);
+			const {length} = filters;
+
+			for (let index = 0; index < length; index += 1) {
+				const field = filters[index];
+
+				if (field !== value) {
+					keyed[field] = this.items[field];
+				}
+			}
+
 			this.items = keyed;
 		} else {
 			const {field} = value;
@@ -145,17 +169,17 @@ export class FilterManager {
 	}
 }
 
-const comparators: Record<TabelaFilterComparison, (row: unknown, filter: unknown) => boolean> = {
-	contains: (row, filter) => includes(getString(row), getString(filter), true),
-	'ends-with': (row, filter) => endsWith(getString(row), getString(filter), true),
-	equals: (row, filter) => equalizer(row, filter),
-	'greater-than': (row, filter) => getNumber(row) > getNumber(filter),
-	'greater-than-or-equal': (row, filter) => getNumber(row) >= getNumber(filter),
-	'less-than': (row, filter) => getNumber(row) < getNumber(filter),
-	'less-than-or-equal': (row, filter) => getNumber(row) <= getNumber(filter),
-	'not-contains': (row, filter) => !includes(getString(row), getString(filter), true),
-	'not-equals': (row, filter) => !equalizer(row, filter),
-	'starts-with': (row, filter) => startsWith(getString(row), getString(filter), true),
+const comparators: Record<string, (row: unknown, filter: unknown) => boolean> = {
+	[FILTER_CONTAINS]: (row, filter) => includes(getString(row), getString(filter), true),
+	[FILTER_ENDS_WITH]: (row, filter) => endsWith(getString(row), getString(filter), true),
+	[FILTER_EQUALS]: (row, filter) => equalizer(row, filter),
+	[FILTER_GREATER_THAN]: (row, filter) => getNumber(row) > getNumber(filter),
+	[FILTER_GREATER_THAN_OR_EQUAL]: (row, filter) => getNumber(row) >= getNumber(filter),
+	[FILTER_LESS_THAN]: (row, filter) => getNumber(row) < getNumber(filter),
+	[FILTER_LESS_THAN_OR_EQUAL]: (row, filter) => getNumber(row) <= getNumber(filter),
+	[FILTER_NOT_CONTAINS]: (row, filter) => !includes(getString(row), getString(filter), true),
+	[FILTER_NOT_EQUALS]: (row, filter) => !equalizer(row, filter),
+	[FILTER_STARTS_WITH]: (row, filter) => startsWith(getString(row), getString(filter), true),
 };
 
 const equalizer = equal.initialize({

package/src/managers/group.manager.ts

@@ -1,8 +1,11 @@
 import {sort} from '@oscarpalmer/atoms/array';
+import {toMap} from '@oscarpalmer/atoms/array/to-map';
 import {toRecord} from '@oscarpalmer/atoms/array/to-record';
 import {isNullableOrWhitespace} from '@oscarpalmer/atoms/is';
 import type {Key, Simplify} from '@oscarpalmer/atoms/models';
-import type {GroupComponent} from '../components/group.component';
+import {getString} from '@oscarpalmer/atoms/string';
+import {removeGroup, type GroupComponent} from '../components/group.component';
+import type {TabelaGroup} from '../models/group.model';
 import type {State} from '../models/tabela.model';
 
 export class GroupManager {
@@ -12,11 +15,26 @@ export class GroupManager {
 
 	field!: string;
 
+	handlers: TabelaGroup = {
+		set: (group?: string) => {
+			if (group === this.field) {
+				return;
+			}
+
+			this.enabled = !isNullableOrWhitespace(group);
+			this.field = group ?? '';
+
+			this.state.managers.data.set(this.state.managers.data.get());
+		},
+	};
+
 	items: GroupComponent[] = [];
 
+	mapped = new Map<string, GroupComponent>();
+
 	order: Record<never, number> = {};
 
-	constructor(readonly state: State) {
+	constructor(public state: State) {
 		if (isNullableOrWhitespace(state.options.grouping)) {
 			return;
 		}
@@ -29,13 +47,42 @@ export class GroupManager {
 		this.set([...this.items, group]);
 	}
 
-	get(value: unknown) {
-		return this.items.find(item => item.value === value);
+	clear(): void {
+		const groups = this.items.splice(0);
+		const {length} = groups;
+
+		for (let index = 0; index < length; index += 1) {
+			this.remove(groups[index]);
+		}
+	}
+
+	destroy(): void {
+		const groups = this.items.splice(0);
+		const {length} = groups;
+
+		for (let index = 0; index < length; index += 1) {
+			removeGroup(groups[index]);
+		}
+
+		this.collapsed.clear();
+
+		this.handlers = undefined as never;
+		this.state = undefined as never;
+	}
+
+	getForKey(key: string): GroupComponent | undefined {
+		return this.mapped.get(key);
+	}
+
+	getForValue(value: unknown): GroupComponent | undefined {
+		const asString = getString(value);
+
+		return this.items.find(item => item.value.stringified === asString);
 	}
 
 	handle(button: HTMLElement): void {
-		const key = button.dataset.key;
-		const group = this.get(key);
+		const key = button.dataset.key?.replace(`${this.state.prefix}_`, '');
+		const group = this.getForKey(key ?? '');
 
 		if (group == null) {
 			return;
@@ -47,15 +94,15 @@ export class GroupManager {
 
 		const index = items.indexOf(group);
 
-		let first = state.managers.data.values.keys.original.indexOf(items[index]) + 1;
+		let first = state.managers.data.state.keys.original.indexOf(group.key) + 1;
 
 		const last =
 			items[index + 1] == null
-				? state.managers.data.keys.length - 1
-				: state.managers.data.values.keys.original.indexOf(items[index + 1]) - 1;
+				? state.managers.data.state.keys.original.length - 1
+				: state.managers.data.state.keys.original.indexOf(items[index + 1].key) - 1;
 
 		for (; first <= last; first += 1) {
-			const key = state.managers.data.values.keys.original[first] as Key;
+			const key = state.managers.data.state.keys.original[first] as Key;
 
 			if (group.expanded) {
 				collapsed.delete(key);
@@ -64,16 +111,30 @@ export class GroupManager {
 			}
 		}
 
-		state.managers.render.update(true, true);
+		if (Object.keys(state.managers.filter.items).length > 0) {
+			state.managers.filter.filter();
+		} else if (state.managers.sort.items.length > 0) {
+			state.managers.sort.sort();
+		} else {
+			state.managers.render.update(true, true);
+		}
 	}
 
 	remove(group: GroupComponent): void {
+		removeGroup(group);
+
 		this.set(this.items.filter(item => item !== group));
 	}
 
 	set(items: GroupComponent[]) {
 		this.items = sort(items, item => item.label);
 
-		this.order = toRecord(items as Simplify<GroupComponent>[], 'value', (_, index) => index);
+		this.mapped = toMap(items, group => group.key);
+
+		this.order = toRecord(
+			items as Simplify<GroupComponent>[],
+			group => group.value.stringified,
+			(_, index) => index,
+		);
 	}
 }

package/src/managers/navigation.manager.ts

@@ -1,8 +1,8 @@
 import {isNullableOrWhitespace} from '@oscarpalmer/atoms/is';
 import type {Key} from '@oscarpalmer/atoms/models';
 import {clamp} from '@oscarpalmer/atoms/number';
-import type {GroupComponent} from '../components/group.component';
-import {getKey} from '../helpers/misc.helpers';
+import {getKey, isGroupKey} from '../helpers/misc.helpers';
+import {ARIA_ACTIVEDESCENDANT, ATTRIBUTE_DATA_ACTIVE} from '../models/dom.model';
 import type {State} from '../models/tabela.model';
 
 export class NavigationManager {
@@ -21,9 +21,9 @@ export class NavigationManager {
 
 		event.preventDefault();
 
-		const {components, id, managers} = this.state;
+		const {components, managers} = this.state;
 
-		const activeDescendant = components.body.elements.group.getAttribute('aria-activedescendant');
+		const activeDescendant = components.body.elements.group.getAttribute(ARIA_ACTIVEDESCENDANT);
 
 		const {keys} = managers.data;
 		const {length} = keys;
@@ -33,38 +33,40 @@ export class NavigationManager {
 		if (isNullableOrWhitespace(activeDescendant)) {
 			next = getDefaultIndex(event.key, length);
 		} else {
-			next = getIndex(event, activeDescendant, id, keys)!;
+			next = getIndex(this.state, event, activeDescendant)!;
 		}
 
 		if (next != null) {
-			this.setActive(keys.at(next) as Key);
+			this.setActive(keys.at(next));
 		}
 	}
 
-	setActive(key: Key | undefined, scroll?: boolean): void {
-		const {components, managers, options} = this.state;
+	setActive(item: Key | undefined, scroll?: boolean): void {
+		const {components, managers, options, prefix} = this.state;
 
-		this.active = key;
+		this.active = item;
 
-		const active = components.body.elements.group.querySelectorAll('[data-active="true"]');
+		const active = components.body.elements.group.querySelectorAll(attributeDataActiveTrue);
 
 		for (const item of active) {
-			item.setAttribute('data-active', 'false');
+			item.setAttribute(ATTRIBUTE_DATA_ACTIVE, 'false');
 		}
 
-		const row = managers.row.get(key!);
+		const component = isGroupKey(item)
+			? managers.group.getForKey(item as string)
+			: managers.row.get(item!, false);
 
-		if (row != null) {
-			row.element?.setAttribute('data-active', 'true');
+		if (component != null) {
+			component.element?.setAttribute(ATTRIBUTE_DATA_ACTIVE, 'true');
 
 			if (scroll ?? true) {
-				if (row.element == null) {
+				if (component.element == null) {
 					components.body.elements.group.scrollTo({
-						top: managers.data.getIndex(key!) * options.rowHeight,
+						top: managers.data.getIndex(item!) * options.rowHeight,
 						behavior: 'smooth',
 					});
 				} else {
-					row.element.scrollIntoView({
+					component.element.scrollIntoView({
 						block: 'nearest',
 					});
 				}
@@ -72,8 +74,8 @@ export class NavigationManager {
 		}
 
 		components.body.elements.group.setAttribute(
-			'aria-activedescendant',
-			row == null ? '' : `tabela_${this.state.id}_row_${key}`,
+			ARIA_ACTIVEDESCENDANT,
+			component == null ? '' : `${prefix}${component.key}`,
 		);
 	}
 }
@@ -83,10 +85,10 @@ function getDefaultIndex(key: string, max: number): number {
 		case negativeDefaultKeys.has(key):
 			return -1;
 
-		case key === 'PageDown':
+		case key === KEY_PAGE_DOWN:
 			return Math.min(9, max - 1);
 
-		case key === 'PageUp':
+		case key === KEY_PAGE_UP:
 			return max < 10 ? 0 : max - 10;
 
 		default:
@@ -94,53 +96,49 @@ function getDefaultIndex(key: string, max: number): number {
 	}
 }
 
-function getIndex(
-	event: KeyboardEvent,
-	active: string,
-	id: number,
-	keys: Array<GroupComponent | Key>,
-): number | undefined {
-	const key = getKey(active.replace(`tabela_${id}_row_`, ''));
+function getIndex(state: State, event: KeyboardEvent, active: string): number | undefined {
+	const key = getKey(active.replace(state.prefix, ''));
 
 	if (key == null) {
 		return;
 	}
 
 	if (absoluteKeys.has(event.key)) {
-		return event.key === 'Home' ? 0 : keys.length - 1;
+		return event.key === KEY_HOME ? 0 : state.managers.data.size - 1;
 	}
 
-	const index = keys.indexOf(key);
-	const offset = getOffset(event.key);
+	const index = state.managers.data.getIndex(key);
 
-	return clamp(index + offset, 0, keys.length - 1, true);
+	return clamp(index + (offset[event.key] ?? 0), 0, state.managers.data.size - 1, true);
 }
 
-function getOffset(key: string): number {
-	switch (key) {
-		case 'ArrowDown':
-			return 1;
+const KEY_ARROW_DOWN = 'ArrowDown';
 
-		case 'ArrowUp':
-			return -1;
+const KEY_ARROW_UP = 'ArrowUp';
 
-		case 'PageDown':
-			return 10;
+const KEY_END = 'End';
 
-		case 'PageUp':
-			return -10;
+const KEY_HOME = 'Home';
 
-		default:
-			return 0;
-	}
-}
+const KEY_PAGE_DOWN = 'PageDown';
+
+const KEY_PAGE_UP = 'PageUp';
+
+const absoluteKeys = new Set([KEY_END, KEY_HOME]);
+
+const arrowKeys = new Set([KEY_ARROW_DOWN, KEY_ARROW_UP]);
 
-const absoluteKeys = new Set(['End', 'Home']);
+export const attributeDataActiveTrue = `[${ATTRIBUTE_DATA_ACTIVE}="true"]`;
 
-const arrowKeys = new Set(['ArrowDown', 'ArrowUp']);
+const negativeDefaultKeys = new Set([KEY_ARROW_UP, KEY_END]);
 
-const negativeDefaultKeys = new Set(['ArrowUp', 'End']);
+const offset: Record<string, number> = {
+	[KEY_ARROW_DOWN]: 1,
+	[KEY_ARROW_UP]: -1,
+	[KEY_PAGE_DOWN]: 10,
+	[KEY_PAGE_UP]: -10,
+};
 
-const pageKeys = new Set(['PageDown', 'PageUp']);
+const pageKeys = new Set([KEY_PAGE_DOWN, KEY_PAGE_UP]);
 
 const allKeys = new Set([...absoluteKeys, ...arrowKeys, ...pageKeys]);

package/src/managers/render.manager.ts

@@ -1,29 +1,30 @@
 import type {Key} from '@oscarpalmer/atoms/models';
 import {on} from '@oscarpalmer/toretto/event';
 import type {RemovableEventListener} from '@oscarpalmer/toretto/models';
-import {GroupComponent, renderGroup} from '../components/group.component';
+import {renderGroup} from '../components/group.component';
 import {removeRow, renderRow} from '../components/row.component';
+import {isGroupKey} from '../helpers/misc.helpers';
 import type {RenderElementPool, RenderRange, RenderState} from '../models/render.model';
 import type {State} from '../models/tabela.model';
 
 function getRange(state: State, down: boolean): RenderRange {
-	const {components, managers, options} = state;
-	const {clientHeight, scrollTop} = components.body.elements.group;
+	const {element, managers, options} = state;
+	const {clientHeight, scrollTop} = element;
 
 	const {keys} = managers.data;
 
-	const first = Math.floor(scrollTop / options.rowHeight);
+	const firstIndex = Math.floor(scrollTop / options.rowHeight);
+	const lastIndex = keys.length - managers.group.collapsed.size - 1;
 
-	const last = Math.min(
-		keys.length - managers.group.collapsed.size - 1,
-		Math.ceil((scrollTop + clientHeight) / options.rowHeight) - 1,
-	);
+	const last = Math.min(lastIndex, Math.ceil((scrollTop + clientHeight) / options.rowHeight) - 1);
 
-	const before = Math.ceil(clientHeight / options.rowHeight) * (down ? 1 : 2);
-	const after = Math.ceil(clientHeight / options.rowHeight) * (down ? 2 : 1);
+	const visible = clientHeight / options.rowHeight;
 
-	const start = Math.max(0, first - before);
-	const end = Math.min(keys.length - managers.group.collapsed.size - 1, last + after);
+	const before = Math.ceil(visible) * (down ? 1 : 2);
+	const after = Math.ceil(visible) * (down ? 2 : 1);
+
+	const start = Math.max(0, firstIndex - before);
+	const end = Math.min(lastIndex, last + after);
 
 	return {end, start};
 }
@@ -33,7 +34,7 @@ function onScroll(this: RenderManager): void {
 
 	if (!state.active) {
 		requestAnimationFrame(() => {
-			const top = state.components.body.elements.group.scrollTop;
+			const top = state.element.scrollTop;
 
 			this.update(top > state.top);
 
@@ -57,10 +58,10 @@ export class RenderManager {
 
 	state: RenderState;
 
-	visible = new Map<number, GroupComponent | Key>();
+	visible = new Map<number, Key>();
 
 	constructor(state: State) {
-		this.listener = on(state.components.body.elements.group, 'scroll', onScroll.bind(this));
+		this.listener = on(state.element, 'scroll', onScroll.bind(this));
 
 		this.state = {
 			...state,
@@ -75,6 +76,20 @@ export class RenderManager {
 		listener();
 		visible.clear();
 
+		const cells = Object.values(pool.cells).flat();
+
+		let {length} = cells;
+
+		for (let index = 0; index < length; index += 1) {
+			cells[index].remove();
+		}
+
+		length = pool.rows.length;
+
+		for (let index = 0; index < length; index += 1) {
+			pool.rows[index].remove();
+		}
+
 		pool.cells = {};
 		pool.rows = [];
 
@@ -94,11 +109,11 @@ export class RenderManager {
 		}
 
 		for (const [, key] of visible) {
-			if (key instanceof GroupComponent) {
+			if (isGroupKey(key)) {
 				continue;
 			}
 
-			const row = state.managers.row.get(key);
+			const row = state.managers.row.get(key, false);
 
 			if (row == null || row.element == null) {
 				continue;
@@ -139,17 +154,17 @@ export class RenderManager {
 		let remove = rerender ?? false;
 
 		for (const [index, key] of visible) {
-			if (key instanceof GroupComponent) {
+			if (isGroupKey(key)) {
 				if (remove || !indices.has(index)) {
 					visible.delete(index);
 
-					key.element?.remove();
+					state.managers.group.getForKey(key as string)?.element?.remove();
 				}
 
 				continue;
 			}
 
-			const row = managers.row.get(key);
+			const row = managers.row.get(key, false);
 
 			if (remove || row == null || !indices.has(index) || managers.group.collapsed.has(key)) {
 				visible.delete(index);
@@ -174,23 +189,29 @@ export class RenderManager {
 
 			const key = keys[index];
 
-			if (key instanceof GroupComponent) {
+			if (isGroupKey(key)) {
+				const group = managers.group.getForKey(key as string);
+
+				if (group == null) {
+					continue;
+				}
+
 				count += 1;
 
-				renderGroup(state, key);
+				renderGroup(state, group);
 
-				visible.set(index, key);
+				visible.set(index, group.key);
 
-				if (key.element != null) {
-					key.element.style.transform = `translateY(${(index - offset) * options.rowHeight}px)`;
+				if (group.element != null) {
+					group.element.style.transform = `translateY(${(index - offset) * options.rowHeight}px)`;
 
-					fragment.append(key.element);
+					fragment.append(group.element);
 				}
 
 				continue;
 			}
 
-			const row = managers.row.get(key);
+			const row = managers.row.get(key, true);
 
 			if (row == null) {
 				continue;
@@ -215,8 +236,14 @@ export class RenderManager {
 			}
 		}
 
-		if (count > 0) {
-			components.body.elements.group[down ? 'append' : 'prepend'](fragment);
+		if (count === 0) {
+			return;
+		}
+
+		if (down) {
+			components.body.elements.group.append(fragment);
+		} else {
+			components.body.elements.group.prepend(fragment);
 		}
 	}
 }

package/src/managers/row.manager.ts

@@ -7,24 +7,30 @@ export class RowManager {
 
 	constructor(public state: State) {}
 
-	destroy(): void {
-		const components = [...this.components.values()];
-		const {length} = components;
+	clear(): void {
+		const {components} = this;
+
+		const rows = [...components.values()];
+		const {length} = rows;
 
 		for (let index = 0; index < length; index += 1) {
-			removeRow(this.state.managers.render.pool, components[index]);
+			this.removeRow(rows[index]);
 		}
 
-		this.components.clear();
+		components.clear();
+	}
+
+	destroy(): void {
+		this.clear();
 
 		this.components = undefined as never;
 		this.state = undefined as never;
 	}
 
-	get(key: Key): RowComponent | undefined {
+	get(key: Key, create: boolean): RowComponent | undefined {
 		let row = this.components.get(key);
 
-		if (row == null) {
+		if (row == null && create) {
 			row = new RowComponent(key);
 
 			this.components.set(key, row);
@@ -41,16 +47,22 @@ export class RowManager {
 		const row = this.components.get(key);
 
 		if (row != null) {
-			removeRow(this.state.managers.render.pool, row);
+			this.removeRow(row);
+		}
+	}
 
-			this.components.delete(key);
+	removeRow(row: RowComponent): void {
+		if (row.element != null) {
+			removeRow(this.state.managers.render.pool, row);
 		}
+
+		this.components.delete(row.key);
 	}
 
 	update(key: Key): void {
 		const row = this.components.get(key);
 
-		if (row != null) {
+		if (row?.element != null) {
 			renderRow(this.state, row);
 		}
 	}