From 69fd6780204d76c7ed6f7635a2d0d11865ab2673 Mon Sep 17 00:00:00 2001 From: Akash Gupta Date: Wed, 3 Mar 2021 19:25:34 +0530 Subject: [PATCH 1/4] added a cleanup function in useEffect hook --- src-docs/src/views/datagrid/datagrid.js | 7 +++++++ src-docs/src/views/datagrid/footer_row.js | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/src-docs/src/views/datagrid/datagrid.js b/src-docs/src/views/datagrid/datagrid.js index f496a176b42..d3af85fcf3a 100644 --- a/src-docs/src/views/datagrid/datagrid.js +++ b/src-docs/src/views/datagrid/datagrid.js @@ -280,6 +280,13 @@ export default () => { }); } } + return () => { + setCellProps({ + style: { + backgroundColor: 'transparent', + }, + }); + }; }, [rowIndex, columnId, setCellProps, data]); function getFormatted() { diff --git a/src-docs/src/views/datagrid/footer_row.js b/src-docs/src/views/datagrid/footer_row.js index 6d7a247ebe9..1e738d727a0 100644 --- a/src-docs/src/views/datagrid/footer_row.js +++ b/src-docs/src/views/datagrid/footer_row.js @@ -92,6 +92,13 @@ export default () => { }); } } + return () => { + setCellProps({ + style: { + backgroundColor: 'transparent', + }, + }); + }; }, [rowIndex, columnId, setCellProps]); return raw_data.hasOwnProperty(rowIndex) From 0b01a4785b5c485a95f2576fe7aa8cd58c18a423 Mon Sep 17 00:00:00 2001 From: Akash Gupta Date: Wed, 3 Mar 2021 19:46:04 +0530 Subject: [PATCH 2/4] added changelog entry --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e97cb4999df..8a7be29145b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ No public interface changes since `31.9.1`. **Bug fixes** - Fixed an errant export of two non-existant values ([#4597](https://github.com/elastic/eui/pull/4564597)) +- Fixed `EuiDataGrid` retaining cells style when column position is changed ([#4601](https://github.com/elastic/eui/pull/4601)) ## [`31.9.0`](https://github.com/elastic/eui/tree/v31.9.0) From edc4426e080f1e16d244949961aa1336e7e0d320 Mon Sep 17 00:00:00 2001 From: Akash Gupta Date: Thu, 4 Mar 2021 17:01:34 +0530 Subject: [PATCH 3/4] removed style property from cleanup --- src-docs/src/views/datagrid/datagrid.js | 6 +----- src-docs/src/views/datagrid/footer_row.js | 6 +----- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/src-docs/src/views/datagrid/datagrid.js b/src-docs/src/views/datagrid/datagrid.js index d3af85fcf3a..55885de9229 100644 --- a/src-docs/src/views/datagrid/datagrid.js +++ b/src-docs/src/views/datagrid/datagrid.js @@ -281,11 +281,7 @@ export default () => { } } return () => { - setCellProps({ - style: { - backgroundColor: 'transparent', - }, - }); + setCellProps({}); }; }, [rowIndex, columnId, setCellProps, data]); diff --git a/src-docs/src/views/datagrid/footer_row.js b/src-docs/src/views/datagrid/footer_row.js index 1e738d727a0..9825d69e114 100644 --- a/src-docs/src/views/datagrid/footer_row.js +++ b/src-docs/src/views/datagrid/footer_row.js @@ -93,11 +93,7 @@ export default () => { } } return () => { - setCellProps({ - style: { - backgroundColor: 'transparent', - }, - }); + setCellProps({}); }; }, [rowIndex, columnId, setCellProps]); From eb945edb9e771a509f1460b57de7a6c0f66429e2 Mon Sep 17 00:00:00 2001 From: Akash Gupta Date: Fri, 5 Mar 2021 22:39:57 +0530 Subject: [PATCH 4/4] Update CHANGELOG.md --- CHANGELOG.md | 1 - 1 file changed, 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1fe6cde9a75..6091057a7d9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,7 +14,6 @@ **Bug fixes** -- Fixed an errant export of two non-existant values ([#4597](https://github.com/elastic/eui/pull/4564597)) - Fixed an errant export of two non-existant values ([#4597](https://github.com/elastic/eui/pull/4597)) ## [`31.9.0`](https://github.com/elastic/eui/tree/v31.9.0)