Skip to content

Fix how we render TextField children #2369

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 13, 2022
Merged

Fix how we render TextField children #2369

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/components/picker/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ const Picker = React.forwardRef((props: PickerProps, ref) => {
);
} else if (fieldType === PickerFieldTypes.settings) {
return (
<View row spread>
<View flex row spread>
<Text text70 style={labelStyle}>
{others.label}
</Text>
Expand Down
26 changes: 12 additions & 14 deletions src/incubator/TextField/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ const TextField = (props: InternalTextFieldProps) => {
<View style={[paddings, fieldStyle]} row centerV centerH={centered}>
{/* <View row centerV> */}
{leadingAccessoryClone}
<View flex={!centered} flexG={centered} /* flex row */>
{children || <View flex={!centered} flexG={centered} /* flex row */>
{floatingPlaceholder && (
<FloatingPlaceholder
placeholder={placeholder}
Expand All @@ -142,19 +142,17 @@ const TextField = (props: InternalTextFieldProps) => {
testID={`${props.testID}.floatingPlaceholder`}
/>
)}
{children || (
<Input
placeholderTextColor={hidePlaceholder ? 'transparent' : placeholderTextColor}
{...others}
style={[typographyStyle, colorStyle, others.style]}
onFocus={onFocus}
onBlur={onBlur}
onChangeText={onChangeText}
placeholder={placeholder}
hint={hint}
/>
)}
</View>
<Input
placeholderTextColor={hidePlaceholder ? 'transparent' : placeholderTextColor}
{...others}
style={[typographyStyle, colorStyle, others.style]}
onFocus={onFocus}
onBlur={onBlur}
onChangeText={onChangeText}
placeholder={placeholder}
hint={hint}
/>
</View>}
{trailingAccessory}
{/* </View> */}
</View>
Expand Down