diff --git a/packages/core/src/basedirective/BaseDirective.js b/packages/core/src/basedirective/BaseDirective.js index 89febc73b..14007f285 100644 --- a/packages/core/src/basedirective/BaseDirective.js +++ b/packages/core/src/basedirective/BaseDirective.js @@ -40,7 +40,7 @@ const BaseDirective = { return computedValue?.[_key] ?? computedValue; }; - return Object.hasOwn(pt, '_usept') + return pt && Object.hasOwn(pt, '_usept') ? { _usept: pt['_usept'], originalValue: getValue(pt.originalValue), @@ -51,7 +51,7 @@ const BaseDirective = { _usePT: (instance = {}, pt, callback, key, params) => { const fn = (value) => callback(value, key, params); - if (Object.hasOwn(pt, '_usept')) { + if (pt && Object.hasOwn(pt, '_usept')) { const { mergeSections = true, mergeProps: useMergeProps = false } = pt['_usept'] || instance.$primevueConfig?.ptOptions || {}; const originalValue = fn(pt.originalValue); const value = fn(pt.value); diff --git a/packages/forms/src/useform/index.js b/packages/forms/src/useform/index.js index 3a2a61239..eab884d47 100644 --- a/packages/forms/src/useform/index.js +++ b/packages/forms/src/useform/index.js @@ -120,10 +120,10 @@ export const useForm = (options = {}) => { validateFieldOn(field, fieldOptions, 'validateOnBlur'); }, onInput: (event) => { - _states[field].value = Object.hasOwn(event, 'value') ? event.value : event.target.value; + _states[field].value = event && Object.hasOwn(event, 'value') ? event.value : event.target.value; }, onChange: (event) => { - _states[field].value = Object.hasOwn(event, 'value') ? event.value : event.target.type === 'checkbox' || event.target.type === 'radio' ? event.target.checked : event.target.value; + _states[field].value = event && Object.hasOwn(event, 'value') ? event.value : event.target.type === 'checkbox' || event.target.type === 'radio' ? event.target.checked : event.target.value; }, onInvalid: (errors) => { _states[field].invalid = true;