Refactor #5144 - Add mergeProps method to utils

primefaces · Jan 17, 2024 · 65f2e37 · 65f2e37
1 parent f27f8fe
commit 65f2e37
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 2 deletions.
diff --git a/components/lib/utils/MergeProps.js b/components/lib/utils/MergeProps.js
@@ -41,3 +41,37 @@ export function _mergeProps(props, options = {}) {
 
     return undefined;
 }
+
+// @todo - Update this function and remove _mergeProps
+export function mergeProps(...props) {
+    if (props) {
+        const isFn = (o) => !!(o && o.constructor && o.call && o.apply);
+
+        return props.reduce((merged, ps) => {
+            for (const key in ps) {
+                const value = ps[key];
+
+                if (key === 'style') {
+                    merged['style'] = { ...merged['style'], ...ps['style'] };
+                } else if (key === 'className') {
+                    merged['className'] = [merged['className'], ps['className']].join(' ').trim();
+                } else if (isFn(value)) {
+                    const fn = merged[key];
+
+                    merged[key] = fn
+                        ? (...args) => {
+                              fn(...args);
+                              value(...args);
+                          }
+                        : value;
+                } else {
+                    merged[key] = value;
+                }
+            }
+
+            return merged;
+        }, {});
+    }
+
+    return undefined;
+}
diff --git a/components/lib/utils/Utils.js b/components/lib/utils/Utils.js
@@ -3,9 +3,10 @@ import DomHandler from './DomHandler';
 import EventBus from './EventBus';
 import IconUtils from './IconUtils';
 import { mask } from './Mask';
-import { _mergeProps } from './MergeProps';
+import { _mergeProps, mergeProps } from './MergeProps';
 import ObjectUtils from './ObjectUtils';
 import UniqueComponentId from './UniqueComponentId';
 import { ZIndexUtils } from './ZIndexUtils';
 
-export { DomHandler, EventBus, IconUtils, ObjectUtils, UniqueComponentId, ZIndexUtils, _mergeProps, classNames, mask };
+export { DomHandler, EventBus, IconUtils, ObjectUtils, UniqueComponentId, ZIndexUtils, _mergeProps, classNames, mask, mergeProps };
+
diff --git a/components/lib/utils/utils.d.ts b/components/lib/utils/utils.d.ts
@@ -9,6 +9,7 @@ import * as React from 'react';
 
 export declare function classNames(...args: any[]): string | undefined;
 
+// @todo - replace it with mergeProps
 export declare function _mergeProps(args: object[], options?: any): object | undefined;
 
 export declare class DomHandler {