From 39dc84a38cf158a0052bd40cab3f18eca8db98e2 Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Tue, 15 Nov 2022 18:14:44 +1100
Subject: [PATCH] re-enable cell validation tooltips

---
 src/components/Table/CellValidation.tsx       | 85 +++++++++----------
 src/components/Table/Table.tsx                |  4 +-
 .../{TableHeaderGroup.tsx => TableHeader.tsx} |  8 +-
 3 files changed, 45 insertions(+), 52 deletions(-)
 rename src/components/Table/{TableHeaderGroup.tsx => TableHeader.tsx} (97%)

diff --git a/src/components/Table/CellValidation.tsx b/src/components/Table/CellValidation.tsx
index e19dde1b..6e566487 100644
--- a/src/components/Table/CellValidation.tsx
+++ b/src/components/Table/CellValidation.tsx
@@ -17,7 +17,6 @@ import {
   selectedCellAtom,
   contextMenuTargetAtom,
 } from "@src/atoms/tableScope";
-import { TABLE_PADDING } from "./Table";
 import type { TableRow } from "@src/types/table";
 
 const Dot = styled("div")(({ theme }) => ({
@@ -73,51 +72,29 @@ export const CellValidation = memo(function MemoizedCellValidation({
   const isInvalid = validationRegex && !new RegExp(validationRegex).test(value);
   const isMissing = required && value === undefined;
 
-  const renderedCell = (
-    <ErrorBoundary fallbackRender={InlineErrorFallback}>
-      {flexRender(cell.column.columnDef.cell, {
-        ...cell.getContext(),
-        focusInsideCell: isSelectedCell && focusInsideCell,
-        setFocusInsideCell: (focusInside: boolean) =>
-          setSelectedCell({
-            path: row.original._rowy_ref.path,
-            columnKey: cell.column.id,
-            focusInside,
-          }),
-        disabled:
-          !canEditCells || cell.column.columnDef.meta?.editable === false,
-        rowHeight,
-      })}
-    </ErrorBoundary>
-  );
+  let renderedValidationTooltip = null;
 
-  // if (isInvalid)
-  //   return (
-  //     <StyledCell aria-invalid="true" {...props}>
-  //       <RichTooltip
-  //         icon={<ErrorIcon fontSize="inherit" color="error" />}
-  //         title="Invalid data"
-  //         message="This row will not be saved until all the required fields contain valid data"
-  //         placement="right"
-  //         render={({ openTooltip }) => <Dot onClick={openTooltip} />}
-  //       />
-  //       {children}
-  //     </StyledCell>
-  //   );
-
-  // if (isMissing)
-  //   return (
-  //     <StyledCell aria-invalid="true" {...props}>
-  //       <RichTooltip
-  //         icon={<WarningIcon fontSize="inherit" color="warning" />}
-  //         title="Required field"
-  //         message="This row will not be saved until all the required fields contain valid data"
-  //         placement="right"
-  //         render={({ openTooltip }) => <Dot onClick={openTooltip} />}
-  //       />
-  //       {children}
-  //     </StyledCell>
-  //   );
+  if (isInvalid) {
+    renderedValidationTooltip = (
+      <RichTooltip
+        icon={<ErrorIcon fontSize="inherit" color="error" />}
+        title="Invalid data"
+        message="This row will not be saved until all the required fields contain valid data"
+        placement="right"
+        render={({ openTooltip }) => <Dot onClick={openTooltip} />}
+      />
+    );
+  } else if (isMissing) {
+    renderedValidationTooltip = (
+      <RichTooltip
+        icon={<WarningIcon fontSize="inherit" color="warning" />}
+        title="Required field"
+        message="This row will not be saved until all the required fields contain valid data"
+        placement="right"
+        render={({ openTooltip }) => <Dot onClick={openTooltip} />}
+      />
+    );
+  }
 
   return (
     <StyledCell
@@ -139,6 +116,7 @@ export const CellValidation = memo(function MemoizedCellValidation({
           ? "rowy-table-editable-cell-description"
           : undefined
       }
+      aria-invalid={isInvalid || isMissing}
       style={{
         width: cell.column.getSize(),
         height: rowHeight,
@@ -177,7 +155,22 @@ export const CellValidation = memo(function MemoizedCellValidation({
         setContextMenuTarget(e.target as HTMLElement);
       }}
     >
-      {renderedCell}
+      {renderedValidationTooltip}
+      <ErrorBoundary fallbackRender={InlineErrorFallback}>
+        {flexRender(cell.column.columnDef.cell, {
+          ...cell.getContext(),
+          focusInsideCell: isSelectedCell && focusInsideCell,
+          setFocusInsideCell: (focusInside: boolean) =>
+            setSelectedCell({
+              path: row.original._rowy_ref.path,
+              columnKey: cell.column.id,
+              focusInside,
+            }),
+          disabled:
+            !canEditCells || cell.column.columnDef.meta?.editable === false,
+          rowHeight,
+        })}
+      </ErrorBoundary>
     </StyledCell>
   );
 });
diff --git a/src/components/Table/Table.tsx b/src/components/Table/Table.tsx
index c7395447..886fdcff 100644
--- a/src/components/Table/Table.tsx
+++ b/src/components/Table/Table.tsx
@@ -10,7 +10,7 @@ import { DropResult } from "react-beautiful-dnd";
 import { get } from "lodash-es";
 
 import StyledTable from "./Styled/StyledTable";
-import TableHeaderGroup from "./TableHeaderGroup";
+import TableHeader from "./TableHeader";
 import TableBody from "./TableBody";
 import FinalColumn from "./FinalColumn/FinalColumn";
 import ContextMenu from "./ContextMenu";
@@ -215,7 +215,7 @@ export default function Table({
             padding: `0 ${TABLE_PADDING}px`,
           }}
         >
-          <TableHeaderGroup
+          <TableHeader
             headerGroups={table.getHeaderGroups()}
             handleDropColumn={handleDropColumn}
             canAddColumns={canAddColumns}
diff --git a/src/components/Table/TableHeaderGroup.tsx b/src/components/Table/TableHeader.tsx
similarity index 97%
rename from src/components/Table/TableHeaderGroup.tsx
rename to src/components/Table/TableHeader.tsx
index 9f2e0a23..555b6d82 100644
--- a/src/components/Table/TableHeaderGroup.tsx
+++ b/src/components/Table/TableHeader.tsx
@@ -14,7 +14,7 @@ import { DragVertical } from "@src/assets/icons";
 import { tableScope, selectedCellAtom } from "@src/atoms/tableScope";
 import { DEFAULT_ROW_HEIGHT, TABLE_PADDING } from "@src/components/Table";
 
-export interface ITableHeaderGroupProps {
+export interface ITableHeaderProps {
   headerGroups: HeaderGroup<TableRow>[];
   handleDropColumn: (result: DropResult) => void;
   canAddColumns: boolean;
@@ -22,13 +22,13 @@ export interface ITableHeaderGroupProps {
   lastFrozen?: string;
 }
 
-export const TableHeaderGroup = memo(function TableHeaderGroup({
+export const TableHeader = memo(function TableHeader({
   headerGroups,
   handleDropColumn,
   canAddColumns,
   canEditColumns,
   lastFrozen,
-}: ITableHeaderGroupProps) {
+}: ITableHeaderProps) {
   const [selectedCell, setSelectedCell] = useAtom(selectedCellAtom, tableScope);
   const focusInsideCell = selectedCell?.focusInside ?? false;
 
@@ -190,4 +190,4 @@ export const TableHeaderGroup = memo(function TableHeaderGroup({
   );
 });
 
-export default TableHeaderGroup;
+export default TableHeader;