diff --git a/src/components/mui/__tests__/mui-table-editable.test.js b/src/components/mui/__tests__/mui-table-editable.test.js
index 87da923..d76a0ab 100644
--- a/src/components/mui/__tests__/mui-table-editable.test.js
+++ b/src/components/mui/__tests__/mui-table-editable.test.js
@@ -359,22 +359,4 @@ describe("MuiTableEditable", () => {
expect(sx.color).toBe("text.disabled");
});
});
-
- test("does not apply archived styles to archive/unarchive action cell", () => {
- setup({
- options: { sortCol: "name", sortDir: -1, disableProp: "is_archived" },
- data: [{ id: 1, name: "Alice", role: "Dev", age: 35, is_archived: true }],
- onArchive: jest.fn()
- });
-
- const unarchiveButton = screen.getByRole("button", {
- name: "general.unarchive"
- });
- const actionCell = unarchiveButton.closest("td");
- const sx = getCellSx(actionCell);
-
- expect(sx.width).toBe(80);
- expect(sx.backgroundColor).toBeUndefined();
- expect(sx.color).toBeUndefined();
- });
});
diff --git a/src/components/mui/editable-table/mui-table-editable.js b/src/components/mui/editable-table/mui-table-editable.js
index 9a0cf55..3a9e75c 100644
--- a/src/components/mui/editable-table/mui-table-editable.js
+++ b/src/components/mui/editable-table/mui-table-editable.js
@@ -28,6 +28,7 @@ import { IconButton, TextField } from "@mui/material";
import EditIcon from "@mui/icons-material/Edit";
import DeleteIcon from "@mui/icons-material/Delete";
import { visuallyHidden } from "@mui/utils";
+import styles from "./mui-table-editable.module.less";
import {
DEFAULT_PER_PAGE,
@@ -123,7 +124,7 @@ const EditableCell = ({ value, isEditing, onBlur, validation }) => {
onMouseEnter={() => setIsHovering(true)}
onMouseLeave={() => setIsHovering(false)}
>
- {value}
+ {value}
{isHovering && (
@@ -256,6 +258,7 @@ const MuiTableEditable = ({
: "asc"
}
onClick={() => onSort(col.columnKey, sortDir * -1)}
+ sx={{ fontWeight: "normal" }}
>
{col.header}
{sortCol === col.columnKey ? (
@@ -267,13 +270,19 @@ const MuiTableEditable = ({
) : null}
) : (
- col.header
+ {col.header}
)}
))}
- {onEdit && }
- {onArchive && }
- {onDelete && }
+ {onEdit && (
+
+ )}
+ {onArchive && (
+
+ )}
+ {onDelete && (
+
+ )}
{/* TABLE BODY */}
@@ -286,7 +295,8 @@ const MuiTableEditable = ({
onClick={() => handleCellClick(row, col.columnKey)}
sx={getCellSx(row, {
cursor: isEditable(col, row) ? "pointer" : "default",
- padding: isEditable(col, row) ? "8px 16px" : undefined // Ensure enough space for the edit icon
+ padding: isEditable(col, row) ? "8px 16px" : undefined,
+ fontWeight: "normal"
})}
>
{isEditable(col, row) ? (
@@ -310,12 +320,17 @@ const MuiTableEditable = ({
) : col.render ? (
col.render(row)
) : (
- row[col.columnKey]
+
+ {row[col.columnKey]}
+
)}
))}
{onEdit && (
-
+
onEdit(row)}
size="small"
@@ -326,7 +341,13 @@ const MuiTableEditable = ({
)}
{onArchive && (
-
+
)}
{onDelete && (
-
+
handleDelete(row)}
size="small"
diff --git a/src/components/mui/editable-table/styles.module.less b/src/components/mui/editable-table/mui-table-editable.module.less
similarity index 100%
rename from src/components/mui/editable-table/styles.module.less
rename to src/components/mui/editable-table/mui-table-editable.module.less
diff --git a/src/components/mui/sortable-table/mui-table-sortable.js b/src/components/mui/sortable-table/mui-table-sortable.js
index 7b1dbe1..ade4f26 100644
--- a/src/components/mui/sortable-table/mui-table-sortable.js
+++ b/src/components/mui/sortable-table/mui-table-sortable.js
@@ -216,6 +216,7 @@ const MuiTableSortable = ({
className={`${
col.dottedBorder && styles.dottedBorderLeft
} ${col.className}`}
+ sx={{ fontWeight: "normal" }}
>
{col.render?.(row) || row[col.columnKey]}
@@ -230,6 +231,7 @@ const MuiTableSortable = ({
onEdit(row)}
+ sx={{ padding: 0 }}
>
@@ -245,6 +247,7 @@ const MuiTableSortable = ({
handleDelete(row)}
+ sx={{ padding: 0 }}
>
diff --git a/src/components/mui/table/mui-table.js b/src/components/mui/table/mui-table.js
index 97d253e..899f776 100644
--- a/src/components/mui/table/mui-table.js
+++ b/src/components/mui/table/mui-table.js
@@ -137,7 +137,7 @@ const MuiTable = ({
);
}
- return row[col.columnKey];
+ return {row[col.columnKey]};
};
return (
@@ -204,7 +204,7 @@ const MuiTable = ({
className={`${
col.dottedBorder && styles.dottedBorderLeft
} ${col.className}`}
- sx={getCellSx(row)}
+ sx={{ ...getCellSx(row), fontWeight: "normal" }}
>
{renderCell(row, col)}
@@ -216,8 +216,13 @@ const MuiTable = ({
className={styles.dottedBorderLeft}
sx={getCellSx(row, {width: 40})}
>
- onEdit(row)} data-testid="action-edit">
-
+ onEdit(row)}
+ sx={{ padding: 0 }}
+ data-testid="action-edit"
+ >
+
)}
@@ -225,7 +230,7 @@ const MuiTable = ({
{onArchive && (