react-say - npm Package Compare versions

Comparing version 0.0.1-master.601b9a7 to 0.0.1-master.66946c4

CHANGELOG.md

@@ -8,3 +8,5 @@ # Changelog
 ## [Unreleased]
+
+## [1.0.0] - 2018-07-09
 ### Added
 - Initial release

lib/Composer.js

@@ -59,14 +59,36 @@ 'use strict';
       var utterance = new speechSynthesisUtterance(text);
+      var targetVoice = void 0;
 
-      var _ref3 = voice || {},
-          voiceURI = _ref3.voiceURI;
+      if (typeof voice === 'function') {
+        targetVoice = voice.call(speechSynthesis, speechSynthesis.getVoices());
+      } else {
+        var _ref3 = voice || {},
+            voiceURI = _ref3.voiceURI;
 
-      utterance.lang = lang;
-      utterance.pitch = pitch;
-      utterance.rate = rate;
-      utterance.voice = voiceURI && [].find.call(speechSynthesis.getVoices(), function (v) {
-        return v.voiceURI === voiceURI;
-      });
-      utterance.volume = volume;
+        targetVoice = voiceURI && [].find.call([].slice.call(speechSynthesis.getVoices()), function (v) {
+          return v.voiceURI === voiceURI;
+        });
+      }
 
+      // Edge will mute if "lang" is set to ""
+      utterance.lang = lang || '';
+
+      if (utterance.pitch || utterance.pitch === 0) {
+        utterance.pitch = pitch;
+      }
+
+      if (utterance.rate || utterance.rate === 0) {
+        utterance.rate = rate;
+      }
+
+      // Cognitive Services will error when "voice" is set to "null"
+      // Edge will error when "voice" is set to "undefined"
+      if (targetVoice) {
+        utterance.voice = targetVoice;
+      }
+
+      if (utterance.volume || utterance.volume === 0) {
+        utterance.volume = volume;
+      }
+
       utterance.onboundary = onBoundary;
@@ -194,5 +216,15 @@ utterance.onend = onEnd;
 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","voiceURI","find","call","getVoices","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","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';\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      const { voiceURI } = voice || {};\n\n      utterance.lang = lang;\n      utterance.pitch = pitch;\n      utterance.rate = rate;\n      utterance.voice = voiceURI && [].find.call(speechSynthesis.getVoices(), v => v.voiceURI === voiceURI);\n      utterance.volume = volume;\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  speechSynthesis: PropTypes.any,\n  speechSynthesisUtterance: PropTypes.any\n};\n"]}
+//# 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":"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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';\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"]}

lib/index.js

@@ -6,7 +6,7 @@ 'use strict';
 });
-exports.SayButton = exports.Say = exports.Context = exports.Composer = undefined;
+exports.SayPrimitive = exports.SayButton = exports.Context = exports.Composer = undefined;
 
-var _BasicSay = require('./BasicSay');
+var _Say = require('./Say');
 
-var _BasicSay2 = _interopRequireDefault(_BasicSay);
+var _Say2 = _interopRequireDefault(_Say);
 
@@ -21,6 +21,2 @@ var _Composer = require('./Composer');
 
-var _Say = require('./Say');
-
-var _Say2 = _interopRequireDefault(_Say);
-
 var _SayButton = require('./SayButton');
@@ -30,9 +26,13 @@
 
+var _SayPrimitive = require('./SayPrimitive');
+
+var _SayPrimitive2 = _interopRequireDefault(_SayPrimitive);
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-exports.default = _BasicSay2.default;
+exports.default = _Say2.default;
 exports.Composer = _Composer2.default;
 exports.Context = _Context2.default;
