Merge pull request #6323 from gucal/issue-6274

#6274 - InputText: It doesnt take classNames when unstyled is true
primefaces · Apr 8, 2024 · 860dff3 · 860dff3
2 parents 1e7a386 + e1b9667
commit 860dff3
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 13 deletions.
diff --git 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,

diff --git 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({