From d06faa3708bc2f0e16dac0732dcabdf7ada6383e Mon Sep 17 00:00:00 2001
From: Wlad Meixner <wlad.meixner@protonmail.com>
Date: Sun, 15 Mar 2020 19:59:13 +0100
Subject: [PATCH] [react-bootstrap-table-next] add filter example

---
 types/react-bootstrap-table-next/index.d.ts   |  3 +-
 .../react-bootstrap-table-next-tests.tsx      | 42 +++++++++++++++++++
 2 files changed, 44 insertions(+), 1 deletion(-)

diff --git a/types/react-bootstrap-table-next/index.d.ts b/types/react-bootstrap-table-next/index.d.ts
index 0f35efa01a..5db7cd4f40 100644
--- a/types/react-bootstrap-table-next/index.d.ts
+++ b/types/react-bootstrap-table-next/index.d.ts
@@ -108,8 +108,9 @@ export type ColumnFormatter<R, E = any, C = any> = (
 
 export type ColumnDescription<T = any, E = any> = (
     | { isDummyField: true; dataField?: string; formatter?: ColumnFormatter<T, E, never> }
-    | { dataField: T[keyof T] | string; formatter?: ColumnFormatter<T, E, T[keyof T]> }
+    | { dataField: T[keyof T] | string }
 ) & {
+    formatter?: ColumnFormatter<T, E, any>;
     hidden?: boolean;
     /**
      * Column header field
diff --git a/types/react-bootstrap-table-next/react-bootstrap-table-next-tests.tsx b/types/react-bootstrap-table-next/react-bootstrap-table-next-tests.tsx
index d5008cb309..6b61284837 100644
--- a/types/react-bootstrap-table-next/react-bootstrap-table-next-tests.tsx
+++ b/types/react-bootstrap-table-next/react-bootstrap-table-next-tests.tsx
@@ -83,6 +83,48 @@ render(
     document.getElementById('app'),
 );
 
+/**
+ * Inline untyped columns test
+ */
+render(
+    <BootstrapTable
+        data={products}
+        bootstrap4
+        striped={true}
+        hover={true}
+        keyField="id"
+        columns={[
+            { dataField: 'id', align: CellAlignment.center, sort: true, text: 'Product ID' },
+            { dataField: 'name', align: CellAlignment.center, sort: true, text: 'Product Name' },
+            {
+                isDummyField: true,
+                dataField: '',
+                sort: true,
+                formatter: () => <span>Dummy Field</span>,
+                text: 'Dummy Columns',
+            },
+            {
+                dataField: 'price',
+                sort: true,
+                formatter: priceFormatter,
+                text: 'Product Price',
+                headerFormatter: priceHeaderFormatter,
+            },
+            /**
+             * test optional dataField for dummyFields
+             */
+            {
+                isDummyField: true,
+                sort: true,
+                formatter: priceFormatter,
+                text: 'Product Price',
+                headerFormatter: priceHeaderFormatter,
+            },
+        ]}
+    />,
+    document.getElementById('app'),
+);
+
 /**
  * Basic table with custom data indicator and caption
  */