From 4ed1cdf864a8eda19f1af25f50d5ca6d5bcf3d83 Mon Sep 17 00:00:00 2001 From: gucal Date: Mon, 8 Apr 2024 14:33:47 +0300 Subject: [PATCH 1/2] #6274 - InputText: It doesnt take classNames when unstyled is true --- components/lib/inputtext/InputText.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components/lib/inputtext/InputText.js b/components/lib/inputtext/InputText.js index 7b812ee03f..9621782e17 100644 --- a/components/lib/inputtext/InputText.js +++ b/components/lib/inputtext/InputText.js @@ -4,7 +4,7 @@ import { useHandleStyle } from '../componentbase/ComponentBase'; import { useMergeProps } from '../hooks/Hooks'; import { KeyFilter } from '../keyfilter/KeyFilter'; import { Tooltip } from '../tooltip/Tooltip'; -import { DomHandler, ObjectUtils } from '../utils/Utils'; +import { DomHandler, ObjectUtils, classNames } from '../utils/Utils'; import { InputTextBase } from './InputTextBase'; export const InputText = React.memo( @@ -71,7 +71,7 @@ export const InputText = React.memo( const rootProps = mergeProps( { - className: cx('root', { context, isFilled }), + className: classNames(props.className, cx('root', { context, isFilled })), onBeforeInput: onBeforeInput, onInput: onInput, onKeyDown: onKeyDown, From e1b9667e6b7ac566b93da1d4e0aef097e07d458e Mon Sep 17 00:00:00 2001 From: gucal Date: Mon, 8 Apr 2024 14:51:28 +0300 Subject: [PATCH 2/2] Remove classname from inputtextbase --- components/lib/inputtext/InputTextBase.js | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/components/lib/inputtext/InputTextBase.js b/components/lib/inputtext/InputTextBase.js index 4de41a5caf..8517dc67f0 100644 --- a/components/lib/inputtext/InputTextBase.js +++ b/components/lib/inputtext/InputTextBase.js @@ -3,17 +3,12 @@ import { classNames } from '../utils/Utils'; const classes = { root: ({ props, isFilled, context }) => - classNames( - 'p-inputtext p-component', - { - 'p-disabled': props.disabled, - 'p-filled': isFilled, - 'p-invalid': props.invalid, - 'p-variant-filled': props.variant ? props.variant === 'filled' : context && context.inputStyle === 'filled' - }, - - props.className - ) + classNames('p-inputtext p-component', { + 'p-disabled': props.disabled, + 'p-filled': isFilled, + 'p-invalid': props.invalid, + 'p-variant-filled': props.variant ? props.variant === 'filled' : context && context.inputStyle === 'filled' + }) }; export const InputTextBase = ComponentBase.extend({