Allow column.editable: false to disable editing even if we have a cus…

…tom editor
adazzle · Apr 22, 2020 · f7112c6 · f7112c6
1 parent 5d906bd
commit f7112c6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/utils/columnUtils.test.ts b/src/utils/columnUtils.test.ts
@@ -152,7 +152,7 @@ describe('canEdit', () => {
     expect(canEdit({ ...column, editable: false }, row)).toBe(false);
     expect(canEdit({ ...column, editable: true }, row)).toBe(true);
     expect(canEdit({ ...column, editor }, row)).toBe(true);
-    expect(canEdit({ ...column, editor, editable: false }, row)).toBe(true);
+    expect(canEdit({ ...column, editor, editable: false }, row)).toBe(false);
     expect(canEdit({ ...column, editor, editable: true }, row)).toBe(true);
   });
 });
diff --git a/src/utils/columnUtils.ts b/src/utils/columnUtils.ts
@@ -109,7 +109,7 @@ export function canEdit<R, SR>(column: CalculatedColumn<R, SR>, row: R): boolean
   if (typeof column.editable === 'function') {
     return column.editable(row);
   }
-  return Boolean(column.editor || column.editable);
+  return column.editable || column.editor != null && column.editable !== false;
 }
 
 export function getColumnScrollPosition<R, SR>(columns: readonly CalculatedColumn<R, SR>[], idx: number, currentScrollLeft: number, currentClientWidth: number): number {