Skip to content

fix "Composer goes to the top on pressing expand" #11608

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
Beamanator merged 6 commits into from
Oct 19, 2022
Merged

fix "Composer goes to the top on pressing expand" #11608

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f742741
fix "Composer goes to the top on pressing expand"
aimane-chnaif Oct 5, 2022
9a643a8
float text to top when composer expanded
aimane-chnaif Oct 10, 2022
1150a97
stretch input to full height in composer when expanded
aimane-chnaif Oct 11, 2022
61e5278
fix invalid prop warning
aimane-chnaif Oct 11, 2022
2070b13
add contentContainerStyle propsTypes in OfflineWithFeedback
aimane-chnaif Oct 12, 2022
bbe4676
fix text centered in expanded composer issue in android
aimane-chnaif Oct 12, 2022
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
6 changes: 5 additions & 1 deletion src/components/OfflineWithFeedback.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,9 @@ const propTypes = {
/** Additional styles to add after local styles. Applied to the parent container */
style: stylePropTypes,

/** Additional styles to add after local styles. Applied to the children wrapper container */
contentContainerStyle: stylePropTypes,

/** Additional style object for the error row */
errorRowStyles: stylePropTypes,

Expand All @@ -51,6 +54,7 @@ const defaultProps = {
errors: null,
onClose: () => {},
style: [],
contentContainerStyle: [],
errorRowStyles: [],
};

Expand Down Expand Up @@ -89,7 +93,7 @@ const OfflineWithFeedback = (props) => {
return (
<View style={props.style}>
{!hideChildren && (
<View style={needsOpacity ? styles.offlineFeedback.pending : {}}>
<View style={[needsOpacity ? styles.offlineFeedback.pending : {}, props.contentContainerStyle]}>
{children}
</View>
)}
Expand Down
2 changes: 2 additions & 0 deletions src/pages/home/report/ReportFooter.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,8 @@ class ReportFooter extends React.Component {
<SwipeableView onSwipeDown={Keyboard.dismiss}>
<OfflineWithFeedback
pendingAction={this.props.addWorkspaceRoomPendingAction}
style={this.props.isComposerFullSize ? styles.chatItemFullComposeRow : {}}
contentContainerStyle={this.props.isComposerFullSize ? styles.flex1 : {}}
>
<ReportActionCompose
onSubmit={this.props.onSubmitComment}
Expand Down
3 changes: 2 additions & 1 deletion src/styles/styles.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1410,9 +1410,10 @@ const styles = {
}, 0),

textInputFullCompose: {
alignSelf: 'flex-end',
alignSelf: 'stretch',
flex: 1,
maxHeight: '100%',
textAlignVertical: 'top',
},

editInputComposeSpacing: {
Expand Down