Skip to content

Commit 600c8cd

Browse files
committed
ref(ui): Move placeholder to observable props
1 parent a4a0791 commit 600c8cd

File tree

1 file changed

+5
-6
lines changed
  • static/app/components/forms/formField

1 file changed

+5
-6
lines changed

static/app/components/forms/formField/index.tsx

+5-6
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@ interface ObservableProps {
7979
help?: ObservedFnOrValue<FieldGroupProps['help']>;
8080
highlighted?: ObservedFnOrValue<FieldGroupProps['highlighted']>;
8181
inline?: ObservedFnOrValue<FieldGroupProps['inline']>;
82+
placeholder?: ObservedFnOrValue<string>;
8283
visible?: ObservedFnOrValue<FieldGroupProps['visible']>;
8384
}
8485

@@ -91,6 +92,7 @@ interface ResolvedObservableProps {
9192
help?: FieldGroupProps['help'];
9293
highlighted?: FieldGroupProps['highlighted'];
9394
inline?: FieldGroupProps['inline'];
95+
placeholder?: string;
9496
visible?: FieldGroupProps['visible'];
9597
}
9698

@@ -121,7 +123,6 @@ interface BaseProps {
121123
onBlur?: (value: any, event: any) => void;
122124
onChange?: (value: any, event: any) => void;
123125
onKeyDown?: (value: any, event: any) => void;
124-
placeholder?: ObservedFnOrValue<React.ReactNode>;
125126

126127
resetOnError?: boolean;
127128
/**
@@ -171,7 +172,9 @@ export interface FormFieldProps
171172
* ResolvedProps do NOT include props which may be given functions that are
172173
* reacted on. Resolved props are used inside of makeField.
173174
*/
174-
type ResolvedProps = BaseProps & FieldGroupProps;
175+
interface ResolvedProps extends BaseProps, Omit<FieldGroupProps, 'children'> {
176+
placeholder?: string;
177+
}
175178

176179
type PassthroughProps = Omit<
177180
ResolvedProps,
@@ -370,10 +373,6 @@ function FormField(props: FormFieldProps) {
370373
error,
371374
initialData: model.initialData,
372375
'aria-describedby': `${id}_help`,
373-
placeholder:
374-
typeof fieldProps.placeholder === 'function'
375-
? fieldProps.placeholder({...props, model})
376-
: fieldProps.placeholder,
377376
})}
378377
</Fragment>
379378
);

0 commit comments

Comments
 (0)