Merge pull request #562 from trey-wallis/dev

6.18.6

Author: decaf-dev

manifest.json

@@ -7,5 +7,5 @@
 	"authorUrl": "https://github.com/trey-wallis",
 	"isDesktopOnly": false,
 	"fundingUrl": "https://www.buymeacoffee.com/treywallis",
-	"version": "6.18.5"
+	"version": "6.18.6"
 }

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "obsidian-notion-like-tables",
-	"version": "6.18.5",
+	"version": "6.18.6",
 	"description": "Notion-like tables for Obsidian.md",
 	"main": "main.js",
 	"scripts": {

src/data/constants.ts

@@ -1,4 +1,4 @@
-export const CURRENT_PLUGIN_VERSION = "6.18.5";
+export const CURRENT_PLUGIN_VERSION = "6.18.6";
 
 export const DEFAULT_TABLE_NAME = "Untitled";
 

src/data/serialize-table-state.ts

@@ -4,6 +4,7 @@ import {
 	BodyCell,
 	CellType,
 	Column,
+	SortDir,
 	TableState,
 	Tag,
 } from "../shared/types";
@@ -337,6 +338,30 @@ export const deserializeTableState = (data: string): TableState => {
 		});
 	}
 
+	if (isVersionLessThan(pluginVersion, "6.18.6")) {
+		const tableState = currentState as TableState6160;
+		const { columns, bodyRows } = tableState.model;
+
+		//Fix: resolve empty rows being inserted but appearing higher up in the table
+		//This was due to the index being set to the row's position in the array, which
+		//was sometimes less than the highest index value. This is because the index wasn't being
+		//decreased.
+		//This is a reset to force the index to be set to the correct value on all tables.
+		columns.forEach((column: unknown) => {
+			const typedColumn = column as Record<string, unknown>;
+			typedColumn.sortDir = SortDir.NONE;
+		});
+
+		//Sort by index
+		bodyRows.sort((a, b) => a.index - b.index);
+
+		//Set the index to the correct value
+		bodyRows.forEach((row: unknown, i) => {
+			const typedRow = row as Record<string, unknown>;
+			typedRow.index = i;
+		});
+	}
+
 	const tableState = currentState as TableState;
 	tableState.pluginVersion = CURRENT_PLUGIN_VERSION;
 	return tableState;

src/react/table-app/tag-cell-edit/selectable-tag.tsx

@@ -59,12 +59,12 @@ export default function SelectableTag({
 				`}
 				className="NLT__focusable NLT__selectable"
 				onClick={(e) => {
-					//Only trigger onClick if the click is on the tag and not the menu button
-					if (e.target === triggerRef.current) {
-						//Stop propagation so the the menu doesn't remove the focus class
-						e.stopPropagation();
-						onClick(id);
-					}
+					const target = e.target as HTMLElement;
+					if (target.classList.contains("NLT__menu-trigger")) return;
+
+					//Stop propagation so the the menu doesn't remove the focus class
+					e.stopPropagation();
+					onClick(id);
 				}}
 			>
 				<Tag markdown={markdown} color={color} maxWidth="150px" />

src/shared/commands/row-delete-command.ts

@@ -16,6 +16,11 @@ export default class RowDeleteCommand extends TableStateCommand {
 		cell: BodyCell;
 	}[];
 
+	private previousBodyRows: {
+		id: string;
+		index: number;
+	}[];
+
 	constructor(options: { id?: string; last?: boolean }) {
 		super();
 		const { id, last } = options;
@@ -30,33 +35,64 @@ export default class RowDeleteCommand extends TableStateCommand {
 		super.onExecute();
 
 		const { bodyRows, bodyCells } = prevState.model;
+
+		//If there are no rows to delete, return the previous state
 		if (bodyRows.length === 0) return prevState;
 
 		let id = this.rowId;
-		if (this.last) {
-			id = bodyRows[bodyRows.length - 1].id;
-		}
+		if (this.last) id = bodyRows[bodyRows.length - 1].id;
 
+		//Find the row to delete
 		const rowToDelete = bodyRows.find((row) => row.id === id);
 		if (!rowToDelete) throw new RowNotFoundError(id);
 
+		//Cache the row to delete
 		this.deletedRow = {
 			arrIndex: bodyRows.indexOf(rowToDelete),
 			row: structuredClone(rowToDelete),
 		};
 
+		//Get a new array of body rows, filtering the row we want to delete
+		let newBodyRows = bodyRows.filter((row) => row.id !== id);
+
+		//Cache the indexes of the rows that were updated
+		this.previousBodyRows = newBodyRows
+			.filter((row) => row.index > this.deletedRow.row.index)
+			.map((row) => {
+				return {
+					id: row.id,
+					index: row.index,
+				};
+			});
+
+		//Decrement the index of rows that were in a higher position than the deleted row
+		//This is to avoid having duplicate indexes
+		newBodyRows = newBodyRows.map((row) => {
+			if (row.index > this.deletedRow.row.index) {
+				return {
+					...row,
+					index: row.index - 1,
+				};
+			}
+			return row;
+		});
+
+		//Cache the cells to delete
 		const cellsToDelete = bodyCells.filter((cell) => cell.rowId === id);
 		this.deletedCells = cellsToDelete.map((cell) => ({
 			arrIndex: bodyCells.indexOf(cell),
 			cell: structuredClone(cell),
 		}));
 
+		//Get a new array of body cells, filtering the cells we want to delete
+		const newBodyCells = bodyCells.filter((cell) => cell.rowId !== id);
+
 		return {
 			...prevState,
 			model: {
 				...prevState.model,
-				bodyRows: bodyRows.filter((row) => row.id !== id),
-				bodyCells: bodyCells.filter((cell) => cell.rowId !== id),
+				bodyRows: newBodyRows,
+				bodyCells: newBodyCells,
 			},
 		};
 	}
@@ -71,13 +107,28 @@ export default class RowDeleteCommand extends TableStateCommand {
 
 		const { bodyRows, bodyCells } = prevState.model;
 
-		const updatedBodyRows = [...bodyRows];
+		//Restore the row indexes
+		const updatedBodyRows = [...bodyRows].map((row) => {
+			const wasUpdated = this.previousBodyRows.find(
+				(r) => r.id === row.id
+			);
+			if (wasUpdated) {
+				return {
+					...row,
+					index: wasUpdated.index,
+				};
+			}
+			return row;
+		});
+
+		//Restore the deleted row
 		updatedBodyRows.splice(
 			this.deletedRow.arrIndex,
 			0,
 			this.deletedRow.row
 		);
 
+		//Restore the deleted row cells
 		const updatedBodyCells = [...bodyCells];
 		this.deletedCells.forEach((cell) => {
 			updatedBodyCells.splice(cell.arrIndex, 0, cell.cell);

versions.json

@@ -107,5 +107,6 @@
 	"6.18.2": "0.15.0",
 	"6.18.3": "0.15.0",
 	"6.18.4": "0.15.0",
-	"6.18.5": "0.15.0"
+	"6.18.5": "0.15.0",
+	"6.18.6": "0.15.0"
 }