-exports.Say = _Say2.default;
 exports.SayButton = _SayButton2.default;
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL3NyYy9pbmRleC5qcyJdLCJuYW1lcyI6WyJCYXNpY1NheSIsIkNvbXBvc2VyIiwiQ29udGV4dCIsIlNheSIsIlNheUJ1dHRvbiJdLCJtYXBwaW5ncyI6Ijs7Ozs7OztBQUFBOzs7O0FBQ0E7Ozs7QUFDQTs7OztBQUNBOzs7O0FBQ0E7Ozs7OztrQkFFZUEsa0I7UUFHYkMsUSxHQUFBQSxrQjtRQUNBQyxPLEdBQUFBLGlCO1FBQ0FDLEcsR0FBQUEsYTtRQUNBQyxTLEdBQUFBLG1CIiwiZmlsZSI6ImluZGV4LmpzIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IEJhc2ljU2F5IGZyb20gJy4vQmFzaWNTYXknO1xuaW1wb3J0IENvbXBvc2VyIGZyb20gJy4vQ29tcG9zZXInO1xuaW1wb3J0IENvbnRleHQgZnJvbSAnLi9Db250ZXh0JztcbmltcG9ydCBTYXkgZnJvbSAnLi9TYXknO1xuaW1wb3J0IFNheUJ1dHRvbiBmcm9tICcuL1NheUJ1dHRvbic7XG5cbmV4cG9ydCBkZWZhdWx0IEJhc2ljU2F5XG5cbmV4cG9ydCB7XG4gIENvbXBvc2VyLFxuICBDb250ZXh0LFxuICBTYXksXG4gIFNheUJ1dHRvblxufVxuIl19
+exports.SayPrimitive = _SayPrimitive2.default;
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL3NyYy9pbmRleC5qcyJdLCJuYW1lcyI6WyJTYXkiLCJDb21wb3NlciIsIkNvbnRleHQiLCJTYXlCdXR0b24iLCJTYXlQcmltaXRpdmUiXSwibWFwcGluZ3MiOiI7Ozs7Ozs7QUFBQTs7OztBQUNBOzs7O0FBQ0E7Ozs7QUFDQTs7OztBQUNBOzs7Ozs7a0JBRWVBLGE7UUFHYkMsUSxHQUFBQSxrQjtRQUNBQyxPLEdBQUFBLGlCO1FBQ0FDLFMsR0FBQUEsbUI7UUFDQUMsWSxHQUFBQSxzQiIsImZpbGUiOiJpbmRleC5qcyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCBTYXkgZnJvbSAnLi9TYXknO1xuaW1wb3J0IENvbXBvc2VyIGZyb20gJy4vQ29tcG9zZXInO1xuaW1wb3J0IENvbnRleHQgZnJvbSAnLi9Db250ZXh0JztcbmltcG9ydCBTYXlCdXR0b24gZnJvbSAnLi9TYXlCdXR0b24nO1xuaW1wb3J0IFNheVByaW1pdGl2ZSBmcm9tICcuL1NheVByaW1pdGl2ZSc7XG5cbmV4cG9ydCBkZWZhdWx0IFNheVxuXG5leHBvcnQge1xuICBDb21wb3NlcixcbiAgQ29udGV4dCxcbiAgU2F5QnV0dG9uLFxuICBTYXlQcmltaXRpdmVcbn1cbiJdfQ==

lib/Say.js

@@ -7,4 +7,2 @@ '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 _propTypes = require('prop-types');
@@ -18,64 +16,45 @@
 
-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 _SayPrimitive = require('./SayPrimitive');
 
-function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+var _SayPrimitive2 = _interopRequireDefault(_SayPrimitive);
 
-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 _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-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 Say = function Say(props) {
+  return _react2.default.createElement(
+    _Composer2.default,
+    {
+      speechSynthesis: props.speechSynthesis,
+      speechSynthesisUtterance: props.speechSynthesisUtterance
+    },
+    _react2.default.createElement(
+      _SayPrimitive2.default,
+      {
+        lang: props.lang,
+        onBoundary: props.onBoundary,
+        onEnd: props.onEnd,
+        onError: props.onError,
+        onStart: props.onStart,
+        pitch: props.pitch,
+        rate: props.rate,
+        speak: props.speak,
+        voice: props.voice,
+        volume: props.volume
+      },
+      props.children
+    )
+  );
+};
 
