apm-react-audio-player 1.0.10 → 1.0.12

package/dist/index.js

@@ -167,29 +167,48 @@ var useAudioPlayer = function useAudioPlayer(audioRef, progressBarRef, volumeCtr
     setCurrentTime(progressBarRef.current.value);
     progressBarRef.current.style.setProperty('--seek-before-width', "".concat(progressBarRef.current.value / duration * 100, "%"));
   };
-  var timeTravel = function timeTravel(newTime) {
-    progressBarRef.current.value = newTime;
+  var changeRange = function changeRange() {
+    audioRef.current.currentTime = progressBarRef.current.value;
     updateCurrentTime();
     changePlayerCurrentTime();
   };
-  var backThirty = function backThirty() {
-    timeTravel(Number(progressBarRef.current.value) - 30);
+  var rewindControl = function rewindControl() {
+    progressBarRef.current.value = Number(progressBarRef.current.value) - 15;
+    changeRange();
   };
-  var forwardThirty = function forwardThirty() {
-    timeTravel(Number(progressBarRef.current.value) + 30);
+  var forwardControl = function forwardControl() {
+    progressBarRef.current.value = Number(progressBarRef.current.value) + 15;
+    changeRange();
   };
   var volumeControl = function volumeControl(e) {
     var value = e.target.value;
     var volume = value / 100;
     audioRef.current.volume = volume;
   };
+  var formatCalculateTime = function formatCalculateTime(timeString) {
+    var toString = String(timeString);
+    if (toString.split(':').length === 3) {
+      var _toString$split = toString.split(':'),
+        _toString$split2 = _slicedToArray(_toString$split, 3),
+        hours = _toString$split2[0],
+        minutes = _toString$split2[1],
+        seconds = _toString$split2[2];
+      return "".concat(parseInt(hours), "hr ").concat(parseInt(minutes), "min ").concat(parseInt(seconds), "sec");
+    } else if (toString.split(':').length === 2) {
+      var _toString$split3 = toString.split(':'),
+        _toString$split4 = _slicedToArray(_toString$split3, 2),
+        _minutes = _toString$split4[0],
+        _seconds = _toString$split4[1];
+      return "".concat(parseInt(_minutes), "min ").concat(parseInt(_seconds), "sec");
+    }
+  };
   return {
     onLoadedMetadata: onLoadedMetadata,
     calculateTime: calculateTime,
     togglePlaying: togglePlaying,
     changePlayerCurrentTime: changePlayerCurrentTime,
-    backThirty: backThirty,
-    forwardThirty: forwardThirty,
+    rewindControl: rewindControl,
+    forwardControl: forwardControl,
     play: play,
     pause: pause,
     isPlaying: isPlaying,
@@ -197,9 +216,10 @@ var useAudioPlayer = function useAudioPlayer(audioRef, progressBarRef, volumeCtr
     currentTime: currentTime,
     duration: duration,
     volumeCtrl: volumeCtrl,
+    isMuted: isMuted,
     volumeControl: volumeControl,
     toggleMute: toggleMute,
-    isMuted: isMuted
+    formatCalculateTime: formatCalculateTime
   };
 };
 
@@ -252,7 +272,6 @@ var ReactAudioPlayerInner = function ReactAudioPlayerInner(props) {
 
   var customStyles = props ? props.style : '';
   var title = props.title,
-    description = props.description,
     audioSrc = props.audioSrc,
     volumeCtrl = props.volumeCtrl,
     playBtnClass = props.playBtnClass,
@@ -267,7 +286,12 @@ var ReactAudioPlayerInner = function ReactAudioPlayerInner(props) {
     duration = props.duration,
     volumeControl = props.volumeControl,
     toggleMute = props.toggleMute,
-    isMuted = props.isMuted;
+    isMuted = props.isMuted,
+    formatCalculateTime = props.formatCalculateTime,
+    rewindControl = props.rewindControl,
+    forwardControl = props.forwardControl;
+  var audioDuration = duration && !isNaN(duration) && calculateTime(duration);
+  var formatDuration = duration && !isNaN(duration) && audioDuration && formatCalculateTime(audioDuration);
   return audioSrc && /*#__PURE__*/React__default.createElement("div", {
     className: "audioPlayer",
     style: customStyles && customStyles.audioPlayer
@@ -281,8 +305,8 @@ var ReactAudioPlayerInner = function ReactAudioPlayerInner(props) {
     className: "player-layout"
   }, volumeCtrl && /*#__PURE__*/React__default.createElement("div", {
     className: "player-controls-secondary-outer"
-  }, /*#__PURE__*/React__default.createElement("div", null, /*#__PURE__*/React__default.createElement("span", {
-    className: "player-volume-text"
+  }, /*#__PURE__*/React__default.createElement("div", {
+    className: "player-volume-control"
   }, /*#__PURE__*/React__default.createElement("div", {
     className: "player-volume-icon"
   }, /*#__PURE__*/React__default.createElement("button", {
@@ -295,31 +319,47 @@ var ReactAudioPlayerInner = function ReactAudioPlayerInner(props) {
   }) : /*#__PURE__*/React__default.createElement("img", {
     src: "/img/icon-volume-mute.svg",
     alt: "Volume Mute Button"
-  }))), /*#__PURE__*/React__default.createElement("span", null, "Volume")), /*#__PURE__*/React__default.createElement("div", {
-    className: "player-controls player-controls-secondary"
-  }, /*#__PURE__*/React__default.createElement("div", {
-    className: "player-volume"
+  }))), /*#__PURE__*/React__default.createElement("div", {
+    className: "player-timeline player-controls-secondary"
   }, /*#__PURE__*/React__default.createElement("input", {
     id: "player-volume",
     type: "range",
-    className: "player-timeline-progress js-player-volume-current",
+    className: "player-volume-progress",
     min: 0,
     max: 100,
     "aria-hidden": "true",
+    "aria-valuetext": "100%",
     onChange: function onChange(e) {
       return volumeControl(e);
     }
-  }))))), /*#__PURE__*/React__default.createElement("div", {
+  })), /*#__PURE__*/React__default.createElement("div", null, /*#__PURE__*/React__default.createElement("img", {
+    src: "/img/icon-volume-high.svg",
+    alt: "Volume Button"
+  }))), /*#__PURE__*/React__default.createElement("div", {
+    className: "player-volume-label"
+  }, "Volume")), /*#__PURE__*/React__default.createElement("div", {
     className: "player-controls"
-  }, /*#__PURE__*/React__default.createElement("div", {
-    className: "player-btn-play-pause-outer"
+  }, !isLive && /*#__PURE__*/React__default.createElement("div", {
+    className: "player-backward-forward-controls"
+  }, /*#__PURE__*/React__default.createElement("button", {
+    onClick: rewindControl
+  }, /*#__PURE__*/React__default.createElement("img", {
+    src: "/img/icon-rewind-15.svg",
+    alt: "Backward 15 seconds"
+  }))), /*#__PURE__*/React__default.createElement("div", {
+    className: "".concat(isPlaying ? 'is-playing' : '', " player-btn-play-pause-outer")
   }, /*#__PURE__*/React__default.createElement("button", {
     onClick: togglePlaying,
     className: playBtnClass,
     style: customStyles && customStyles.playPause
-  }, isPlaying ? /*#__PURE__*/React__default.createElement(Pause, null) : /*#__PURE__*/React__default.createElement(Play, null)))), customHtml && customHtml, !isLive && /*#__PURE__*/React__default.createElement(React__default.Fragment, null, /*#__PURE__*/React__default.createElement("div", {
-    className: "player-currentTime"
-  }, calculateTime(currentTime)), /*#__PURE__*/React__default.createElement("div", {
+  }, isPlaying ? /*#__PURE__*/React__default.createElement(Pause, null) : /*#__PURE__*/React__default.createElement(Play, null))), !isLive && /*#__PURE__*/React__default.createElement("div", {
+    className: "player-backward-forward-controls"
+  }, /*#__PURE__*/React__default.createElement("button", {
+    onClick: forwardControl
+  }, /*#__PURE__*/React__default.createElement("img", {
+    src: "/img/icon-forward-15.svg",
+    alt: "Forward 15 seconds"
+  })))), !isLive && /*#__PURE__*/React__default.createElement(React__default.Fragment, null, /*#__PURE__*/React__default.createElement("div", {
     className: "player-timeline"
   }, /*#__PURE__*/React__default.createElement("input", {
     type: "range",
@@ -328,20 +368,26 @@ var ReactAudioPlayerInner = function ReactAudioPlayerInner(props) {
     "aria-hidden": "true",
     ref: progressBarRef,
     onChange: changePlayerCurrentTime
-  })), /*#__PURE__*/React__default.createElement("div", {
+  }), /*#__PURE__*/React__default.createElement("div", {
+    className: "player-times"
+  }, /*#__PURE__*/React__default.createElement("div", {
+    className: "player-currentTime"
+  }, calculateTime(currentTime)), /*#__PURE__*/React__default.createElement("div", {
     className: "player-duration",
     style: customStyles && customStyles.duration
-  }, duration && !isNaN(duration) && calculateTime(duration))), /*#__PURE__*/React__default.createElement("div", {
+  }, duration && !isNaN(duration) && calculateTime(duration))))), /*#__PURE__*/React__default.createElement("div", {
     className: "player-content"
-  }, /*#__PURE__*/React__default.createElement("div", {
+  }, customHtml && customHtml, /*#__PURE__*/React__default.createElement("div", {
     className: "player-audio-type type-sm"
   }, isLive ? /*#__PURE__*/React__default.createElement("div", {
     className: "player-live-label"
   }, "On Air") : /*#__PURE__*/React__default.createElement("div", {
+    className: "player-label"
+  }, "listen", /*#__PURE__*/React__default.createElement("div", {
+    className: "player-label-duration"
+  }, "[".concat(formatDuration, "]"))), /*#__PURE__*/React__default.createElement("div", {
     className: "player-title"
-  }, " ", title || '', " "), /*#__PURE__*/React__default.createElement("div", {
-    className: "player-description"
-  }, description || '', " ")))));
+  }, title || '', " ")))));
 };
 
 var ReactAudioPlayer = function ReactAudioPlayer(props) {
@@ -363,21 +409,27 @@ var ReactAudioPlayer = function ReactAudioPlayer(props) {
     duration = _useAudioPlayer.duration,
     volumeControl = _useAudioPlayer.volumeControl,
     toggleMute = _useAudioPlayer.toggleMute,
-    isMuted = _useAudioPlayer.isMuted;
+    isMuted = _useAudioPlayer.isMuted,
+    formatCalculateTime = _useAudioPlayer.formatCalculateTime,
+    rewindControl = _useAudioPlayer.rewindControl,
+    forwardControl = _useAudioPlayer.forwardControl;
   return /*#__PURE__*/React__default.createElement(ReactAudioPlayerInner, _extends({}, props, {
     audioPlayerRef: audioPlayerRef,
     progressBarRef: progressBarRef,
+    isPlaying: isPlaying,
+    isMuted: isMuted,
+    currentTime: currentTime,
+    duration: duration,
     customStyles: customStyles,
     onLoadedMetadata: onLoadedMetadata,
     calculateTime: calculateTime,
     togglePlaying: togglePlaying,
     changePlayerCurrentTime: changePlayerCurrentTime,
-    isPlaying: isPlaying,
-    currentTime: currentTime,
-    duration: duration,
     volumeControl: volumeControl,
     toggleMute: toggleMute,
-    isMuted: isMuted
+    formatCalculateTime: formatCalculateTime,
+    rewindControl: rewindControl,
+    forwardControl: forwardControl
   }));
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "apm-react-audio-player",
-  "version": "1.0.10",
+  "version": "1.0.12",
   "author": "Jason Phan <jphan@mpr.org>",
   "license": "MIT",
   "private": false,