Skip to content

[RN][iOS] Adjust InputAccessoryView width to match device width within Safe Area constraints #43303

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

Closed
mauriciomeirelles wants to merge 1 commit into from
Closed

[RN][iOS] Adjust InputAccessoryView width to match device width within Safe Area constraints #43303

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
12 changes: 11 additions & 1 deletion packages/react-native/Libraries/Components/TextInput/InputAccessoryView.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,10 @@ import StyleSheet, {
type ColorValue,
type ViewStyleProp,
} from '../../StyleSheet/StyleSheet';
import SafeAreaView from '../../Components/SafeAreaView/SafeAreaView';
import Platform from '../../Utilities/Platform';
import useWindowDimensions from '../../Utilities/useWindowDimensions';
import View from '../View/View';
import RCTInputAccessoryViewNativeComponent from './RCTInputAccessoryViewNativeComponent';
import * as React from 'react';

Expand Down Expand Up @@ -86,6 +89,8 @@ type Props = $ReadOnly<{|
|}>;

const InputAccessoryView: React.AbstractComponent<Props> = (props: Props) => {
const {width} = useWindowDimensions();

if (Platform.OS === 'ios') {
if (React.Children.count(props.children) === 0) {
return null;
Expand All @@ -96,7 +101,9 @@ const InputAccessoryView: React.AbstractComponent<Props> = (props: Props) => {
style={[props.style, styles.container]}
nativeID={props.nativeID}
backgroundColor={props.backgroundColor}>
{props.children}
<SafeAreaView style={[styles.safeAreaView, {width}]}>
{props.children}
</SafeAreaView>
</RCTInputAccessoryViewNativeComponent>
);
} else {
Expand All @@ -109,6 +116,9 @@ const styles = StyleSheet.create({
container: {
position: 'absolute',
},
safeAreaView: {
flex: 1,
},
});

export default InputAccessoryView;
30 changes: 28 additions & 2 deletions ...ve/Libraries/Components/TextInput/__tests__/__snapshots__/InputAccessoryView-test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,20 @@ exports[`<InputAccessoryView /> should render as <RCTInputAccessoryView> when mo
]
}
>
<View />
<RCTSafeAreaView
style={
Array [
Object {
"flex": 1,
},
Object {
"width": 750,
},
]
}
>
<View />
</RCTSafeAreaView>
</RCTInputAccessoryView>
`;

Expand All @@ -28,7 +41,20 @@ exports[`<InputAccessoryView /> should render as <RCTInputAccessoryView> when no
]
}
>
<View />
<RCTSafeAreaView
style={
Array [
Object {
"flex": 1,
},
Object {
"width": 750,
},
]
}
>
<View />
</RCTSafeAreaView>
</RCTInputAccessoryView>
`;

Expand Down
4 changes: 2 additions & 2 deletions packages/react-native/Libraries/Text/TextInput/RCTInputAccessoryViewContent.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ - (instancetype)init

[_safeAreaContainer.bottomAnchor constraintEqualToAnchor:self.safeAreaLayoutGuide.bottomAnchor].active = YES;
[_safeAreaContainer.topAnchor constraintEqualToAnchor:self.safeAreaLayoutGuide.topAnchor].active = YES;
[_safeAreaContainer.leadingAnchor constraintEqualToAnchor:self.safeAreaLayoutGuide.leadingAnchor].active = YES;
[_safeAreaContainer.trailingAnchor constraintEqualToAnchor:self.safeAreaLayoutGuide.trailingAnchor].active = YES;
[_safeAreaContainer.leadingAnchor constraintEqualToAnchor:self.leadingAnchor].active = YES;
[_safeAreaContainer.trailingAnchor constraintEqualToAnchor:self.trailingAnchor].active = YES;
}
return self;
}
Expand Down
4 changes: 2 additions & 2 deletions ...ative/React/Fabric/Mounting/ComponentViews/InputAccessory/RCTInputAccessoryContentView.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ - (instancetype)init
[NSLayoutConstraint activateConstraints:@[
[_safeAreaContainer.bottomAnchor constraintEqualToAnchor:self.safeAreaLayoutGuide.bottomAnchor],
[_safeAreaContainer.topAnchor constraintEqualToAnchor:self.safeAreaLayoutGuide.topAnchor],
[_safeAreaContainer.leadingAnchor constraintEqualToAnchor:self.safeAreaLayoutGuide.leadingAnchor],
[_safeAreaContainer.trailingAnchor constraintEqualToAnchor:self.safeAreaLayoutGuide.trailingAnchor]
[_safeAreaContainer.leadingAnchor constraintEqualToAnchor:self.leadingAnchor],
[_safeAreaContainer.trailingAnchor constraintEqualToAnchor:self.trailingAnchor]
]];
}
return self;
Expand Down