Skip to content

Commit

Permalink
Merge branch 'austinkelleher-deep-equal'
Browse files Browse the repository at this point in the history
  • Loading branch information
FaridSafi committed Apr 21, 2016
2 parents 231d8bb + e4d8be6 commit 6c236d0
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions GiftedMessenger.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import Message from './Message';
import GiftedSpinner from 'react-native-gifted-spinner';
import moment from 'moment';
import {setLocale} from './Locale';
import _ from 'lodash';
import deepEqual from 'deep-equal';
import Button from 'react-native-button';

class GiftedMessenger extends Component {
Expand Down Expand Up @@ -148,7 +148,7 @@ class GiftedMessenger extends Component {
}
}

if (_.isEqual(nextProps.messages, this.props.messages) === false) {
if (deepEqual(nextProps.messages, this.props.messages) === false) {
let isAppended = null;
if (nextProps.messages.length === this.props.messages.length) {
// we assume that only a status has been changed
Expand All @@ -157,7 +157,7 @@ class GiftedMessenger extends Component {
} else {
isAppended = null;
}
} else if (_.isEqual(nextProps.messages[nextProps.messages.length - 1], this.props.messages[this.props.messages.length - 1]) === false) {
} else if (deepEqual(nextProps.messages[nextProps.messages.length - 1], this.props.messages[this.props.messages.length - 1]) === false) {
// we assume the messages were appended
isAppended = true;
} else {
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
],
"homepage": "https://github.com/FaridSafi/react-native-gifted-messenger#readme",
"dependencies": {
"lodash": "^4.11.1",
"deep-equal": "^1.0.1",
"moment": "^2.10.6",
"react-native-button": "^1.3.1",
"react-native-gifted-spinner": "0.0.3",
Expand Down

0 comments on commit 6c236d0

Please sign in to comment.