Watch: Update Back to LBRY button for Electron

js/page/watch.js

@@ -9,6 +9,10 @@ const VideoStream = require('videostream');
 
 
 var WatchPage = React.createClass({
+  _isMounted: false,
+  _controlsHideDelay: 3000, // Note: this needs to be shorter than the built-in delay in Electron, or Electron will hide the controls before us
+  _controlsHideTimeout: null,
+
   propTypes: {
     name: React.PropTypes.string,
   },
@@ -18,6 +22,7 @@ var WatchPage = React.createClass({
       readyToPlay: false,
       loadStatusMessage: "Requesting stream",
       mimeType: null,
+      controlsShown: false,
     };
   },
   componentDidMount: function() {
@@ -27,6 +32,37 @@ var WatchPage = React.createClass({
   handleBackClicked: function() {
     history.back();
   },
+  handleMouseMove: function() {
+    if (this._controlsTimeout) {
+      clearTimeout(this._controlsTimeout);
+    }
+
+    if (!this.state.controlsShown) {
+      this.setState({
+        controlsShown: true,
+      });
+    }
+    this._controlsTimeout = setTimeout(() => {
+      if (!this.isMounted) {
+        return;
+      }
+
+      this.setState({
+        controlsShown: false,
+      });
+    }, this._controlsHideDelay);
+  },
+  handleMouseOut: function() {
+    if (this._controlsTimeout) {
+      clearTimeout(this._controlsTimeout);
+    }
+
+    if (this.state.controlsShown) {
+      this.setState({
+        controlsShown: false,
+      });
+    }
+  },
   updateLoadStatus: function() {
     lbry.getFileStatus(this.props.name, (status) => {
       if (!status || !['running', 'stopped'].includes(status.code) || status.written_bytes == 0) {
@@ -61,19 +97,22 @@ var WatchPage = React.createClass({
     return (
       !this.state.readyToPlay
         ? <LoadScreen message={'Loading video...'} details={this.state.loadStatusMessage} />
-        : <main className="video full-screen">
+        : <main className="video full-screen" onMouseMove={this.handleMouseMove} onMouseOut={this.handleMouseOut}>
-            <video width="100%" height="100%" id="video" ref="video" src={'/view?name=' + this.props.name} />
+            <video width="100%" height="100%" id="video" ref="video" src={'/view?name=' + this.props.name}
-            <div className="video__overlay">
+                   controls={this.state.controlsShown}/>
-              <div className="video__back">
+            {this.state.controlsShown
-                <Link icon="icon-arrow-circle-o-left" className="video__back-link" onClick={this.handleBackClicked}/>
+              ? <div className="video__overlay">
-                <div className="video__back-label">
+                  <div className="video__back">
-                  <Icon icon="icon-caret-left" className="video__back-label-arrow" />
+                    <Link icon="icon-arrow-circle-o-left" className="video__back-link" onClick={this.handleBackClicked}/>
-                  <div className="video__back-label-content">
+                    <div className="video__back-label">
-                    Back to LBRY
+                      <Icon icon="icon-caret-left" className="video__back-label-arrow" />
+                      <div className="video__back-label-content">
+                        Back to LBRY
+                      </div>
+                    </div>
                   </div>
                 </div>
-              </div>
+              : null}
-            </div>
           </main>
     );
   }

scss/page/_watch.scss

@@ -5,9 +5,7 @@
 .video__overlay {
   position: absolute;
   top: 0px;
-  bottom: 0px;
   left: 0px;
-  right: 0px;
   color: #fff;
   z-index: 1;
 }