From c4d9c95f601e930fc409fa0f6fc308d9921307a3 Mon Sep 17 00:00:00 2001
From: melloware <mellowaredev@gmail.com>
Date: Mon, 4 Jul 2022 10:05:03 -0400
Subject: [PATCH] Fix #3019: Column sortFunction add rowData

---
 components/lib/column/Column.d.ts     | 1 +
 components/lib/datatable/DataTable.js | 6 +++---
 components/lib/treetable/TreeTable.js | 1 +
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/components/lib/column/Column.d.ts b/components/lib/column/Column.d.ts
index aa630f7a99..efa02aba8e 100644
--- a/components/lib/column/Column.d.ts
+++ b/components/lib/column/Column.d.ts
@@ -117,6 +117,7 @@ interface ColumnEventParams {
 }
 
 interface ColumnSortParams {
+    rowData: any;
     field: string;
     order: ColumnSortOrderType;
 }
diff --git a/components/lib/datatable/DataTable.js b/components/lib/datatable/DataTable.js
index c724101fd4..f123a109f7 100644
--- a/components/lib/datatable/DataTable.js
+++ b/components/lib/datatable/DataTable.js
@@ -898,14 +898,14 @@ export const DataTable = React.forwardRef((props, ref) => {
         let value = [...data];
 
         if (columnSortable.current && columnSortFunction.current) {
-            value = columnSortFunction.current({ field, order });
+            value = columnSortFunction.current({ rowData: value, field: field, order: order });
         }
         else {
             value.sort((data1, data2) => {
                 const value1 = ObjectUtils.resolveFieldData(data1, field);
                 const value2 = ObjectUtils.resolveFieldData(data2, field);
 
-                return compareValuesOnSort(value1, value2, order);;
+                return compareValuesOnSort(value1, value2, order);
             });
         }
 
@@ -933,7 +933,7 @@ export const DataTable = React.forwardRef((props, ref) => {
             const field = columnField.current;
             const order = meta ? meta.order : defaultSortOrder;
 
-            value = columnSortFunction.current({ field, order });
+            value = columnSortFunction.current({ rowData: value, field: field, order: order });
         }
         else {
             value.sort((data1, data2) => {
diff --git a/components/lib/treetable/TreeTable.js b/components/lib/treetable/TreeTable.js
index 74f8b78c64..a629eac40c 100644
--- a/components/lib/treetable/TreeTable.js
+++ b/components/lib/treetable/TreeTable.js
@@ -174,6 +174,7 @@ export const TreeTable = React.forwardRef((props, ref) => {
 
         if (columnSortable.current && columnSortable.current === 'custom' && columnSortFunction.current) {
             value = columnSortFunction.current({
+                rowData: value,
                 field: getSortField(),
                 order: getSortOrder()
             });