Skip to content

Support special innerFlexBehavior prop to resolve flex issues #3271

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 2 commits into from
Sep 25, 2024
Merged

Support special innerFlexBehavior prop to resolve flex issues #3271

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a2b4128
Support special innerFlexBehavior prop to resolve flex issues
ethanshar Sep 25, 2024
842acb5
Update snapshot
ethanshar Sep 25, 2024
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
1 change: 1 addition & 0 deletions .eslintrc.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ module.exports = {
// TODO: remove after migration of legacy lifecycle methods
camelcase: 'off',
'comma-dangle': ['error', 'never'],
complexity: ['warn', {max: 25}],
'no-mixed-operators': ['off'],
'no-trailing-spaces': 'off',
'operator-linebreak': 'off',
Expand Down
284 changes: 284 additions & 0 deletions demo/src/screens/__tests__/__snapshots__/TextFieldScreen.spec.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7459,6 +7459,290 @@ exports[`TextField Screen renders screen 1`] = `
</View>
</View>
</View>
<Text
$textPrimary={true}
marginB-s1={true}
style={
[
{
"backgroundColor": "transparent",
"color": "#20303C",
"writingDirection": "ltr",
},
undefined,
{
"color": "#5A48F5",
},
undefined,
undefined,
{
"marginBottom": 4,
},
undefined,
undefined,
undefined,
undefined,
]
}
>
leading/trailing accessory overflow (innerFlexBehavior)
</Text>
<View
style={
[
undefined,
undefined,
undefined,
undefined,
undefined,
undefined,
undefined,
undefined,
undefined,
]
}
>
<View
style={
[
undefined,
undefined,
undefined,
undefined,
undefined,
undefined,
undefined,
undefined,
[
{},
undefined,
undefined,
undefined,
],
]
}
>
<View
row={true}
spread={true}
style={
[
undefined,
undefined,
undefined,
undefined,
undefined,
{},
{},
{
"flexDirection": "row",
"justifyContent": "space-between",
},
undefined,
]
}
/>
<View
centerV={true}
row={true}
style={
[
undefined,
undefined,
undefined,
undefined,
undefined,
{},
{},
{
"alignItems": "center",
"flexDirection": "row",
},
[
{},
[
[
{
"borderBottomColor": "#E8ECF0",
"borderBottomWidth": 1,
"paddingBottom": 8,
},
undefined,
],
undefined,
],
],
]
}
>
<View
style={
[
undefined,
undefined,
undefined,
{
"flex": 1,
},
undefined,
{},
{},
{},
undefined,
]
}
>
<TextInput
accessibilityState={
{
"disabled": false,
}
}
editable={true}
onBlur={[Function]}
onChangeText={[Function]}
onFocus={[Function]}
placeholder="Placeholder"
placeholderTextColor="#6E7881"
style={
[
{
"flexGrow": 1,
"paddingBottom": 0,
"paddingTop": 0,
"textAlign": "left",
},
{
"color": "#20303C",
},
[
{},
undefined,
{
"fontFamily": "System",
"fontSize": 16,
"fontWeight": "400",
"height": 24,
"lineHeight": undefined,
},
undefined,
],
false,
]
}
underlineColorAndroid="transparent"
validateOnBlur={true}
value="Abcdefghijklmnopqrstuvwxyz1234567890!@#$%^&*"
/>
</View>
<Image
accessibilityRole="image"
accessible={false}
source={
{
"testUri": "../../../demo/src/assets/icons/search.png",
}
}
style={
[
undefined,
undefined,
undefined,
false,
undefined,
]
}
/>
</View>
<View
row={true}
spread={true}
style={
[
undefined,
undefined,
undefined,
undefined,
undefined,
{},
{},
{
"flexDirection": "row",
"justifyContent": "space-between",
},
undefined,
]
}
>
<View
style={
[
undefined,
undefined,
undefined,
{
"flex": 1,
},
undefined,
{},
{},
{},
undefined,
]
}
>
<Text
$textDangerLight={true}
style={
[
{
"backgroundColor": "transparent",
"color": "#20303C",
"writingDirection": "ltr",
},
undefined,
{
"color": "#FC3D2F",
},
undefined,
undefined,
{},
undefined,
undefined,
undefined,
[
{
"flexShrink": 1,
"minHeight": 20,
},
[
undefined,
undefined,
],
],
]
}
testID="undefined.validationMessage"
/>
</View>
<View
style={
[
undefined,
undefined,
undefined,
undefined,
undefined,
undefined,
undefined,
undefined,
undefined,
]
}
/>
</View>
</View>
</View>
</View>
<KeyboardTrackingViewTemp
pointerEvents="none"
Expand Down
12 changes: 12 additions & 0 deletions demo/src/screens/componentScreens/TextFieldScreen.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -508,6 +508,18 @@ export default class TextFieldScreen extends Component {
</Text>
<TextField placeholder="minutes" preset={preset}/>
</View>

<Text marginB-s1 $textPrimary>
leading/trailing accessory overflow (innerFlexBehavior)
</Text>
<View>
<TextField
placeholder="Placeholder"
value="Abcdefghijklmnopqrstuvwxyz1234567890!@#$%^&*"
trailingAccessory={<Icon source={Assets.icons.demo.search}/>}
innerFlexBehavior
/>
</View>
</>
);
}
Expand Down
3 changes: 2 additions & 1 deletion src/components/textField/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ const TextField = (props: InternalTextFieldProps) => {
hint,
helperText,
validationIcon,
innerFlexBehavior,
// Label
label,
labelColor,
Expand Down Expand Up @@ -171,7 +172,7 @@ const TextField = (props: InternalTextFieldProps) => {
Known Issue: This slightly push the trailing accessory and clear button when entering a long text
*/}
{children || (
<View {...(Constants.isWeb ? {flex: true} : {flexG: true})}>
<View {...(Constants.isWeb || innerFlexBehavior ? {flex: true} : {flexG: true})}>
{/* Note: Render dummy placeholder for Android center issues */}
{Constants.isAndroid && centered && (
<Text marginR-s1 style={dummyPlaceholderStyle}>
Expand Down
6 changes: 6 additions & 0 deletions src/components/textField/textField.api.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,12 @@
"name": "showMandatoryIndication",
"type": "boolean",
"description": "Whether to show a mandatory field indication"
},
{
"name": "innerFlexBehavior",
"type": "boolean",
"description": "Set the inner container to use flex behavior to resolve text overflow issues when using leading or trailing accessories",
"note": "This may cause flex issues when the field is inside a row container"
}
],
"snippet": [
Expand Down
7 changes: 3 additions & 4 deletions src/components/textField/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,10 +282,9 @@ export type TextFieldProps = MarginModifiers &
*/
centered?: boolean;
/**
* @deprecated
* Set an alignment fit for inline behavior (when rendered inside a row container)
*/
inline?: boolean;
* Set the inner container to use flex behavior to resolve text overflow issues when using leading or trailing accessories
* This may cause flex issues when the field is inside a row container */
innerFlexBehavior?: boolean;
};

export type InternalTextFieldProps = PropsWithChildren<
Expand Down