-
Notifications
You must be signed in to change notification settings - Fork 25
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #8 from 10play/compose-followup
Compose followup
- Loading branch information
Showing
8 changed files
with
220 additions
and
61 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,193 @@ | ||
| import React, { useEffect, useMemo, useRef, useState } from 'react'; | ||
| import { | ||
| View, | ||
| KeyboardAvoidingView, | ||
| Platform, | ||
| StyleSheet, | ||
| TouchableOpacity, | ||
| } from 'react-native'; | ||
| import { RichText, useNativeEditorState } from '../../../../src/RichText'; | ||
| import { CustomKeyboard } from '../../../../src/RichText/Keyboard'; | ||
| import { ColorKeyboard } from '../../../../src/RichText/Keyboard/ColorKeyboard'; | ||
| import type { EditorInstance } from '../../../../src/types'; | ||
| import { icons } from '../../assets'; | ||
| import { Icon } from '../Icon'; | ||
| import { useKeyboard } from '../../../../src/utils'; | ||
|
|
||
| interface ComposeRichTextProps { | ||
| editor: EditorInstance; | ||
| onSendClick: () => void; | ||
| } | ||
| export const ComposeRichText = ({ | ||
| editor, | ||
| onSendClick, | ||
| }: ComposeRichTextProps) => { | ||
| const rootRef = useRef(null); | ||
| const [activeKeyboard, setActiveKeyboard] = React.useState<string>(); | ||
|
|
||
| return ( | ||
| <> | ||
| <View style={composeStyles.compose}> | ||
| <RichText editor={editor} avoidIosKeyboard /> | ||
| </View> | ||
| <KeyboardAvoidingView | ||
| behavior={Platform.OS === 'ios' ? 'padding' : 'height'} | ||
| style={composeStyles.keyboardAvoidingView} | ||
| > | ||
| <ComposeToolbar | ||
| editor={editor} | ||
| activeKeyboard={activeKeyboard} | ||
| setActiveKeyboard={setActiveKeyboard} | ||
| onSendClick={onSendClick} | ||
| /> | ||
| <CustomKeyboard | ||
| rootRef={rootRef} | ||
| activeKeyboardID={activeKeyboard} | ||
| setActiveKeyboardID={setActiveKeyboard} | ||
| keyboards={[ColorKeyboard]} | ||
| editor={editor} | ||
| /> | ||
| </KeyboardAvoidingView> | ||
| </> | ||
| ); | ||
| }; | ||
|
|
||
| interface ComposeToolbarProps { | ||
| editor: EditorInstance; | ||
| activeKeyboard: string | undefined; | ||
| setActiveKeyboard: (keyboard: string) => void; | ||
| onSendClick: () => void; | ||
| } | ||
| interface CustomToolbarAction { | ||
| isActive: boolean; | ||
| isDisabled: boolean; | ||
| onPress: () => void; | ||
| icon: keyof typeof icons; | ||
| } | ||
| enum ToolbarType { | ||
| Main, | ||
| Link, | ||
| Formatting, | ||
| } | ||
| const ComposeToolbar = ({ editor, onSendClick }: ComposeToolbarProps) => { | ||
| const editorState = useNativeEditorState(editor); | ||
| const { isKeyboardUp } = useKeyboard(); | ||
| const [toolbarType, setToolbar] = useState<ToolbarType>(ToolbarType.Main); | ||
|
|
||
| const hideToolbar = !isKeyboardUp || !editorState.isFocused; | ||
|
|
||
| useEffect(() => { | ||
| if (hideToolbar) { | ||
| setToolbar(ToolbarType.Main); | ||
| } | ||
| }, [hideToolbar]); | ||
|
|
||
| const formattingOptions: CustomToolbarAction[] = useMemo( | ||
| () => [ | ||
| { | ||
| isActive: true, | ||
| isDisabled: false, | ||
| onPress: () => { | ||
| setToolbar(ToolbarType.Main); | ||
| }, | ||
| icon: 'formatting', | ||
| }, | ||
| { | ||
| isActive: editorState.isBoldActive, | ||
| isDisabled: !editorState.canToggleBold, | ||
| onPress: editor.toggleBold, | ||
| icon: 'bold', | ||
| }, | ||
| { | ||
| isActive: editorState.headingLevel === 1, | ||
| isDisabled: !editorState.canToggleHeading, | ||
| onPress: () => editor.toggleHeading(1), | ||
| icon: 'h1', | ||
| }, | ||
| ], | ||
| [editor, editorState] | ||
| ); | ||
|
|
||
| if (toolbarType === ToolbarType.Main) { | ||
| return ( | ||
| <View | ||
| style={[hideToolbar && composeStyles.hidden, composeStyles.mainToolbar]} | ||
| > | ||
| <TouchableOpacity onPress={() => setToolbar(ToolbarType.Formatting)}> | ||
| <Icon name={'formatting'} style={composeStyles.button} /> | ||
| </TouchableOpacity> | ||
| <TouchableOpacity onPress={onSendClick}> | ||
| <Icon name={'send'} style={composeStyles.button} /> | ||
| </TouchableOpacity> | ||
| </View> | ||
| ); | ||
| } | ||
|
|
||
| return ( | ||
| <View | ||
| style={[ | ||
| hideToolbar && composeStyles.hidden, | ||
| composeStyles.formattingToolbar, | ||
| ]} | ||
| > | ||
| {formattingOptions.map(({ isDisabled, isActive, icon, onPress }) => ( | ||
| <TouchableOpacity | ||
| onPress={onPress} | ||
| disabled={isDisabled} | ||
| style={isActive ? composeStyles.activeButton : undefined} | ||
| key={icon} | ||
| > | ||
| <Icon | ||
| name={icon} | ||
| fill={isDisabled ? 'gray' : 'black'} | ||
| style={composeStyles.button} | ||
| /> | ||
| </TouchableOpacity> | ||
| ))} | ||
| </View> | ||
| ); | ||
| }; | ||
|
|
||
| const composeStyles = StyleSheet.create({ | ||
| compose: { | ||
| flex: 1, | ||
| paddingHorizontal: 14, | ||
| backgroundColor: 'white', | ||
| }, | ||
| keyboardAvoidingView: { | ||
| position: 'absolute', | ||
| width: '100%', | ||
| bottom: 0, | ||
| }, | ||
| mainToolbar: { | ||
| flexDirection: 'row', | ||
| justifyContent: 'space-between', | ||
| paddingHorizontal: 8, | ||
| paddingVertical: 4, | ||
| backgroundColor: 'white', | ||
| borderTopWidth: 1, | ||
| borderTopColor: 'lightgray', | ||
| }, | ||
| formattingToolbar: { | ||
| flexDirection: 'row', | ||
| justifyContent: 'flex-start', | ||
| backgroundColor: 'white', | ||
| borderTopWidth: 1, | ||
| paddingVertical: 4, | ||
| paddingHorizontal: 8, | ||
| gap: 4, | ||
| borderTopColor: 'lightgray', | ||
| }, | ||
| button: { | ||
| width: 24, | ||
| margin: 4, | ||
| padding: 5, | ||
| }, | ||
| activeButton: { | ||
| backgroundColor: 'lightblue', | ||
| borderRadius: 10, | ||
| }, | ||
| hidden: { | ||
| display: 'none', | ||
| }, | ||
| }); |
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,13 @@ | ||
| import close from './close.svg'; | ||
| import send from './send.svg'; | ||
| import formatting from './formatting.svg'; | ||
| import bold from './bold.svg'; | ||
| import h1 from './h1.svg'; | ||
|
|
||
| export const icons = { | ||
| close, | ||
| send, | ||
| formatting, | ||
| bold, | ||
| h1, | ||
| }; |