-var Say = function (_React$Component) {
-  _inherits(Say, _React$Component);
+Say.defaultProps = {
+  speechSynthesis: window.speechSynthesis || window.webkitSpeechSynthesis,
+  speechSynthesisUtterance: window.SpeechSynthesisUtterance || window.webkitSpeechSynthesisUtterance
+};
 
-  function Say() {
-    _classCallCheck(this, Say);
-
-    return _possibleConstructorReturn(this, (Say.__proto__ || Object.getPrototypeOf(Say)).apply(this, arguments));
-  }
-
-  _createClass(Say, [{
-    key: 'shouldComponentUpdate',
-    value: function shouldComponentUpdate(nextProps) {
-      return nextProps.text !== this.props.text;
-    }
-  }, {
-    key: 'render',
-    value: function render() {
-      var _props = this.props,
-          lang = _props.lang,
-          onBoundary = _props.onBoundary,
-          onEnd = _props.onEnd,
-          onError = _props.onError,
-          onStart = _props.onStart,
-          pitch = _props.pitch,
-          rate = _props.rate,
-          text = _props.text,
-          voice = _props.voice,
-          volume = _props.volume;
-
-
-      return _react2.default.createElement(
-        _Context2.default.Consumer,
-        null,
-        function (context) {
-          return context.speak({ lang: lang, onBoundary: onBoundary, onEnd: onEnd, onError: onError, onStart: onStart, pitch: pitch, rate: rate, text: text, voice: voice, volume: volume });
-        }
-      );
-    }
-  }]);
-
-  return Say;
-}(_react2.default.Component);
-
-exports.default = Say;
-
-
 Say.propTypes = {
   lang: _propTypes2.default.string,
-  pitch: _propTypes2.default.number,
-  rate: _propTypes2.default.number,
   onBoundary: _propTypes2.default.func,
@@ -85,6 +64,12 @@ onEnd: _propTypes2.default.func,
   onStart: _propTypes2.default.func,
-  text: _propTypes2.default.string,
-  voice: _propTypes2.default.any,
+  pitch: _propTypes2.default.number,
+  rate: _propTypes2.default.number,
+  speechSynthesis: _propTypes2.default.any,
+  speechSynthesisUtterance: _propTypes2.default.any,
+  speak: _propTypes2.default.string,
+  voice: _propTypes2.default.oneOfType([_propTypes2.default.any, _propTypes2.default.func]),
   volume: _propTypes2.default.number
 };
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL3NyYy9TYXkuanMiXSwibmFtZXMiOlsiU2F5IiwibmV4dFByb3BzIiwidGV4dCIsInByb3BzIiwibGFuZyIsIm9uQm91bmRhcnkiLCJvbkVuZCIsIm9uRXJyb3IiLCJvblN0YXJ0IiwicGl0Y2giLCJyYXRlIiwidm9pY2UiLCJ2b2x1bWUiLCJjb250ZXh0Iiwic3BlYWsiLCJSZWFjdCIsIkNvbXBvbmVudCIsInByb3BUeXBlcyIsIlByb3BUeXBlcyIsInN0cmluZyIsIm51bWJlciIsImZ1bmMiLCJhbnkiXSwibWFwcGluZ3MiOiI7Ozs7Ozs7O0FBQUE7Ozs7QUFDQTs7OztBQUVBOzs7Ozs7Ozs7Ozs7SUFFcUJBLEc7Ozs7Ozs7Ozs7OzBDQUNHQyxTLEVBQVc7QUFDL0IsYUFBT0EsVUFBVUMsSUFBVixLQUFtQixLQUFLQyxLQUFMLENBQVdELElBQXJDO0FBQ0Q7Ozs2QkFFUTtBQUFBLG1CQUNpRixLQUFLQyxLQUR0RjtBQUFBLFVBQ0NDLElBREQsVUFDQ0EsSUFERDtBQUFBLFVBQ09DLFVBRFAsVUFDT0EsVUFEUDtBQUFBLFVBQ21CQyxLQURuQixVQUNtQkEsS0FEbkI7QUFBQSxVQUMwQkMsT0FEMUIsVUFDMEJBLE9BRDFCO0FBQUEsVUFDbUNDLE9BRG5DLFVBQ21DQSxPQURuQztBQUFBLFVBQzRDQyxLQUQ1QyxVQUM0Q0EsS0FENUM7QUFBQSxVQUNtREMsSUFEbkQsVUFDbURBLElBRG5EO0FBQUEsVUFDeURSLElBRHpELFVBQ3lEQSxJQUR6RDtBQUFBLFVBQytEUyxLQUQvRCxVQUMrREEsS0FEL0Q7QUFBQSxVQUNzRUMsTUFEdEUsVUFDc0VBLE1BRHRFOzs7QUFHUCxhQUNFO0FBQUMseUJBQUQsQ0FBUyxRQUFUO0FBQUE7QUFDSTtBQUFBLGlCQUFXQyxRQUFRQyxLQUFSLENBQWMsRUFBRVYsVUFBRixFQUFRQyxzQkFBUixFQUFvQkMsWUFBcEIsRUFBMkJDLGdCQUEzQixFQUFvQ0MsZ0JBQXBDLEVBQTZDQyxZQUE3QyxFQUFvREMsVUFBcEQsRUFBMERSLFVBQTFELEVBQWdFUyxZQUFoRSxFQUF1RUMsY0FBdkUsRUFBZCxDQUFYO0FBQUE7QUFESixPQURGO0FBS0Q7Ozs7RUFiOEJHLGdCQUFNQyxTOztrQkFBbEJoQixHOzs7QUFnQnJCQSxJQUFJaUIsU0FBSixHQUFnQjtBQUNkYixRQUFNYyxvQkFBVUMsTUFERjtBQUVkVixTQUFPUyxvQkFBVUUsTUFGSDtBQUdkVixRQUFNUSxvQkFBVUUsTUFIRjtBQUlkZixjQUFZYSxvQkFBVUcsSUFKUjtBQUtkZixTQUFPWSxvQkFBVUcsSUFMSDtBQU1kZCxXQUFTVyxvQkFBVUcsSUFOTDtBQU9kYixXQUFTVSxvQkFBVUcsSUFQTDtBQVFkbkIsUUFBTWdCLG9CQUFVQyxNQVJGO0FBU2RSLFNBQU9PLG9CQUFVSSxHQVRIO0FBVWRWLFVBQVFNLG9CQUFVRTtBQVZKLENBQWhCIiwiZmlsZSI6IlNheS5qcyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCBQcm9wVHlwZXMgZnJvbSAncHJvcC10eXBlcyc7XG5pbXBvcnQgUmVhY3QgZnJvbSAncmVhY3QnO1xuXG5pbXBvcnQgQ29udGV4dCBmcm9tICcuL0NvbnRleHQnO1xuXG5leHBvcnQgZGVmYXVsdCBjbGFzcyBTYXkgZXh0ZW5kcyBSZWFjdC5Db21wb25lbnQge1xuICBzaG91bGRDb21wb25lbnRVcGRhdGUobmV4dFByb3BzKSB7XG4gICAgcmV0dXJuIG5leHRQcm9wcy50ZXh0ICE9PSB0aGlzLnByb3BzLnRleHQ7XG4gIH1cblxuICByZW5kZXIoKSB7XG4gICAgY29uc3QgeyBsYW5nLCBvbkJvdW5kYXJ5LCBvbkVuZCwgb25FcnJvciwgb25TdGFydCwgcGl0Y2gsIHJhdGUsIHRleHQsIHZvaWNlLCB2b2x1bWUgfSA9IHRoaXMucHJvcHM7XG5cbiAgICByZXR1cm4gKFxuICAgICAgPENvbnRleHQuQ29uc3VtZXI+XG4gICAgICAgIHsgY29udGV4dCA9PiBjb250ZXh0LnNwZWFrKHsgbGFuZywgb25Cb3VuZGFyeSwgb25FbmQsIG9uRXJyb3IsIG9uU3RhcnQsIHBpdGNoLCByYXRlLCB0ZXh0LCB2b2ljZSwgdm9sdW1lIH0pIH1cbiAgICAgIDwvQ29udGV4dC5Db25zdW1lcj5cbiAgICApO1xuICB9XG59XG5cblNheS5wcm9wVHlwZXMgPSB7XG4gIGxhbmc6IFByb3BUeXBlcy5zdHJpbmcsXG4gIHBpdGNoOiBQcm9wVHlwZXMubnVtYmVyLFxuICByYXRlOiBQcm9wVHlwZXMubnVtYmVyLFxuICBvbkJvdW5kYXJ5OiBQcm9wVHlwZXMuZnVuYyxcbiAgb25FbmQ6IFByb3BUeXBlcy5mdW5jLFxuICBvbkVycm9yOiBQcm9wVHlwZXMuZnVuYyxcbiAgb25TdGFydDogUHJvcFR5cGVzLmZ1bmMsXG4gIHRleHQ6IFByb3BUeXBlcy5zdHJpbmcsXG4gIHZvaWNlOiBQcm9wVHlwZXMuYW55LFxuICB2b2x1bWU6IFByb3BUeXBlcy5udW1iZXJcbn07XG4iXX0=
+
+exports.default = Say;
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL3NyYy9TYXkuanMiXSwibmFtZXMiOlsiU2F5IiwicHJvcHMiLCJzcGVlY2hTeW50aGVzaXMiLCJzcGVlY2hTeW50aGVzaXNVdHRlcmFuY2UiLCJsYW5nIiwib25Cb3VuZGFyeSIsIm9uRW5kIiwib25FcnJvciIsIm9uU3RhcnQiLCJwaXRjaCIsInJhdGUiLCJzcGVhayIsInZvaWNlIiwidm9sdW1lIiwiY2hpbGRyZW4iLCJkZWZhdWx0UHJvcHMiLCJ3aW5kb3ciLCJ3ZWJraXRTcGVlY2hTeW50aGVzaXMiLCJTcGVlY2hTeW50aGVzaXNVdHRlcmFuY2UiLCJ3ZWJraXRTcGVlY2hTeW50aGVzaXNVdHRlcmFuY2UiLCJwcm9wVHlwZXMiLCJQcm9wVHlwZXMiLCJzdHJpbmciLCJmdW5jIiwibnVtYmVyIiwiYW55Iiwib25lT2ZUeXBlIl0sIm1hcHBpbmdzIjoiOzs7Ozs7QUFBQTs7OztBQUNBOzs7O0FBRUE7Ozs7QUFDQTs7Ozs7O0FBRUEsSUFBTUEsTUFBTSxTQUFOQSxHQUFNO0FBQUEsU0FDVjtBQUFDLHNCQUFEO0FBQUE7QUFDRSx1QkFBa0JDLE1BQU1DLGVBRDFCO0FBRUUsZ0NBQTJCRCxNQUFNRTtBQUZuQztBQUlFO0FBQUMsNEJBQUQ7QUFBQTtBQUNFLGNBQU9GLE1BQU1HLElBRGY7QUFFRSxvQkFBYUgsTUFBTUksVUFGckI7QUFHRSxlQUFRSixNQUFNSyxLQUhoQjtBQUlFLGlCQUFVTCxNQUFNTSxPQUpsQjtBQUtFLGlCQUFVTixNQUFNTyxPQUxsQjtBQU1FLGVBQVFQLE1BQU1RLEtBTmhCO0FBT0UsY0FBT1IsTUFBTVMsSUFQZjtBQVFFLGVBQVFULE1BQU1VLEtBUmhCO0FBU0UsZUFBUVYsTUFBTVcsS0FUaEI7QUFVRSxnQkFBU1gsTUFBTVk7QUFWakI7QUFZSVosWUFBTWE7QUFaVjtBQUpGLEdBRFU7QUFBQSxDQUFaOztBQXFCQWQsSUFBSWUsWUFBSixHQUFtQjtBQUNqQmIsbUJBQWlCYyxPQUFPZCxlQUFQLElBQTBCYyxPQUFPQyxxQkFEakM7QUFFakJkLDRCQUEwQmEsT0FBT0Usd0JBQVAsSUFBbUNGLE9BQU9HO0FBRm5ELENBQW5COztBQUtBbkIsSUFBSW9CLFNBQUosR0FBZ0I7QUFDZGhCLFFBQU1pQixvQkFBVUMsTUFERjtBQUVkakIsY0FBWWdCLG9CQUFVRSxJQUZSO0FBR2RqQixTQUFPZSxvQkFBVUUsSUFISDtBQUlkaEIsV0FBU2Msb0JBQVVFLElBSkw7QUFLZGYsV0FBU2Esb0JBQVVFLElBTEw7QUFNZGQsU0FBT1ksb0JBQVVHLE1BTkg7QUFPZGQsUUFBTVcsb0JBQVVHLE1BUEY7QUFRZHRCLG1CQUFpQm1CLG9CQUFVSSxHQVJiO0FBU2R0Qiw0QkFBMEJrQixvQkFBVUksR0FUdEI7QUFVZGQsU0FBT1Usb0JBQVVDLE1BVkg7QUFXZFYsU0FBT1Msb0JBQVVLLFNBQVYsQ0FBb0IsQ0FBQ0wsb0JBQVVJLEdBQVgsRUFBZ0JKLG9CQUFVRSxJQUExQixDQUFwQixDQVhPO0FBWWRWLFVBQVFRLG9CQUFVRztBQVpKLENBQWhCOztrQkFlZXhCLEciLCJmaWxlIjoiU2F5LmpzIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IFByb3BUeXBlcyBmcm9tICdwcm9wLXR5cGVzJztcbmltcG9ydCBSZWFjdCBmcm9tICdyZWFjdCc7XG5cbmltcG9ydCBDb21wb3NlciBmcm9tICcuL0NvbXBvc2VyJztcbmltcG9ydCBTYXlQcmltaXRpdmUgZnJvbSAnLi9TYXlQcmltaXRpdmUnO1xuXG5jb25zdCBTYXkgPSBwcm9wcyA9PlxuICA8Q29tcG9zZXJcbiAgICBzcGVlY2hTeW50aGVzaXM9eyBwcm9wcy5zcGVlY2hTeW50aGVzaXMgfVxuICAgIHNwZWVjaFN5bnRoZXNpc1V0dGVyYW5jZT17IHByb3BzLnNwZWVjaFN5bnRoZXNpc1V0dGVyYW5jZSB9XG4gID5cbiAgICA8U2F5UHJpbWl0aXZlXG4gICAgICBsYW5nPXsgcHJvcHMubGFuZyB9XG4gICAgICBvbkJvdW5kYXJ5PXsgcHJvcHMub25Cb3VuZGFyeSB9XG4gICAgICBvbkVuZD17IHByb3BzLm9uRW5kIH1cbiAgICAgIG9uRXJyb3I9eyBwcm9wcy5vbkVycm9yIH1cbiAgICAgIG9uU3RhcnQ9eyBwcm9wcy5vblN0YXJ0IH1cbiAgICAgIHBpdGNoPXsgcHJvcHMucGl0Y2ggfVxuICAgICAgcmF0ZT17IHByb3BzLnJhdGUgfVxuICAgICAgc3BlYWs9eyBwcm9wcy5zcGVhayB9XG4gICAgICB2b2ljZT17IHByb3BzLnZvaWNlIH1cbiAgICAgIHZvbHVtZT17IHByb3BzLnZvbHVtZSB9XG4gICAgPlxuICAgICAgeyBwcm9wcy5jaGlsZHJlbiB9XG4gICAgPC9TYXlQcmltaXRpdmU+XG4gIDwvQ29tcG9zZXI+XG5cblNheS5kZWZhdWx0UHJvcHMgPSB7XG4gIHNwZWVjaFN5bnRoZXNpczogd2luZG93LnNwZWVjaFN5bnRoZXNpcyB8fCB3aW5kb3cud2Via2l0U3BlZWNoU3ludGhlc2lzLFxuICBzcGVlY2hTeW50aGVzaXNVdHRlcmFuY2U6IHdpbmRvdy5TcGVlY2hTeW50aGVzaXNVdHRlcmFuY2UgfHwgd2luZG93LndlYmtpdFNwZWVjaFN5bnRoZXNpc1V0dGVyYW5jZVxufTtcblxuU2F5LnByb3BUeXBlcyA9IHtcbiAgbGFuZzogUHJvcFR5cGVzLnN0cmluZyxcbiAgb25Cb3VuZGFyeTogUHJvcFR5cGVzLmZ1bmMsXG4gIG9uRW5kOiBQcm9wVHlwZXMuZnVuYyxcbiAgb25FcnJvcjogUHJvcFR5cGVzLmZ1bmMsXG4gIG9uU3RhcnQ6IFByb3BUeXBlcy5mdW5jLFxuICBwaXRjaDogUHJvcFR5cGVzLm51bWJlcixcbiAgcmF0ZTogUHJvcFR5cGVzLm51bWJlcixcbiAgc3BlZWNoU3ludGhlc2lzOiBQcm9wVHlwZXMuYW55LFxuICBzcGVlY2hTeW50aGVzaXNVdHRlcmFuY2U6IFByb3BUeXBlcy5hbnksXG4gIHNwZWFrOiBQcm9wVHlwZXMuc3RyaW5nLFxuICB2b2ljZTogUHJvcFR5cGVzLm9uZU9mVHlwZShbUHJvcFR5cGVzLmFueSwgUHJvcFR5cGVzLmZ1bmNdKSxcbiAgdm9sdW1lOiBQcm9wVHlwZXMubnVtYmVyXG59O1xuXG5leHBvcnQgZGVmYXVsdCBTYXlcbiJdfQ==

