slick-table 1.1.67 → 1.1.69

package/src/shared/lib/localStrore/model/localStore.ts

@@ -1,28 +1,8 @@
-import { getSlickTable, getSorting, setSorting } from "../lib";
-import { ILastSorting, ISlickTable } from "./types";
+import { HiddenColumns, Sorting } from "./classes";
 
 class LocalStore {
-	getTableSorting(tableId: string): ILastSorting | undefined {
-		const slickTable: ISlickTable = getSlickTable();
-		const sorting = getSorting(slickTable);
-		return sorting[tableId];
-	}
-	resetTableSorting(tableId: string): void {
-		const slickTable = getSlickTable();
-		const sorting = getSorting(slickTable);
-		delete sorting[tableId];
-		setSorting(slickTable, sorting);
-	}
-	setTableSorting(
-		tableId: string,
-		columnId: string | number,
-		isAscending: boolean,
-	): void {
-		const slickTable = getSlickTable();
-		const sorting = getSorting(slickTable);
-		sorting[tableId] = { columnId, isAscending };
-		setSorting(slickTable, sorting);
-	}
+	hiddenColumns = new HiddenColumns();
+	sorting = new Sorting();
 }
 
 export const localStore = new LocalStore();

package/src/shared/lib/slickgrid/lib/sorting/ColumnSorter.ts

