Skip to content

Commit c5e80a4

Browse files
committed
Merge branch 'master' into fragments
2 parents 83214fc + 93aa3fd commit c5e80a4

File tree

6 files changed

+72
-36
lines changed

6 files changed

+72
-36
lines changed

.babelrc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
{
22
"presets": [
3-
["kyt-react", {"modules": true}],
3+
["kyt-react", {"modules": true}]
44
],
55
"plugins": [
66
"transform-class-properties",
77
"transform-es2015-modules-commonjs",
88
"transform-object-rest-spread",
9-
"transform-regenerator",
9+
"transform-regenerator"
1010
]
1111
}

package-lock.json

Lines changed: 62 additions & 25 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
"license": "Apache-2.0",
99
"typings": "index.d.ts",
1010
"dependencies": {
11-
"deep-equal": "^1.0.1",
1211
"invariant": "^2.2.4",
1312
"prop-types": "^15.6.1",
13+
"react-fast-compare": "^2.0.2",
1414
"shallowequal": "^1.0.2"
1515
},
1616
"devDependencies": {

src/Dispatcher.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ export default class Dispatcher extends Component {
3636
let serverState = null;
3737
const state = reducePropsToState(
3838
helmetInstances.get().map(instance => {
39-
const props = Object.assign({}, instance.props);
39+
const props = { ...instance.props };
4040
delete props.context;
4141
return props;
4242
})

src/index.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React, { Component } from 'react';
22
import PropTypes from 'prop-types';
3-
import deepEqual from 'deep-equal';
3+
import fastCompare from 'react-fast-compare';
44
import invariant from 'invariant';
55
import Context from './Context';
66
import Dispatcher from './Dispatcher';
@@ -55,7 +55,7 @@ export default class Helmet extends Component {
5555
};
5656

5757
shouldComponentUpdate(nextProps) {
58-
return !deepEqual(this.props, nextProps);
58+
return !fastCompare(this.props, nextProps);
5959
}
6060

6161
mapNestedChildrenToProps(child, nestedChildren) {

0 commit comments

Comments
 (0)