Merge pull request #859 from trey-wallis/dev

8.12.2

manifest.json

@@ -1,13 +1,13 @@
 {
 	"id": "notion-like-tables",
 	"name": "DataLoom",
-	"minAppVersion": "1.2.0",
+	"minAppVersion": "1.4.0",
 	"description": "Weave together data from diverse sources into a cohesive table view. Inspired by Excel Spreadsheets and Notion.so.",
 	"author": "Trey Wallis",
 	"authorUrl": "https://github.com/trey-wallis",
 	"isDesktopOnly": false,
 	"fundingUrl": {
 		"Buymeacoffee": "https://www.buymeacoffee.com/treywallis"
 	},
-	"version": "8.12.1"
+	"version": "8.12.2"
 }

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "obsidian-dataloom",
-	"version": "8.12.1",
+	"version": "8.12.2",
 	"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/body-cell-container/index.tsx

@@ -136,6 +136,13 @@ export default function BodyCellContainer({
 		columnType === CellType.TAG ||
 		columnType === CellType.MULTI_TAG ||
 		columnType === CellType.DATE;
+	const isDisabled = source !== null && frontmatterKey === null;
+	const isUneditable =
+		columnType === CellType.CHECKBOX ||
+		columnType === CellType.CREATION_TIME ||
+		columnType === CellType.LAST_EDITED_TIME ||
+		columnType === CellType.SOURCE ||
+		columnType === CellType.SOURCE_FILE;
 
 	const COMPONENT_ID = `body-cell-${cellId}`;
 	const menu = useMenu(COMPONENT_ID);
@@ -180,13 +187,13 @@ export default function BodyCellContainer({
 	}
 
 	function handleMenuTriggerEnterDown() {
+		if (isDisabled) return;
 		if (columnType === CellType.CHECKBOX) toggleCheckbox();
 	}
 
 	function handleMenuTriggerClick() {
-		if (columnType === CellType.CHECKBOX) {
-			toggleCheckbox();
-		}
+		if (isDisabled) return;
+		if (columnType === CellType.CHECKBOX) toggleCheckbox();
 	}
 
 	function handleExternalLinkToggle(value: boolean) {
@@ -300,35 +307,32 @@ export default function BodyCellContainer({
 	const overflowClass = useOverflow(shouldWrapOverflow, {
 		ellipsis: columnType === CellType.DATE,
 	});
+
 	className += " " + overflowClass;
 
-	if (
-		columnType === CellType.LAST_EDITED_TIME ||
-		columnType === CellType.CREATION_TIME ||
-		columnType === CellType.SOURCE ||
-		columnType === CellType.SOURCE_FILE ||
-		(source && frontmatterKey === null)
-	) {
-		className += " dataloom-cell--body__container--default-cursor";
+	if (isUneditable) {
+		className += " dataloom-cell--uneditable";
+	} else if (isDisabled) {
+		className += " dataloom-cell--disabled";
 	}
 
 	const cellTags = columnTags.filter((tag) => cellTagIds.includes(tag.id));
 
 	let shouldRunTrigger = true;
-	if (
-		columnType === CellType.CHECKBOX ||
-		columnType === CellType.CREATION_TIME ||
-		columnType === CellType.LAST_EDITED_TIME ||
-		columnType === CellType.SOURCE ||
-		columnType === CellType.SOURCE_FILE ||
-		(source && frontmatterKey === null)
-	) {
+	if (isUneditable || isDisabled) {
 		shouldRunTrigger = false;
 	}
 
+	let ariaLabel = "";
+	if (isDisabled) {
+		ariaLabel =
+			"This cell is disabled until you choose a frontmatter key for this column";
+	}
+
 	return (
 		<>
 			<MenuTrigger
+				ariaLabel={ariaLabel}
 				ref={menu.triggerRef}
 				variant="cell"
 				menuId={menu.id}

src/react/loom-app/body-cell-container/styles.css

@@ -8,6 +8,11 @@
     color: var(--text-normal); /* Stop dimming of text when mouse leaves embedded loom */
 }
 
-.dataloom-cell--body__container--default-cursor {
-    cursor: default;
+.dataloom-cell--uneditable {
+	cursor: default;
+}
+
+.dataloom-cell--disabled {
+	cursor: default;
+	background-color: var(--background-secondary);
 }

src/react/shared/menu-trigger/index.tsx

@@ -11,6 +11,7 @@ import { useMenuOperations } from "../menu-provider/hooks";
 import { LoomMenuLevel } from "../menu-provider/types";
 
 interface Props {
+	ariaLabel?: string;
 	menuId: string;
 	level: LoomMenuLevel;
 	shouldRunTrigger?: boolean;
@@ -27,6 +28,7 @@ interface Props {
 const MenuTrigger = React.forwardRef<HTMLDivElement, Props>(
 	(
 		{
+			ariaLabel,
 			menuId,
 			level,
 			variant,
@@ -109,6 +111,7 @@ const MenuTrigger = React.forwardRef<HTMLDivElement, Props>(
 		}
 		return (
 			<div
+				aria-label={ariaLabel}
 				data-menu-id={menuId}
 				tabIndex={0}
 				className={className}

versions.json

@@ -142,5 +142,6 @@
 	"8.11.2": "1.2.0",
 	"8.11.3": "1.2.0",
 	"8.12.0": "1.2.0",
-	"8.12.1": "1.2.0"
+	"8.12.1": "1.2.0",
+	"8.12.2": "1.4.0"
 }