merge fixes

payloadcms · Jul 31, 2024 · 0244109 · 0244109
1 parent aeeb470
commit 0244109
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 11 deletions.
diff --git a/packages/ui/src/fields/Password/index.tsx b/packages/ui/src/fields/Password/index.tsx
@@ -28,7 +28,10 @@ export type PasswordFieldProps = {
   style?: React.CSSProperties
   validate?: Validate
   width?: string
-} & Pick<FormFieldBase, 'AfterInput' | 'BeforeInput' | 'CustomDescription' | 'CustomError' | 'CustomLabel' | >
+} & Pick<
+  FormFieldBase,
+  'AfterInput' | 'BeforeInput' | 'CustomDescription' | 'CustomError' | 'CustomLabel'
+>
 
 const PasswordFieldComponent: React.FC<PasswordFieldProps> = (props) => {
   const {

diff --git a/packages/ui/src/fields/Password/input.tsx b/packages/ui/src/fields/Password/input.tsx
@@ -5,6 +5,7 @@ import React from 'react'
 
 import type { PasswordInputProps } from './types.js'
 
+import { RenderComponent } from '../../providers/ComponentMap/RenderComponent.js'
 import { FieldError } from '../FieldError/index.js'
 import { FieldLabel } from '../FieldLabel/index.js'
 import { fieldBaseClass } from '../shared/index.js'
@@ -62,7 +63,7 @@ export const PasswordInput: React.FC<PasswordInputProps> = (props) => {
       <div className={`${fieldBaseClass}__wrap`}>
         <FieldError CustomError={CustomError} path={path} {...(errorProps || {})} />
         <div>
-          {BeforeInput !== undefined && BeforeInput}
+          <RenderComponent mappedComponent={BeforeInput} />
           <input
             aria-label={label}
             autoComplete={autoComplete}
@@ -77,9 +78,9 @@ export const PasswordInput: React.FC<PasswordInputProps> = (props) => {
             type="password"
             value={value || ''}
           />
-          {AfterInput !== undefined && AfterInput}
+          <RenderComponent mappedComponent={AfterInput} />
         </div>
-        {CustomDescription !== undefined && CustomDescription}
+        <RenderComponent mappedComponent={CustomDescription} />
       </div>
     </div>
   )

diff --git a/packages/ui/src/fields/Password/types.ts b/packages/ui/src/fields/Password/types.ts
@@ -1,11 +1,6 @@
-import type { ErrorProps, LabelProps } from 'payload'
+import type { ErrorProps, FormFieldBase, LabelProps } from 'payload'
 import type { ChangeEvent } from 'react'
 export type PasswordInputProps = {
-  AfterInput?: React.ReactElement
-  BeforeInput?: React.ReactElement
-  CustomDescription?: React.ReactElement
-  CustomError?: React.ReactElement
-  CustomLabel?: React.ReactElement
   autoComplete?: string
   className?: string
   errorProps: ErrorProps
@@ -23,4 +18,7 @@ export type PasswordInputProps = {
   style?: React.CSSProperties
   value?: string
   width?: string
-}
+} & Pick<
+  FormFieldBase,
+  'AfterInput' | 'BeforeInput' | 'CustomDescription' | 'CustomError' | 'CustomLabel'
+>