versacall-core-library-react 2.0.34 → 2.0.38

package/dist/context/Channels/ChannelsConsumer.js

@@ -55,7 +55,7 @@ function (_Component) {
   _createClass(ChannelsConsumer, [{
     key: "componentDidMount",
     value: function componentDidMount() {
-      this.props.channels.registerHandlers(this.props.id, this.props.handler, this.props.connectionChanged);
+      this.props.channels.registerHandlers(this.props.id, this.props.handler, this.props.connectionChanged, this.props.subscribing);
     }
   }, {
     key: "componentWillUnmount",
@@ -77,11 +77,13 @@ ChannelsConsumer.propTypes = {
   id: _propTypes.default.string.isRequired,
   handler: _propTypes.default.func.isRequired,
   connectionChanged: _propTypes.default.func,
+  subscribing: _propTypes.default.func,
   addDefaultChannels: _propTypes.default.bool,
   channels: _propTypes.default.objectOf(_propTypes.default.func).isRequired
 };
 ChannelsConsumer.defaultProps = {
   connectionChanged: null,
+  subscribing: null,
   addDefaultChannels: true,
   children: null
 };

package/dist/context/Channels/ChannelsProvider.js

@@ -44,6 +44,7 @@ var channelInformation = [];
 var channelFunctions = [];
 var handlers = [];
 var connectionChangedHandlers = [];
+var subscribingHandlers = [];
 var client;
 
 function compareChannelInfo(ci1, ci2) {
@@ -70,7 +71,7 @@ function compareChannelInfo(ci1, ci2) {
   return true;
 }
 
-var _registerHandlers = function registerHandlers(id, handler, connectionChanged) {
+var _registerHandlers = function registerHandlers(id, handler, connectionChanged, subscribing) {
   var existing = handlers.find(function (x) {
     return x.id === id;
   });
@@ -89,7 +90,7 @@ var _registerHandlers = function registerHandlers(id, handler, connectionChanged
       return x.id === id;
     });
 
-    if (existing !== undefined) {
+    if (existingConnectionChanged !== undefined) {
       existingConnectionChanged.handler = connectionChanged;
     } else {
       connectionChangedHandlers.push({
@@ -98,6 +99,21 @@ var _registerHandlers = function registerHandlers(id, handler, connectionChanged
       });
     }
   }
+
+  if (subscribing) {
+    var existingSubscribing = subscribingHandlers.find(function (x) {
+      return x.id === id;
+    });
+
+    if (existingSubscribing !== undefined) {
+      existingSubscribing.handler = subscribing;
+    } else {
+      subscribingHandlers.push({
+        id: id,
+        handler: subscribing
+      });
+    }
+  }
 };
 
 var _unregisterHandlers = function unregisterHandlers(id) {
@@ -116,6 +132,14 @@ var _unregisterHandlers = function unregisterHandlers(id) {
   if (existingConnectionChanged !== undefined) {
     connectionChangedHandlers.splice(connectionChangedHandlers.indexOf(existingConnectionChanged), 1);
   }
+
+  var existingSubscribing = subscribingHandlers.find(function (x) {
+    return x.id === id;
+  });
+
+  if (existingSubscribing !== undefined) {
+    subscribingHandlers.splice(subscribingHandlers.indexOf(existingSubscribing), 1);
+  }
 };
 
 var _registerChannel = function registerChannel(id, _channelFunction) {
@@ -167,6 +191,12 @@ var notifyConnectionChanged = function notifyConnectionChanged(connected) {
   });
 };
 
+var notifySubscribing = function notifySubscribing(channel) {
+  subscribingHandlers.forEach(function (x) {
+    x.handler(channel);
+  });
+};
+
 var ChannelsProvider =
 /*#__PURE__*/
 function (_Component) {
@@ -303,17 +333,18 @@ function (_Component) {
     key: "subscribe",
     value: function subscribe(channelInfo) {
       var methodName = 'subscribe()';
-      this.props.core.log('system', namespace, methodName, 'Subscribing', channelInfo);
+      this.props.core.log('system', namespace, methodName, "Subscribing to ".concat(channelInfo.channelName));
       client.subscribe({
         key: channelInfo.channelKey,
         channel: channelInfo.channelName
       });
+      notifySubscribing(channelInfo.channelName);
     }
   }, {
     key: "unsubscribe",
     value: function unsubscribe(channelInfo) {
       var methodName = 'unsubscribe()';
-      this.props.core.log('system', namespace, methodName, 'Unsubscribing', channelInfo);
+      this.props.core.log('system', namespace, methodName, "Unsubscribing from ".concat(channelInfo.channelName));
       client.unsubscribe({
         key: channelInfo.channelKey,
         channel: channelInfo.channelName
@@ -344,8 +375,8 @@ function (_Component) {
           updateChannel: function updateChannel(id, data) {
             return _this5.updateChannel(id, data);
           },
-          registerHandlers: function registerHandlers(id, handler, connectionChanged) {
-            return _registerHandlers(id, handler, connectionChanged);
+          registerHandlers: function registerHandlers(id, handler, connectionChanged, subscribing) {
+            return _registerHandlers(id, handler, connectionChanged, subscribing);
           },
           registerChannel: function registerChannel(id, channelFunction) {
             return _registerChannel(id, channelFunction);

package/package.json

@@ -2,10 +2,10 @@
   "versacall": {
     "title": "Versacall Core Library React",
     "applicationType": "react-library",
-    "build": 34
+    "build": 38
   },
   "name": "versacall-core-library-react",
-  "version": "2.0.34",
+  "version": "2.0.38",
   "description": "Versacall Core Library",
   "main": "dist/index.js",
   "module": "dist/index.js",