change id notation from _id to id

.npmignore

@@ -1,3 +1,4 @@
 example/
 TODO.md
 screenshots/
+

README.md

@@ -37,12 +37,12 @@ class Example extends React.Component {
     this.setState({
       messages: [
         {
-          _id: 1,
+          id: 1,
           text: 'Hello developer',
           createdAt: new Date(),
           user: {
-            _id: 2,
-            name: 'React Native',
+            id: 2,
+            name: 'React',
             avatar: 'https://facebook.github.io/react/img/logo_og.png',
           },
         },
@@ -62,7 +62,7 @@ class Example extends React.Component {
         messages={this.state.messages}
         onSend={(messages) => this.onSend(messages)}
         user={{
-          _id: 1,
+          id: 1,
         }}
       />
     );
@@ -81,12 +81,12 @@ e.g.
 
 ```js
 {
-  _id: 1,
+  id: 1,
   text: 'My message',
   createdAt: new Date(Date.UTC(2016, 5, 11, 17, 20, 0)),
   user: {
-    _id: 2,
-    name: 'React Native',
+    id: 2,
+    name: 'React',
     avatar: 'https://facebook.github.io/react/img/logo_og.png',
   },
   image: 'https://facebook.github.io/react/img/logo_og.png',
@@ -98,7 +98,7 @@ e.g.
 
 - **`messages`** _(Array)_ - Messages to display
 - **`messageIdGenerator`** _(Function)_ - Generate an id for new messages. Defaults to UUID v4, generated by [uuid](https://github.com/kelektiv/node-uuid)
-- **`user`** _(Object)_ - User sending the messages: `{ _id, name, avatar }`
+- **`user`** _(Object)_ - User sending the messages: `{ id, name, avatar }`
 - **`onSend`** _(Function)_ - Callback when sending a message
 - **`locale`** _(String)_ - Locale to localize the dates
 - **`isAnimated`** _(Bool)_ - Animates the view when the keyboard appears

example/src/App.js

@@ -17,11 +17,11 @@ messages.push(generateMessage(`Goood`, 2, 'http://img2.dmty.pl//uploads/201010/1
 
 function generateMessage(text, index, image) {
   return {
-    _id: Math.round(Math.random() * 1000000),
+    id: Math.round(Math.random() * 1000000),
     text: text,
     createdAt: new Date(),
     user: {
-      _id: index % 3 == 0 ? 1 : 2,
+      id: index % 3 == 0 ? 1 : 2,
       name: 'Johniak',
     },
     image,
@@ -55,7 +55,7 @@ class App extends Component {
         Converstions
         </div>
         <div style={styles.chat}>
-          <GiftedChat user={{_id: 1,}}
+          <GiftedChat user={{id: 1,}}
                       messages={this.state.messages.slice().reverse()}
                       onSend={this.onSend}/>
           </div>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-web-gifted-chat",
-  "version": "0.0.6",
+  "version": "0.1.0",
   "description": "The most complete chat UI for React Web",
   "main": "dist/index.js",
   "repository": {

src/Bubble.js

@@ -62,7 +62,7 @@ export default class Bubble extends React.Component {
     if (this.props.renderTicks) {
         return this.props.renderTicks(currentMessage);
     }
-    if (currentMessage.user._id !== this.props.user._id) {
+    if (currentMessage.user.id !== this.props.user.id) {
         return;
     }
     if (currentMessage.sent || currentMessage.received) {

src/GiftedChat.js

@@ -306,7 +306,7 @@ class GiftedChat extends React.Component {
         ...message,
         user: this.props.user,
         createdAt: new Date(),
-        _id: this.props.messageIdGenerator(),
+        id: this.props.messageIdGenerator(),
       };
     });
 

src/Message.js

@@ -43,7 +43,7 @@ export default class Message extends React.Component {
   }
 
   renderAvatar() {
-    if (this.props.user._id !== this.props.currentMessage.user._id) {
+    if (this.props.user.id !== this.props.currentMessage.user.id) {
       const avatarProps = this.getInnerComponentProps();
       return <Avatar {...avatarProps}/>;
     }

src/MessageContainer.js

@@ -30,13 +30,13 @@ export default class MessageContainer extends React.Component {
 
   prepareMessages(messages) {
     return {
-      keys: messages.map((m) => m._id),
+      keys: messages.map((m) => m.id),
       blob: messages.reduce((o, m, i) => {
         const previousMessage = messages[i + 1] || {};
         const nextMessage = messages[i - 1] || {};
         // add next and previous messages to hash to ensure updates
-        const toHash = JSON.stringify(m) + previousMessage._id + nextMessage._id;
-        o[m._id] = {
+        const toHash = JSON.stringify(m) + previousMessage.id + nextMessage.id;
+        o[m.id] = {
           ...m,
           previousMessage,
           nextMessage,
@@ -88,8 +88,8 @@ export default class MessageContainer extends React.Component {
 
   renderRow({ item, index }) {
     const message = item;
-    if (!message._id && message._id !== 0) {
-      console.warn('GiftedChat: `_id` is missing for message', JSON.stringify(message));
+    if (!message.id && message.id !== 0) {
+      console.warn('GiftedChat: `id` is missing for message', JSON.stringify(message));
     }
     if (!message.user) {
       console.warn('GiftedChat: `user` is missing for message', JSON.stringify(message));
@@ -98,11 +98,11 @@ export default class MessageContainer extends React.Component {
 
     const messageProps = {
       ...this.props,
-      key: message._id,
+      key: message.id,
       currentMessage: message,
       previousMessage: message.previousMessage,
       nextMessage: message.nextMessage,
-      position: message.user._id === this.props.user._id ? 'right' : 'left',
+      position: message.user.id === this.props.user.id ? 'right' : 'left',
     };
 
     if (this.props.renderMessage) {
@@ -133,7 +133,7 @@ export default class MessageContainer extends React.Component {
       >
         <FlatList
           ref={this.flatListRef}
-          keyExtractor={(item) => `${item._id}`}
+          keyExtractor={(item) => `${item.id}`}
           enableEmptySections
           automaticallyAdjustContentInsets={false}
           inverted={this.props.inverted}

src/utils.js

@@ -21,7 +21,7 @@ export function isSameDay(currentMessage = {}, diffMessage = {}) {
 
 export function isSameUser(currentMessage = {}, diffMessage = {}) {
 
-  return !!(diffMessage.user && currentMessage.user && diffMessage.user._id === currentMessage.user._id);
+  return !!(diffMessage.user && currentMessage.user && diffMessage.user.id === currentMessage.user.id);
 
 }