diff --git a/packages/big-design/src/components/AccordionPanel/__snapshots__/spec.tsx.snap b/packages/big-design/src/components/AccordionPanel/__snapshots__/spec.tsx.snap
index c8f545562..df8b49ffb 100644
--- a/packages/big-design/src/components/AccordionPanel/__snapshots__/spec.tsx.snap
+++ b/packages/big-design/src/components/AccordionPanel/__snapshots__/spec.tsx.snap
@@ -2,7 +2,7 @@
exports[`it renders accordion panel header 1`] = `
Accordion Panel Header
diff --git a/packages/big-design/src/components/Tree/__snapshots__/spec.tsx.snap b/packages/big-design/src/components/Tree/__snapshots__/spec.tsx.snap
index fe497402d..8d9e37317 100644
--- a/packages/big-design/src/components/Tree/__snapshots__/spec.tsx.snap
+++ b/packages/big-design/src/components/Tree/__snapshots__/spec.tsx.snap
@@ -3,25 +3,25 @@
exports[`renders simple tree 1`] = `
-
-
-
Test Node 9
@@ -190,19 +190,19 @@ exports[`renders simple tree 1`] = `
-
-
Test Node 6
@@ -302,22 +302,22 @@ exports[`renders simple tree 1`] = `
-
Category
@@ -345,19 +345,19 @@ exports[`renders simple tree 1`] = `
-
-
Test Node 7
@@ -457,19 +457,19 @@ exports[`renders simple tree 1`] = `
-
-
Test Node 8
diff --git a/packages/big-design/src/components/Worksheet/Row/Row.tsx b/packages/big-design/src/components/Worksheet/Row/Row.tsx
index 18d24dff5..bfbd45205 100644
--- a/packages/big-design/src/components/Worksheet/Row/Row.tsx
+++ b/packages/big-design/src/components/Worksheet/Row/Row.tsx
@@ -73,6 +73,17 @@ const InternalRow = ({ columns, rowIndex }: RowProps
[expandableRows, row.id],
);
+ const getIsCellDisabled = useCallback(
+ ({ enabled, disabled }: InternalWorksheetColumn) => {
+ if (typeof enabled === 'boolean' && enabled) {
+ return false;
+ }
+
+ return disabled || isDisabled;
+ },
+ [isDisabled],
+ );
+
if (isChild && !isExpanded) {
return null;
}
@@ -83,7 +94,7 @@ const InternalRow = ({ columns, rowIndex }: RowProps
{columns.map((column, columnIndex) => (
|