Merge pull request #619 from jbetancur/fix/615-amend

do not aply overflow when using custom cells
jbetancur · Jul 5, 2020 · 02c88fb · 02c88fb
2 parents 6e2ce83 + 1c386fd
commit 02c88fb
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-data-table-component",
-  "version": "6.9.4",
+  "version": "6.9.5",
   "description": "A declarative react based data table",
   "main": "dist/index.cjs.js",
   "module": "dist/index.es.js",

diff --git a/src/DataTable/TableCell.js b/src/DataTable/TableCell.js
@@ -15,7 +15,7 @@ const overflowCSS = css`
 const TableCellStyle = styled(Cell)`
   font-size: ${props => props.theme.rows.fontSize};
   font-weight: 400;
-  ${props => !props.column.button && overflowCSS};
+  ${props => !props.column.cell && overflowCSS};
   ${props => props.column.style};
   ${props => props.extendedCellStyle};
 `;

diff --git a/src/DataTable/__tests__/__snapshots__/DataTable.test.js.snap b/src/DataTable/__tests__/__snapshots__/DataTable.test.js.snap
@@ -20461,6 +20461,12 @@ exports[`DataTable::columns should render correctly when column.button = true 1`
   font-weight: 400;
 }
 
+.c15 div:first-child {
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+
 .c14 {
   display: -webkit-box;
   display: -webkit-flex;
@@ -20899,12 +20905,6 @@ exports[`DataTable::columns should render correctly when column.cell is set to a
   font-weight: 400;
 }
 
-.c15 div:first-child {
-  white-space: nowrap;
-  overflow: hidden;
-  text-overflow: ellipsis;
-}
-
 .c14 {
   display: -webkit-box;
   display: -webkit-flex;