Skip to content
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

Fix max length on return #194

Merged
merged 2 commits into from
Oct 8, 2020
+12 −4
Merged

Fix max length on return #194

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d720b4d
Extract maximum length logic condition
niuware Oct 8, 2020
c03e00e
Handle maximum length on return
niuware Oct 8, 2020
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
16 changes: 12 additions & 4 deletions src/MUIRichTextEditor.tsx
View file
Original file line number Diff line number Diff line change
@@ -489,7 +489,7 @@ const MUIRichTextEditor: RefForwardingComponent<TMUIRichTextEditorRef, IMUIRichT
setEditorState(state)
}

const handleBeforeInput = (chars: string): DraftHandleValue => {
const handleBeforeInput = (chars: string, editorState: EditorState): DraftHandleValue => {
if (chars === " " && searchTerm.length) {
clearSearch()
} else if (autocompleteSelectionStateRef.current) {
@@ -501,8 +501,7 @@ const MUIRichTextEditor: RefForwardingComponent<TMUIRichTextEditorRef, IMUIRichT
updateAutocompletePosition()
}
}
const currentLength = editorState.getCurrentContent().getPlainText('').length
return isGreaterThan(currentLength + 1, props.maxLength) ? "handled" : "not-handled"
return isMaxLengthHandled(editorState, 1)
}

const isSyntheticEventTriggeredByTab = (event: SyntheticEvent): boolean => {
@@ -745,8 +744,16 @@ const MUIRichTextEditor: RefForwardingComponent<TMUIRichTextEditorRef, IMUIRichT
}

const handlePastedText = (text: string, _html: string|undefined, editorState: EditorState): DraftHandleValue => {
return isMaxLengthHandled(editorState, text.length)
}

const handleReturn = (_e: any, editorState: EditorState): DraftHandleValue => {
return isMaxLengthHandled(editorState, 1)
}

const isMaxLengthHandled = (editorState: EditorState, nextLength: number): DraftHandleValue => {
const currentLength = editorState.getCurrentContent().getPlainText('').length
return isGreaterThan(currentLength + text.length, props.maxLength) ? "handled" : "not-handled"
return isGreaterThan(currentLength + nextLength, props.maxLength) ? "handled" : "not-handled"
}

const toggleMouseUpListener = (addAfter = false) => {
@@ -1074,6 +1081,7 @@ const MUIRichTextEditor: RefForwardingComponent<TMUIRichTextEditorRef, IMUIRichT
handleKeyCommand={handleKeyCommand}
handleBeforeInput={handleBeforeInput}
handlePastedText={handlePastedText}
handleReturn={handleReturn}
keyBindingFn={keyBindingFn}
ref={editorRef}
{...props.draftEditorProps}