@lls/lls-audio 0.0.30 → 0.0.32

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lls/lls-audio",
-  "version": "0.0.30",
+  "version": "0.0.32",
   "main": "index.js",
   "devDependencies": {
     "@kadira/storybook": "^2.21.0",

package/player/Audio.js

@@ -79,6 +79,12 @@ var Player = function (_Component) {
     };
 
     _this.onPlay = function () {
+      var _this$state$currentRa = _this.state.currentRange,
+          startTime = _this$state$currentRa.startTime,
+          endTime = _this$state$currentRa.endTime;
+      var currentTime = _this.refs.player.currentTime;
+
+      if (currentTime >= endTime) _this.setCurrentTime(startTime);
       _this.setStateWithCallback({ play: true }, function () {
         return _this.watchAudioUpdate();
       });
@@ -188,10 +194,13 @@ var Player = function (_Component) {
 
       // check if current time is in the middle of current range
 
-      if (currentTime > endTime || currentTime < startTime) {
+      if (currentTime < startTime) {
         this.setCurrentTime(startTime);
         if (!loop) this.pause();
         return startTime;
+      } else if (currentTime > endTime) {
+        if (!loop) this.pause();
+        return endTime;
       }
       return currentTime;
     }

package/player/Speed.js

@@ -6,6 +6,8 @@ Object.defineProperty(exports, "__esModule", {
 
 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 _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 _react = require('react');
 
 var _react2 = _interopRequireDefault(_react);
@@ -22,19 +24,19 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
+function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+
+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 _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 styles = _aphrodite.StyleSheet.create({
-  speed_menu: {
-    ':hover .Speed_menu_menu': {
-      display: 'flex'
-    }
-  },
   current: {
     color: _colors.BLUE
   },
   menu: {
     cursor: 'pointer',
     position: 'absolute',
-    display: 'none',
     flexDirection: 'column',
     top: -84,
     boxShadow: '0 0 3px rgba(0, 0, 0, 0.5)',
@@ -59,39 +61,71 @@ var styles = _aphrodite.StyleSheet.create({
   }
 });
 
-var getIcons = function getIcons(onSpeedChange) {
+var getIcons = function getIcons(onSpeedChange, cb) {
   return {
     1: _react2.default.createElement(_llsIcons2.default, { key: '1', onClick: function onClick() {
-        return onSpeedChange(1);
+        onSpeedChange(1);cb();
       }, className: (0, _aphrodite.css)(styles.icon), name: 'btn_audio_player_vitesse_normal' }),
     1.25: _react2.default.createElement(_llsIcons2.default, { key: '1.25', onClick: function onClick() {
-        return onSpeedChange(1.25);
+        onSpeedChange(1.25);cb();
       }, className: (0, _aphrodite.css)(styles.icon), name: 'btn_audio_player_vitesse_speed' }),
     0.75: _react2.default.createElement(_llsIcons2.default, { key: '0.75', onClick: function onClick() {
-        return onSpeedChange(0.75);
+        onSpeedChange(0.75);cb();
       }, className: (0, _aphrodite.css)(styles.icon), name: 'btn_audio_player_vitesse_lent' })
   };
 };
 
-var Speed = function Speed(_ref) {
-  var speed = _ref.speed,
-      onSpeedChange = _ref.onSpeedChange;
-
-  var icons = getIcons(onSpeedChange);
-  return _react2.default.createElement(
-    'div',
-    { className: 'Speed_menu ' + (0, _aphrodite.css)(styles.speed_menu) },
-    _react2.default.createElement(
-      'div',
-      { className: 'Speed_menu_menu ' + (0, _aphrodite.css)(styles.menu) },
-      Object.values(_extends({}, icons, _defineProperty({}, speed, null)))
-    ),
-    _react2.default.createElement(
-      'div',
-      { className: 'Speed_menu_current ' + (0, _aphrodite.css)(styles.current) },
-      icons[speed]
-    )
-  );
-};
+var Speed = function (_Component) {
+  _inherits(Speed, _Component);
+
+  function Speed(props) {
+    _classCallCheck(this, Speed);
+
+    var _this = _possibleConstructorReturn(this, (Speed.__proto__ || Object.getPrototypeOf(Speed)).call(this, props));
+
+    _this.state = { display: false };
+    return _this;
+  }
+
+  _createClass(Speed, [{
+    key: 'render',
+    value: function render() {
+      var _this2 = this;
+
+      var _props = this.props,
+          speed = _props.speed,
+          onSpeedChange = _props.onSpeedChange;
+      var display = this.state.display;
+
+      var icons = getIcons(onSpeedChange, function () {
+        return _this2.setState({ display: false });
+      });
+
+      return _react2.default.createElement(
+        'div',
+        {
+          onMouseEnter: function onMouseEnter() {
+            return _this2.setState({ display: true });
+          },
+          onMouseLeave: function onMouseLeave() {
+            return _this2.setState({ display: false });
+          },
+          className: 'Speed_menu ' + (0, _aphrodite.css)(styles.speed_menu) },
+        _react2.default.createElement(
+          'div',
+          { style: { display: display ? 'flex' : 'none' }, className: 'Speed_menu_menu ' + (0, _aphrodite.css)(styles.menu) },
+          Object.values(_extends({}, icons, _defineProperty({}, speed, null)))
+        ),
+        _react2.default.createElement(
+          'div',
+          { className: 'Speed_menu_current ' + (0, _aphrodite.css)(styles.current) },
+          icons[speed]
+        )
+      );
+    }
+  }]);
+
+  return Speed;
+}(_react.Component);
 
 exports.default = Speed;