@agilemotion/oui-react-js 1.6.4 → 1.6.5

package/dist/components/media/VCRoomWorkspace.js

@@ -1,490 +1,242 @@
 "use strict";
 
-function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 var _react = _interopRequireWildcard(require("react"));
-
 require("./VCRoomWorkspace.css");
-
 var _Grid = _interopRequireDefault(require("@material-ui/core/Grid"));
-
 var _VCRoomParticipant = _interopRequireDefault(require("./VCRoomParticipant"));
-
 var _Box = _interopRequireDefault(require("@material-ui/core/Box"));
-
 var _VCEventManager = _interopRequireDefault(require("./VCEventManager"));
-
 var _MediaSoupHelper = _interopRequireDefault(require("./MediaSoupHelper"));
-
 var _Transports = _interopRequireDefault(require("./Transports"));
-
 var _VCEventType = require("./VCEventType");
-
 var _Icon = _interopRequireDefault(require("../Icon"));
-
 var _SocketManager = _interopRequireDefault(require("../SocketManager"));
-
 var _LobbyWaitingList = _interopRequireDefault(require("./LobbyWaitingList"));
-
 var _VCRoom = require("./VCRoom");
-
 var _SideBarContent = _interopRequireDefault(require("./SideBarContent"));
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function _getRequireWildcardCache() { return cache; }; return cache; }
-
-function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-
-function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
-
-function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
-
-function _createForOfIteratorHelper(o, allowArrayLike) { var it; if (typeof Symbol === "undefined" || o[Symbol.iterator] == null) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e2) { throw _e2; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = o[Symbol.iterator](); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e3) { didErr = true; err = _e3; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
-
-function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
-
-function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-
-function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-
-function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
-
-function _iterableToArrayLimit(arr, i) { if (typeof Symbol === "undefined" || !(Symbol.iterator in Object(arr))) return; var _arr = []; var _n = true; var _d = false; var _e = undefined; try { for (var _i = arr[Symbol.iterator](), _s; !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
-
-function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-
-var MAX_COLS = 3;
-var MAX_ROWS = 2; // TODO : Clean-up all tracks and producers and consumers when the component closes
-
-var VCRoomWorkspace = function VCRoomWorkspace(props) {
-  var _React$useState = _react.default.useState(null),
-      _React$useState2 = _slicedToArray(_React$useState, 2),
-      currentUserParticipant = _React$useState2[0],
-      setCurrentUserParticipant = _React$useState2[1];
-
-  var _React$useState3 = _react.default.useState([]),
-      _React$useState4 = _slicedToArray(_React$useState3, 2),
-      inViewParticipants = _React$useState4[0],
-      setInViewParticipants = _React$useState4[1];
-
-  var _React$useState5 = _react.default.useState(null),
-      _React$useState6 = _slicedToArray(_React$useState5, 2),
-      consumerTransport = _React$useState6[0],
-      setConsumerTransport = _React$useState6[1]; //const [videoRefresher, setVideoRefresher] = React.useState(false);
-
-
-  var _React$useState7 = _react.default.useState(null),
-      _React$useState8 = _slicedToArray(_React$useState7, 2),
-      device = _React$useState8[0],
-      setDevice = _React$useState8[1];
-
-  var _React$useState9 = _react.default.useState(null),
-      _React$useState10 = _slicedToArray(_React$useState9, 2),
-      shareScreenProducer = _React$useState10[0],
-      setShareScreenProducer = _React$useState10[1];
-
-  var _React$useState11 = _react.default.useState(null),
-      _React$useState12 = _slicedToArray(_React$useState11, 2),
-      producerTransport = _React$useState12[0],
-      setProducerTransport = _React$useState12[1];
-
-  var _React$useState13 = _react.default.useState(null),
-      _React$useState14 = _slicedToArray(_React$useState13, 2),
-      screenShared = _React$useState14[0],
-      setScreenShared = _React$useState14[1];
-
-  var _React$useState15 = _react.default.useState(null),
-      _React$useState16 = _slicedToArray(_React$useState15, 2),
-      someoneSharing = _React$useState16[0],
-      setSomeoneSharing = _React$useState16[1];
-
-  var _React$useState17 = _react.default.useState(false),
-      _React$useState18 = _slicedToArray(_React$useState17, 2),
-      showSharedScreen = _React$useState18[0],
-      setShowSharedScreen = _React$useState18[1];
-
-  var _React$useState19 = _react.default.useState(''),
-      _React$useState20 = _slicedToArray(_React$useState19, 2),
-      message = _React$useState20[0],
-      setMessage = _React$useState20[1];
-
-  var _React$useState21 = _react.default.useState(null),
-      _React$useState22 = _slicedToArray(_React$useState21, 2),
-      shareScreenConsumer = _React$useState22[0],
-      setShareScreenConsumer = _React$useState22[1];
-
-  var _React$useState23 = _react.default.useState(null),
-      _React$useState24 = _slicedToArray(_React$useState23, 2),
-      grid = _React$useState24[0],
-      setGrid = _React$useState24[1];
-
-  var _useState = (0, _react.useState)({}),
-      _useState2 = _slicedToArray(_useState, 1),
-      eventHandler = _useState2[0];
-
-  var transports = (0, _react.useRef)(new _Transports.default());
-  var shareScreenVideoRef = (0, _react.useRef)();
-  var shareScreenStream = (0, _react.useRef)();
-  var waitingList = props.waitingList,
-      roomStatus = props.roomStatus,
-      meetingId = props.meetingId,
-      meetingChat = props.meetingChat,
-      sideBarTab = props.sideBarTab,
-      meetingTitle = props.meetingTitle,
-      whiteBoardShown = props.whiteBoardShown,
-      videoMuted = props.videoMuted,
-      audioMuted = props.audioMuted,
-      isHost = props.isHost,
-      rtpCapabilities = props.rtpCapabilities,
-      onloadScreenShareData = props.onloadScreenShareData,
-      displayState = props.displayState,
-      startScreenSharing = props.startScreenSharing,
-      participants = props.participants;
-
-  var startShareScreen = function startShareScreen() {
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+/* eslint-disable react-hooks/exhaustive-deps */
+
+const MAX_COLS = 3;
+const MAX_ROWS = 2;
+
+// TODO : Clean-up all tracks and producers and consumers when the component closes
+const VCRoomWorkspace = props => {
+  const [currentUserParticipant, setCurrentUserParticipant] = _react.default.useState(null);
+  const [inViewParticipants, setInViewParticipants] = _react.default.useState([]);
+  const [consumerTransport, setConsumerTransport] = _react.default.useState(null);
+  //const [videoRefresher, setVideoRefresher] = React.useState(false);
+  const [device, setDevice] = _react.default.useState(null);
+  const [shareScreenProducer, setShareScreenProducer] = _react.default.useState(null);
+  const [producerTransport, setProducerTransport] = _react.default.useState(null);
+  const [screenShared, setScreenShared] = _react.default.useState(null);
+  const [someoneSharing, setSomeoneSharing] = _react.default.useState(null);
+  const [showSharedScreen, setShowSharedScreen] = _react.default.useState(false);
+  const [message, setMessage] = _react.default.useState('');
+  const [shareScreenConsumer, setShareScreenConsumer] = _react.default.useState(null);
+  const [grid, setGrid] = _react.default.useState(null);
+  const [eventHandler] = (0, _react.useState)({});
+  const transports = (0, _react.useRef)(new _Transports.default());
+  const shareScreenVideoRef = (0, _react.useRef)();
+  const shareScreenStream = (0, _react.useRef)();
+  const {
+    waitingList,
+    roomStatus,
+    meetingId,
+    meetingChat,
+    sideBarTab,
+    meetingTitle,
+    whiteBoardShown,
+    videoMuted,
+    audioMuted,
+    isHost,
+    rtpCapabilities,
+    onloadScreenShareData,
+    displayState,
+    startScreenSharing,
+    participants
+  } = props;
+  const startShareScreen = () => {
     produceScreenShare();
   };
-
-  var stopShareScreen = function stopShareScreen() {
+  const stopShareScreen = () => {
     if (shareScreenStream.current) {
-      var _iterator = _createForOfIteratorHelper(shareScreenStream.current.getTracks()),
-          _step;
-
-      try {
-        for (_iterator.s(); !(_step = _iterator.n()).done;) {
-          var track = _step.value;
-          track.stop();
-        }
-      } catch (err) {
-        _iterator.e(err);
-      } finally {
-        _iterator.f();
+      for (const track of shareScreenStream.current.getTracks()) {
+        track.stop();
       }
-
       shareScreenStream.current = null;
       removeShareScreenElement();
     }
-
     props.onStopSharing();
   };
-
-  var produceScreenShare = /*#__PURE__*/function () {
-    var _ref = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee3() {
-      var videoConstraints;
-      return regeneratorRuntime.wrap(function _callee3$(_context3) {
-        while (1) {
-          switch (_context3.prev = _context3.next) {
-            case 0:
-              if (device) {
-                _context3.next = 3;
-                break;
-              }
-
-              console.error('No available device');
-              return _context3.abrupt("return");
-
-            case 3:
-              if (producerTransport) {
-                _context3.next = 6;
-                break;
-              }
-
-              console.error('No producer transport');
-              return _context3.abrupt("return");
-
-            case 6:
-              if (device.canProduce('video')) {
-                _context3.next = 9;
-                break;
-              }
-
-              console.error('Cannot produce screen share');
-              return _context3.abrupt("return");
-
-            case 9:
-              if (!shareScreenProducer) {
-                _context3.next = 12;
-                break;
-              }
-
-              console.log('Share screen producer already exist');
-              return _context3.abrupt("return");
-
-            case 12:
-              videoConstraints = {
-                cursor: true,
-                audio: false,
-                video: {
-                  mandatory: {
-                    width: {
-                      min: 160,
-                      ideal: 320,
-                      max: 640
-                    },
-                    height: {
-                      min: 120,
-                      ideal: 240,
-                      max: 480
-                    },
-                    frameRate: {
-                      min: 15,
-                      max: 15
-                    },
-                    googCpuOveruseDetection: true,
-                    googCpuOveruseEncodeUsage: true,
-                    googCpuOveruseThreshold: 70
-                  }
-                },
-                preferCurrentTab: true,
-                selfBrowserSurface: 'include',
-                systemAudio: 'exclude',
-                surfaceSwitching: 'exclude',
-                monitorTypeSurfaces: 'exclude'
-              };
-
-              _SocketManager.default.emitEvent(_VCEventType.VCEventType.CANCEL_SCREEN_SHARE, {
-                roomId: props.meetingId
-              }).then( /*#__PURE__*/function () {
-                var _ref2 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee2(result) {
-                  return regeneratorRuntime.wrap(function _callee2$(_context2) {
-                    while (1) {
-                      switch (_context2.prev = _context2.next) {
-                        case 0:
-                          navigator.mediaDevices.getDisplayMedia(videoConstraints).then( /*#__PURE__*/function () {
-                            var _ref3 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(stream) {
-                              var track, params, producer;
-                              return regeneratorRuntime.wrap(function _callee$(_context) {
-                                while (1) {
-                                  switch (_context.prev = _context.next) {
-                                    case 0:
-                                      track = stream.getVideoTracks()[0];
-
-                                      track.onended = function (e) {
-                                        track.stop();
-                                        stopShareScreen();
-                                      };
-
-                                      params = {
-                                        track: track,
-                                        appData: {
-                                          screenSharing: true
-                                        }
-                                      };
-                                      _context.next = 5;
-                                      return producerTransport.produce(params);
-
-                                    case 5:
-                                      producer = _context.sent;
-                                      setShareScreenProducer(producer);
-                                      shareScreenStream.current = stream;
-
-                                      if (showSharedScreen) {
-                                        shareScreenVideoRef.current.srcObject = stream;
-                                      }
-
-                                      producer.on('transportclose', function () {
-                                        stream.srcObject.getTracks().forEach(function (track) {
-                                          track.stop();
-                                        });
-                                        setShareScreenProducer(null);
-                                      });
-                                      producer.on('close', function () {
-                                        stream.srcObject.getTracks().forEach(function (track) {
-                                          track.stop();
-                                        });
-                                        setShareScreenProducer(null);
-                                      });
-                                      props.onStartSharing();
-
-                                    case 12:
-                                    case "end":
-                                      return _context.stop();
-                                  }
-                                }
-                              }, _callee);
-                            }));
-
-                            return function (_x2) {
-                              return _ref3.apply(this, arguments);
-                            };
-                          }()).catch(function (e) {
-                            props.onStopSharing();
-                          });
-
-                        case 1:
-                        case "end":
-                          return _context2.stop();
-                      }
-                    }
-                  }, _callee2);
-                }));
-
-                return function (_x) {
-                  return _ref2.apply(this, arguments);
-                };
-              }()).catch(function (e) {
-                return console.log('ERROR CANCELLING SCREEN SHARE : ', e);
-              });
-
-            case 14:
-            case "end":
-              return _context3.stop();
-          }
+  const produceScreenShare = async () => {
+    if (!device) {
+      console.error('No available device');
+      return;
+    }
+    if (!producerTransport) {
+      console.error('No producer transport');
+      return;
+    }
+    if (!device.canProduce('video')) {
+      console.error('Cannot produce screen share');
+      return;
+    }
+    if (shareScreenProducer) {
+      console.log('Share screen producer already exist');
+      return;
+    }
+    const videoConstraints = {
+      cursor: true,
+      audio: false,
+      video: {
+        mandatory: {
+          width: {
+            min: 160,
+            ideal: 320,
+            max: 640
+          },
+          height: {
+            min: 120,
+            ideal: 240,
+            max: 480
+          },
+          frameRate: {
+            min: 15,
+            max: 15
+          },
+          googCpuOveruseDetection: true,
+          googCpuOveruseEncodeUsage: true,
+          googCpuOveruseThreshold: 70
         }
-      }, _callee3);
-    }));
-
-    return function produceScreenShare() {
-      return _ref.apply(this, arguments);
+      },
+      preferCurrentTab: true,
+      selfBrowserSurface: 'include',
+      systemAudio: 'exclude',
+      surfaceSwitching: 'exclude',
+      monitorTypeSurfaces: 'exclude'
     };
-  }();
-
-  var stopProducingScreenShare = /*#__PURE__*/function () {
-    var _ref4 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee4() {
-      var producerId, _iterator2, _step2, track;
-
-      return regeneratorRuntime.wrap(function _callee4$(_context4) {
-        while (1) {
-          switch (_context4.prev = _context4.next) {
-            case 0:
-              if (shareScreenProducer) {
-                _context4.next = 3;
-                break;
-              }
-
-              console.log('There is no share screen producer');
-              return _context4.abrupt("return");
-
-            case 3:
-              producerId = shareScreenProducer.id;
-              console.log('Close producer', producerId);
-
-              _SocketManager.default.emitEvent(_VCEventType.VCEventType.PRODUCER_CLOSED, {
-                userId: sessionStorage.getItem('username'),
-                producerId: producerId,
-                roomId: meetingId
-              }).catch(function (e) {
-                return console.log('PRODUCER_CLOSED ERROR : ', e);
-              });
-
-              shareScreenProducer.close();
-              stopShareScreen();
-              setShareScreenProducer(null); //setSomeoneSharing(false);
-
-              setScreenShared(false);
-
-              if (shareScreenStream.current) {
-                _iterator2 = _createForOfIteratorHelper(shareScreenStream.current.getTracks());
-
-                try {
-                  for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
-                    track = _step2.value;
-                    track.stop();
-                  }
-                } catch (err) {
-                  _iterator2.e(err);
-                } finally {
-                  _iterator2.f();
-                }
-              }
-
-            case 11:
-            case "end":
-              return _context4.stop();
+    _SocketManager.default.emitEvent(_VCEventType.VCEventType.CANCEL_SCREEN_SHARE, {
+      roomId: props.meetingId
+    }).then(async result => {
+      navigator.mediaDevices.getDisplayMedia(videoConstraints).then(async stream => {
+        const track = stream.getVideoTracks()[0];
+        track.onended = e => {
+          track.stop();
+          stopShareScreen();
+        };
+        const params = {
+          track,
+          appData: {
+            screenSharing: true
           }
+        };
+        let producer = await producerTransport.produce(params);
+        setShareScreenProducer(producer);
+        shareScreenStream.current = stream;
+        if (showSharedScreen) {
+          shareScreenVideoRef.current.srcObject = stream;
         }
-      }, _callee4);
-    }));
-
-    return function stopProducingScreenShare() {
-      return _ref4.apply(this, arguments);
-    };
-  }();
-
-  var onNewProducers = function onNewProducers(producers) {
-    var screenShareProducer = producers.find(function (p) {
-      return p.screenSharing;
-    });
-
+        producer.on('transportclose', () => {
+          stream.srcObject.getTracks().forEach(function (track) {
+            track.stop();
+          });
+          setShareScreenProducer(null);
+        });
+        producer.on('close', () => {
+          stream.srcObject.getTracks().forEach(function (track) {
+            track.stop();
+          });
+          setShareScreenProducer(null);
+        });
+        props.onStartSharing();
+      }).catch(e => {
+        props.onStopSharing();
+      });
+    }).catch(e => console.log('ERROR CANCELLING SCREEN SHARE : ', e));
+  };
+  const stopProducingScreenShare = async () => {
+    if (!shareScreenProducer) {
+      console.log('There is no share screen producer');
+      return;
+    }
+    let producerId = shareScreenProducer.id;
+    console.log('Close producer', producerId);
+    _SocketManager.default.emitEvent(_VCEventType.VCEventType.PRODUCER_CLOSED, {
+      userId: sessionStorage.getItem('username'),
+      producerId,
+      roomId: meetingId
+    }).catch(e => console.log('PRODUCER_CLOSED ERROR : ', e));
+    shareScreenProducer.close();
+    stopShareScreen();
+    setShareScreenProducer(null);
+    //setSomeoneSharing(false);
+    setScreenShared(false);
+    if (shareScreenStream.current) {
+      for (const track of shareScreenStream.current.getTracks()) {
+        track.stop();
+      }
+    }
+  };
+  const onNewProducers = producers => {
+    let screenShareProducer = producers.find(p => p.screenSharing);
     if (screenShareProducer) {
       consume(screenShareProducer);
     }
   };
-
-  var removeShareScreenElement = function removeShareScreenElement() {
-    var el = document.getElementById('share-screen-video');
-
+  const removeShareScreenElement = () => {
+    let el = document.getElementById('share-screen-video');
     if (el) {
       el.parentNode.removeChild(el);
     }
   };
-
-  var consume = /*#__PURE__*/function () {
-    var _ref5 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee5(producer) {
-      return regeneratorRuntime.wrap(function _callee5$(_context5) {
-        while (1) {
-          switch (_context5.prev = _context5.next) {
-            case 0:
-              _MediaSoupHelper.default.getConsumeStream(producer.producerId, device.rtpCapabilities, consumerTransport, props.meetingId, sessionStorage.getItem('username'), 'video').then(function (_ref6) {
-                var consumer = _ref6.consumer,
-                    stream = _ref6.stream,
-                    kind = _ref6.kind;
-
-                if (consumer) {
-                  setShareScreenConsumer(consumer);
-                  console.log('=====================================SHARING CONSUME=====================================');
-                  props.sharingHandler(true);
-                  setScreenShared(true);
-                  setSomeoneSharing(true); //setShowSharedScreen(true);
-
-                  setMessage(producer.username + ' is sharing');
-                  shareScreenVideoRef.current.srcObject = stream;
-                  shareScreenStream.current = stream; //setVideoRefresher(!videoRefresher);
-
-                  consumer.on('trackended', function () {
-                    removeShareScreenElement();
-                  });
-                  consumer.on('transportclose', function () {
-                    removeShareScreenElement();
-                  });
-                }
-              });
-
-            case 1:
-            case "end":
-              return _context5.stop();
-          }
-        }
-      }, _callee5);
-    }));
-
-    return function consume(_x3) {
-      return _ref5.apply(this, arguments);
-    };
-  }();
-
-  var handler = function handler() {
+  const consume = async producer => {
+    _MediaSoupHelper.default.getConsumeStream(producer.producerId, device.rtpCapabilities, consumerTransport, props.meetingId, sessionStorage.getItem('username'), 'video').then(_ref => {
+      let {
+        consumer,
+        stream,
+        kind
+      } = _ref;
+      if (consumer) {
+        setShareScreenConsumer(consumer);
+        console.log('=====================================SHARING CONSUME=====================================');
+        props.sharingHandler(true);
+        setScreenShared(true);
+        setSomeoneSharing(true);
+        //setShowSharedScreen(true);
+        setMessage(producer.username + ' is sharing');
+        shareScreenVideoRef.current.srcObject = stream;
+        shareScreenStream.current = stream;
+        //setVideoRefresher(!videoRefresher);
+
+        consumer.on('trackended', () => {
+          removeShareScreenElement();
+        });
+        consumer.on('transportclose', () => {
+          removeShareScreenElement();
+        });
+      }
+    });
+  };
+  const handler = () => {
     return {
       get id() {
         return 'meeting-participant-grid';
       },
-
-      on: function on(eventType, be) {
+      on: (eventType, be) => {
         switch (eventType) {
           case _VCEventType.VCEventType.PARTICIPANT_IN_VIEW:
             onBringToView(be);
             break;
-
           case _VCEventType.VCEventType.NEW_PRODUCERS:
             onNewProducers(be.payload);
             break;
-
           case _VCEventType.VCEventType.CONSUMER_CLOSED:
             if (shareScreenConsumer && shareScreenConsumer.id === be.payload.consumerId) {
               removeShareScreenElement();
@@ -494,139 +246,93 @@ var VCRoomWorkspace = function VCRoomWorkspace(props) {
               setScreenShared(false);
               setShowSharedScreen(false);
             }
-
             break;
         }
       }
     };
   };
-
-  var onBringToView = function onBringToView(payload) {
-    if (!inViewParticipants.find(function (p) {
-      return p.userId === payload.userId;
-    })) {
+  const onBringToView = payload => {
+    if (!inViewParticipants.find(p => p.userId === payload.userId)) {
       if (inViewParticipants.length === MAX_COLS * MAX_ROWS) {
-        var offViewParticipant = inViewParticipants[inViewParticipants.length - 1];
-
+        let offViewParticipant = inViewParticipants[inViewParticipants.length - 1];
         _VCEventManager.default.fireEvent(_VCEventType.VCEventType.PARTICIPANT_OFF_VIEW, offViewParticipant);
-
         inViewParticipants.splice(inViewParticipants.length - 1, 1);
         offViewParticipant.inView = false;
       }
+      let participant = props.participants.find(p => p.userId === payload.userId);
+      inViewParticipants.push(participant);
 
-      var participant = props.participants.find(function (p) {
-        return p.userId === payload.userId;
-      });
-      inViewParticipants.push(participant); // Refresh the list
-
+      // Refresh the list
       setInViewParticipants([].concat(inViewParticipants));
     }
   };
-
-  var removeFromView = function removeFromView(participant) {
+  const removeFromView = participant => {
     participant.inView = false;
-    setInViewParticipants(inViewParticipants.filter(function (p) {
-      return p.userId !== participant.userId;
-    }));
-
+    setInViewParticipants(inViewParticipants.filter(p => p.userId !== participant.userId));
     _VCEventManager.default.fireEvent(_VCEventType.VCEventType.PARTICIPANT_OFF_VIEW, participant);
   };
-
-  var setupSelfDevices = /*#__PURE__*/function () {
-    var _ref7 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee6() {
-      var device, consumerTransport, producerTransport;
-      return regeneratorRuntime.wrap(function _callee6$(_context6) {
-        while (1) {
-          switch (_context6.prev = _context6.next) {
-            case 0:
-              _context6.next = 2;
-              return _MediaSoupHelper.default.getParticipantDevice(rtpCapabilities);
-
-            case 2:
-              device = _context6.sent;
-              setDevice(device);
-              _context6.next = 6;
-              return _MediaSoupHelper.default.initConsumerTransport(device, meetingId, sessionStorage.getItem('username'));
-
-            case 6:
-              consumerTransport = _context6.sent;
-              _context6.next = 9;
-              return _MediaSoupHelper.default.initProducerTransport(device, meetingId, sessionStorage.getItem('username'));
-
-            case 9:
-              producerTransport = _context6.sent;
-              setConsumerTransport(consumerTransport);
-              setProducerTransport(producerTransport);
-              transports.current.setConsumerTransport(consumerTransport);
-              transports.current.setProducerTransport(producerTransport);
-
-            case 14:
-            case "end":
-              return _context6.stop();
-          }
-        }
-      }, _callee6);
-    }));
-
-    return function setupSelfDevices() {
-      return _ref7.apply(this, arguments);
-    };
-  }();
-
-  (0, _react.useEffect)(function () {
+  const setupSelfDevices = async () => {
+    let device = await _MediaSoupHelper.default.getParticipantDevice(rtpCapabilities);
+    setDevice(device);
+    let consumerTransport = await _MediaSoupHelper.default.initConsumerTransport(device, meetingId, sessionStorage.getItem('username'));
+    let producerTransport = await _MediaSoupHelper.default.initProducerTransport(device, meetingId, sessionStorage.getItem('username'));
+    setConsumerTransport(consumerTransport);
+    setProducerTransport(producerTransport);
+    transports.current.setConsumerTransport(consumerTransport);
+    transports.current.setProducerTransport(producerTransport);
+  };
+  (0, _react.useEffect)(() => {
     eventHandler.api = handler();
   });
-  (0, _react.useEffect)(function () {}, [props.audioMuted]);
-  (0, _react.useEffect)(function () {
+  (0, _react.useEffect)(() => {}, [props.audioMuted]);
+  (0, _react.useEffect)(() => {
     setupGrid();
   }, [inViewParticipants]);
+
   /*useEffect(() => {
     if(grid === null) {
       setupGrid();
     }
   }, [grid]);*/
 
-  (0, _react.useEffect)(function () {
+  (0, _react.useEffect)(() => {
     if (!screenShared) {
       stopProducingScreenShare();
     }
   }, [screenShared]);
-  (0, _react.useEffect)(function () {
+  (0, _react.useEffect)(() => {
     if (startScreenSharing) {
       produceScreenShare();
     }
   }, [startScreenSharing]);
-  (0, _react.useEffect)(function () {
+  (0, _react.useEffect)(() => {
     if (onloadScreenShareData && device && consumerTransport) {
       consume(onloadScreenShareData);
     }
   }, [onloadScreenShareData, device, consumerTransport]);
-  (0, _react.useEffect)(function () {
+  (0, _react.useEffect)(() => {
     setScreenShared(props.screenShared);
-
     if (props.screenShared) {
       startShareScreen();
     } else {
       stopShareScreen();
     }
   }, [props.screenShared]);
-  (0, _react.useEffect)(function () {
+  (0, _react.useEffect)(() => {
     _VCEventManager.default.addSubscriptions(eventHandler, _VCEventType.VCEventType.NEW_PRODUCERS, _VCEventType.VCEventType.CONSUMER_CLOSED, _VCEventType.VCEventType.PARTICIPANT_IN_VIEW);
-
     setupSelfDevices();
-    return function () {
+    return () => {
       _VCEventManager.default.removeSubscriptions(eventHandler);
-
       transports.current.closeConsumerTransport();
       transports.current.closeProducerTransport();
     };
   }, []);
-  (0, _react.useEffect)(function () {
+  (0, _react.useEffect)(() => {
     if (grid) {
       props.onGridSetup();
     }
   }, [grid]);
-  (0, _react.useEffect)(function () {
+  (0, _react.useEffect)(() => {
     if (props.participants && props.currentUserFullName) {
       setCurrentUserParticipant({
         isCurrentUser: true,
@@ -634,57 +340,37 @@ var VCRoomWorkspace = function VCRoomWorkspace(props) {
         peer: null,
         name: props.currentUserFullName,
         avatarId: sessionStorage.getItem('userAvatarId'),
-        videoMuted: videoMuted,
-        audioMuted: audioMuted
+        videoMuted,
+        audioMuted
       });
-      var counter = 0;
+      let counter = 0;
       inViewParticipants.splice(0, inViewParticipants.length);
-
-      var _iterator3 = _createForOfIteratorHelper(props.participants),
-          _step3;
-
-      try {
-        for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
-          var participant = _step3.value;
-          participant.inView = true;
-          inViewParticipants.push(participant);
-
-          if (++counter >= MAX_ROWS * MAX_COLS) {
-            break;
-          }
+      for (const participant of props.participants) {
+        participant.inView = true;
+        inViewParticipants.push(participant);
+        if (++counter >= MAX_ROWS * MAX_COLS) {
+          break;
         }
-      } catch (err) {
-        _iterator3.e(err);
-      } finally {
-        _iterator3.f();
       }
-
       setupGrid(inViewParticipants);
     }
   }, [props.participants, props.currentUserFullName, props.displayState]);
-
-  var setupGrid = function setupGrid() {
-    var inViewGrid = [];
-    var numRows = inViewParticipants.length < MAX_ROWS ? inViewParticipants.length : MAX_ROWS;
-    var rows = inViewParticipants.length === 2 ? 1 : numRows;
-
-    for (var i = 0; i < rows; i++) {
+  const setupGrid = () => {
+    let inViewGrid = [];
+    let numRows = inViewParticipants.length < MAX_ROWS ? inViewParticipants.length : MAX_ROWS;
+    let rows = inViewParticipants.length === 2 ? 1 : numRows;
+    for (let i = 0; i < rows; i++) {
       inViewGrid.push([]);
     }
-
-    var currentRowIndex = 0;
-
-    for (var _i2 = 0; _i2 < inViewParticipants.length; _i2++) {
-      inViewGrid[currentRowIndex].push(inViewParticipants[_i2]);
-
+    let currentRowIndex = 0;
+    for (let i = 0; i < inViewParticipants.length; i++) {
+      inViewGrid[currentRowIndex].push(inViewParticipants[i]);
       if (currentRowIndex++ === rows - 1) {
         currentRowIndex = 0;
       }
     }
-
     setGrid(inViewGrid);
   };
-
   function renderStrip() {
     return inViewParticipants && inViewParticipants.length > 0 && /*#__PURE__*/_react.default.createElement("div", {
       style: {
@@ -697,7 +383,7 @@ var VCRoomWorkspace = function VCRoomWorkspace(props) {
         alignItems: 'center'
       },
       className: "row flex-row flex-nowrap no-margin no-padding"
-    }, inViewParticipants.map(function (participant, index) {
+    }, inViewParticipants.map((participant, index) => {
       return /*#__PURE__*/_react.default.createElement("div", {
         className: 'col-*-*',
         key: index + '-' + participant.userId,
@@ -714,26 +400,19 @@ var VCRoomWorkspace = function VCRoomWorkspace(props) {
         displayState: displayState,
         audioMuted: participant.audioMuted,
         videoMuted: participant.videoMuted,
-        onRemoveFromView: function onRemoveFromView(participant) {
-          return removeFromView(participant);
-        },
+        onRemoveFromView: participant => removeFromView(participant),
         consumerTransport: consumerTransport,
         rtpCapabilities: rtpCapabilities,
         numberOfInViewParticipants: inViewParticipants.length,
         participants: participants,
         sizing: 'sm',
-        onHostAudioMute: function onHostAudioMute() {
-          return props.onHostAudioMute(participant);
-        },
-        onHostVideoMute: function onHostVideoMute() {
-          return props.onHostVideoMute(participant);
-        },
+        onHostAudioMute: () => props.onHostAudioMute(participant),
+        onHostVideoMute: () => props.onHostVideoMute(participant),
         isHost: isHost
       }));
     }));
   }
-
-  var renderRow = function renderRow(row, index) {
+  const renderRow = (row, index) => {
     return /*#__PURE__*/_react.default.createElement(_Grid.default, {
       style: {
         height: '100%',
@@ -747,7 +426,7 @@ var VCRoomWorkspace = function VCRoomWorkspace(props) {
       container: true,
       item: true,
       spacing: 2
-    }, /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, row.map(function (participant, index) {
+    }, /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, row.map((participant, index) => {
       return /*#__PURE__*/_react.default.createElement(_Grid.default, {
         item: true,
         key: index + '-' + participant.userId,
@@ -765,24 +444,17 @@ var VCRoomWorkspace = function VCRoomWorkspace(props) {
         sizing: displayState === 'MINIMIZED' ? 'sm' : 'md',
         audioMuted: participant.audioMuted,
         videoMuted: participant.videoMuted,
-        onRemoveFromView: function onRemoveFromView(participant) {
-          return removeFromView(participant);
-        },
+        onRemoveFromView: participant => removeFromView(participant),
         consumerTransport: consumerTransport,
         numberOfInViewParticipants: inViewParticipants.length,
         participants: participants,
         rtpCapabilities: rtpCapabilities,
-        onHostAudioMute: function onHostAudioMute() {
-          return props.onHostAudioMute(participant);
-        },
-        onHostVideoMute: function onHostVideoMute() {
-          return props.onHostVideoMute(participant);
-        },
+        onHostAudioMute: () => props.onHostAudioMute(participant),
+        onHostVideoMute: () => props.onHostVideoMute(participant),
         isHost: isHost
       }));
     })));
   };
-
   function renderCurrentParticipant() {
     return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, currentUserParticipant && /*#__PURE__*/_react.default.createElement(_VCRoomParticipant.default, {
       data: currentUserParticipant,
@@ -798,16 +470,11 @@ var VCRoomWorkspace = function VCRoomWorkspace(props) {
       videoMuted: videoMuted,
       numberOfInViewParticipants: inViewParticipants.length,
       participants: participants,
-      onHostAudioMute: function onHostAudioMute() {
-        return props.onHostAudioMute(currentUserParticipant);
-      },
-      onHostVideoMute: function onHostVideoMute() {
-        return props.onHostVideoMute(currentUserParticipant);
-      },
+      onHostAudioMute: () => props.onHostAudioMute(currentUserParticipant),
+      onHostVideoMute: () => props.onHostVideoMute(currentUserParticipant),
       isHost: isHost
     }));
   }
-
   function renderParticipantGrid() {
     return (!screenShared && !whiteBoardShown || screenShared && !showSharedScreen && !someoneSharing) && /*#__PURE__*/_react.default.createElement(_Box.default, {
       style: {
@@ -830,7 +497,7 @@ var VCRoomWorkspace = function VCRoomWorkspace(props) {
         overflowY: 'auto',
         overflowX: 'hidden'
       }
-    }, grid.map(function (row, index) {
+    }, grid.map((row, index) => {
       return /*#__PURE__*/_react.default.createElement("div", {
         style: {
           width: '100%',
@@ -841,7 +508,6 @@ var VCRoomWorkspace = function VCRoomWorkspace(props) {
       }, renderRow(row, index)));
     })));
   }
-
   return device ? /*#__PURE__*/_react.default.createElement("div", {
     className: 'row-*-* grid',
     style: {
@@ -897,7 +563,7 @@ var VCRoomWorkspace = function VCRoomWorkspace(props) {
       zIndex: '0'
     }
   })))), /*#__PURE__*/_react.default.createElement("div", {
-    className: "".concat(displayState === 'MAXIMIZED' ? 'row-*-*' : ''),
+    className: `${displayState === 'MAXIMIZED' ? 'row-*-*' : ''}`,
     style: {
       width: displayState === 'MAXIMIZED' ? '100%' : '200px',
       height: displayState === 'MAXIMIZED' ? '152px' : displayState === 'MINIMIZED' ? '100%' : null,
@@ -923,7 +589,7 @@ var VCRoomWorkspace = function VCRoomWorkspace(props) {
       height: '100%'
     }
   }, renderStrip())), /*#__PURE__*/_react.default.createElement("div", {
-    className: "".concat((displayState === 'MAXIMIZED' ? 'col ' : '') + 'no-margin no-padding'),
+    className: `${(displayState === 'MAXIMIZED' ? 'col ' : '') + 'no-margin no-padding'}`,
     style: {
       width: '200px',
       height: '148px'
@@ -943,6 +609,4 @@ var VCRoomWorkspace = function VCRoomWorkspace(props) {
     acceptUserHandler: props.acceptUserHandler
   }))) : null;
 };
-
-var _default = VCRoomWorkspace;
-exports.default = _default;
+var _default = exports.default = VCRoomWorkspace;