Refactor #4473

primefaces · Sep 20, 2023 · 4421237 · 4421237
1 parent c634ad5
commit 4421237
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/components/lib/basecomponent/BaseComponent.vue b/components/lib/basecomponent/BaseComponent.vue
@@ -487,8 +487,6 @@ export default {
             return ObjectUtils.isString(value) || ObjectUtils.isArray(value) ? { class: value } : value;
         },
         _getPT(pt, key = '', callback) {
-            const _usept = pt?.['_usept'];
-
             const getValue = (value, checkSameKey = false) => {
                 const computedValue = callback ? callback(value) : value;
                 const _key = ObjectUtils.toFlatCase(key);
@@ -497,9 +495,9 @@ export default {
                 return (checkSameKey ? (_key !== _cKey ? computedValue?.[_key] : undefined) : computedValue?.[_key]) ?? computedValue;
             };
 
-            return ObjectUtils.isNotEmpty(_usept)
+            return pt?.hasOwnProperty('_usept')
                 ? {
-                      _usept,
+                      _usept: pt['_usept'],
                       originalValue: getValue(pt.originalValue),
                       value: getValue(pt.value)
                   }

diff --git a/components/lib/basedirective/BaseDirective.js b/components/lib/basedirective/BaseDirective.js
@@ -33,18 +33,16 @@ const BaseDirective = {
         return mergeSections || (!mergeSections && self) ? (useMergeProps ? mergeProps(global, self, datasets) : { ...global, ...self, ...datasets }) : { ...self, ...datasets };
     },
     _getPT: (pt, key = '', callback) => {
-        const _usept = pt?.['_usept'];
-
         const getValue = (value) => {
             const computedValue = callback ? callback(value) : value;
             const _key = ObjectUtils.toFlatCase(key);
 
             return computedValue?.[_key] ?? computedValue;
         };
 
-        return ObjectUtils.isNotEmpty(_usept)
+        return pt?.hasOwnProperty('_usept')
             ? {
-                  _usept,
+                  _usept: pt['_usept'],
                   originalValue: getValue(pt.originalValue),
                   value: getValue(pt.value)
               }