-
Notifications
You must be signed in to change notification settings - Fork 136
Fix DraftJS link parsing issue #3101
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.
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
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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 hidden or 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 hidden or 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
104 changes: 104 additions & 0 deletions
104
src/components/RichTextArea/LinkPlugin/utils/handlePastedText.js
This file contains hidden or 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,104 @@ | ||
| import { EditorState, Modifier, convertFromHTML } from 'draft-js' | ||
|
|
||
| import newLinkifyIt from 'linkify-it' | ||
| import tlds from 'tlds' | ||
|
|
||
| const linkifyIt = newLinkifyIt() | ||
| linkifyIt.tlds(tlds) | ||
|
|
||
| /** | ||
| * Handle pasted text | ||
| * @param {string} text - pasted text | ||
| * @param {string} html - pasted html | ||
| * @param {Object} lastEditorState - current editor state | ||
| * @param {Object} extras - Extra object passed by draft-js-link-editor. | ||
| * @param {function} extras.setEditorState - function to set new editor state. | ||
| * @param {function} extras.getEditorState - function to get current editor state. | ||
| */ | ||
| export default function handlePastedText( | ||
| text, | ||
| html, | ||
| lastEditorState, | ||
| { setEditorState, getEditorState } | ||
| ) { | ||
| if (!text) { | ||
| return false | ||
| } | ||
|
|
||
| // parse all the links in the pasted text | ||
| const links = linkifyIt.match(text) | ||
| if (!links) { | ||
| return false | ||
| } | ||
|
|
||
| // Let the editor render the pasted text before we detect the links | ||
| setTimeout(() => { | ||
| const lastSelectionState = lastEditorState.getSelection() | ||
| const startKey = lastSelectionState.getStartKey() | ||
| let startOffset = lastSelectionState.getStartOffset() | ||
|
|
||
| const newBlocks = html && convertFromHTML(html).contentBlocks | ||
| const pastedLines = text.split('\n').filter(line => line) | ||
|
|
||
| // When we paste formatted text, draftjs pastes it automatically in a new line (i.e., new block) | ||
| const extraBlockInserted = | ||
| newBlocks && newBlocks.length > pastedLines.length | ||
|
|
||
| const currentEditorState = getEditorState() | ||
| const initialSelectionState = currentEditorState.getSelection() | ||
| let currentContentState = currentEditorState.getCurrentContent() | ||
| let currentSelectionState = initialSelectionState | ||
|
|
||
| let currentBlock = extraBlockInserted | ||
| ? currentContentState.getBlockAfter(startKey) | ||
| : currentContentState.getBlockForKey(startKey) | ||
| let currentBlockKey = currentBlock.getKey() | ||
| let currentLine | ||
|
|
||
| for (let i = 0, numLines = pastedLines.length; i < numLines; i++) { | ||
| currentLine = pastedLines[i] | ||
|
|
||
| const linksInLine = linkifyIt.match(currentLine) | ||
| if (linksInLine) { | ||
| linksInLine.forEach(({ index, lastIndex, url }) => { | ||
| // Create the link entity | ||
| currentContentState = currentContentState.createEntity( | ||
| 'LINK', | ||
| 'MUTABLE', | ||
| { | ||
| url, | ||
| text: null | ||
| } | ||
| ) | ||
| const entityKey = currentContentState.getLastCreatedEntityKey() | ||
|
|
||
| // Apply the link entity | ||
| currentSelectionState = currentSelectionState.merge({ | ||
| anchorOffset: index + startOffset, | ||
| focusOffset: lastIndex + startOffset, | ||
| anchorKey: currentBlockKey, | ||
| focusKey: currentBlockKey, | ||
| isBackward: false | ||
| }) | ||
| currentContentState = Modifier.applyEntity( | ||
| currentContentState, | ||
| currentSelectionState, | ||
| entityKey | ||
| ) | ||
| }) | ||
| } | ||
|
|
||
| currentBlock = currentContentState.getBlockAfter(currentBlockKey) | ||
| currentBlockKey = currentBlock && currentBlock.getKey() | ||
| startOffset = 0 | ||
| } | ||
|
|
||
| // Move cursor to the end of the pasted text | ||
| const newEditorState = EditorState.forceSelection( | ||
| EditorState.push(currentEditorState, currentContentState, 'apply-entity'), | ||
| initialSelectionState | ||
| ) | ||
|
|
||
| setEditorState(newEditorState) | ||
| }) | ||
| } |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@vigneshTheDev Looks like the previous code is equivalent to the new one. Maybe we can revert this change and keep the previous code.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes. Correct. I changed it to enable debugging. I'll make the change and push it
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hi @maxceem, looks like the pull request is closed. Shall I submit a new PR with the change?