Skip to content

Commit 4fabffe

Browse files
author
Vir Desai
committed
CRNS-151: removing flex from view container to allow button to be clickable on android and ios and making android not crash from MessageInput
1 parent 0d5b884 commit 4fabffe

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

src/components/Attachment/Gallery.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ const ImageContainer = styled.TouchableOpacity`
5555
`;
5656

5757
const HeaderContainer = styled.View`
58-
flex: 1;
5958
flex-direction: row;
6059
justify-content: flex-end;
6160
z-index: 1000;

src/components/MessageInput/MessageInput.js

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,10 @@ const Container = styled.View`
3737
border-radius: 10px;
3838
flex-direction: column;
3939
margin-horizontal: 10px;
40-
padding-top: ${({ padding, theme }) =>
41-
padding ? theme.messageInput.container.conditionalPadding : 0}px;
40+
padding-top: ${({ imageUploads, theme }) =>
41+
imageUploads && imageUploads.length
42+
? theme.messageInput.container.conditionalPadding
43+
: 0}px;
4244
${({ theme }) => theme.messageInput.container.css};
4345
`;
4446

@@ -340,7 +342,7 @@ const MessageInput = (props) => {
340342
}
341343

342344
return (
343-
<Container padding={imageUploads && imageUploads.length > 0}>
345+
<Container imageUploads={imageUploads}>
344346
{fileUploads && (
345347
<FileUploadPreview
346348
AttachmentFileIcon={AttachmentFileIcon}

0 commit comments

Comments
 (0)