From 77a94872ebdfcf235b29de8e7a3712db0bceb19c Mon Sep 17 00:00:00 2001 From: woothu <32914662+woothu@users.noreply.github.com> Date: Fri, 31 Jul 2020 13:32:29 +0200 Subject: [PATCH 1/3] chore: update changelog --- CHANGELOG.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 14e8f1e5..9f6611e0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,15 @@ All notable changes to this project will be documented in this file. Dates are displayed in UTC. +#### [3.2.2](https://github.com/coreui/coreui-react/compare/3.2.1...3.2.2) + +> 31 July 2020 + +- chore: 3.2.2 release: update dependencies [`895f454`](https://github.com/coreui/coreui-react/commit/895f4545e0de72c103e1e20b082161c1f9fab1e5) +- fix: CDataTable component fixes [`9dae2ab`](https://github.com/coreui/coreui-react/commit/9dae2ab32fc9dcc730b1214ecb777776f5346bf9) +- fix: CSidebarNavDropdown: add possibility of component as `icon` [`03c4c32`](https://github.com/coreui/coreui-react/commit/03c4c3239f42b174c703f0ee5b0eef45761ceb9f) +- chore: update changelog [`df6d3b9`](https://github.com/coreui/coreui-react/commit/df6d3b9664c72690a542a1804fcff9164cc80f42) + #### [3.2.1](https://github.com/coreui/coreui-react/compare/3.2.0...3.2.1) > 30 July 2020 From 8425052d2c7cb4a431a1611977da98cc0f21b64c Mon Sep 17 00:00:00 2001 From: woothu <32914662+woothu@users.noreply.github.com> Date: Tue, 11 Aug 2020 13:05:21 +0200 Subject: [PATCH 2/3] fix: CDataTable: fix wrong class assignment in itemsPerPageSelect #138 --- src/table/CDataTable.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/table/CDataTable.js b/src/table/CDataTable.js index 294a5759..0a770a51 100644 --- a/src/table/CDataTable.js +++ b/src/table/CDataTable.js @@ -238,9 +238,9 @@ const CDataTable = props => { return items } const filter = tableFilterState.toLowerCase() - const hasFilter = (item) => String(item).toLowerCase().includes(filter) + const valueContainFilter = val => String(val).toLowerCase().includes(filter) items = items.filter(item => { - return itemsDataColumns.filter(key => hasFilter(item[key])).length + return !!itemsDataColumns.find(key => valueContainFilter(item[key])) }) return items }, [ @@ -444,7 +444,7 @@ const CDataTable = props => { } { itemsPerPageSelect && -
+