react-say - npm Package Compare versions

Comparing version 1.0.1-master.efdec9e to 1.1.0

CHANGELOG.md

@@ -9,4 +9,18 @@ # Changelog
 
+## [1.1.0] - 2018-10-28
+### Added
+- Utterance queue are now controlled by `<Composer>` instance, instead of native `speechSynthesis` for better browser compatibility
+   - Chrome: does not fire `start` and `end` events if `speak`/`cancel` are called too fast
+   - Safari: does not play audio or `start` event if the first utterance is not triggered by user event
+- Unmounting elements will cancel the speech in progress or pending speech
+
+### Changed
+- Lerna bootstrap will no longer hoist
+- Playground: Bump to `react@16.6.0`, `react-dom@16.6.0`, and `react-scripts@2.0.5`
+
+### Fixed
+- Null reference on `props.speechSynthesis`
+
 ## [1.0.0] - 2018-07-09
 ### Added
 - Initial release

lib/Composer.js

@@ -7,6 +7,34 @@ 'use strict';
 
-var _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
+var _getPrototypeOf = require('babel-runtime/core-js/object/get-prototype-of');
 
-var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
+var _getPrototypeOf2 = _interopRequireDefault(_getPrototypeOf);
 
+var _possibleConstructorReturn2 = require('babel-runtime/helpers/possibleConstructorReturn');
+
+var _possibleConstructorReturn3 = _interopRequireDefault(_possibleConstructorReturn2);
+
+var _inherits2 = require('babel-runtime/helpers/inherits');
+
+var _inherits3 = _interopRequireDefault(_inherits2);
+
+var _toConsumableArray2 = require('babel-runtime/helpers/toConsumableArray');
+
+var _toConsumableArray3 = _interopRequireDefault(_toConsumableArray2);
+
+var _regenerator = require('babel-runtime/regenerator');
+
+var _regenerator2 = _interopRequireDefault(_regenerator);
+
+var _asyncToGenerator2 = require('babel-runtime/helpers/asyncToGenerator');
+
+var _asyncToGenerator3 = _interopRequireDefault(_asyncToGenerator2);
+
+var _classCallCheck2 = require('babel-runtime/helpers/classCallCheck');
+
+var _classCallCheck3 = _interopRequireDefault(_classCallCheck2);
+
+var _createClass2 = require('babel-runtime/helpers/createClass');
+
+var _createClass3 = _interopRequireDefault(_createClass2);
+
 var _memoizeOne = require('memoize-one');
@@ -28,119 +56,180 @@
 
+var _Utterance = require('./Utterance');
+
+var _Utterance2 = _interopRequireDefault(_Utterance);
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+var SpeechContext = function () {
+  function SpeechContext(ponyfill) {
+    (0, _classCallCheck3.default)(this, SpeechContext);
 
-function _possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return call && (typeof call === "object" || typeof call === "function") ? call : self; }
+    this.queueWithCurrent = [];
 
-function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }
+    this.cancel = this.cancel.bind(this);
+    this.cancelAll = this.cancelAll.bind(this);
+    this.speak = this.speak.bind(this);
 
-function createContext(_ref) {
-  var speechSynthesis = _ref.speechSynthesis,
-      speechSynthesisUtterance = _ref.speechSynthesisUtterance;
+    this.setPonyfill(ponyfill);
+  }
 
-  return {
-    cancel: function cancel() {
-      return speechSynthesis.cancel();
-    },
-    speak: function speak(_ref2) {
-      var lang = _ref2.lang,
-          onBoundary = _ref2.onBoundary,
-          onEnd = _ref2.onEnd,
-          onError = _ref2.onError,
-          onStart = _ref2.onStart,
-          _ref2$pitch = _ref2.pitch,
-          pitch = _ref2$pitch === undefined ? 1 : _ref2$pitch,
-          _ref2$rate = _ref2.rate,
-          rate = _ref2$rate === undefined ? 1 : _ref2$rate,
-          text = _ref2.text,
-          voice = _ref2.voice,
-          _ref2$volume = _ref2.volume,
-          volume = _ref2$volume === undefined ? 1 : _ref2$volume;
+  (0, _createClass3.default)(SpeechContext, [{
+    key: 'setPonyfill',
+    value: function setPonyfill(_ref) {
+      var speechSynthesis = _ref.speechSynthesis,
+          SpeechSynthesisUtterance = _ref.SpeechSynthesisUtterance;
 
-      var utterance = new speechSynthesisUtterance(text);
-      var targetVoice = void 0;
+      this.ponyfill = { speechSynthesis: speechSynthesis, SpeechSynthesisUtterance: SpeechSynthesisUtterance };
+    }
+  }, {
+    key: 'cancel',
+    value: function () {
+      var _ref2 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee(id) {
+        var index;
+        return _regenerator2.default.wrap(function _callee$(_context) {
+          while (1) {
+            switch (_context.prev = _context.next) {
+              case 0:
+                index = this.queueWithCurrent.findIndex(function (utterance) {
+                  return utterance.id === id;
+                });
 
-      if (typeof voice === 'function') {
-        targetVoice = voice.call(speechSynthesis, speechSynthesis.getVoices());
-      } else {
-        var _ref3 = voice || {},
-            voiceURI = _ref3.voiceURI;
+                if (!~index) {
+                  _context.next = 3;
+                  break;
+                }
 
-        targetVoice = voiceURI && [].find.call([].slice.call(speechSynthesis.getVoices()), function (v) {
-          return v.voiceURI === voiceURI;
-        });
+                return _context.abrupt('return', this.queueWithCurrent[index].cancel());
+
+              case 3:
+              case 'end':
+                return _context.stop();
+            }
+          }
+        }, _callee, this);
+      }));
+
+      function cancel(_x) {
+        return _ref2.apply(this, arguments);
       }
 
-      // Edge will mute if "lang" is set to ""
-      utterance.lang = lang || '';
+      return cancel;
+    }()
+  }, {
+    key: 'cancelAll',
+    value: function () {
+      var _ref3 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee2() {
+        return _regenerator2.default.wrap(function _callee2$(_context2) {
+          while (1) {
+            switch (_context2.prev = _context2.next) {
+              case 0:
+              case 'end':
+                return _context2.stop();
+            }
+          }
+        }, _callee2, this);
+      }));
 
-      if (utterance.pitch || utterance.pitch === 0) {
-        utterance.pitch = pitch;
+      function cancelAll() {
+        return _ref3.apply(this, arguments);
       }
 
-      if (utterance.rate || utterance.rate === 0) {
-        utterance.rate = rate;
+      return cancelAll;
+    }()
+  }, {
+    key: 'speak',
+    value: function speak(utteranceLike) {
+      // console.debug(`QUEUED: ${ utteranceLike.text }`);
+
+      if (utteranceLike.id && this.queueWithCurrent.find(function (_ref4) {
+        var id = _ref4.id;
+        return id === utteranceLike.id;
+      })) {
+        // Do not queue duplicated speak with same unique ID
+        // console.debug('NOT QUEUEING DUPE');
+
+        return;
       }
 
-      // Cognitive Services will error when "voice" is set to "null"
-      // Edge will error when "voice" is set to "undefined"
-      if (targetVoice) {
-        utterance.voice = targetVoice;
+      var utterance = new _Utterance2.default(utteranceLike);
+
+      this.queueWithCurrent = [].concat((0, _toConsumableArray3.default)(this.queueWithCurrent), [utterance]);
+
+      if (this.queueWithCurrent.length === 1) {
+        this._next();
       }
 
-      if (utterance.volume || utterance.volume === 0) {
-        utterance.volume = volume;
+      return utterance.deferred.promise;
+    }
+  }, {
+    key: '_next',
+    value: function _next() {
+      var _this = this;
+
+      var utterance = this.queueWithCurrent[0];
+
+      if (!utterance) {
+        return;
       }
 
-      utterance.onboundary = onBoundary;
-      utterance.onend = onEnd;
-      utterance.onerror = onError;
-      utterance.onstart = onStart;
+      var id = utterance.id;
 
-      speechSynthesis.speak(utterance);
+      var promise = utterance.speak(this.ponyfill);
+
+      promise.then(function () {
+        _this.queueWithCurrent = _this.queueWithCurrent.filter(function (utterance) {
+          return utterance.id !== id;
+        });
+        _this._next();
+      }, function () {
+        // TODO: If the error is due to Safari restriction on user touch
+        //       The next loop on the next audio will also fail because it was not queued with a user touch
+        _this.queueWithCurrent = _this.queueWithCurrent.filter(function (utterance) {
+          return utterance.id !== id;
+        });
+        _this._next();
+      });
     }
-  };
-}
+  }]);
+  return SpeechContext;
+}();
 
