Skip to content

Remove deprecated componentWillReceiveProps #13

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

Open
avertin wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Remove deprecated componentWillReceiveProps #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 11 additions & 0 deletions Utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import SimpleMarkdown from 'simple-markdown';

const Utils = {
isTextOnly(nodes) {
try {
Expand Down Expand Up @@ -58,6 +60,15 @@ const Utils = {
}
}
}
},

getSyntaxTree: function getSyntaxTree(props) {
const rules = SimpleMarkdown.defaultRules;
const parser = SimpleMarkdown.parserFor(rules);
const reactOutput = SimpleMarkdown.reactFor(SimpleMarkdown.ruleOutput(rules, 'react'));
const blockSource = props.children + '\n\n';
const parseTree = parser(blockSource, { inline: props.parseInline });
return reactOutput(parseTree);
}
}

Expand Down
42 changes: 21 additions & 21 deletions index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,42 +17,42 @@ class Markdown extends Component {
constructor(props) {
super(props);

const rules = SimpleMarkdown.defaultRules;
this.parser = SimpleMarkdown.parserFor(rules);
this.reactOutput = SimpleMarkdown.reactFor(SimpleMarkdown.ruleOutput(rules, 'react'));
const blockSource = this.props.children + '\n\n';
const parseTree = this.parser(blockSource, { inline: this.props.parseInline });
const outputResult = this.reactOutput(parseTree);

const outputResult = Utils.getSyntaxTree(this.props);
const defaultStyles = this.props.useDefaultStyles && styles ? styles : {};
const _styles = StyleSheet.create(Object.assign({}, defaultStyles, this.props.markdownStyles));

this.state = {
syntaxTree: outputResult,
styles: _styles
styles: _styles,
prevPropsChildren: undefined,
prevPropsMarkdownStyles: undefined
};
}

componentWillReceiveProps(nextProps) {

let newState = {};
static getDerivedStateFromProps(props, state) {

if (nextProps.children !== this.props.children) {
const blockSource = nextProps.children + '\n\n';
const parseTree = this.parser(blockSource, { inline: this.props.parseInline });
const outputResult = this.reactOutput(parseTree);
let newState = Object.assign({}, state);
let changed = false;

if (props.children !== state.prevPropsChildren) {
const outputResult = Utils.getSyntaxTree(props);
newState.syntaxTree = outputResult;
newState.prevPropsChildren = props.children;
changed = true;
}

if (nextProps.markdownStyles !== this.props.markdownStyles) {
const defaultStyles = this.props.useDefaultStyles && styles ? styles : {};
newState.styles = StyleSheet.create(Object.assign(defaultStyles, nextProps.markdownStyles));
if (props.markdownStyles !== state.prevPropsMarkdownStyles) {
const defaultStyles = props.useDefaultStyles && styles ? styles : {};
newState.styles = StyleSheet.create(Object.assign(defaultStyles, props.markdownStyles));
newState.prevPropsMarkdownStyles = props.markdownStyles;
changed = true;
}

if (Object.keys(newState).length !== 0) {
this.setState(newState);
}
if (changed) {
return newState;
}

return null;
}

shouldComponentUpdate(nextProps) {
Expand Down