@@ -38,13 +38,13 @@ export class ColumnSorter implements IColumnSorter {
 			const dataView: SlickDataView = grid.getData();
 			if (sortAsc && sortedColumnId === sortCol?.id) {
 				resetSorting = true;
-				localStore.resetTableSorting(tableId);
+				localStore.sorting.reset(tableId);
 				grid.setSortColumns([]);
 				sortedColumnId = "";
 			} else {
 				resetSorting = false;
 				sortedColumnId = columnId as string;
-				localStore.setTableSorting(tableId, columnId, sortAsc);
+				localStore.sorting.set(tableId, columnId, sortAsc);
 			}
 
 			const sign = sortAsc ? -1 : 1;
@@ -105,7 +105,7 @@ export class ColumnSorter implements IColumnSorter {
 	public restoreSorting(table: ISlickTable): void {
 		const grid = table.grid;
 		if (!grid) return;
-		const params = localStore.getTableSorting(table.id);
+		const params = localStore.sorting.get(table.id);
 		if (params) {
 			const { columnId, isAscending } = params;
 			const sortFunction = this.getSortFunction(table.id);

package/src/shared/lib/slickgrid/model/SlickTable/column-picker/ColumnPicker.ts

@@ -1,35 +1,25 @@
+import { localStore } from "shared/lib/localStrore";
 import { IColumn, IColumnPicker } from "shared/model/types";
 
 export class ColumnPicker implements IColumnPicker {
 	private _initialColumns: IColumn[] = [];
-	private _visibleColumnIds: string[] = [];
 	private _hiddenColumnIds: string[] = [];
+	private _tableId = "";
 
-	constructor({ hiddenColumnIds }: IOptions = {}) {
-		if (hiddenColumnIds) this._hiddenColumnIds = hiddenColumnIds;
-	}
-
-	get visibleColumnIds() {
-		return this._visibleColumnIds;
-	}
-	set visibleColumnIds(ids) {
-		this._visibleColumnIds = ids;
-	}
-
-	get initialColumns() {
+	getInitialColumns(): IColumn[] {
 		return this._initialColumns;
 	}
-	set initialColumns(columns) {
-		if (!this.visibleColumnIds.length) {
-			this.visibleColumnIds = columns
-				.map(({ id }) => id as string)
-				.filter((id) => !this._hiddenColumnIds.includes(id));
-		}
+	setInitialColumns(columns: IColumn[], tableId: string): void {
 		this._initialColumns = columns;
+		this._tableId = tableId;
+		this.hiddenColumnIds = localStore.hiddenColumns.get(tableId);
 	}
-}
 
-interface IOptions {
-	/** Columns with specified IDs will be initially hidden. */
-	hiddenColumnIds?: string[];
+	get hiddenColumnIds() {
+		return this._hiddenColumnIds;
+	}
+	set hiddenColumnIds(columnIds) {
+		this._hiddenColumnIds = columnIds;
+		localStore.hiddenColumns.set(this._tableId, columnIds);
+	}
 }

package/src/shared/lib/slickgrid/ui/SlickgridTable/lib/hooks/useGrid.ts

@@ -151,17 +151,11 @@ export function useGrid({
 			grid.setColumns(columns);
 		}
 		if (table.columnPicker) {
-			table.columnPicker.initialColumns = grid.getColumns();
-			if (!table.columnPicker.visibleColumnIds.length) {
-				table.columnPicker.visibleColumnIds = grid
-					.getColumns()
-					.map(({ id }) => id as string);
-			}
+			table.columnPicker.setInitialColumns(grid.getColumns(), table.id);
 			grid.setColumns(
 				grid.getColumns().filter(({ id }) => {
 					if (!table.columnPicker) return true;
-					if (!table.columnPicker.visibleColumnIds.length) return true;
-					return table.columnPicker.visibleColumnIds.includes(id as string);
+					return !table.columnPicker.hiddenColumnIds.includes(id as string);
 				}),
 			);
 		}

package/src/shared/model/types/IColumnPicker.ts

@@ -1,6 +1,7 @@
 import { IColumn } from "./IColumn";
 
 export interface IColumnPicker {
-	initialColumns: IColumn[];
-	visibleColumnIds: string[];
+	hiddenColumnIds: string[];
+	getInitialColumns(): IColumn[];
+	setInitialColumns(columns: IColumn[], tableId: string): void;
 }

package/dist/types/shared/lib/localStrore/lib/getSorting.d.ts

@@ -1,3 +0,0 @@
-import { ISlickTable, ISorting } from '../model';
-export declare function getSorting(slickTable: ISlickTable): ISorting;
-//# sourceMappingURL=getSorting.d.ts.map

package/dist/types/shared/lib/localStrore/lib/getSorting.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"getSorting.d.ts","sourceRoot":"","sources":["../../../../../../src/shared/lib/localStrore/lib/getSorting.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,WAAW,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AAE9D,wBAAgB,UAAU,CAAC,UAAU,EAAE,WAAW,GAAG,QAAQ,CAE5D"}

package/dist/types/shared/lib/localStrore/lib/setSorting.d.ts

@@ -1,3 +0,0 @@
-import { ISlickTable, ISorting } from '../model';
-export declare function setSorting(slickTable: ISlickTable, sorting: ISorting): void;
-//# sourceMappingURL=setSorting.d.ts.map

package/dist/types/shared/lib/localStrore/lib/setSorting.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"setSorting.d.ts","sourceRoot":"","sources":["../../../../../../src/shared/lib/localStrore/lib/setSorting.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,WAAW,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AAE9D,wBAAgB,UAAU,CAAC,UAAU,EAAE,WAAW,EAAE,OAAO,EAAE,QAAQ,GAAG,IAAI,CAK3E"}

package/src/shared/lib/localStrore/lib/getSorting.ts

@@ -1,5 +0,0 @@
-import { EStorageKey, ISlickTable, ISorting } from "../model";
-
-export function getSorting(slickTable: ISlickTable): ISorting {
-	return slickTable[EStorageKey.sorting] || {};
-}

package/src/shared/lib/localStrore/lib/setSorting.ts

@@ -1,8 +0,0 @@
-import { EStorageKey, ISlickTable, ISorting } from "../model";
-
-export function setSorting(slickTable: ISlickTable, sorting: ISorting): void {
-	localStorage.setItem(
-		EStorageKey.slickTable,
-		JSON.stringify({ ...slickTable, sorting }),
-	);
-}