Fixed #4342 - Rename merge and useMergeProps options with mergeSectio…

…ns and mergeProps options on usePassThrough method
primefaces · Aug 28, 2023 · c57faf3 · c57faf3
1 parent ed62934
commit c57faf3
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/components/lib/basecomponent/BaseComponent.vue b/components/lib/basecomponent/BaseComponent.vue
@@ -508,15 +508,15 @@ export default {
             const fn = (value) => callback(value, key, params);
 
             if (pt?.hasOwnProperty('_usept')) {
-                const { merge, useMergeProps } = pt['_usept'];
+                const { mergeSections, mergeProps: useMergeProps } = pt['_usept'];
                 const originalValue = fn(pt.originalValue);
                 const value = fn(pt.value);
 
                 if (originalValue === undefined && value === undefined) return undefined;
                 else if (ObjectUtils.isString(value)) return value;
                 else if (ObjectUtils.isString(originalValue)) return originalValue;
 
-                return merge ? (useMergeProps ? mergeProps(originalValue, value) : { ...originalValue, ...value }) : value;
+                return mergeSections || (!mergeSections && value) ? (useMergeProps ? mergeProps(originalValue, value) : { ...originalValue, ...value }) : value;
             }
 
             return fn(pt);

diff --git a/components/lib/basedirective/BaseDirective.js b/components/lib/basedirective/BaseDirective.js
@@ -52,15 +52,15 @@ const BaseDirective = {
         const fn = (value) => callback(value, key, params);
 
         if (pt?.hasOwnProperty('_usept')) {
-            const { merge, useMergeProps } = pt['_usept'];
+            const { mergeSections, mergeProps: useMergeProps } = pt['_usept'];
             const originalValue = fn(pt.originalValue);
             const value = fn(pt.value);
 
             if (originalValue === undefined && value === undefined) return undefined;
             else if (ObjectUtils.isString(value)) return value;
             else if (ObjectUtils.isString(originalValue)) return originalValue;
 
-            return merge ? (useMergeProps ? mergeProps(originalValue, value) : { ...originalValue, ...value }) : value;
+            return mergeSections || (!mergeSections && value) ? (useMergeProps ? mergeProps(originalValue, value) : { ...originalValue, ...value }) : value;
         }
 
         return fn(pt);

diff --git a/components/lib/passthrough/index.js b/components/lib/passthrough/index.js
@@ -2,16 +2,16 @@
  * @todo: Add dynamic params support;
  *
  * Exp;
- * usePassThrough(pt1, pt2, pt3, pt*, { merge: true });
- * usePassThrough(pt1, { merge: true });
+ * usePassThrough(pt1, pt2, pt3, pt*, { mergeSections: true });
+ * usePassThrough(pt1, { mergeSections: true });
  */
-export const usePassThrough = (pt1 = {}, pt2 = {}, { merge = true, useMergeProps = true } = {}) => {
+export const usePassThrough = (pt1 = {}, pt2 = {}, { mergeSections = true, mergeProps = false } = {}) => {
     return {
         _usept: {
-            merge,
-            useMergeProps
+            mergeSections,
+            mergeProps
         },
         originalValue: pt1,
-        value: pt2
+        value: { ...pt1, ...pt2 }
     };
 };