BodyRows merge rowClassName properly #5983 (#5995)

primefaces · Feb 17, 2024 · a0567fb · a0567fb
1 parent f69f689
commit a0567fb
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/components/lib/datatable/BodyRow.js b/components/lib/datatable/BodyRow.js
@@ -468,7 +468,7 @@ export const BodyRow = React.memo((props) => {
         {
             role: 'row',
             tabIndex: tabIndex,
-            className: classNames(rowClassName, cx('bodyRow', { rowProps: props })),
+            className: classNames(cx('bodyRow', { rowProps: props })),
             style: style,
             onMouseDown: (e) => onMouseDown(e),
             onMouseUp: (e) => onMouseUp(e),
@@ -491,7 +491,10 @@ export const BodyRow = React.memo((props) => {
             'data-p-highlight': props.selected,
             'data-p-highlight-contextmenu': props.contextMenuSelected
         },
-        getBodyRowPTOptions('bodyRow')
+        getBodyRowPTOptions('bodyRow'),
+        {
+            className: classNames(rowClassName)
+        }
     );
 
     return <tr {...rowProps}>{content}</tr>;

diff --git a/components/lib/hooks/useMergeProps.js b/components/lib/hooks/useMergeProps.js
@@ -10,7 +10,7 @@ export const useMergeProps = () => {
 
     return (...props) => {
         const options = {
-            ...(context?.ptOptions?.classNameMergeFunction && { classNameMergeFunction: context.classNameMergeFunction })
+            classNameMergeFunction: context?.ptOptions?.classNameMergeFunction
         };
 
         return _mergeProps(props, options);