From 398f0f0372b316df782868cdc98d5e344caa242a Mon Sep 17 00:00:00 2001
From: "Wittig, Steffen" <steffen.wittig@Sartorius.com>
Date: Tue, 22 Dec 2020 13:25:18 +0100
Subject: [PATCH 1/3] fix(CDataTable): correct itemsPerPageSelect padding

---
 src/table/CDataTable.js                               | 2 +-
 src/table/tests/__snapshots__/CDataTable.test.js.snap | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/table/CDataTable.js b/src/table/CDataTable.js
index 821492c1..876ca834 100644
--- a/src/table/CDataTable.js
+++ b/src/table/CDataTable.js
@@ -444,7 +444,7 @@ const CDataTable = props => {
       }
       {
         itemsPerPageSelect &&
-        <div className={'col-sm-6 p-0' + (!(tableFilter || cleaner) && ' offset-sm-6')}>
+        <div className={'col-sm-6 p-0 ' + (!(tableFilter || cleaner) && ' offset-sm-6')}>
           <div className="form-inline justify-content-sm-end">
             <label className="mr-2">{paginationSelect.label}</label>
             <select
diff --git a/src/table/tests/__snapshots__/CDataTable.test.js.snap b/src/table/tests/__snapshots__/CDataTable.test.js.snap
index 84e7ee9e..ffdadea0 100644
--- a/src/table/tests/__snapshots__/CDataTable.test.js.snap
+++ b/src/table/tests/__snapshots__/CDataTable.test.js.snap
@@ -69,7 +69,7 @@ Array [
         />
       </div>
       <div
-        className="col-sm-6 p-0false"
+        className="col-sm-6 p-0 false"
       >
         <div
           className="form-inline justify-content-sm-end"

From 1b5079f76020d579d2edc00da20edec0956521bf Mon Sep 17 00:00:00 2001
From: xidedix <xidedix@users.noreply.github.com>
Date: Tue, 22 Dec 2020 17:58:01 +0100
Subject: [PATCH 2/3] fix(CDataTable): tableFilter and cleaner minor cleanup

---
 src/table/CDataTable.css                      | 18 ++++++++++++++
 src/table/CDataTable.js                       | 16 +++++++------
 src/table/tests/CDataTable.test.js            |  1 +
 .../__snapshots__/CDataTable.test.js.snap     | 24 +++++++++++++++----
 4 files changed, 47 insertions(+), 12 deletions(-)
 create mode 100644 src/table/CDataTable.css

diff --git a/src/table/CDataTable.css b/src/table/CDataTable.css
new file mode 100644
index 00000000..9cc1914f
--- /dev/null
+++ b/src/table/CDataTable.css
@@ -0,0 +1,18 @@
+.c-datatable-filter {
+  display: flex;
+  flex-flow: row nowrap;
+  justify-content: flex-start;
+  align-items: center;
+}
+.c-datatable-filter label {
+  margin-bottom: 0;
+}
+.c-datatable-items-per-page {
+  display: flex;
+  flex-flow: row nowrap;
+  justify-content: flex-end;
+  align-items: center;
+}
+.c-datatable-items-per-page label {
+  margin-bottom: 0;
+}
diff --git a/src/table/CDataTable.js b/src/table/CDataTable.js
index 876ca834..7d1c0163 100644
--- a/src/table/CDataTable.js
+++ b/src/table/CDataTable.js
@@ -3,9 +3,10 @@ import PropTypes from 'prop-types'
 import classNames from 'classnames'
 import CPagination from '../pagination/CPagination'
 import CElementCover from '../element-cover/CElementCover'
-import style from './CDataTable.module.css'
 import CIcon from '@coreui/icons-react'
 import { cilArrowTop, cilBan, cilFilterX } from '@coreui/icons'
+import style from './CDataTable.module.css'
+import './CDataTable.css'
 
 //component - CoreUI / CTable
 const CDataTable = props => {
@@ -343,7 +344,7 @@ const CDataTable = props => {
 
   const cleanerProps = {
     content: cilFilterX,
-    className: `ml-2 ${isFiltered ? 'text-danger' : 'transparent'}`,
+    className: `mfs-2 ${isFiltered ? 'text-danger' : 'transparent'}`,
     role: isFiltered ? 'button' : null,
     tabIndex: isFiltered ? 0 : null,
   }
@@ -414,11 +415,11 @@ const CDataTable = props => {
     <div className="row my-2 mx-0">
       {
         (tableFilter || cleaner) &&
-        <div className="col-sm-6 form-inline p-0">
+        <div className="col-sm-6 form-inline p-0 c-datatable-filter">
           {
             tableFilter &&
             <>
-              <label className="mr-2">{tableFilterData.label}</label>
+              <label className="mfe-2">{tableFilterData.label}</label>
               <input
                 className="form-control"
                 type="text"
@@ -436,6 +437,7 @@ const CDataTable = props => {
               <CIcon
                 {...cleanerProps}
                 onClick={clean}
+                onKeyUp={(event) => { if (event.key === 'Enter') clean() }}
               />
             )
           }
@@ -444,9 +446,9 @@ const CDataTable = props => {
       }
       {
         itemsPerPageSelect &&
-        <div className={'col-sm-6 p-0 ' + (!(tableFilter || cleaner) && ' offset-sm-6')}>
-          <div className="form-inline justify-content-sm-end">
-            <label className="mr-2">{paginationSelect.label}</label>
+        <div className={`col-sm-6 p-0 ${(tableFilter || cleaner) ? '' : 'offset-sm-6'}`}>
+          <div className="form-inline justify-content-sm-end c-datatable-items-per-page">
+            <label className="mfe-2">{paginationSelect.label}</label>
             <select
               className="form-control"
               onChange={paginationChange}
diff --git a/src/table/tests/CDataTable.test.js b/src/table/tests/CDataTable.test.js
index fef53466..c905e41b 100644
--- a/src/table/tests/CDataTable.test.js
+++ b/src/table/tests/CDataTable.test.js
@@ -49,6 +49,7 @@ describe('CDataTable', () => {
         clickableRows
         columnFilter
         tableFilter
+        cleaner
         addTableClasses="table-classes"
         size="sm"
         dark
diff --git a/src/table/tests/__snapshots__/CDataTable.test.js.snap b/src/table/tests/__snapshots__/CDataTable.test.js.snap
index ffdadea0..5f3c3902 100644
--- a/src/table/tests/__snapshots__/CDataTable.test.js.snap
+++ b/src/table/tests/__snapshots__/CDataTable.test.js.snap
@@ -51,10 +51,10 @@ Array [
       className="row my-2 mx-0"
     >
       <div
-        className="col-sm-6 form-inline p-0"
+        className="col-sm-6 form-inline p-0 c-datatable-filter"
       >
         <label
-          className="mr-2"
+          className="mfe-2"
         >
           Filter:
         </label>
@@ -67,15 +67,29 @@ Array [
           type="text"
           value=""
         />
+        <svg
+          className="c-icon mfs-2 transparent"
+          dangerouslySetInnerHTML={
+            Object {
+              "__html": "<polygon fill='var(--ci-primary-color, currentColor)' points='40 16 40 53.828 109.024 136 150.815 136 76.896 48 459.51 48 304 242.388 304 401.373 241.373 464 240 464 240 368 208 368 208 496 254.627 496 336 414.627 336 253.612 496 53.612 496 16 40 16' class='ci-primary'/><polygon fill='var(--ci-primary-color, currentColor)' points='166.403 248.225 226.864 187.763 204.237 165.135 143.775 225.597 83.313 165.135 60.687 187.763 121.148 248.225 60.687 308.687 83.313 331.314 143.775 270.852 204.237 331.314 226.864 308.687 166.403 248.225' class='ci-primary'/>",
+            }
+          }
+          onClick={[Function]}
+          onKeyUp={[Function]}
+          role="img"
+          tabIndex={null}
+          viewBox="0 0 512 512"
+          xmlns="http://www.w3.org/2000/svg"
+        />
       </div>
       <div
-        className="col-sm-6 p-0 false"
+        className="col-sm-6 p-0 "
       >
         <div
-          className="form-inline justify-content-sm-end"
+          className="form-inline justify-content-sm-end c-datatable-items-per-page"
         >
           <label
-            className="mr-2"
+            className="mfe-2"
           >
             Items per page:
           </label>

From 72497b696f8f90694fc953c5d047511c14c351d1 Mon Sep 17 00:00:00 2001
From: xidedix <xidedix@users.noreply.github.com>
Date: Tue, 22 Dec 2020 18:01:59 +0100
Subject: [PATCH 3/3] chore(release): 3.4.3

---
 CHANGELOG.md | 8 ++++++++
 package.json | 4 ++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cfdaf276..6c49007a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,11 +2,19 @@
 
 All notable changes to this project will be documented in this file. Dates are displayed in UTC.
 
+#### [3.4.3](https://github.com/coreui/coreui-react/compare/3.4.2...3.4.3)
+
+> 22 December 2020
+
+- fix(CDataTable): correct itemsPerPageSelect padding [`#171`](https://github.com/coreui/coreui-react/pull/171)
+- fix(CDataTable): tableFilter and cleaner minor cleanup [`1b5079f`](https://github.com/coreui/coreui-react/commit/1b5079f76020d579d2edc00da20edec0956521bf)
+
 #### [3.4.2](https://github.com/coreui/coreui-react/compare/3.4.1...3.4.2)
 
 > 18 December 2020
 
 - fix(CToast): add missing color prop [`f48c98c`](https://github.com/coreui/coreui-react/commit/f48c98cf7f66ed3089730fbb37da5d0c4a975563)
+- chore(release): 3.4.2 [`939098f`](https://github.com/coreui/coreui-react/commit/939098f265dc9fe8d908995db369bae3f3c65ef9)
 
 #### [3.4.1](https://github.com/coreui/coreui-react/compare/3.4.0...3.4.1)
 
diff --git a/package.json b/package.json
index e9cbeae4..323dab26 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@coreui/react",
-  "version": "3.4.2",
+  "version": "3.4.3",
   "description": "CoreUI React 17 Bootstrap 4 components",
   "license": "MIT",
   "author": {
@@ -87,7 +87,7 @@
     "del-cli": "^3.0.1",
     "enzyme": "^3.11.0",
     "enzyme-to-json": "^3.6.1",
-    "eslint": "^7.15.0",
+    "eslint": "^7.16.0",
     "eslint-plugin-import": "^2.22.1",
     "eslint-plugin-react": "^7.21.5",
     "expect": "^26.6.2",