From 8560936e0dc21ee2d06677c766a0bbcbc93b6de0 Mon Sep 17 00:00:00 2001 From: Brian Kim Date: Wed, 16 Jun 2021 23:53:03 +0900 Subject: Further merges with master --- src/components/comments/CommentTextField.tsx | 28 +++++++++++++++++++++++----- 1 file changed, 23 insertions(+), 5 deletions(-) (limited to 'src/components/comments/CommentTextField.tsx') diff --git a/src/components/comments/CommentTextField.tsx b/src/components/comments/CommentTextField.tsx index 3e97449c..a3a14ec8 100644 --- a/src/components/comments/CommentTextField.tsx +++ b/src/components/comments/CommentTextField.tsx @@ -40,6 +40,9 @@ type CommentTextFieldProps = { ) => null; parts: Part[]; addComment: () => any; + theme?: 'dark' | 'white'; + keyboardVisible?: boolean; + comment?: string; }; const CommentTextField: FC = ({ @@ -53,6 +56,9 @@ const CommentTextField: FC = ({ handleSelectionChange, parts, addComment, + theme = 'white', + keyboardVisible = true, + comment = '', ...textInputProps }) => { const {avatar} = useSelector((state: RootState) => state.user); @@ -93,11 +99,20 @@ const CommentTextField: FC = ({ )} - - - - - + {(theme === 'white' || (theme === 'dark' && keyboardVisible)) && ( + + + + + + )} {validateInput(keyboardText) @@ -130,6 +145,9 @@ const styles = StyleSheet.create({ justifyContent: 'center', height: normalize(40), }, + greyButton: { + backgroundColor: 'grey', + }, submitButton: { height: 35, width: 35, -- cgit v1.2.3-70-g09d2