Merge pull request #857 from trey-wallis/revert-856-show-as-disabled

Revert "fix: add disabled background and tooltip when column frontmat…
decaf-dev · Nov 15, 2023 · 7cdc42a · 7cdc42a
2 parents 6530379 + 28198b0
commit 7cdc42a
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 33 deletions.
diff --git a/src/react/loom-app/body-cell-container/index.tsx b/src/react/loom-app/body-cell-container/index.tsx
@@ -136,13 +136,6 @@ 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);
@@ -187,13 +180,13 @@ export default function BodyCellContainer({
 	}
 
 	function handleMenuTriggerEnterDown() {
-		if (isDisabled) return;
 		if (columnType === CellType.CHECKBOX) toggleCheckbox();
 	}
 
 	function handleMenuTriggerClick() {
-		if (isDisabled) return;
-		if (columnType === CellType.CHECKBOX) toggleCheckbox();
+		if (columnType === CellType.CHECKBOX) {
+			toggleCheckbox();
+		}
 	}
 
 	function handleExternalLinkToggle(value: boolean) {
@@ -307,32 +300,35 @@ export default function BodyCellContainer({
 	const overflowClass = useOverflow(shouldWrapOverflow, {
 		ellipsis: columnType === CellType.DATE,
 	});
-
 	className += " " + overflowClass;
 
-	if (isUneditable) {
-		className += " dataloom-cell--uneditable";
-	} else if (isDisabled) {
-		className += " dataloom-cell--disabled";
+	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";
 	}
 
 	const cellTags = columnTags.filter((tag) => cellTagIds.includes(tag.id));
 
 	let shouldRunTrigger = true;
-	if (isUneditable || isDisabled) {
+	if (
+		columnType === CellType.CHECKBOX ||
+		columnType === CellType.CREATION_TIME ||
+		columnType === CellType.LAST_EDITED_TIME ||
+		columnType === CellType.SOURCE ||
+		columnType === CellType.SOURCE_FILE ||
+		(source && frontmatterKey === null)
+	) {
 		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}

diff --git a/src/react/loom-app/body-cell-container/styles.css b/src/react/loom-app/body-cell-container/styles.css
@@ -8,11 +8,6 @@
     color: var(--text-normal); /* Stop dimming of text when mouse leaves embedded loom */
 }
 
-.dataloom-cell--uneditable {
-	cursor: default;
-}
-
-.dataloom-cell--disabled {
-	cursor: default;
-	background-color: var(--background-secondary);
+.dataloom-cell--body__container--default-cursor {
+    cursor: default;
 }
diff --git a/src/react/shared/menu-trigger/index.tsx b/src/react/shared/menu-trigger/index.tsx
@@ -11,7 +11,6 @@ import { useMenuOperations } from "../menu-provider/hooks";
 import { LoomMenuLevel } from "../menu-provider/types";
 
 interface Props {
-	ariaLabel?: string;
 	menuId: string;
 	level: LoomMenuLevel;
 	shouldRunTrigger?: boolean;
@@ -28,7 +27,6 @@ interface Props {
 const MenuTrigger = React.forwardRef<HTMLDivElement, Props>(
 	(
 		{
-			ariaLabel,
 			menuId,
 			level,
 			variant,
@@ -111,7 +109,6 @@ const MenuTrigger = React.forwardRef<HTMLDivElement, Props>(
 		}
 		return (
 			<div
-				aria-label={ariaLabel}
 				data-menu-id={menuId}
 				tabIndex={0}
 				className={className}