Merge pull request #20 from aiham/dev

Release 0.6.0

Author: aiham

package.json

@@ -1,6 +1,6 @@
 {
   "name": "opentok-react",
-  "version": "0.5.0",
+  "version": "0.6.0",
   "description": "React components for OpenTok.js",
   "main": "dist/index.js",
   "scripts": {

src/OTPublisher.js

@@ -34,17 +34,17 @@ export default class OTPublisher extends Component {
     };
 
     if (shouldUpdate('videoSource', undefined)) {
+      this.destroyPublisher();
       this.createPublisher();
       return;
     }
 
     updatePublisherProperty('publishAudio', true);
     updatePublisherProperty('publishVideo', true);
 
-    if (!prevProps.session && this.props.session) {
-      this.createPublisher();
-    } else if (prevProps.session && !this.props.session) {
+    if (this.props.session !== prevProps.session) {
       this.destroyPublisher(prevProps.session);
+      this.createPublisher();
     }
   }
 
@@ -100,9 +100,8 @@ export default class OTPublisher extends Component {
   }
 
   createPublisher() {
-    this.destroyPublisher();
-
     if (!this.props.session) {
+      this.setState({ publisher: null, lastStreamId: '' });
       return;
     }
 

src/OTSession.js

@@ -13,6 +13,26 @@ export default class OTSession extends Component {
   }
 
   componentWillMount() {
+    this.createSession();
+  }
+
+  componentDidUpdate(prevProps) {
+    if (
+      prevProps.apiKey !== this.props.apiKey ||
+      prevProps.sessionId !== this.props.sessionId ||
+      prevProps.token !== this.props.token
+    ) {
+      this.createSession();
+    }
+  }
+
+  componentWillUnmount() {
+    this.destroySession();
+  }
+
+  createSession() {
+    this.destroySession();
+
     this.sessionHelper = createSession({
       apiKey: this.props.apiKey,
       sessionId: this.props.sessionId,
@@ -33,14 +53,16 @@ export default class OTSession extends Component {
     this.setState({ streams });
   }
 
-  componentWillUnmount() {
-    if (
-      this.props.eventHandlers &&
-      typeof this.props.eventHandlers === 'object'
-    ) {
-      this.sessionHelper.session.off(this.props.eventHandlers);
+  destroySession() {
+    if (this.sessionHelper) {
+      if (
+        this.props.eventHandlers &&
+        typeof this.props.eventHandlers === 'object'
+      ) {
+        this.sessionHelper.session.off(this.props.eventHandlers);
+      }
+      this.sessionHelper.disconnect();
     }
-    this.sessionHelper.disconnect();
   }
 
   render() {

src/OTSubscriber.js

@@ -29,16 +29,9 @@ export default class OTSubscriber extends Component {
     updateSubscriberProperty('subscribeToAudio');
     updateSubscriberProperty('subscribeToVideo');
 
-    if (
-      (!prevProps.session || !prevProps.stream) &&
-      this.props.session && this.props.stream
-    ) {
-      this.createSubscriber();
-    } else if (
-      prevProps.session && prevProps.stream &&
-      (!this.props.session || !this.props.stream)
-    ) {
+    if (this.props.session !== prevProps.session || this.props.stream !== prevProps.stream) {
       this.destroySubscriber(prevProps.session);
+      this.createSubscriber();
     }
   }
 
@@ -51,9 +44,8 @@ export default class OTSubscriber extends Component {
   }
 
   createSubscriber() {
-    this.destroySubscriber();
-
     if (!this.props.session || !this.props.stream) {
+      this.setState({ subscriber: null });
       return;
     }