lib/SayButton.js

@@ -7,2 +7,6 @@ 'use strict';
 
+var _propTypes = require('prop-types');
+
+var _propTypes2 = _interopRequireDefault(_propTypes);
+
 var _react = require('react');
@@ -18,3 +22,3 @@
 
-exports.default = function (props) {
+var SayButton = function SayButton(props) {
   return _react2.default.createElement(
@@ -29,5 +33,9 @@ _Context2.default.Consumer,
               lang: props.lang,
+              onBoundary: props.onBoundary,
+              onEnd: props.onEnd,
+              onError: props.onError,
+              onStart: props.onStart,
               pitch: props.pitch,
               rate: props.rate,
-              text: props.text,
+              text: props.speak,
               voice: props.voice,
@@ -43,2 +51,17 @@ volume: props.volume
 };
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL3NyYy9TYXlCdXR0b24uanMiXSwibmFtZXMiOlsiY29udGV4dCIsInNwZWFrIiwibGFuZyIsInByb3BzIiwicGl0Y2giLCJyYXRlIiwidGV4dCIsInZvaWNlIiwidm9sdW1lIiwib25DbGljayIsImV2ZW50IiwiY2hpbGRyZW4iXSwibWFwcGluZ3MiOiI7Ozs7OztBQUFBOzs7O0FBRUE7Ozs7OztrQkFFZTtBQUFBLFNBQ2I7QUFBQyxxQkFBRCxDQUFTLFFBQVQ7QUFBQTtBQUNJO0FBQUEsYUFDQTtBQUFBO0FBQUEsVUFBUSxTQUFVLHdCQUFTO0FBQ3pCQSxvQkFBUUMsS0FBUixDQUFjO0FBQ1pDLG9CQUFNQyxNQUFNRCxJQURBO0FBRVpFLHFCQUFPRCxNQUFNQyxLQUZEO0FBR1pDLG9CQUFNRixNQUFNRSxJQUhBO0FBSVpDLG9CQUFNSCxNQUFNRyxJQUpBO0FBS1pDLHFCQUFPSixNQUFNSSxLQUxEO0FBTVpDLHNCQUFRTCxNQUFNSztBQU5GLGFBQWQ7QUFRQUwsa0JBQU1NLE9BQU4sSUFBaUJOLE1BQU1NLE9BQU4sQ0FBY0MsS0FBZCxDQUFqQjtBQUNELFdBVkQ7QUFXSVAsY0FBTVE7QUFYVixPQURBO0FBQUE7QUFESixHQURhO0FBQUEsQyIsImZpbGUiOiJTYXlCdXR0b24uanMiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgUmVhY3QgZnJvbSAncmVhY3QnO1xuXG5pbXBvcnQgQ29udGV4dCBmcm9tICcuL0NvbnRleHQnO1xuXG5leHBvcnQgZGVmYXVsdCBwcm9wcyA9PlxuICA8Q29udGV4dC5Db25zdW1lcj5cbiAgICB7IGNvbnRleHQgPT5cbiAgICAgIDxidXR0b24gb25DbGljaz17IGV2ZW50ID0+IHtcbiAgICAgICAgY29udGV4dC5zcGVhayh7XG4gICAgICAgICAgbGFuZzogcHJvcHMubGFuZyxcbiAgICAgICAgICBwaXRjaDogcHJvcHMucGl0Y2gsXG4gICAgICAgICAgcmF0ZTogcHJvcHMucmF0ZSxcbiAgICAgICAgICB0ZXh0OiBwcm9wcy50ZXh0LFxuICAgICAgICAgIHZvaWNlOiBwcm9wcy52b2ljZSxcbiAgICAgICAgICB2b2x1bWU6IHByb3BzLnZvbHVtZVxuICAgICAgICB9KTtcbiAgICAgICAgcHJvcHMub25DbGljayAmJiBwcm9wcy5vbkNsaWNrKGV2ZW50KTtcbiAgICAgIH0gfT5cbiAgICAgICAgeyBwcm9wcy5jaGlsZHJlbiB9XG4gICAgICA8L2J1dHRvbj5cbiAgICB9XG4gIDwvQ29udGV4dC5Db25zdW1lcj5cbiJdfQ==
+
+SayButton.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,
+  speak: _propTypes2.default.string,
+  voice: _propTypes2.default.oneOfType([_propTypes2.default.any, _propTypes2.default.func]),
+  volume: _propTypes2.default.number
+};
+
+exports.default = SayButton;
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL3NyYy9TYXlCdXR0b24uanMiXSwibmFtZXMiOlsiU2F5QnV0dG9uIiwiY29udGV4dCIsInNwZWFrIiwibGFuZyIsInByb3BzIiwib25Cb3VuZGFyeSIsIm9uRW5kIiwib25FcnJvciIsIm9uU3RhcnQiLCJwaXRjaCIsInJhdGUiLCJ0ZXh0Iiwidm9pY2UiLCJ2b2x1bWUiLCJvbkNsaWNrIiwiZXZlbnQiLCJjaGlsZHJlbiIsInByb3BUeXBlcyIsIlByb3BUeXBlcyIsInN0cmluZyIsImZ1bmMiLCJudW1iZXIiLCJvbmVPZlR5cGUiLCJhbnkiXSwibWFwcGluZ3MiOiI7Ozs7OztBQUFBOzs7O0FBQ0E7Ozs7QUFFQTs7Ozs7O0FBRUEsSUFBTUEsWUFBWSxTQUFaQSxTQUFZO0FBQUEsU0FDaEI7QUFBQyxxQkFBRCxDQUFTLFFBQVQ7QUFBQTtBQUNJO0FBQUEsYUFDQTtBQUFBO0FBQUEsVUFBUSxTQUFVLHdCQUFTO0FBQ3pCQyxvQkFBUUMsS0FBUixDQUFjO0FBQ1pDLG9CQUFNQyxNQUFNRCxJQURBO0FBRVpFLDBCQUFZRCxNQUFNQyxVQUZOO0FBR1pDLHFCQUFPRixNQUFNRSxLQUhEO0FBSVpDLHVCQUFTSCxNQUFNRyxPQUpIO0FBS1pDLHVCQUFTSixNQUFNSSxPQUxIO0FBTVpDLHFCQUFPTCxNQUFNSyxLQU5EO0FBT1pDLG9CQUFNTixNQUFNTSxJQVBBO0FBUVpDLG9CQUFNUCxNQUFNRixLQVJBO0FBU1pVLHFCQUFPUixNQUFNUSxLQVREO0FBVVpDLHNCQUFRVCxNQUFNUztBQVZGLGFBQWQ7QUFZQVQsa0JBQU1VLE9BQU4sSUFBaUJWLE1BQU1VLE9BQU4sQ0FBY0MsS0FBZCxDQUFqQjtBQUNELFdBZEQ7QUFlSVgsY0FBTVk7QUFmVixPQURBO0FBQUE7QUFESixHQURnQjtBQUFBLENBQWxCOztBQXVCQWhCLFVBQVVpQixTQUFWLEdBQXNCO0FBQ3BCZCxRQUFNZSxvQkFBVUMsTUFESTtBQUVwQmQsY0FBWWEsb0JBQVVFLElBRkY7QUFHcEJkLFNBQU9ZLG9CQUFVRSxJQUhHO0FBSXBCYixXQUFTVyxvQkFBVUUsSUFKQztBQUtwQlosV0FBU1Usb0JBQVVFLElBTEM7QUFNcEJYLFNBQU9TLG9CQUFVRyxNQU5HO0FBT3BCWCxRQUFNUSxvQkFBVUcsTUFQSTtBQVFwQm5CLFNBQU9nQixvQkFBVUMsTUFSRztBQVNwQlAsU0FBT00sb0JBQVVJLFNBQVYsQ0FBb0IsQ0FBQ0osb0JBQVVLLEdBQVgsRUFBZ0JMLG9CQUFVRSxJQUExQixDQUFwQixDQVRhO0FBVXBCUCxVQUFRSyxvQkFBVUc7QUFWRSxDQUF0Qjs7a0JBYWVyQixTIiwiZmlsZSI6IlNheUJ1dHRvbi5qcyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCBQcm9wVHlwZXMgZnJvbSAncHJvcC10eXBlcyc7XG5pbXBvcnQgUmVhY3QgZnJvbSAncmVhY3QnO1xuXG5pbXBvcnQgQ29udGV4dCBmcm9tICcuL0NvbnRleHQnO1xuXG5jb25zdCBTYXlCdXR0b24gPSBwcm9wcyA9PlxuICA8Q29udGV4dC5Db25zdW1lcj5cbiAgICB7IGNvbnRleHQgPT5cbiAgICAgIDxidXR0b24gb25DbGljaz17IGV2ZW50ID0+IHtcbiAgICAgICAgY29udGV4dC5zcGVhayh7XG4gICAgICAgICAgbGFuZzogcHJvcHMubGFuZyxcbiAgICAgICAgICBvbkJvdW5kYXJ5OiBwcm9wcy5vbkJvdW5kYXJ5LFxuICAgICAgICAgIG9uRW5kOiBwcm9wcy5vbkVuZCxcbiAgICAgICAgICBvbkVycm9yOiBwcm9wcy5vbkVycm9yLFxuICAgICAgICAgIG9uU3RhcnQ6IHByb3BzLm9uU3RhcnQsXG4gICAgICAgICAgcGl0Y2g6IHByb3BzLnBpdGNoLFxuICAgICAgICAgIHJhdGU6IHByb3BzLnJhdGUsXG4gICAgICAgICAgdGV4dDogcHJvcHMuc3BlYWssXG4gICAgICAgICAgdm9pY2U6IHByb3BzLnZvaWNlLFxuICAgICAgICAgIHZvbHVtZTogcHJvcHMudm9sdW1lXG4gICAgICAgIH0pO1xuICAgICAgICBwcm9wcy5vbkNsaWNrICYmIHByb3BzLm9uQ2xpY2soZXZlbnQpO1xuICAgICAgfSB9PlxuICAgICAgICB7IHByb3BzLmNoaWxkcmVuIH1cbiAgICAgIDwvYnV0dG9uPlxuICAgIH1cbiAgPC9Db250ZXh0LkNvbnN1bWVyPlxuXG5TYXlCdXR0b24ucHJvcFR5cGVzID0ge1xuICBsYW5nOiBQcm9wVHlwZXMuc3RyaW5nLFxuICBvbkJvdW5kYXJ5OiBQcm9wVHlwZXMuZnVuYyxcbiAgb25FbmQ6IFByb3BUeXBlcy5mdW5jLFxuICBvbkVycm9yOiBQcm9wVHlwZXMuZnVuYyxcbiAgb25TdGFydDogUHJvcFR5cGVzLmZ1bmMsXG4gIHBpdGNoOiBQcm9wVHlwZXMubnVtYmVyLFxuICByYXRlOiBQcm9wVHlwZXMubnVtYmVyLFxuICBzcGVhazogUHJvcFR5cGVzLnN0cmluZyxcbiAgdm9pY2U6IFByb3BUeXBlcy5vbmVPZlR5cGUoW1Byb3BUeXBlcy5hbnksIFByb3BUeXBlcy5mdW5jXSksXG4gIHZvbHVtZTogUHJvcFR5cGVzLm51bWJlclxufTtcblxuZXhwb3J0IGRlZmF1bHQgU2F5QnV0dG9uO1xuIl19

package.json

 {
   "name": "react-say",
-  "version": "0.0.1-master.601b9a7",
+  "version": "0.0.1-master.66946c4",
   "description": "A React component that synthesis text into speech using Web Speech API",
@@ -5,0 +5,0 @@ "keywords": [],

README.md

@@ -22,25 +22,22 @@ # react-say
 ```jsx
-import BasicSay from 'react-say';
+import Say from 'react-say';
 
 export default props =>
-  <BasicSay
-    text="A quick brown fox jumped over the lazy dogs."
-  />
+  <Say speak="A quick brown fox jumped over the lazy dogs." />
 ```
 
-## Customizing pitch/rate
+## Customizing pitch/rate/volume
 
-You may want to customize the speech by varying pitch and rate. You can use `<Composer>` and `<Say>` to say your text.
+You may want to customize the speech by varying pitch, rate, and volume. You can use `<Composer>` and `<Say>` to say your text.
 
 ```jsx
-import { Composer, Say } from 'react-say';
+import Say from 'react-say';
 
 export default props =>
-  <Composer>
-    <Say
-      pitch={ 1.1 }
-      rate={ 1.5 }
-      text="A quick brown fox jumped over the lazy dogs."
-    />
-  </Composer>
+  <Say
+    pitch={ 1.1 }
+    rate={ 1.5 }
+    speak="A quick brown fox jumped over the lazy dogs."
+    volume={ .8 }
+  />
 ```
@@ -52,18 +49,66 @@
 
-Since some browsers may block speak synthesis before the user interacting with the page, you can use `<SayButton>` for the purpose.
+You may want to say something after the user interacted with the page, for example, after clicking on a button. We have built `<SayButton>` that speak immediately after clicking on it. Some browsers may requires "priming" with a button.
 
 ```jsx
-import { Composer, SayButton } from 'react-say';
+import { SayButton } from 'react-say';
 
 export default props =>
-  <Composer>
-    <SayButton
-      onClick={ event => console.log(event) }
-      text="A quick brown fox jumped over the lazy dogs."
-    >
-      Tell me a story
-    </SayButton>
-  </Composer>
+  <SayButton
+    onClick={ event => console.log(event) }
+    speak="A quick brown fox jumped over the lazy dogs."
+  >
+    Tell me a story
+  </SayButton>
 ```
 
+## Selecting voice
+
+Instead of passing a `SpeechSynthesisVoice` object, you can pass a function `(voices: SpeechSynthesisVoice[]) => SpeechSynthesisVoice` to select the voice just before the text is synthesized.
+
+```jsx
+import Say from 'react-say';
+
+export default props =>
+  <Say
+    speak="A quick brown fox jumped over the lazy dogs."
+    voice={ voices => [].find.call(voices, v => v.lang === 'zh-HK') }
+  />
+```
+
+> Note: it also works with `<SayButton>`.
+
+## Bring your own `SpeechSynthesis`
+
+You can bring your own `window.speechSynthesis` and `window.speechSynthesisUtterance` for custom speech synthesis. For example, you can bring Azure Cognitive Services thru [`web-speech-cognitive-services`](https://npmjs.com/package/web-speech-cognitive-services') package.
+
+```jsx
+import Say from 'react-say';
+import { speechSynthesis, SpeechSynthesisUtterance, SubscriptionKey } from 'web-speech-cognitive-services';
+
+// You will need to wait until the speech token has been exchanged
+// The part has been omitted for code clarity
+speechSynthesis.speechToken = new SubscriptionKey('your subscription key');
+
+export default props =>
+  <Say
+    speak="A quick brown fox jumped over the lazy dogs."
+    speechSynthesis={ speechSynthesis }
+    speechSynthesisUtterance={ SpeechSynthesisUtterance }
+    voice={ voices => [].find.call(voices, v => v.lang === 'zh-HK') }
+  />
+```
+
+> Note: `speechSynthesis` is camel-casing because it is an instance.
+
+# Caveats
+
+* 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
+
+# Roadmap
+
+* [ ] Prettify playground page
+
 # Contributions
@@ -70,0 +115,0 @@

New alerts

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

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

Improved metrics

Total package byte prevSize

49811

29.78%

Lines of code

426

23.48%

Number of lines in readme file

119

60.81%

No dependency changes