From 8d888d3e2349f78db7db286f29eca4026e6fc72b Mon Sep 17 00:00:00 2001
From: Sean Yesmunt <sean@lbry.io>
Date: Thu, 30 Apr 2020 14:25:51 -0400
Subject: [PATCH] improve floating behavior when coming from embeds

---
 ui/component/common/loading-screen.jsx   | 11 +++++++----
 ui/component/embedPlayButton/index.js    |  3 ++-
 ui/component/embedPlayButton/view.jsx    |  5 +++++
 ui/component/fileRenderFloating/view.jsx |  9 ++++++++-
 ui/component/fileRenderInline/view.jsx   |  2 +-
 ui/redux/selectors/content.js            | 18 ++++++++----------
 ui/scss/component/_content.scss          |  9 +++++++++
 ui/scss/component/_file-render.scss      | 10 ----------
 8 files changed, 40 insertions(+), 27 deletions(-)

diff --git a/ui/component/common/loading-screen.jsx b/ui/component/common/loading-screen.jsx
index 4f2a09a03..661d311cd 100644
--- a/ui/component/common/loading-screen.jsx
+++ b/ui/component/common/loading-screen.jsx
@@ -1,23 +1,26 @@
 // @flow
 import React from 'react';
+import classnames from 'classnames';
 import Spinner from 'component/spinner';
 
 type Props = {
   status?: string,
   spinner: boolean,
+  isDocument: boolean,
 };
 
 class LoadingScreen extends React.PureComponent<Props> {
   static defaultProps = {
     spinner: true,
+    isDocument: false,
   };
 
   render() {
-    const { status, spinner } = this.props;
+    const { status, spinner, isDocument } = this.props;
     return (
-      <div className="content__loading">
-        {spinner && <Spinner light />}
-        {status && <span className="content__loading-text">{status}</span>}
+      <div className={classnames('content__loading', { 'content__loading--document': isDocument })}>
+        {spinner && <Spinner light={!isDocument} />}
+        {status && <span className={classnames('content__loading-text')}>{status}</span>}
       </div>
     );
   }
diff --git a/ui/component/embedPlayButton/index.js b/ui/component/embedPlayButton/index.js
index 02b8187f9..bd9bcab9f 100644
--- a/ui/component/embedPlayButton/index.js
+++ b/ui/component/embedPlayButton/index.js
@@ -2,7 +2,7 @@ import * as SETTINGS from 'constants/settings';
 import { connect } from 'react-redux';
 import { makeSelectThumbnailForUri, doResolveUri, makeSelectClaimForUri } from 'lbry-redux';
 import { doFetchCostInfoForUri } from 'lbryinc';
-import { doSetFloatingUri } from 'redux/actions/content';
+import { doSetFloatingUri, doPlayUri } from 'redux/actions/content';
 import { makeSelectClientSetting } from 'redux/selectors/settings';
 import ChannelThumbnail from './view';
 
@@ -16,4 +16,5 @@ export default connect(select, {
   doResolveUri,
   doFetchCostInfoForUri,
   doSetFloatingUri,
+  doPlayUri,
 })(ChannelThumbnail);
diff --git a/ui/component/embedPlayButton/view.jsx b/ui/component/embedPlayButton/view.jsx
index 27f5fe734..47a888480 100644
--- a/ui/component/embedPlayButton/view.jsx
+++ b/ui/component/embedPlayButton/view.jsx
@@ -14,6 +14,7 @@ type Props = {
   doFetchCostInfoForUri: string => void,
   doSetFloatingUri: string => void,
   floatingPlayerEnabled: boolean,
+  doPlayUri: string => void,
 };
 
 export default function FileRenderFloating(props: Props) {
@@ -25,6 +26,7 @@ export default function FileRenderFloating(props: Props) {
     doFetchCostInfoForUri,
     doSetFloatingUri,
     floatingPlayerEnabled,
+    doPlayUri,
   } = props;
   const { push } = useHistory();
   const isMobile = useIsMobile();
@@ -43,6 +45,9 @@ export default function FileRenderFloating(props: Props) {
       push(formattedUrl);
     } else {
       doSetFloatingUri(uri);
+      // @if TARGET='app'
+      doPlayUri(uri);
+      // @endif
     }
   }
 
diff --git a/ui/component/fileRenderFloating/view.jsx b/ui/component/fileRenderFloating/view.jsx
index 7c9de0bb7..8dba004b7 100644
--- a/ui/component/fileRenderFloating/view.jsx
+++ b/ui/component/fileRenderFloating/view.jsx
@@ -118,7 +118,14 @@ export default function FileRenderFloating(props: Props) {
               <span className="media__uri--inline">{uri}</span>
               <div className="content__actions">
                 <Tooltip label={__('View File')}>
-                  <Button navigate={uri} onClick={() => setPlayingUri(uri)} icon={ICONS.VIEW} button="primary" />
+                  <Button
+                    navigate={uri}
+                    onClick={() => {
+                      setPlayingUri(uri);
+                    }}
+                    icon={ICONS.VIEW}
+                    button="primary"
+                  />
                 </Tooltip>
                 <Tooltip label={__('Close')}>
                   <Button onClick={closeFloatingPlayer} icon={ICONS.REMOVE} button="primary" />
diff --git a/ui/component/fileRenderInline/view.jsx b/ui/component/fileRenderInline/view.jsx
index 417a704b0..ef6f75cba 100644
--- a/ui/component/fileRenderInline/view.jsx
+++ b/ui/component/fileRenderInline/view.jsx
@@ -52,5 +52,5 @@ export default function FileRenderInline(props: Props) {
     return null;
   }
 
-  return renderContent ? <FileRender uri={uri} /> : <LoadingScreen status={__('Preparing your content')} />;
+  return renderContent ? <FileRender uri={uri} /> : <LoadingScreen status={__('Preparing your content')} isDocument />;
 }
diff --git a/ui/redux/selectors/content.js b/ui/redux/selectors/content.js
index d992fba18..8e89b8eee 100644
--- a/ui/redux/selectors/content.js
+++ b/ui/redux/selectors/content.js
@@ -37,20 +37,18 @@ export const makeSelectIsPlaying = (uri: string) => createSelector(selectPlaying
 
 // below is dumb, some context: https://stackoverflow.com/questions/39622864/access-react-router-state-in-selector
 export const makeSelectIsPlayerFloating = (location: UrlLocation) =>
-  createSelector(selectFloatingUri, selectPlayingUri, (floatingUri, playingUri) => {
-    if (floatingUri) {
-      if (!playingUri) {
-        return true;
-      } else {
-        return floatingUri !== playingUri;
-      }
+  createSelector(selectFloatingUri, selectPlayingUri, selectClaimsByUri, (floatingUri, playingUri, claimsByUri) => {
+    if (playingUri && floatingUri && playingUri !== floatingUri) {
+      return true;
     }
 
     // If there is no floatingPlayer explicitly set, see if the playingUri can float
     try {
-      const { pathname, hash } = location;
-      const newpath = buildURI(parseURI(pathname.slice(1).replace(/:/g, '#')));
-      return playingUri && playingUri !== newpath + hash;
+      const { pathname } = location;
+      const pageUrl = buildURI(parseURI(pathname.slice(1).replace(/:/g, '#')));
+      const claimFromUrl = claimsByUri[pageUrl];
+      const playingClaim = claimsByUri[playingUri];
+      return (claimFromUrl && claimFromUrl.claim_id) !== (playingClaim && playingClaim.claim_id);
     } catch (e) {}
 
     return !!playingUri;
diff --git a/ui/scss/component/_content.scss b/ui/scss/component/_content.scss
index 094bc657b..0d4d45af4 100644
--- a/ui/scss/component/_content.scss
+++ b/ui/scss/component/_content.scss
@@ -155,6 +155,15 @@
   justify-content: center;
   padding: 0 var(--spacing-large);
   background-color: #000;
+
+  &.content__loading--document {
+    background-color: var(--color-card-background);
+    padding: calc(var(--spacing-xlarge) * 3) 0;
+
+    .content__loading-text {
+      color: var(--color-text);
+    }
+  }
 }
 
 .content__loading-text {
diff --git a/ui/scss/component/_file-render.scss b/ui/scss/component/_file-render.scss
index 5a72d2857..5454fbfcb 100644
--- a/ui/scss/component/_file-render.scss
+++ b/ui/scss/component/_file-render.scss
@@ -51,16 +51,6 @@
   max-height: none;
   overflow: auto;
 
-  .content__loading {
-    background-color: transparent;
-    padding: 0;
-    margin: var(--spacing-xlarge) 0;
-
-    .content__loading-text {
-      color: var(--color-text);
-    }
-  }
-
   .markdown-preview {
     height: 100%;
     overflow: auto;