-function getVoices(speechSynthesis) {
-  return speechSynthesis.getVoices().map(function (_ref4) {
-    var def = _ref4['default'],
-        lang = _ref4.lang,
-        localService = _ref4.localService,
-        name = _ref4.name,
-        voiceURI = _ref4.voiceURI;
-    return {
-      'default': def,
-      lang: lang,
-      localService: localService,
-      name: name,
-      voiceURI: voiceURI
-    };
-  });
-}
-
 var Composer = function (_React$Component) {
-  _inherits(Composer, _React$Component);
+  (0, _inherits3.default)(Composer, _React$Component);
 
   function Composer(props) {
-    _classCallCheck(this, Composer);
+    (0, _classCallCheck3.default)(this, Composer);
 
-    var _this = _possibleConstructorReturn(this, (Composer.__proto__ || Object.getPrototypeOf(Composer)).call(this, props));
+    var _this2 = (0, _possibleConstructorReturn3.default)(this, (Composer.__proto__ || (0, _getPrototypeOf2.default)(Composer)).call(this, props));
 
-    _this.handleVoicesChanged = _this.handleVoicesChanged.bind(_this);
+    _this2.handleVoicesChanged = _this2.handleVoicesChanged.bind(_this2);
 
-    props.speechSynthesis.onvoiceschanged = _this.handleVoicesChanged;
+    var voices = [];
 
-    _this.mergeContext = (0, _memoizeOne2.default)(function (context, voices) {
-      return _extends({}, context, { voices: voices });
+    if (props.speechSynthesis) {
+      props.speechSynthesis.addEventListener && props.speechSynthesis.addEventListener('voiceschanged', _this2.handleVoicesChanged);
+      voices = props.speechSynthesis.getVoices();
+    }
+
+    _this2.mergeContext = (0, _memoizeOne2.default)(function (_ref5, voices) {
+      var cancel = _ref5.cancel,
+          speak = _ref5.speak;
+      return {
+        cancel: cancel,
+        speak: speak,
+        voices: voices
+      };
     });
 
-    _this.state = {
-      context: createContext(props),
-      voices: getVoices(props.speechSynthesis)
+    _this2.state = {
+      context: new SpeechContext({
+        speechSynthesis: props.speechSynthesis,
+        SpeechSynthesisUtterance: props.speechSynthesisUtterance
+      }),
+      voices: voices
     };
-    return _this;
+    return _this2;
   }
 
-  _createClass(Composer, [{
+  (0, _createClass3.default)(Composer, [{
     key: 'componentWillReceiveProps',
@@ -155,16 +244,20 @@ value: function componentWillReceiveProps(nextProps) {
       if (changed) {
-        this.props.speechSynthesis.onvoiceschanged = null;
-        this.state.context.cancel();
+        if (props.speechSynthesis) {
+          props.speechSynthesis.removeEventListener && props.speechSynthesis.removeEventListener('voiceschanged', this.handleVoicesChanged);
+        }
 
-        nextProps.speechSynthesis.onvoiceschanged = this.handleVoicesChanged;
+        this.state.context.setPonyfill({
+          speechSynthesis: nextProps.speechSynthesis,
+          SpeechSynthesisUtterance: nextProps.speechSynthesisUtterance
+        });
 
-        this.setState(function (_ref5) {
-          var context = _ref5.context;
+        var nextVoices = [];
 
-          context.cancel();
+        if (nextProps.speechSynthesis) {
+          nextProps.speechSynthesis.addEventListener && nextProps.speechSynthesis.addEventListener('voiceschanged', this.handleVoicesChanged);
+          nextVoices = nextProps.speechSynthesis.getVoices() || [];
+        }
 
-          return {
-            context: createContext(nextProps),
-            voices: getVoices(nextProps.speechSynthesis)
-          };
+        this.setState(function () {
+          return { voices: nextVoices };
         });
@@ -174,2 +267,10 @@ }
   }, {
+    key: 'componentWillUnmount',
+    value: function componentWillUnmount() {
+      var speechSynthesis = this.props.speechSynthesis;
+
+
+      speechSynthesis && speechSynthesis.removeEventListener && speechSynthesis.removeEventListener('voiceschanged', this.handleVoicesChanged);
+    }
+  }, {
     key: 'handleVoicesChanged',
@@ -179,6 +280,4 @@ value: function handleVoicesChanged(_ref6) {
 
-      var voices = getVoices(target);
-
       this.setState(function () {
-        return { voices: voices };
+        return { voices: target.getVoices() };
       });
@@ -189,2 +288,4 @@ }
     value: function render() {
+      var _this3 = this;
+
       var props = this.props,
@@ -196,15 +297,20 @@ state = this.state;
       return _react2.default.createElement(
-        _Context2.default.Provider,
-        { value: this.mergeContext(state.context, state.voices) },
-        typeof children === 'function' ? _react2.default.createElement(
-          _Context2.default.Consumer,
-          null,
-          function (context) {
-            return children(context);
-          }
-        ) : children
+        _Context2.default.Consumer,
+        null,
+        function (context) {
+          return context ? typeof children === 'function' ? children(context) : children : _react2.default.createElement(
+            _Context2.default.Provider,
+            { value: _this3.mergeContext(state.context, state.voices) },
+            typeof children === 'function' ? _react2.default.createElement(
+              _Context2.default.Consumer,
+              null,
+              function (context) {
+                return children(context);
+              }
+            ) : children
+          );
+        }
       );
     }
   }]);
-
   return Composer;
@@ -222,15 +328,5 @@ }(_react2.default.Component);
 Composer.propTypes = {
-  lang: _propTypes2.default.string,
-  onBoundary: _propTypes2.default.func,
-  onEnd: _propTypes2.default.func,
-  onError: _propTypes2.default.func,
-  onStart: _propTypes2.default.func,
-  pitch: _propTypes2.default.number,
-  rate: _propTypes2.default.number,
-  text: _propTypes2.default.string,
-  voice: _propTypes2.default.oneOfType([_propTypes2.default.any, _propTypes2.default.func]),
-  volume: _propTypes2.default.number,
   speechSynthesis: _propTypes2.default.any,
   speechSynthesisUtterance: _propTypes2.default.any
 };
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"sources":["../src/Composer.js"],"names":["createContext","speechSynthesis","speechSynthesisUtterance","cancel","speak","lang","onBoundary","onEnd","onError","onStart","pitch","rate","text","voice","volume","utterance","targetVoice","call","getVoices","voiceURI","find","slice","v","onboundary","onend","onerror","onstart","map","def","localService","name","Composer","props","handleVoicesChanged","bind","onvoiceschanged","mergeContext","context","voices","state","nextProps","changed","some","setState","target","children","React","Component","defaultProps","window","webkitSpeechSynthesis","SpeechSynthesisUtterance","webkitSpeechSynthesisUtterance","propTypes","PropTypes","string","func","number","oneOfType","any"],"mappings":";;;;;;;;;;AAAA;;;;AACA;;;;AACA;;;;AAEA;;;;;;;;;;;;AAEA,SAASA,aAAT,OAGG;AAAA,MAFDC,eAEC,QAFDA,eAEC;AAAA,MADDC,wBACC,QADDA,wBACC;;AACD,SAAO;AACLC,YAAQ;AAAA,aAAMF,gBAAgBE,MAAhB,EAAN;AAAA,KADH;AAELC,WAAO,sBAWD;AAAA,UAVJC,IAUI,SAVJA,IAUI;AAAA,UATJC,UASI,SATJA,UASI;AAAA,UARJC,KAQI,SARJA,KAQI;AAAA,UAPJC,OAOI,SAPJA,OAOI;AAAA,UANJC,OAMI,SANJA,OAMI;AAAA,8BALJC,KAKI;AAAA,UALJA,KAKI,+BALI,CAKJ;AAAA,6BAJJC,IAII;AAAA,UAJJA,IAII,8BAJG,CAIH;AAAA,UAHJC,IAGI,SAHJA,IAGI;AAAA,UAFJC,KAEI,SAFJA,KAEI;AAAA,+BADJC,MACI;AAAA,UADJA,MACI,gCADK,CACL;;AACJ,UAAMC,YAAY,IAAIb,wBAAJ,CAA6BU,IAA7B,CAAlB;AACA,UAAII,oBAAJ;;AAEA,UAAI,OAAOH,KAAP,KAAiB,UAArB,EAAiC;AAC/BG,sBAAcH,MAAMI,IAAN,CAAWhB,eAAX,EAA4BA,gBAAgBiB,SAAhB,EAA5B,CAAd;AACD,OAFD,MAEO;AAAA,oBACgBL,SAAS,EADzB;AAAA,YACGM,QADH,SACGA,QADH;;AAGLH,sBAAcG,YAAY,GAAGC,IAAH,CAAQH,IAAR,CAAa,GAAGI,KAAH,CAASJ,IAAT,CAAchB,gBAAgBiB,SAAhB,EAAd,CAAb,EAAyD;AAAA,iBAAKI,EAAEH,QAAF,KAAeA,QAApB;AAAA,SAAzD,CAA1B;AACD;;AAED;AACAJ,gBAAUV,IAAV,GAAiBA,QAAQ,EAAzB;;AAEA,UAAIU,UAAUL,KAAV,IAAmBK,UAAUL,KAAV,KAAoB,CAA3C,EAA8C;AAC5CK,kBAAUL,KAAV,GAAkBA,KAAlB;AACD;;AAED,UAAIK,UAAUJ,IAAV,IAAkBI,UAAUJ,IAAV,KAAmB,CAAzC,EAA4C;AAC1CI,kBAAUJ,IAAV,GAAiBA,IAAjB;AACD;;AAED;AACA;AACA,UAAIK,WAAJ,EAAiB;AACfD,kBAAUF,KAAV,GAAkBG,WAAlB;AACD;;AAED,UAAID,UAAUD,MAAV,IAAoBC,UAAUD,MAAV,KAAqB,CAA7C,EAAgD;AAC9CC,kBAAUD,MAAV,GAAmBA,MAAnB;AACD;;AAEDC,gBAAUQ,UAAV,GAAuBjB,UAAvB;AACAS,gBAAUS,KAAV,GAAkBjB,KAAlB;AACAQ,gBAAUU,OAAV,GAAoBjB,OAApB;AACAO,gBAAUW,OAAV,GAAoBjB,OAApB;;AAEAR,sBAAgBG,KAAhB,CAAsBW,SAAtB;AACD;AApDI,GAAP;AAsDD;;AAED,SAASG,SAAT,CAAmBjB,eAAnB,EAAoC;AAClC,SAAOA,gBAAgBiB,SAAhB,GAA4BS,GAA5B,CAAgC;AAAA,QAC1BC,GAD0B,SACrC,SADqC;AAAA,QAErCvB,IAFqC,SAErCA,IAFqC;AAAA,QAGrCwB,YAHqC,SAGrCA,YAHqC;AAAA,QAIrCC,IAJqC,SAIrCA,IAJqC;AAAA,QAKrCX,QALqC,SAKrCA,QALqC;AAAA,WAMhC;AACL,iBAAWS,GADN;AAELvB,gBAFK;AAGLwB,gCAHK;AAILC,gBAJK;AAKLX;AALK,KANgC;AAAA,GAAhC,CAAP;AAaD;;IAEoBY,Q;;;AACnB,oBAAYC,KAAZ,EAAmB;AAAA;;AAAA,oHACXA,KADW;;AAGjB,UAAKC,mBAAL,GAA2B,MAAKA,mBAAL,CAAyBC,IAAzB,OAA3B;;AAEAF,UAAM/B,eAAN,CAAsBkC,eAAtB,GAAwC,MAAKF,mBAA7C;;AAEA,UAAKG,YAAL,GAAoB,0BAAQ,UAACC,OAAD,EAAUC,MAAV;AAAA,0BAA2BD,OAA3B,IAAoCC,cAApC;AAAA,KAAR,CAApB;;AAEA,UAAKC,KAAL,GAAa;AACXF,eAASrC,cAAcgC,KAAd,CADE;AAEXM,cAAQpB,UAAUc,MAAM/B,eAAhB;AAFG,KAAb;AATiB;AAalB;;;;8CAEyBuC,S,EAAW;AAAA,UAC3BR,KAD2B,GACjB,IADiB,CAC3BA,KAD2B;;AAEnC,UAAMS,UAAU,CACd,iBADc,EAEd,0BAFc,EAGdC,IAHc,CAGT;AAAA,eAAQF,UAAUV,IAAV,MAAoBE,MAAMF,IAAN,CAA5B;AAAA,OAHS,CAAhB;;AAKA,UAAIW,OAAJ,EAAa;AACX,aAAKT,KAAL,CAAW/B,eAAX,CAA2BkC,eAA3B,GAA6C,IAA7C;AACA,aAAKI,KAAL,CAAWF,OAAX,CAAmBlC,MAAnB;;AAEAqC,kBAAUvC,eAAV,CAA0BkC,eAA1B,GAA4C,KAAKF,mBAAjD;;AAEA,aAAKU,QAAL,CAAc,iBAAiB;AAAA,cAAdN,OAAc,SAAdA,OAAc;;AAC7BA,kBAAQlC,MAAR;;AAEA,iBAAO;AACLkC,qBAASrC,cAAcwC,SAAd,CADJ;AAELF,oBAAQpB,UAAUsB,UAAUvC,eAApB;AAFH,WAAP;AAID,SAPD;AAQD;AACF;;;+CAE+B;AAAA,UAAV2C,MAAU,SAAVA,MAAU;;AAC9B,UAAMN,SAASpB,UAAU0B,MAAV,CAAf;;AAEA,WAAKD,QAAL,CAAc;AAAA,eAAO,EAAEL,cAAF,EAAP;AAAA,OAAd;AACD;;;6BAEQ;AAAA,UACCN,KADD,GACkB,IADlB,CACCA,KADD;AAAA,UACQO,KADR,GACkB,IADlB,CACQA,KADR;AAAA,UAECM,QAFD,GAEcb,KAFd,CAECa,QAFD;;;AAIP,aACE;AAAC,yBAAD,CAAS,QAAT;AAAA,UAAkB,OAAQ,KAAKT,YAAL,CAAkBG,MAAMF,OAAxB,EAAiCE,MAAMD,MAAvC,CAA1B;AAEI,eAAOO,QAAP,KAAoB,UAApB,GACE;AAAC,2BAAD,CAAS,QAAT;AAAA;AACI;AAAA,mBAAWA,SAASR,OAAT,CAAX;AAAA;AADJ,SADF,GAKEQ;AAPN,OADF;AAYD;;;;EA9DmCC,gBAAMC,S;;kBAAvBhB,Q;;;AAiErBA,SAASiB,YAAT,GAAwB;AACtB/C,mBAAiBgD,OAAOhD,eAAP,IAA0BgD,OAAOC,qBAD5B;AAEtBhD,4BAA0B+C,OAAOE,wBAAP,IAAmCF,OAAOG;AAF9C,CAAxB;;AAKArB,SAASsB,SAAT,GAAqB;AACnBhD,QAAMiD,oBAAUC,MADG;AAEnBjD,cAAYgD,oBAAUE,IAFH;AAGnBjD,SAAO+C,oBAAUE,IAHE;AAInBhD,WAAS8C,oBAAUE,IAJA;AAKnB/C,WAAS6C,oBAAUE,IALA;AAMnB9C,SAAO4C,oBAAUG,MANE;AAOnB9C,QAAM2C,oBAAUG,MAPG;AAQnB7C,QAAM0C,oBAAUC,MARG;AASnB1C,SAAOyC,oBAAUI,SAAV,CAAoB,CAACJ,oBAAUK,GAAX,EAAgBL,oBAAUE,IAA1B,CAApB,CATY;AAUnB1C,UAAQwC,oBAAUG,MAVC;AAWnBxD,mBAAiBqD,oBAAUK,GAXR;AAYnBzD,4BAA0BoD,oBAAUK;AAZjB,CAArB","file":"Composer.js","sourcesContent":["import memoize from 'memoize-one';\nimport PropTypes from 'prop-types';\nimport React from 'react';\n\nimport Context from './Context';\n\nfunction createContext({\n  speechSynthesis,\n  speechSynthesisUtterance\n}) {\n  return {\n    cancel: () => speechSynthesis.cancel(),\n    speak: ({\n      lang,\n      onBoundary,\n      onEnd,\n      onError,\n      onStart,\n      pitch = 1,\n      rate = 1,\n      text,\n      voice,\n      volume = 1\n    }) => {\n      const utterance = new speechSynthesisUtterance(text);\n      let targetVoice;\n\n      if (typeof voice === 'function') {\n        targetVoice = voice.call(speechSynthesis, speechSynthesis.getVoices());\n      } else {\n        const { voiceURI } = voice || {};\n\n        targetVoice = voiceURI && [].find.call([].slice.call(speechSynthesis.getVoices()), v => v.voiceURI === voiceURI);\n      }\n\n      // Edge will mute if \"lang\" is set to \"\"\n      utterance.lang = lang || '';\n\n      if (utterance.pitch || utterance.pitch === 0) {\n        utterance.pitch = pitch;\n      }\n\n      if (utterance.rate || utterance.rate === 0) {\n        utterance.rate = rate;\n      }\n\n      // Cognitive Services will error when \"voice\" is set to \"null\"\n      // Edge will error when \"voice\" is set to \"undefined\"\n      if (targetVoice) {\n        utterance.voice = targetVoice;\n      }\n\n      if (utterance.volume || utterance.volume === 0) {\n        utterance.volume = volume;\n      }\n\n      utterance.onboundary = onBoundary;\n      utterance.onend = onEnd;\n      utterance.onerror = onError;\n      utterance.onstart = onStart;\n\n      speechSynthesis.speak(utterance);\n    }\n  };\n}\n\nfunction getVoices(speechSynthesis) {\n  return speechSynthesis.getVoices().map(({\n    'default': def,\n    lang,\n    localService,\n    name,\n    voiceURI\n  }) => ({\n    'default': def,\n    lang,\n    localService,\n    name,\n    voiceURI\n  }));\n}\n\nexport default class Composer extends React.Component {\n  constructor(props) {\n    super(props);\n\n    this.handleVoicesChanged = this.handleVoicesChanged.bind(this);\n\n    props.speechSynthesis.onvoiceschanged = this.handleVoicesChanged;\n\n    this.mergeContext = memoize((context, voices) => ({ ...context, voices }));\n\n    this.state = {\n      context: createContext(props),\n      voices: getVoices(props.speechSynthesis)\n    };\n  }\n\n  componentWillReceiveProps(nextProps) {\n    const { props } = this;\n    const changed = [\n      'speechSynthesis',\n      'speechSynthesisUtterance'\n    ].some(name => nextProps[name] !== props[name]);\n\n    if (changed) {\n      this.props.speechSynthesis.onvoiceschanged = null;\n      this.state.context.cancel();\n\n      nextProps.speechSynthesis.onvoiceschanged = this.handleVoicesChanged;\n\n      this.setState(({ context }) => {\n        context.cancel();\n\n        return {\n          context: createContext(nextProps),\n          voices: getVoices(nextProps.speechSynthesis)\n        };\n      });\n    }\n  }\n\n  handleVoicesChanged({ target }) {\n    const voices = getVoices(target);\n\n    this.setState(() => ({ voices }));\n  }\n\n  render() {\n    const { props, state } = this;\n    const { children } = props;\n\n    return (\n      <Context.Provider value={ this.mergeContext(state.context, state.voices) }>\n        {\n          typeof children === 'function' ?\n            <Context.Consumer>\n              { context => children(context) }\n            </Context.Consumer>\n          :\n            children\n        }\n      </Context.Provider>\n    );\n  }\n}\n\nComposer.defaultProps = {\n  speechSynthesis: window.speechSynthesis || window.webkitSpeechSynthesis,\n  speechSynthesisUtterance: window.SpeechSynthesisUtterance || window.webkitSpeechSynthesisUtterance\n};\n\nComposer.propTypes = {\n  lang: PropTypes.string,\n  onBoundary: PropTypes.func,\n  onEnd: PropTypes.func,\n  onError: PropTypes.func,\n  onStart: PropTypes.func,\n  pitch: PropTypes.number,\n  rate: PropTypes.number,\n  text: PropTypes.string,\n  voice: PropTypes.oneOfType([PropTypes.any, PropTypes.func]),\n  volume: PropTypes.number,\n  speechSynthesis: PropTypes.any,\n  speechSynthesisUtterance: PropTypes.any\n};\n"]}
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"sources":["../src/Composer.js"],"names":["SpeechContext","ponyfill","queueWithCurrent","cancel","bind","cancelAll","speak","setPonyfill","speechSynthesis","SpeechSynthesisUtterance","id","index","findIndex","utterance","utteranceLike","find","Utterance","length","_next","deferred","promise","then","filter","Composer","props","handleVoicesChanged","voices","addEventListener","getVoices","mergeContext","state","context","speechSynthesisUtterance","nextProps","changed","some","name","removeEventListener","nextVoices","setState","target","children","React","Component","defaultProps","window","webkitSpeechSynthesis","webkitSpeechSynthesisUtterance","propTypes","PropTypes","any"],"mappings":"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","file":"Composer.js","sourcesContent":["import memoize from 'memoize-one';\nimport PropTypes from 'prop-types';\nimport React from 'react';\n\nimport Context from './Context';\nimport Utterance from './Utterance';\n\nclass SpeechContext {\n  constructor(ponyfill) {\n    this.queueWithCurrent = [];\n\n    this.cancel = this.cancel.bind(this);\n    this.cancelAll = this.cancelAll.bind(this);\n    this.speak = this.speak.bind(this);\n\n    this.setPonyfill(ponyfill);\n  }\n\n  setPonyfill({ speechSynthesis, SpeechSynthesisUtterance }) {\n    this.ponyfill = { speechSynthesis, SpeechSynthesisUtterance };\n  }\n\n  async cancel(id) {\n    const index = this.queueWithCurrent.findIndex(utterance => utterance.id === id);\n\n    if (~index) {\n      return this.queueWithCurrent[index].cancel();\n    }\n  }\n\n  async cancelAll() {\n    // console.debug(`CANCELLING QUEUED ITEMS: ${ this.queueWithCurrent.length }`);\n\n    // this.queueWithCurrent.forEach(entry => entry.cancelled = true);\n\n    // const cancelAll = Promise.all(this.queueWithCurrent.map(({ deferred: { promise } }) => promise.catch(err => 0)));\n\n    // this.ponyfill.speechSynthesis.cancel();\n\n    // try {\n    //   await cancelAll;\n    // } catch (err) {}\n\n    // console.debug(`ALL CANCELLED OR FINISHED`);\n  }\n\n  speak(utteranceLike) {\n    // console.debug(`QUEUED: ${ utteranceLike.text }`);\n\n    if (\n      utteranceLike.id\n      && this.queueWithCurrent.find(({ id }) => id === utteranceLike.id)\n    ) {\n      // Do not queue duplicated speak with same unique ID\n      // console.debug('NOT QUEUEING DUPE');\n\n      return;\n    }\n\n    const utterance = new Utterance(utteranceLike);\n\n    this.queueWithCurrent = [...this.queueWithCurrent, utterance];\n\n    if (this.queueWithCurrent.length === 1) {\n      this._next();\n    }\n\n    return utterance.deferred.promise;\n  }\n\n  _next() {\n    const utterance = this.queueWithCurrent[0];\n\n    if (!utterance) { return; }\n\n    const { id } = utterance;\n    const promise = utterance.speak(this.ponyfill);\n\n    promise.then(() => {\n      this.queueWithCurrent = this.queueWithCurrent.filter(utterance => utterance.id !== id);\n      this._next();\n    }, () => {\n      // TODO: If the error is due to Safari restriction on user touch\n      //       The next loop on the next audio will also fail because it was not queued with a user touch\n      this.queueWithCurrent = this.queueWithCurrent.filter(utterance => utterance.id !== id);\n      this._next();\n    });\n  }\n}\n\nexport default class Composer extends React.Component {\n  constructor(props) {\n    super(props);\n\n    this.handleVoicesChanged = this.handleVoicesChanged.bind(this);\n\n    let voices = [];\n\n    if (props.speechSynthesis) {\n      props.speechSynthesis.addEventListener && props.speechSynthesis.addEventListener('voiceschanged', this.handleVoicesChanged);\n      voices = props.speechSynthesis.getVoices();\n    }\n\n    this.mergeContext = memoize(({ cancel, speak }, voices) => ({\n      cancel,\n      speak,\n      voices\n    }));\n\n    this.state = {\n      context: new SpeechContext({\n        speechSynthesis: props.speechSynthesis,\n        SpeechSynthesisUtterance: props.speechSynthesisUtterance\n      }),\n      voices\n    };\n  }\n\n  componentWillReceiveProps(nextProps) {\n    const { props } = this;\n    const changed = [\n      'speechSynthesis',\n      'speechSynthesisUtterance'\n    ].some(name => nextProps[name] !== props[name]);\n\n    if (changed) {\n      if (props.speechSynthesis) {\n        props.speechSynthesis.removeEventListener && props.speechSynthesis.removeEventListener('voiceschanged', this.handleVoicesChanged);\n      }\n\n      this.state.context.setPonyfill({\n        speechSynthesis: nextProps.speechSynthesis,\n        SpeechSynthesisUtterance: nextProps.speechSynthesisUtterance\n      });\n\n      let nextVoices = [];\n\n      if (nextProps.speechSynthesis) {\n        nextProps.speechSynthesis.addEventListener && nextProps.speechSynthesis.addEventListener('voiceschanged', this.handleVoicesChanged);\n        nextVoices = nextProps.speechSynthesis.getVoices() || [];\n      }\n\n      this.setState(() => ({ voices: nextVoices }));\n    }\n  }\n\n  componentWillUnmount() {\n    const { speechSynthesis } = this.props;\n\n    speechSynthesis && speechSynthesis.removeEventListener && speechSynthesis.removeEventListener('voiceschanged', this.handleVoicesChanged);\n  }\n\n  handleVoicesChanged({ target }) {\n    this.setState(() => ({ voices: target.getVoices() }));\n  }\n\n  render() {\n    const { props, state } = this;\n    const { children } = props;\n\n    return (\n      <Context.Consumer>\n        { context => context ?\n            typeof children === 'function' ? children(context) : children\n          :\n            <Context.Provider value={ this.mergeContext(state.context, state.voices) }>\n              {\n                typeof children === 'function' ?\n                  <Context.Consumer>\n                    { context => children(context) }\n                  </Context.Consumer>\n                :\n                  children\n              }\n            </Context.Provider>\n        }\n      </Context.Consumer>\n    );\n  }\n}\n\nComposer.defaultProps = {\n  speechSynthesis: window.speechSynthesis || window.webkitSpeechSynthesis,\n  speechSynthesisUtterance: window.SpeechSynthesisUtterance || window.webkitSpeechSynthesisUtterance\n};\n\nComposer.propTypes = {\n  speechSynthesis: PropTypes.any,\n  speechSynthesisUtterance: PropTypes.any\n};\n"]}

lib/Context.js

@@ -13,11 +13,5 @@ 'use strict';
 
-var Context = _react2.default.createContext({
-  cancel: function cancel() {},
-  getVoices: function getVoices() {
-    return [];
-  },
-  speak: function speak() {}
-});
+var Context = _react2.default.createContext();
 
 exports.default = Context;
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL3NyYy9Db250ZXh0LmpzIl0sIm5hbWVzIjpbIkNvbnRleHQiLCJSZWFjdCIsImNyZWF0ZUNvbnRleHQiLCJjYW5jZWwiLCJnZXRWb2ljZXMiLCJzcGVhayJdLCJtYXBwaW5ncyI6Ijs7Ozs7O0FBQUE7Ozs7OztBQUVBLElBQU1BLFVBQVVDLGdCQUFNQyxhQUFOLENBQW9CO0FBQ2xDQyxVQUFRLGtCQUFNLENBQUUsQ0FEa0I7QUFFbENDLGFBQVc7QUFBQSxXQUFNLEVBQU47QUFBQSxHQUZ1QjtBQUdsQ0MsU0FBTyxpQkFBTSxDQUFFO0FBSG1CLENBQXBCLENBQWhCOztrQkFNZUwsTyIsImZpbGUiOiJDb250ZXh0LmpzIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IFJlYWN0IGZyb20gJ3JlYWN0JztcblxuY29uc3QgQ29udGV4dCA9IFJlYWN0LmNyZWF0ZUNvbnRleHQoe1xuICBjYW5jZWw6ICgpID0+IHt9LFxuICBnZXRWb2ljZXM6ICgpID0+IFtdLFxuICBzcGVhazogKCkgPT4ge31cbn0pO1xuXG5leHBvcnQgZGVmYXVsdCBDb250ZXh0XG4iXX0=
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL3NyYy9Db250ZXh0LmpzIl0sIm5hbWVzIjpbIkNvbnRleHQiLCJSZWFjdCIsImNyZWF0ZUNvbnRleHQiXSwibWFwcGluZ3MiOiI7Ozs7OztBQUFBOzs7Ozs7QUFFQSxJQUFNQSxVQUFVQyxnQkFBTUMsYUFBTixFQUFoQjs7a0JBRWVGLE8iLCJmaWxlIjoiQ29udGV4dC5qcyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCBSZWFjdCBmcm9tICdyZWFjdCc7XG5cbmNvbnN0IENvbnRleHQgPSBSZWFjdC5jcmVhdGVDb250ZXh0KCk7XG5cbmV4cG9ydCBkZWZhdWx0IENvbnRleHRcbiJdfQ==

lib/SayButton.js

@@ -7,2 +7,34 @@ 'use strict';
 
+var _extends2 = require('babel-runtime/helpers/extends');
+
+var _extends3 = _interopRequireDefault(_extends2);
+
+var _regenerator = require('babel-runtime/regenerator');
+
+var _regenerator2 = _interopRequireDefault(_regenerator);
+
+var _asyncToGenerator2 = require('babel-runtime/helpers/asyncToGenerator');
+
+var _asyncToGenerator3 = _interopRequireDefault(_asyncToGenerator2);
+
+var _getPrototypeOf = require('babel-runtime/core-js/object/get-prototype-of');
+
+var _getPrototypeOf2 = _interopRequireDefault(_getPrototypeOf);
+
+var _classCallCheck2 = require('babel-runtime/helpers/classCallCheck');
+
+var _classCallCheck3 = _interopRequireDefault(_classCallCheck2);
+
+var _createClass2 = require('babel-runtime/helpers/createClass');
+
+var _createClass3 = _interopRequireDefault(_createClass2);
+
+var _possibleConstructorReturn2 = require('babel-runtime/helpers/possibleConstructorReturn');
+
+var _possibleConstructorReturn3 = _interopRequireDefault(_possibleConstructorReturn2);
+
+var _inherits2 = require('babel-runtime/helpers/inherits');
+
+var _inherits3 = _interopRequireDefault(_inherits2);
+
 var _propTypes = require('prop-types');
@@ -16,37 +48,115 @@
 
-var _Context = require('./Context');
+var _Composer = require('./Composer');
 
-var _Context2 = _interopRequireDefault(_Context);
+var _Composer2 = _interopRequireDefault(_Composer);
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-var SayButton = function SayButton(props) {
-  return _react2.default.createElement(
-    _Context2.default.Consumer,
-    null,
-    function (context) {
+var SayButton = function (_React$Component) {
+  (0, _inherits3.default)(SayButton, _React$Component);
+
+  function SayButton(props) {
+    (0, _classCallCheck3.default)(this, SayButton);
+
+    var _this = (0, _possibleConstructorReturn3.default)(this, (SayButton.__proto__ || (0, _getPrototypeOf2.default)(SayButton)).call(this, props));
+
+    _this.handleClick = _this.handleClick.bind(_this);
+
+    _this.state = {
+      busy: false,
+      id: Date.now() + Math.random()
+    };
+    return _this;
+  }
+
+  (0, _createClass3.default)(SayButton, [{
+    key: 'componentWillUnmount',
+    value: function componentWillUnmount() {
+      this.props.context.cancel(this.state.id);
+    }
+  }, {
+    key: 'handleClick',
+    value: function handleClick() {
+      var _this2 = this;
+
+      var props = this.props,
+          state = this.state;
+
+
+      props.onClick && props.onClick(event);
+
+      this.setState(function () {
+        return { busy: true };
+      }, (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee() {
+        return _regenerator2.default.wrap(function _callee$(_context) {
+          while (1) {
+            switch (_context.prev = _context.next) {
+              case 0:
+                _context.next = 2;
+                return props.context.speak({
+                  id: state.id,
+                  lang: props.lang,
+                  onBoundary: props.onBoundary,
+                  onEnd: props.onEnd,
+                  onError: props.onError,
+                  onStart: props.onStart,
+                  pitch: props.pitch,
+                  rate: props.rate,
+                  text: props.speak,
+                  voice: props.voice,
+                  volume: props.volume
+                });
+
+              case 2:
+
+                _this2.setState(function () {
+                  return {
+                    busy: false
+                  };
+                });
+
+              case 3:
+              case 'end':
+                return _context.stop();
+            }
+          }
+        }, _callee, _this2);
+      })));
+    }
+  }, {
+    key: 'render',
+    value: function render() {
+      var _props = this.props,
+          children = _props.children,
+          disabled = _props.disabled,
+          busy = this.state.busy;
+
+
       return _react2.default.createElement(
         'button',
-        { onClick: function onClick(event) {
-            context.speak({
-              lang: props.lang,
-              onBoundary: props.onBoundary,
-              onEnd: props.onEnd,
-              onError: props.onError,
-              onStart: props.onStart,
-              pitch: props.pitch,
-              rate: props.rate,
-              text: props.speak,
-              voice: props.voice,
-              volume: props.volume
-            });
-            props.onClick && props.onClick(event);
-          } },
-        props.children
+        {
+          disabled: typeof disabled === 'boolean' ? disabled : busy,
+          onClick: this.handleClick
+        },
+        children
       );
     }
+  }]);
+  return SayButton;
+}(_react2.default.Component);
+
+var SayButtonWithContext = function SayButtonWithContext(props) {
+  return _react2.default.createElement(
+    _Composer2.default,
+    {
+      speechSynthesis: props.speechSynthesis,
+      speechSynthesisUtterance: props.speechSynthesisUtterance
+    },
+    function (context) {
+      return _react2.default.createElement(SayButton, (0, _extends3.default)({ context: context }, props));
+    }
   );
 };
 
-SayButton.propTypes = {
+SayButtonWithContext.propTypes = {
   lang: _propTypes2.default.string,
@@ -64,3 +174,3 @@ onBoundary: _propTypes2.default.func,
 
-exports.default = SayButton;
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL3NyYy9TYXlCdXR0b24uanMiXSwibmFtZXMiOlsiU2F5QnV0dG9uIiwiY29udGV4dCIsInNwZWFrIiwibGFuZyIsInByb3BzIiwib25Cb3VuZGFyeSIsIm9uRW5kIiwib25FcnJvciIsIm9uU3RhcnQiLCJwaXRjaCIsInJhdGUiLCJ0ZXh0Iiwidm9pY2UiLCJ2b2x1bWUiLCJvbkNsaWNrIiwiZXZlbnQiLCJjaGlsZHJlbiIsInByb3BUeXBlcyIsIlByb3BUeXBlcyIsInN0cmluZyIsImZ1bmMiLCJudW1iZXIiLCJvbmVPZlR5cGUiLCJhbnkiXSwibWFwcGluZ3MiOiI7Ozs7OztBQUFBOzs7O0FBQ0E7Ozs7QUFFQTs7Ozs7O0FBRUEsSUFBTUEsWUFBWSxTQUFaQSxTQUFZO0FBQUEsU0FDaEI7QUFBQyxxQkFBRCxDQUFTLFFBQVQ7QUFBQTtBQUNJO0FBQUEsYUFDQTtBQUFBO0FBQUEsVUFBUSxTQUFVLHdCQUFTO0FBQ3pCQyxvQkFBUUMsS0FBUixDQUFjO0FBQ1pDLG9CQUFNQyxNQUFNRCxJQURBO0FBRVpFLDBCQUFZRCxNQUFNQyxVQUZOO0FBR1pDLHFCQUFPRixNQUFNRSxLQUhEO0FBSVpDLHVCQUFTSCxNQUFNRyxPQUpIO0FBS1pDLHVCQUFTSixNQUFNSSxPQUxIO0FBTVpDLHFCQUFPTCxNQUFNSyxLQU5EO0FBT1pDLG9CQUFNTixNQUFNTSxJQVBBO0FBUVpDLG9CQUFNUCxNQUFNRixLQVJBO0FBU1pVLHFCQUFPUixNQUFNUSxLQVREO0FBVVpDLHNCQUFRVCxNQUFNUztBQVZGLGFBQWQ7QUFZQVQsa0JBQU1VLE9BQU4sSUFBaUJWLE1BQU1VLE9BQU4sQ0FBY0MsS0FBZCxDQUFqQjtBQUNELFdBZEQ7QUFlSVgsY0FBTVk7QUFmVixPQURBO0FBQUE7QUFESixHQURnQjtBQUFBLENBQWxCOztBQXVCQWhCLFVBQVVpQixTQUFWLEdBQXNCO0FBQ3BCZCxRQUFNZSxvQkFBVUMsTUFESTtBQUVwQmQsY0FBWWEsb0JBQVVFLElBRkY7QUFHcEJkLFNBQU9ZLG9CQUFVRSxJQUhHO0FBSXBCYixXQUFTVyxvQkFBVUUsSUFKQztBQUtwQlosV0FBU1Usb0JBQVVFLElBTEM7QUFNcEJYLFNBQU9TLG9CQUFVRyxNQU5HO0FBT3BCWCxRQUFNUSxvQkFBVUcsTUFQSTtBQVFwQm5CLFNBQU9nQixvQkFBVUMsTUFSRztBQVNwQlAsU0FBT00sb0JBQVVJLFNBQVYsQ0FBb0IsQ0FBQ0osb0JBQVVLLEdBQVgsRUFBZ0JMLG9CQUFVRSxJQUExQixDQUFwQixDQVRhO0FBVXBCUCxVQUFRSyxvQkFBVUc7QUFWRSxDQUF0Qjs7a0JBYWVyQixTIiwiZmlsZSI6IlNheUJ1dHRvbi5qcyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCBQcm9wVHlwZXMgZnJvbSAncHJvcC10eXBlcyc7XG5pbXBvcnQgUmVhY3QgZnJvbSAncmVhY3QnO1xuXG5pbXBvcnQgQ29udGV4dCBmcm9tICcuL0NvbnRleHQnO1xuXG5jb25zdCBTYXlCdXR0b24gPSBwcm9wcyA9PlxuICA8Q29udGV4dC5Db25zdW1lcj5cbiAgICB7IGNvbnRleHQgPT5cbiAgICAgIDxidXR0b24gb25DbGljaz17IGV2ZW50ID0+IHtcbiAgICAgICAgY29udGV4dC5zcGVhayh7XG4gICAgICAgICAgbGFuZzogcHJvcHMubGFuZyxcbiAgICAgICAgICBvbkJvdW5kYXJ5OiBwcm9wcy5vbkJvdW5kYXJ5LFxuICAgICAgICAgIG9uRW5kOiBwcm9wcy5vbkVuZCxcbiAgICAgICAgICBvbkVycm9yOiBwcm9wcy5vbkVycm9yLFxuICAgICAgICAgIG9uU3RhcnQ6IHByb3BzLm9uU3RhcnQsXG4gICAgICAgICAgcGl0Y2g6IHByb3BzLnBpdGNoLFxuICAgICAgICAgIHJhdGU6IHByb3BzLnJhdGUsXG4gICAgICAgICAgdGV4dDogcHJvcHMuc3BlYWssXG4gICAgICAgICAgdm9pY2U6IHByb3BzLnZvaWNlLFxuICAgICAgICAgIHZvbHVtZTogcHJvcHMudm9sdW1lXG4gICAgICAgIH0pO1xuICAgICAgICBwcm9wcy5vbkNsaWNrICYmIHByb3BzLm9uQ2xpY2soZXZlbnQpO1xuICAgICAgfSB9PlxuICAgICAgICB7IHByb3BzLmNoaWxkcmVuIH1cbiAgICAgIDwvYnV0dG9uPlxuICAgIH1cbiAgPC9Db250ZXh0LkNvbnN1bWVyPlxuXG5TYXlCdXR0b24ucHJvcFR5cGVzID0ge1xuICBsYW5nOiBQcm9wVHlwZXMuc3RyaW5nLFxuICBvbkJvdW5kYXJ5OiBQcm9wVHlwZXMuZnVuYyxcbiAgb25FbmQ6IFByb3BUeXBlcy5mdW5jLFxuICBvbkVycm9yOiBQcm9wVHlwZXMuZnVuYyxcbiAgb25TdGFydDogUHJvcFR5cGVzLmZ1bmMsXG4gIHBpdGNoOiBQcm9wVHlwZXMubnVtYmVyLFxuICByYXRlOiBQcm9wVHlwZXMubnVtYmVyLFxuICBzcGVhazogUHJvcFR5cGVzLnN0cmluZyxcbiAgdm9pY2U6IFByb3BUeXBlcy5vbmVPZlR5cGUoW1Byb3BUeXBlcy5hbnksIFByb3BUeXBlcy5mdW5jXSksXG4gIHZvbHVtZTogUHJvcFR5cGVzLm51bWJlclxufTtcblxuZXhwb3J0IGRlZmF1bHQgU2F5QnV0dG9uO1xuIl19
+exports.default = SayButtonWithContext;
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL3NyYy9TYXlCdXR0b24uanMiXSwibmFtZXMiOlsiU2F5QnV0dG9uIiwicHJvcHMiLCJoYW5kbGVDbGljayIsImJpbmQiLCJzdGF0ZSIsImJ1c3kiLCJpZCIsIkRhdGUiLCJub3ciLCJNYXRoIiwicmFuZG9tIiwiY29udGV4dCIsImNhbmNlbCIsIm9uQ2xpY2siLCJldmVudCIsInNldFN0YXRlIiwic3BlYWsiLCJsYW5nIiwib25Cb3VuZGFyeSIsIm9uRW5kIiwib25FcnJvciIsIm9uU3RhcnQiLCJwaXRjaCIsInJhdGUiLCJ0ZXh0Iiwidm9pY2UiLCJ2b2x1bWUiLCJjaGlsZHJlbiIsImRpc2FibGVkIiwiUmVhY3QiLCJDb21wb25lbnQiLCJTYXlCdXR0b25XaXRoQ29udGV4dCIsInNwZWVjaFN5bnRoZXNpcyIsInNwZWVjaFN5bnRoZXNpc1V0dGVyYW5jZSIsInByb3BUeXBlcyIsIlByb3BUeXBlcyIsInN0cmluZyIsImZ1bmMiLCJudW1iZXIiLCJvbmVPZlR5cGUiLCJhbnkiXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQUE7Ozs7QUFDQTs7OztBQUVBOzs7Ozs7SUFFTUEsUzs7O0FBQ0oscUJBQVlDLEtBQVosRUFBbUI7QUFBQTs7QUFBQSw0SUFDWEEsS0FEVzs7QUFHakIsVUFBS0MsV0FBTCxHQUFtQixNQUFLQSxXQUFMLENBQWlCQyxJQUFqQixPQUFuQjs7QUFFQSxVQUFLQyxLQUFMLEdBQWE7QUFDWEMsWUFBTSxLQURLO0FBRVhDLFVBQUlDLEtBQUtDLEdBQUwsS0FBYUMsS0FBS0MsTUFBTDtBQUZOLEtBQWI7QUFMaUI7QUFTbEI7Ozs7MkNBRXNCO0FBQ3JCLFdBQUtULEtBQUwsQ0FBV1UsT0FBWCxDQUFtQkMsTUFBbkIsQ0FBMEIsS0FBS1IsS0FBTCxDQUFXRSxFQUFyQztBQUNEOzs7a0NBRWE7QUFBQTs7QUFBQSxVQUNKTCxLQURJLEdBQ2EsSUFEYixDQUNKQSxLQURJO0FBQUEsVUFDR0csS0FESCxHQUNhLElBRGIsQ0FDR0EsS0FESDs7O0FBR1pILFlBQU1ZLE9BQU4sSUFBaUJaLE1BQU1ZLE9BQU4sQ0FBY0MsS0FBZCxDQUFqQjs7QUFFQSxXQUFLQyxRQUFMLENBQWM7QUFBQSxlQUFPLEVBQUVWLE1BQU0sSUFBUixFQUFQO0FBQUEsT0FBZCwyRUFBc0M7QUFBQTtBQUFBO0FBQUE7QUFBQTtBQUFBO0FBQUEsdUJBQzlCSixNQUFNVSxPQUFOLENBQWNLLEtBQWQsQ0FBb0I7QUFDeEJWLHNCQUFJRixNQUFNRSxFQURjO0FBRXhCVyx3QkFBTWhCLE1BQU1nQixJQUZZO0FBR3hCQyw4QkFBWWpCLE1BQU1pQixVQUhNO0FBSXhCQyx5QkFBT2xCLE1BQU1rQixLQUpXO0FBS3hCQywyQkFBU25CLE1BQU1tQixPQUxTO0FBTXhCQywyQkFBU3BCLE1BQU1vQixPQU5TO0FBT3hCQyx5QkFBT3JCLE1BQU1xQixLQVBXO0FBUXhCQyx3QkFBTXRCLE1BQU1zQixJQVJZO0FBU3hCQyx3QkFBTXZCLE1BQU1lLEtBVFk7QUFVeEJTLHlCQUFPeEIsTUFBTXdCLEtBVlc7QUFXeEJDLDBCQUFRekIsTUFBTXlCO0FBWFUsaUJBQXBCLENBRDhCOztBQUFBOztBQWVwQyx1QkFBS1gsUUFBTCxDQUFjO0FBQUEseUJBQU87QUFDbkJWLDBCQUFNO0FBRGEsbUJBQVA7QUFBQSxpQkFBZDs7QUFmb0M7QUFBQTtBQUFBO0FBQUE7QUFBQTtBQUFBO0FBQUEsT0FBdEM7QUFtQkQ7Ozs2QkFFUTtBQUFBLG1CQUlILElBSkcsQ0FFTEosS0FGSztBQUFBLFVBRUkwQixRQUZKLFVBRUlBLFFBRko7QUFBQSxVQUVjQyxRQUZkLFVBRWNBLFFBRmQ7QUFBQSxVQUdJdkIsSUFISixHQUlILElBSkcsQ0FHTEQsS0FISyxDQUdJQyxJQUhKOzs7QUFNUCxhQUNFO0FBQUE7QUFBQTtBQUNFLG9CQUFXLE9BQU91QixRQUFQLEtBQW9CLFNBQXBCLEdBQWdDQSxRQUFoQyxHQUEyQ3ZCLElBRHhEO0FBRUUsbUJBQVUsS0FBS0g7QUFGakI7QUFJSXlCO0FBSkosT0FERjtBQVFEOzs7RUF4RHFCRSxnQkFBTUMsUzs7QUEyRDlCLElBQU1DLHVCQUF1QixTQUF2QkEsb0JBQXVCO0FBQUEsU0FDM0I7QUFBQyxzQkFBRDtBQUFBO0FBQ0UsdUJBQWtCOUIsTUFBTStCLGVBRDFCO0FBRUUsZ0NBQTJCL0IsTUFBTWdDO0FBRm5DO0FBSUk7QUFBQSxhQUNBLDhCQUFDLFNBQUQsMkJBQVcsU0FBVXRCLE9BQXJCLElBQW9DVixLQUFwQyxFQURBO0FBQUE7QUFKSixHQUQyQjtBQUFBLENBQTdCOztBQVVBOEIscUJBQXFCRyxTQUFyQixHQUFpQztBQUMvQmpCLFFBQU1rQixvQkFBVUMsTUFEZTtBQUUvQmxCLGNBQVlpQixvQkFBVUUsSUFGUztBQUcvQmxCLFNBQU9nQixvQkFBVUUsSUFIYztBQUkvQmpCLFdBQVNlLG9CQUFVRSxJQUpZO0FBSy9CaEIsV0FBU2Msb0JBQVVFLElBTFk7QUFNL0JmLFNBQU9hLG9CQUFVRyxNQU5jO0FBTy9CZixRQUFNWSxvQkFBVUcsTUFQZTtBQVEvQnRCLFNBQU9tQixvQkFBVUMsTUFSYztBQVMvQlgsU0FBT1Usb0JBQVVJLFNBQVYsQ0FBb0IsQ0FBQ0osb0JBQVVLLEdBQVgsRUFBZ0JMLG9CQUFVRSxJQUExQixDQUFwQixDQVR3QjtBQVUvQlgsVUFBUVMsb0JBQVVHO0FBVmEsQ0FBakM7O2tCQWFlUCxvQiIsImZpbGUiOiJTYXlCdXR0b24uanMiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgUHJvcFR5cGVzIGZyb20gJ3Byb3AtdHlwZXMnO1xuaW1wb3J0IFJlYWN0IGZyb20gJ3JlYWN0JztcblxuaW1wb3J0IENvbXBvc2VyIGZyb20gJy4vQ29tcG9zZXInO1xuXG5jbGFzcyBTYXlCdXR0b24gZXh0ZW5kcyBSZWFjdC5Db21wb25lbnQge1xuICBjb25zdHJ1Y3Rvcihwcm9wcykge1xuICAgIHN1cGVyKHByb3BzKTtcblxuICAgIHRoaXMuaGFuZGxlQ2xpY2sgPSB0aGlzLmhhbmRsZUNsaWNrLmJpbmQodGhpcyk7XG5cbiAgICB0aGlzLnN0YXRlID0ge1xuICAgICAgYnVzeTogZmFsc2UsXG4gICAgICBpZDogRGF0ZS5ub3coKSArIE1hdGgucmFuZG9tKClcbiAgICB9O1xuICB9XG5cbiAgY29tcG9uZW50V2lsbFVubW91bnQoKSB7XG4gICAgdGhpcy5wcm9wcy5jb250ZXh0LmNhbmNlbCh0aGlzLnN0YXRlLmlkKTtcbiAgfVxuXG4gIGhhbmRsZUNsaWNrKCkge1xuICAgIGNvbnN0IHsgcHJvcHMsIHN0YXRlIH0gPSB0aGlzO1xuXG4gICAgcHJvcHMub25DbGljayAmJiBwcm9wcy5vbkNsaWNrKGV2ZW50KTtcblxuICAgIHRoaXMuc2V0U3RhdGUoKCkgPT4gKHsgYnVzeTogdHJ1ZSB9KSwgYXN5bmMgKCkgPT4ge1xuICAgICAgYXdhaXQgcHJvcHMuY29udGV4dC5zcGVhayh7XG4gICAgICAgIGlkOiBzdGF0ZS5pZCxcbiAgICAgICAgbGFuZzogcHJvcHMubGFuZyxcbiAgICAgICAgb25Cb3VuZGFyeTogcHJvcHMub25Cb3VuZGFyeSxcbiAgICAgICAgb25FbmQ6IHByb3BzLm9uRW5kLFxuICAgICAgICBvbkVycm9yOiBwcm9wcy5vbkVycm9yLFxuICAgICAgICBvblN0YXJ0OiBwcm9wcy5vblN0YXJ0LFxuICAgICAgICBwaXRjaDogcHJvcHMucGl0Y2gsXG4gICAgICAgIHJhdGU6IHByb3BzLnJhdGUsXG4gICAgICAgIHRleHQ6IHByb3BzLnNwZWFrLFxuICAgICAgICB2b2ljZTogcHJvcHMudm9pY2UsXG4gICAgICAgIHZvbHVtZTogcHJvcHMudm9sdW1lXG4gICAgICB9KTtcblxuICAgICAgdGhpcy5zZXRTdGF0ZSgoKSA9PiAoe1xuICAgICAgICBidXN5OiBmYWxzZVxuICAgICAgfSkpO1xuICAgIH0pO1xuICB9XG5cbiAgcmVuZGVyKCkge1xuICAgIGNvbnN0IHtcbiAgICAgIHByb3BzOiB7IGNoaWxkcmVuLCBkaXNhYmxlZCB9LFxuICAgICAgc3RhdGU6IHsgYnVzeSB9XG4gICAgfSA9IHRoaXM7XG5cbiAgICByZXR1cm4gKFxuICAgICAgPGJ1dHRvblxuICAgICAgICBkaXNhYmxlZD17IHR5cGVvZiBkaXNhYmxlZCA9PT0gJ2Jvb2xlYW4nID8gZGlzYWJsZWQgOiBidXN5IH1cbiAgICAgICAgb25DbGljaz17IHRoaXMuaGFuZGxlQ2xpY2sgfVxuICAgICAgPlxuICAgICAgICB7IGNoaWxkcmVuIH1cbiAgICAgIDwvYnV0dG9uPlxuICAgICk7XG4gIH1cbn1cblxuY29uc3QgU2F5QnV0dG9uV2l0aENvbnRleHQgPSBwcm9wcyA9PlxuICA8Q29tcG9zZXJcbiAgICBzcGVlY2hTeW50aGVzaXM9eyBwcm9wcy5zcGVlY2hTeW50aGVzaXMgfVxuICAgIHNwZWVjaFN5bnRoZXNpc1V0dGVyYW5jZT17IHByb3BzLnNwZWVjaFN5bnRoZXNpc1V0dGVyYW5jZSB9XG4gID5cbiAgICB7IGNvbnRleHQgPT5cbiAgICAgIDxTYXlCdXR0b24gY29udGV4dD17IGNvbnRleHQgfSB7IC4uLnByb3BzIH0gLz5cbiAgICB9XG4gIDwvQ29tcG9zZXI+XG5cblNheUJ1dHRvbldpdGhDb250ZXh0LnByb3BUeXBlcyA9IHtcbiAgbGFuZzogUHJvcFR5cGVzLnN0cmluZyxcbiAgb25Cb3VuZGFyeTogUHJvcFR5cGVzLmZ1bmMsXG4gIG9uRW5kOiBQcm9wVHlwZXMuZnVuYyxcbiAgb25FcnJvcjogUHJvcFR5cGVzLmZ1bmMsXG4gIG9uU3RhcnQ6IFByb3BUeXBlcy5mdW5jLFxuICBwaXRjaDogUHJvcFR5cGVzLm51bWJlcixcbiAgcmF0ZTogUHJvcFR5cGVzLm51bWJlcixcbiAgc3BlYWs6IFByb3BUeXBlcy5zdHJpbmcsXG4gIHZvaWNlOiBQcm9wVHlwZXMub25lT2ZUeXBlKFtQcm9wVHlwZXMuYW55LCBQcm9wVHlwZXMuZnVuY10pLFxuICB2b2x1bWU6IFByb3BUeXBlcy5udW1iZXJcbn07XG5cbmV4cG9ydCBkZWZhdWx0IFNheUJ1dHRvbldpdGhDb250ZXh0XG4iXX0=

lib/SayPrimitive.js

@@ -7,4 +7,34 @@ 'use strict';
 
-var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
+var _extends2 = require('babel-runtime/helpers/extends');
 
+var _extends3 = _interopRequireDefault(_extends2);
+
+var _regenerator = require('babel-runtime/regenerator');
+
+var _regenerator2 = _interopRequireDefault(_regenerator);
+
+var _asyncToGenerator2 = require('babel-runtime/helpers/asyncToGenerator');
+
+var _asyncToGenerator3 = _interopRequireDefault(_asyncToGenerator2);
+
+var _getPrototypeOf = require('babel-runtime/core-js/object/get-prototype-of');
+
+var _getPrototypeOf2 = _interopRequireDefault(_getPrototypeOf);
+
+var _classCallCheck2 = require('babel-runtime/helpers/classCallCheck');
+
+var _classCallCheck3 = _interopRequireDefault(_classCallCheck2);
+
+var _createClass2 = require('babel-runtime/helpers/createClass');
+
+var _createClass3 = _interopRequireDefault(_createClass2);
+
+var _possibleConstructorReturn2 = require('babel-runtime/helpers/possibleConstructorReturn');
+
+var _possibleConstructorReturn3 = _interopRequireDefault(_possibleConstructorReturn2);
+
+var _inherits2 = require('babel-runtime/helpers/inherits');
+
+var _inherits3 = _interopRequireDefault(_inherits2);
+
 var _propTypes = require('prop-types');
@@ -24,16 +54,10 @@
 
-function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+var SayPrimitive = function (_React$Component) {
+  (0, _inherits3.default)(SayPrimitive, _React$Component);
 
-function _possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return call && (typeof call === "object" || typeof call === "function") ? call : self; }
+  function SayPrimitive(props) {
+    (0, _classCallCheck3.default)(this, SayPrimitive);
 
-function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }
+    var _this = (0, _possibleConstructorReturn3.default)(this, (SayPrimitive.__proto__ || (0, _getPrototypeOf2.default)(SayPrimitive)).call(this, props));
 
-var Say = function (_React$Component) {
-  _inherits(Say, _React$Component);
-
-  function Say(props) {
-    _classCallCheck(this, Say);
-
-    var _this = _possibleConstructorReturn(this, (Say.__proto__ || Object.getPrototypeOf(Say)).call(this, props));
-
     _this.handleBoundary = _this.handleBoundary.bind(_this);
@@ -43,9 +67,16 @@ _this.handleEnd = _this.handleEnd.bind(_this);
     _this.handleStart = _this.handleStart.bind(_this);
+
+    _this.state = { id: Date.now() + Math.random() };
     return _this;
   }
 
-  _createClass(Say, [{
+  (0, _createClass3.default)(SayPrimitive, [{
     key: 'componentWillUnmount',
     value: function componentWillUnmount() {
+      // TODO: Should dequeue self on unmount
       this.unmounted = true;
+
+      this.props.context.cancel(this.state.id).catch(function (err) {
+        return 0;
+      });
     }
@@ -82,39 +113,60 @@ }, {
 
-      var _props = this.props,
-          lang = _props.lang,
-          pitch = _props.pitch,
-          rate = _props.rate,
-          text = _props.speak,
-          voice = _props.voice,
-          volume = _props.volume;
+      (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee() {
+        var _props, context, lang, pitch, rate, text, voice, volume, id;
 
+        return _regenerator2.default.wrap(function _callee$(_context) {
+          while (1) {
+            switch (_context.prev = _context.next) {
+              case 0:
+                _props = _this2.props, context = _props.context, lang = _props.lang, pitch = _props.pitch, rate = _props.rate, text = _props.speak, voice = _props.voice, volume = _props.volume;
+                id = _this2.state.id;
 
-      return _react2.default.createElement(
-        _Context2.default.Consumer,
-        null,
-        function (context) {
-          return context.speak({
-            lang: lang,
-            onBoundary: _this2.handleBoundary,
-            onEnd: _this2.handleEnd,
-            onError: _this2.handleError,
-            onStart: _this2.handleStart,
-            pitch: pitch,
-            rate: rate,
-            text: text,
-            voice: voice,
-            volume: volume
-          });
-        }
-      );
+
+                context.speak({
+                  id: id,
+                  lang: lang,
+                  onBoundary: _this2.handleBoundary,
+                  onEnd: _this2.handleEnd,
+                  onError: _this2.handleError,
+                  onStart: _this2.handleStart,
+                  pitch: pitch,
+                  rate: rate,
+                  text: text,
+                  voice: voice,
+                  volume: volume
+                });
+
+              case 3:
+              case 'end':
+                return _context.stop();
+            }
+          }
+        }, _callee, _this2);
+      }))().catch(function (err) {
+        return console.error(err);
+      });
+
+      return false;
     }
   }]);
-
-  return Say;
+  return SayPrimitive;
 }(_react2.default.Component);
 
-exports.default = Say;
+var SayPrimitiveWithContext = function SayPrimitiveWithContext(props) {
+  return _react2.default.createElement(
+    _Context2.default.Consumer,
+    null,
+    function (context) {
+      return _react2.default.createElement(
+        SayPrimitive,
+        (0, _extends3.default)({
+          context: context
+        }, props),
+        props.children
+      );
+    }
+  );
+};
 
-
-Say.propTypes = {
+SayPrimitiveWithContext.propTypes = {
   lang: _propTypes2.default.string,
@@ -131,2 +183,4 @@ pitch: _propTypes2.default.number,
 };
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL3NyYy9TYXlQcmltaXRpdmUuanMiXSwibmFtZXMiOlsiU2F5IiwicHJvcHMiLCJoYW5kbGVCb3VuZGFyeSIsImJpbmQiLCJoYW5kbGVFbmQiLCJoYW5kbGVFcnJvciIsImhhbmRsZVN0YXJ0IiwidW5tb3VudGVkIiwiZXZlbnQiLCJvbkJvdW5kYXJ5Iiwib25FbmQiLCJvbkVycm9yIiwib25TdGFydCIsIm5leHRQcm9wcyIsInNwZWFrIiwibGFuZyIsInBpdGNoIiwicmF0ZSIsInRleHQiLCJ2b2ljZSIsInZvbHVtZSIsImNvbnRleHQiLCJSZWFjdCIsIkNvbXBvbmVudCIsInByb3BUeXBlcyIsIlByb3BUeXBlcyIsInN0cmluZyIsIm51bWJlciIsImZ1bmMiLCJvbmVPZlR5cGUiLCJhbnkiXSwibWFwcGluZ3MiOiI7Ozs7Ozs7O0FBQUE7Ozs7QUFDQTs7OztBQUVBOzs7Ozs7Ozs7Ozs7SUFFcUJBLEc7OztBQUNuQixlQUFZQyxLQUFaLEVBQW1CO0FBQUE7O0FBQUEsMEdBQ1hBLEtBRFc7O0FBR2pCLFVBQUtDLGNBQUwsR0FBc0IsTUFBS0EsY0FBTCxDQUFvQkMsSUFBcEIsT0FBdEI7QUFDQSxVQUFLQyxTQUFMLEdBQWlCLE1BQUtBLFNBQUwsQ0FBZUQsSUFBZixPQUFqQjtBQUNBLFVBQUtFLFdBQUwsR0FBbUIsTUFBS0EsV0FBTCxDQUFpQkYsSUFBakIsT0FBbkI7QUFDQSxVQUFLRyxXQUFMLEdBQW1CLE1BQUtBLFdBQUwsQ0FBaUJILElBQWpCLE9BQW5CO0FBTmlCO0FBT2xCOzs7OzJDQUVzQjtBQUNyQixXQUFLSSxTQUFMLEdBQWlCLElBQWpCO0FBQ0Q7OzttQ0FFY0MsSyxFQUFPO0FBQ3BCLE9BQUMsS0FBS0QsU0FBTixJQUFtQixLQUFLTixLQUFMLENBQVdRLFVBQTlCLElBQTRDLEtBQUtSLEtBQUwsQ0FBV1EsVUFBWCxDQUFzQkQsS0FBdEIsQ0FBNUM7QUFDRDs7OzhCQUVTQSxLLEVBQU87QUFDZixPQUFDLEtBQUtELFNBQU4sSUFBbUIsS0FBS04sS0FBTCxDQUFXUyxLQUE5QixJQUF1QyxLQUFLVCxLQUFMLENBQVdTLEtBQVgsQ0FBaUJGLEtBQWpCLENBQXZDO0FBQ0Q7OztnQ0FFV0EsSyxFQUFPO0FBQ2pCLE9BQUMsS0FBS0QsU0FBTixJQUFtQixLQUFLTixLQUFMLENBQVdVLE9BQTlCLElBQXlDLEtBQUtWLEtBQUwsQ0FBV1UsT0FBWCxDQUFtQkgsS0FBbkIsQ0FBekM7QUFDRDs7O2dDQUVXQSxLLEVBQU87QUFDakIsT0FBQyxLQUFLRCxTQUFOLElBQW1CLEtBQUtOLEtBQUwsQ0FBV1csT0FBOUIsSUFBeUMsS0FBS1gsS0FBTCxDQUFXVyxPQUFYLENBQW1CSixLQUFuQixDQUF6QztBQUNEOzs7MENBRXFCSyxTLEVBQVc7QUFDL0IsYUFBT0EsVUFBVUMsS0FBVixLQUFvQixLQUFLYixLQUFMLENBQVdhLEtBQXRDO0FBQ0Q7Ozs2QkFFUTtBQUFBOztBQUFBLG1CQUNtRCxLQUFLYixLQUR4RDtBQUFBLFVBQ0NjLElBREQsVUFDQ0EsSUFERDtBQUFBLFVBQ09DLEtBRFAsVUFDT0EsS0FEUDtBQUFBLFVBQ2NDLElBRGQsVUFDY0EsSUFEZDtBQUFBLFVBQzJCQyxJQUQzQixVQUNvQkosS0FEcEI7QUFBQSxVQUNpQ0ssS0FEakMsVUFDaUNBLEtBRGpDO0FBQUEsVUFDd0NDLE1BRHhDLFVBQ3dDQSxNQUR4Qzs7O0FBR1AsYUFDRTtBQUFDLHlCQUFELENBQVMsUUFBVDtBQUFBO0FBQ0k7QUFBQSxpQkFBV0MsUUFBUVAsS0FBUixDQUFjO0FBQ3ZCQyxzQkFEdUI7QUFFdkJOLHdCQUFZLE9BQUtQLGNBRk07QUFHdkJRLG1CQUFPLE9BQUtOLFNBSFc7QUFJdkJPLHFCQUFTLE9BQUtOLFdBSlM7QUFLdkJPLHFCQUFTLE9BQUtOLFdBTFM7QUFNdkJVLHdCQU51QjtBQU92QkMsc0JBUHVCO0FBUXZCQyxzQkFSdUI7QUFTdkJDLHdCQVR1QjtBQVV2QkM7QUFWdUIsV0FBZCxDQUFYO0FBQUE7QUFESixPQURGO0FBaUJEOzs7O0VBdEQ4QkUsZ0JBQU1DLFM7O2tCQUFsQnZCLEc7OztBQXlEckJBLElBQUl3QixTQUFKLEdBQWdCO0FBQ2RULFFBQU1VLG9CQUFVQyxNQURGO0FBRWRWLFNBQU9TLG9CQUFVRSxNQUZIO0FBR2RWLFFBQU1RLG9CQUFVRSxNQUhGO0FBSWRsQixjQUFZZ0Isb0JBQVVHLElBSlI7QUFLZGxCLFNBQU9lLG9CQUFVRyxJQUxIO0FBTWRqQixXQUFTYyxvQkFBVUcsSUFOTDtBQU9kaEIsV0FBU2Esb0JBQVVHLElBUEw7QUFRZGQsU0FBT1csb0JBQVVDLE1BUkg7QUFTZFAsU0FBT00sb0JBQVVJLFNBQVYsQ0FBb0IsQ0FBQ0osb0JBQVVLLEdBQVgsRUFBZ0JMLG9CQUFVRyxJQUExQixDQUFwQixDQVRPO0FBVWRSLFVBQVFLLG9CQUFVRTtBQVZKLENBQWhCIiwiZmlsZSI6IlNheVByaW1pdGl2ZS5qcyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCBQcm9wVHlwZXMgZnJvbSAncHJvcC10eXBlcyc7XG5pbXBvcnQgUmVhY3QgZnJvbSAncmVhY3QnO1xuXG5pbXBvcnQgQ29udGV4dCBmcm9tICcuL0NvbnRleHQnO1xuXG5leHBvcnQgZGVmYXVsdCBjbGFzcyBTYXkgZXh0ZW5kcyBSZWFjdC5Db21wb25lbnQge1xuICBjb25zdHJ1Y3Rvcihwcm9wcykge1xuICAgIHN1cGVyKHByb3BzKTtcblxuICAgIHRoaXMuaGFuZGxlQm91bmRhcnkgPSB0aGlzLmhhbmRsZUJvdW5kYXJ5LmJpbmQodGhpcyk7XG4gICAgdGhpcy5oYW5kbGVFbmQgPSB0aGlzLmhhbmRsZUVuZC5iaW5kKHRoaXMpO1xuICAgIHRoaXMuaGFuZGxlRXJyb3IgPSB0aGlzLmhhbmRsZUVycm9yLmJpbmQodGhpcyk7XG4gICAgdGhpcy5oYW5kbGVTdGFydCA9IHRoaXMuaGFuZGxlU3RhcnQuYmluZCh0aGlzKTtcbiAgfVxuXG4gIGNvbXBvbmVudFdpbGxVbm1vdW50KCkge1xuICAgIHRoaXMudW5tb3VudGVkID0gdHJ1ZTtcbiAgfVxuXG4gIGhhbmRsZUJvdW5kYXJ5KGV2ZW50KSB7XG4gICAgIXRoaXMudW5tb3VudGVkICYmIHRoaXMucHJvcHMub25Cb3VuZGFyeSAmJiB0aGlzLnByb3BzLm9uQm91bmRhcnkoZXZlbnQpO1xuICB9XG5cbiAgaGFuZGxlRW5kKGV2ZW50KSB7XG4gICAgIXRoaXMudW5tb3VudGVkICYmIHRoaXMucHJvcHMub25FbmQgJiYgdGhpcy5wcm9wcy5vbkVuZChldmVudCk7XG4gIH1cblxuICBoYW5kbGVFcnJvcihldmVudCkge1xuICAgICF0aGlzLnVubW91bnRlZCAmJiB0aGlzLnByb3BzLm9uRXJyb3IgJiYgdGhpcy5wcm9wcy5vbkVycm9yKGV2ZW50KTtcbiAgfVxuXG4gIGhhbmRsZVN0YXJ0KGV2ZW50KSB7XG4gICAgIXRoaXMudW5tb3VudGVkICYmIHRoaXMucHJvcHMub25TdGFydCAmJiB0aGlzLnByb3BzLm9uU3RhcnQoZXZlbnQpO1xuICB9XG5cbiAgc2hvdWxkQ29tcG9uZW50VXBkYXRlKG5leHRQcm9wcykge1xuICAgIHJldHVybiBuZXh0UHJvcHMuc3BlYWsgIT09IHRoaXMucHJvcHMuc3BlYWs7XG4gIH1cblxuICByZW5kZXIoKSB7XG4gICAgY29uc3QgeyBsYW5nLCBwaXRjaCwgcmF0ZSwgc3BlYWs6IHRleHQsIHZvaWNlLCB2b2x1bWUgfSA9IHRoaXMucHJvcHM7XG5cbiAgICByZXR1cm4gKFxuICAgICAgPENvbnRleHQuQ29uc3VtZXI+XG4gICAgICAgIHsgY29udGV4dCA9PiBjb250ZXh0LnNwZWFrKHtcbiAgICAgICAgICAgIGxhbmcsXG4gICAgICAgICAgICBvbkJvdW5kYXJ5OiB0aGlzLmhhbmRsZUJvdW5kYXJ5LFxuICAgICAgICAgICAgb25FbmQ6IHRoaXMuaGFuZGxlRW5kLFxuICAgICAgICAgICAgb25FcnJvcjogdGhpcy5oYW5kbGVFcnJvcixcbiAgICAgICAgICAgIG9uU3RhcnQ6IHRoaXMuaGFuZGxlU3RhcnQsXG4gICAgICAgICAgICBwaXRjaCxcbiAgICAgICAgICAgIHJhdGUsXG4gICAgICAgICAgICB0ZXh0LFxuICAgICAgICAgICAgdm9pY2UsXG4gICAgICAgICAgICB2b2x1bWVcbiAgICAgICAgICB9KVxuICAgICAgICB9XG4gICAgICA8L0NvbnRleHQuQ29uc3VtZXI+XG4gICAgKTtcbiAgfVxufVxuXG5TYXkucHJvcFR5cGVzID0ge1xuICBsYW5nOiBQcm9wVHlwZXMuc3RyaW5nLFxuICBwaXRjaDogUHJvcFR5cGVzLm51bWJlcixcbiAgcmF0ZTogUHJvcFR5cGVzLm51bWJlcixcbiAgb25Cb3VuZGFyeTogUHJvcFR5cGVzLmZ1bmMsXG4gIG9uRW5kOiBQcm9wVHlwZXMuZnVuYyxcbiAgb25FcnJvcjogUHJvcFR5cGVzLmZ1bmMsXG4gIG9uU3RhcnQ6IFByb3BUeXBlcy5mdW5jLFxuICBzcGVhazogUHJvcFR5cGVzLnN0cmluZyxcbiAgdm9pY2U6IFByb3BUeXBlcy5vbmVPZlR5cGUoW1Byb3BUeXBlcy5hbnksIFByb3BUeXBlcy5mdW5jXSksXG4gIHZvbHVtZTogUHJvcFR5cGVzLm51bWJlclxufTtcbiJdfQ==
+
+exports.default = SayPrimitiveWithContext;
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL3NyYy9TYXlQcmltaXRpdmUuanMiXSwibmFtZXMiOlsiU2F5UHJpbWl0aXZlIiwicHJvcHMiLCJoYW5kbGVCb3VuZGFyeSIsImJpbmQiLCJoYW5kbGVFbmQiLCJoYW5kbGVFcnJvciIsImhhbmRsZVN0YXJ0Iiwic3RhdGUiLCJpZCIsIkRhdGUiLCJub3ciLCJNYXRoIiwicmFuZG9tIiwidW5tb3VudGVkIiwiY29udGV4dCIsImNhbmNlbCIsImNhdGNoIiwiZXZlbnQiLCJvbkJvdW5kYXJ5Iiwib25FbmQiLCJvbkVycm9yIiwib25TdGFydCIsIm5leHRQcm9wcyIsInNwZWFrIiwibGFuZyIsInBpdGNoIiwicmF0ZSIsInRleHQiLCJ2b2ljZSIsInZvbHVtZSIsImNvbnNvbGUiLCJlcnJvciIsImVyciIsIlJlYWN0IiwiQ29tcG9uZW50IiwiU2F5UHJpbWl0aXZlV2l0aENvbnRleHQiLCJjaGlsZHJlbiIsInByb3BUeXBlcyIsIlByb3BUeXBlcyIsInN0cmluZyIsIm51bWJlciIsImZ1bmMiLCJvbmVPZlR5cGUiLCJhbnkiXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQUE7Ozs7QUFDQTs7OztBQUVBOzs7Ozs7SUFFTUEsWTs7O0FBQ0osd0JBQVlDLEtBQVosRUFBbUI7QUFBQTs7QUFBQSxrSkFDWEEsS0FEVzs7QUFHakIsVUFBS0MsY0FBTCxHQUFzQixNQUFLQSxjQUFMLENBQW9CQyxJQUFwQixPQUF0QjtBQUNBLFVBQUtDLFNBQUwsR0FBaUIsTUFBS0EsU0FBTCxDQUFlRCxJQUFmLE9BQWpCO0FBQ0EsVUFBS0UsV0FBTCxHQUFtQixNQUFLQSxXQUFMLENBQWlCRixJQUFqQixPQUFuQjtBQUNBLFVBQUtHLFdBQUwsR0FBbUIsTUFBS0EsV0FBTCxDQUFpQkgsSUFBakIsT0FBbkI7O0FBRUEsVUFBS0ksS0FBTCxHQUFhLEVBQUVDLElBQUlDLEtBQUtDLEdBQUwsS0FBYUMsS0FBS0MsTUFBTCxFQUFuQixF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bENsQixTQUFPZSxvQkFBVUMsTUFSaUI7QUFTbENYLFNBQU9VLG9CQUFVSSxTQUFWLENBQW9CLENBQUNKLG9CQUFVSyxHQUFYLEVBQWdCTCxvQkFBVUcsSUFBMUIsQ0FBcEIsQ0FUMkI7QUFVbENaLFVBQVFTLG9CQUFVRTtBQVZnQixDQUFwQzs7a0JBYWVMLHVCIiwiZmlsZSI6IlNheVByaW1pdGl2ZS5qcyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCBQcm9wVHlwZXMgZnJvbSAncHJvcC10eXBlcyc7XG5pbXBvcnQgUmVhY3QgZnJvbSAncmVhY3QnO1xuXG5pbXBvcnQgQ29udGV4dCBmcm9tICcuL0NvbnRleHQnO1xuXG5jbGFzcyBTYXlQcmltaXRpdmUgZXh0ZW5kcyBSZWFjdC5Db21wb25lbnQge1xuICBjb25zdHJ1Y3Rvcihwcm9wcykge1xuICAgIHN1cGVyKHByb3BzKTtcblxuICAgIHRoaXMuaGFuZGxlQm91bmRhcnkgPSB0aGlzLmhhbmRsZUJvdW5kYXJ5LmJpbmQodGhpcyk7XG4gICAgdGhpcy5oYW5kbGVFbmQgPSB0aGlzLmhhbmRsZUVuZC5iaW5kKHRoaXMpO1xuICAgIHRoaXMuaGFuZGxlRXJyb3IgPSB0aGlzLmhhbmRsZUVycm9yLmJpbmQodGhpcyk7XG4gICAgdGhpcy5oYW5kbGVTdGFydCA9IHRoaXMuaGFuZGxlU3RhcnQuYmluZCh0aGlzKTtcblxuICAgIHRoaXMuc3RhdGUgPSB7IGlkOiBEYXRlLm5vdygpICsgTWF0aC5yYW5kb20oKSB9O1xuICB9XG5cbiAgY29tcG9uZW50V2lsbFVubW91bnQoKSB7XG4gICAgLy8gVE9ETzogU2hvdWxkIGRlcXVldWUgc2VsZiBvbiB1bm1vdW50XG4gICAgdGhpcy51bm1vdW50ZWQgPSB0cnVlO1xuXG4gICAgdGhpcy5wcm9wcy5jb250ZXh0LmNhbmNlbCh0aGlzLnN0YXRlLmlkKS5jYXRjaChlcnIgPT4gMCk7XG4gIH1cblxuICBoYW5kbGVCb3VuZGFyeShldmVudCkge1xuICAgICF0aGlzLnVubW91bnRlZCAmJiB0aGlzLnByb3BzLm9uQm91bmRhcnkgJiYgdGhpcy5wcm9wcy5vbkJvdW5kYXJ5KGV2ZW50KTtcbiAgfVxuXG4gIGhhbmRsZUVuZChldmVudCkge1xuICAgICF0aGlzLnVubW91bnRlZCAmJiB0aGlzLnByb3BzLm9uRW5kICYmIHRoaXMucHJvcHMub25FbmQoZXZlbnQpO1xuICB9XG5cbiAgaGFuZGxlRXJyb3IoZXZlbnQpIHtcbiAgICAhdGhpcy51bm1vdW50ZWQgJiYgdGhpcy5wcm9wcy5vbkVycm9yICYmIHRoaXMucHJvcHMub25FcnJvcihldmVudCk7XG4gIH1cblxuICBoYW5kbGVTdGFydChldmVudCkge1xuICAgICF0aGlzLnVubW91bnRlZCAmJiB0aGlzLnByb3BzLm9uU3RhcnQgJiYgdGhpcy5wcm9wcy5vblN0YXJ0KGV2ZW50KTtcbiAgfVxuXG4gIHNob3VsZENvbXBvbmVudFVwZGF0ZShuZXh0UHJvcHMpIHtcbiAgICByZXR1cm4gbmV4dFByb3BzLnNwZWFrICE9PSB0aGlzLnByb3BzLnNwZWFrO1xuICB9XG5cbiAgcmVuZGVyKCkge1xuICAgIChhc3luYyAoKSA9PiB7XG4gICAgICBjb25zdCB7IGNvbnRleHQsIGxhbmcsIHBpdGNoLCByYXRlLCBzcGVhazogdGV4dCwgdm9pY2UsIHZvbHVtZSB9ID0gdGhpcy5wcm9wcztcbiAgICAgIGNvbnN0IHsgaWQgfSA9IHRoaXMuc3RhdGU7XG5cbiAgICAgIGNvbnRleHQuc3BlYWsoe1xuICAgICAgICBpZCxcbiAgICAgICAgbGFuZyxcbiAgICAgICAgb25Cb3VuZGFyeTogdGhpcy5oYW5kbGVCb3VuZGFyeSxcbiAgICAgICAgb25FbmQ6IHRoaXMuaGFuZGxlRW5kLFxuICAgICAgICBvbkVycm9yOiB0aGlzLmhhbmRsZUVycm9yLFxuICAgICAgICBvblN0YXJ0OiB0aGlzLmhhbmRsZVN0YXJ0LFxuICAgICAgICBwaXRjaCxcbiAgICAgICAgcmF0ZSxcbiAgICAgICAgdGV4dCxcbiAgICAgICAgdm9pY2UsXG4gICAgICAgIHZvbHVtZVxuICAgICAgfSk7XG4gICAgfSkoKS5jYXRjaChlcnIgPT4gY29uc29sZS5lcnJvcihlcnIpKTtcblxuICAgIHJldHVybiBmYWxzZTtcbiAgfVxufVxuXG5jb25zdCBTYXlQcmltaXRpdmVXaXRoQ29udGV4dCA9IHByb3BzID0+XG4gIDxDb250ZXh0LkNvbnN1bWVyPlxuICAgIHsgY29udGV4dCA9PlxuICAgICAgPFNheVByaW1pdGl2ZVxuICAgICAgICBjb250ZXh0PXsgY29udGV4dCB9XG4gICAgICAgIHsgLi4ucHJvcHMgfVxuICAgICAgPlxuICAgICAgICB7IHByb3BzLmNoaWxkcmVuIH1cbiAgICAgIDwvU2F5UHJpbWl0aXZlPlxuICAgIH1cbiAgPC9Db250ZXh0LkNvbnN1bWVyPlxuXG5TYXlQcmltaXRpdmVXaXRoQ29udGV4dC5wcm9wVHlwZXMgPSB7XG4gIGxhbmc6IFByb3BUeXBlcy5zdHJpbmcsXG4gIHBpdGNoOiBQcm9wVHlwZXMubnVtYmVyLFxuICByYXRlOiBQcm9wVHlwZXMubnVtYmVyLFxuICBvbkJvdW5kYXJ5OiBQcm9wVHlwZXMuZnVuYyxcbiAgb25FbmQ6IFByb3BUeXBlcy5mdW5jLFxuICBvbkVycm9yOiBQcm9wVHlwZXMuZnVuYyxcbiAgb25TdGFydDogUHJvcFR5cGVzLmZ1bmMsXG4gIHNwZWFrOiBQcm9wVHlwZXMuc3RyaW5nLFxuICB2b2ljZTogUHJvcFR5cGVzLm9uZU9mVHlwZShbUHJvcFR5cGVzLmFueSwgUHJvcFR5cGVzLmZ1bmNdKSxcbiAgdm9sdW1lOiBQcm9wVHlwZXMubnVtYmVyXG59O1xuXG5leHBvcnQgZGVmYXVsdCBTYXlQcmltaXRpdmVXaXRoQ29udGV4dFxuIl19

package.json

 {
   "name": "react-say",
-  "version": "1.0.1-master.efdec9e",
+  "version": "1.1.0",
   "description": "A React component that synthesis text into speech using Web Speech API",
@@ -21,5 +21,6 @@ "keywords": [
   "scripts": {
-    "bootstrap": "lerna bootstrap --hoist",
-    "build": "lerna run build",
-    "test": "lerna run test"
+    "bootstrap": "lerna bootstrap",
+    "build": "lerna run --stream build",
+    "test": "lerna run --stream test",
+    "watch": "lerna run --parallel --stream watch"
   },
@@ -36,22 +37,14 @@ "author": "William Wong <[e-mail]> (http://compulim.info/)",
   "homepage": "https://github.com/compulim/react-say#readme",
-  "devDependencies": {
-    "babel-cli": "^6.26.0",
-    "babel-core": "^6.26.3",
-    "babel-env": "^2.4.1",
-    "babel-plugin-transform-object-rest-spread": "^6.26.0",
-    "babel-preset-stage-3": "^6.24.1",
-    "jest": "^22.4.4",
-    "lerna": "^2.11.0",
-    "react": "^16.4.1",
-    "react-dom": "^16.4.1",
-    "react-scripts": "1.1.4",
-    "rimraf": "^2.6.2"
-  },
   "dependencies": {
     "classnames": "^2.2.6",
-    "glamor": "^2.20.40"
+    "event-as-promise": "^1.0.3",
+    "glamor": "^2.20.40",
+    "memoize-one": "^4.0.0"
   },
   "peerDependencies": {
     "react": "^16.4.1"
+  },
+  "devDependencies": {
+    "lerna": "^2.11.0"
   }
 }

README.md

@@ -102,10 +102,15 @@ # react-say
 
-* If `<Say>` or `<SayButton>` is unmounted, the utterance will continue to speak
-   * Web Speech does not support stopping or dequeueing a pending utterance, only to cancel all utterances at once
-   * Since the utterance is already queued, speaking, or spoken, we cannot stop it and not cancelling other "innocent" utterance
-   * We decided to let it continue but not firing any events after unmount
+* Instead of using the native queue for utterances, we implement our own speech queue for browser compatibility reasons
+   * Queue is managed by `<Composer>`, all `<Say>` and `<SayButton>` inside the same `<Composer>` will share the same queue
+   * Native queue does not support partial cancel, when `cancel` is called, all pending utterances are stopped
+   * If `<Say>` or `<SayButton>` is unmounted, the utterance can be stopped without affecting other pending utterances
+   * Utterance order can be changed on-the-fly
+* Browser quirks
+   * Chrome: if `cancel` and `speak` are called repeatedly, `speak` will appear to succeed (`speaking === true`) but audio is never played (`start` event is never fired)
+   * Safari: when speech is not triggered by user event (e.g. mouse click or tap), the speech will not be played
+      * Workaround: on page load, prime the speech engine by any user events
 
 # Roadmap
 
-* [ ] Prettify playground page
+* [x] Prettify playground page
 
@@ -112,0 +117,0 @@ # Contributions

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Major refactor

Supply chain risk

Package has recently undergone a major refactor. It may be unstable or indicate significant internal changes. Use caution when updating to versions that include significant changes.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

No v1

Quality

Package is not semver >=1. This means it is not stable and does not support ^ ranges.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

97596

increased by95.58%

Dev dependency count

1

decreased by-90.91%

Number of package files

17

increased by70%

Lines of code

994

increased by133.33%

Number of low quality alerts

0

decreased by-100%

Number of lines in readme file

123

increased by4.24%

Worsened metrics

Dependency count

5

increased by66.67%

Number of medium supply chain risk alerts

1

increased byInfinity%

Dependency changes

• + Addedevent-as-promise@^1.0.3

• + Addedmemoize-one@^4.0.0

• + Addedevent-as-promise@1.1.0(transitive)

• + Addedmemoize-one@4.1.0(transitive)