Merge pull request #700 from trey-wallis/dev

8.2.1

Author: decaf-dev

manifest.json

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

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "obsidian-dataloom",
-	"version": "8.2.0",
+	"version": "8.2.1",
 	"description": "Weave together data from diverse sources into a cohesive table view. Inspired by Excel Spreadsheets and Notion.so.",
 	"main": "main.js",
 	"scripts": {

src/react/loom-app/app/hooks/use-row.ts

@@ -4,10 +4,11 @@ import RowAddCommand from "src/shared/loom-state/commands/row-add-command";
 import RowDeleteCommand from "src/shared/loom-state/commands/row-delete-command";
 import React from "react";
 import RowInsertCommand from "src/shared/loom-state/commands/row-insert-command";
+import { confirmSortOrderChange } from "src/shared/sort-utils";
 
 export const useRow = () => {
 	const logger = useLogger();
-	const { doCommand } = useLoomState();
+	const { doCommand, loomState } = useLoomState();
 
 	const handleRowDeleteClick = React.useCallback(
 		(rowId: string) => {
@@ -28,14 +29,18 @@ export const useRow = () => {
 		logger("handleRowInsertAboveClick", {
 			rowId,
 		});
-		doCommand(new RowInsertCommand(rowId, "above"));
+		if (confirmSortOrderChange(loomState)) {
+			doCommand(new RowInsertCommand(rowId, "above"));
+		}
 	}
 
 	function handleRowInsertBelowClick(rowId: string) {
 		logger("handleRowInsertBelowClick", {
 			rowId,
 		});
-		doCommand(new RowInsertCommand(rowId, "below"));
+		if (confirmSortOrderChange(loomState)) {
+			doCommand(new RowInsertCommand(rowId, "below"));
+		}
 	}
 
 	return {

src/react/loom-app/table/index.tsx

@@ -111,9 +111,20 @@ const Components: TableComponents = {
 	},
 	//Don't apply styles because we want to apply sticky positioning
 	//to the cells, not the header container
-	TableHead: React.forwardRef(({ ...props }, ref) => (
-		<div className="dataloom-header" {...props} ref={ref} />
-	)),
+	TableHead: React.forwardRef(({ ...props }, ref) => {
+		return (
+			<div
+				className="dataloom-header"
+				{...props}
+				style={{
+					position: undefined,
+					top: undefined,
+					zIndex: undefined,
+				}}
+				ref={ref}
+			/>
+		);
+	}),
 	TableRow: ({ style, ...props }) => {
 		return <BodyRow {...props} style={style} />;
 	},
@@ -123,7 +134,16 @@ const Components: TableComponents = {
 	//Don't apply styles because we want to apply sticky positioning
 	//to the cells, not the footer container
 	TableFoot: React.forwardRef(({ ...props }, ref) => (
-		<div className="dataloom-footer" {...props} ref={ref} />
+		<div
+			className="dataloom-footer"
+			{...props}
+			style={{
+				position: undefined,
+				bottom: undefined,
+				zIndex: undefined,
+			}}
+			ref={ref}
+		/>
 	)),
 	FillerRow: ({ height }) => {
 		return <div className="dataloom-row" style={{ height }} />;

src/shared/dragging/utils.ts

@@ -1,4 +1,5 @@
 import { SortDir, LoomState } from "../loom-state/types";
+import { confirmSortOrderChange } from "../sort-utils";
 import { DragData } from "./types";
 
 export const getRowId = (rowEl: HTMLElement) => {
@@ -15,26 +16,15 @@ export const getRowId = (rowEl: HTMLElement) => {
 export const dropDrag = (
 	targetRowId: string,
 	dragData: DragData | null,
-	LoomState: LoomState,
+	state: LoomState,
 	onLoomStateChange: React.Dispatch<React.SetStateAction<LoomState>>
 ) => {
 	if (dragData === null) throw Error("No drag data found");
 
 	//If we're dragging a column type, then return
 	if (dragData.type !== "row") return;
 
-	const { columns } = LoomState.model;
-	const isSorted = columns.find((column) => column.sortDir !== SortDir.NONE);
-	if (isSorted) {
-		if (
-			!window.confirm(
-				"This will set your default sorting to the current sort filter. Do you wish to continue?" +
-					"\n\n" +
-					"If not, please remove your sort filter before dragging a row."
-			)
-		)
-			return;
-	}
+	if (!confirmSortOrderChange(state)) return;
 
 	onLoomStateChange((prevState) => {
 		const { bodyRows, columns } = prevState.model;

src/shared/loom-state/commands/row-insert-command.spec.ts

@@ -31,8 +31,8 @@ describe("row-insert-command", () => {
 		//Assert
 		expect(executeState.model.bodyRows.length).toEqual(2); //make sure that the row was added
 		expect(executeState.model.bodyCells.length).toEqual(2);
-		expect(executeState.model.bodyRows[0].id).toEqual(rowId); //make sure that the row was added above the original row
-		expect(executeState.model.bodyRows[0].index).toEqual(1);
+		expect(executeState.model.bodyRows[1].id).toEqual(rowId); //make sure that the row was added above the original row
+		expect(executeState.model.bodyRows[1].index).toEqual(1);
 	});
 
 	it("should insert a row below when execute() is called", () => {