Fix deprecated getEntity (fixes #67) #71
Conversation
src/stateToHTML.js
Outdated
| ); | ||
| this.inlineStyles = inlineStyles; | ||
| this.styleOrder = styleOrder; | ||
| } |
There was a problem hiding this comment.
What's the difference between the code on the left and the code on the right? If there are no changes can you rebase this PR so they are the same?
There was a problem hiding this comment.
No change really, must be some spacing or something changed just be opening and saving the file in my editor. I couldn't manage to unstage the hunk either using SourceTree.
src/stateToHTML.js
Outdated
| export default function stateToHTML(content: ContentState, options: ?Options): string { | ||
| return new MarkupGenerator(content, options).generate(); | ||
| export default function stateToHTML(content: ContentState, options: ?Options): string { | ||
| return new MarkupGenerator(content, options).generate(); |
There was a problem hiding this comment.
Also, what is the difference here?
There was a problem hiding this comment.
No change really, must be some spacing or something changed just be opening and saving the file in my editor. I couldn't manage to unstage the hunk either using SourceTree.
src/stateToHTML.js
Outdated
| @@ -341,7 +340,7 @@ class MarkupGenerator { | |||
| } | |||
| return content; | |||
| }).join(''); | |||
| let entity = entityKey ? Entity.get(entityKey) : null; | |||
| let entity = entityKey ? this.contentState.getEntity(entityKey) : null; | |||
There was a problem hiding this comment.
This is the main change of this PR, right? This fixes the issue?
There was a problem hiding this comment.
Correct, Entity.get is deprecated as of 0.10 and replaced by contentState.getEntity
There was a problem hiding this comment.
There was a problem hiding this comment.
I have removed the accidental trailing whitespace changes now.
|
👍 |
|
Have tested and this works well for me in |
|
How is it now? |
There was a problem hiding this comment.
Thanks for this contribution. My only concern is that this will NOT work with older versions draft-js which do not support contentState.getEntity()
We should create a helper function with feature detection:
function getEntity(contentState, entityKey) {
return contentState.getEntity ? contentState.getEntity(entityKey) : Entity.get(entityKey);
}
Then you can change line 343 to:
let entity = entityKey ? getEntity(this.contentState, entityKey) : null;
…ions of draft-js as per sstur's suggestion
|
Added your improvements for backward compatibility |
| @@ -377,6 +376,10 @@ class MarkupGenerator { | |||
|
|
|||
| } | |||
|
|
|||
| function getEntity(contentState, entityKey) { | |||
| return contentState.getEntity ? contentState.getEntity(entityKey) : Entity.get(entityKey); | |||
There was a problem hiding this comment.
Entity is not defined, is it?
I think because you removed line 7.
|
Please run
|
|
Sorry for that, weren't able to install all the tools necessary to run the tests and unfortunately I was to busy to look into it any further.
|
|
Thanks! |
WARNING: DraftEntity.get will be deprecated soon! Please use "contentState.getEntity" instead.