From 504f230d59eed26c1ff61d49ef1becce59fde528 Mon Sep 17 00:00:00 2001
From: btzr-io <btzr.io@gmail.com>
Date: Mon, 12 Jul 2021 17:39:23 -0500
Subject: [PATCH] show currently active playing item on playlist: #6204

---
 ui/component/claimList/view.jsx               |  3 +++
 ui/component/claimPreview/view.jsx            |  3 +++
 .../collectionContentSidebar/index.js         |  6 +++---
 .../collectionContentSidebar/view.jsx         | 20 +++++++++++++------
 ui/scss/component/_claim-list.scss            |  4 ++++
 5 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/ui/component/claimList/view.jsx b/ui/component/claimList/view.jsx
index 7666f553b..1cf6743fe 100644
--- a/ui/component/claimList/view.jsx
+++ b/ui/component/claimList/view.jsx
@@ -21,6 +21,7 @@ type Props = {
   headerAltControls: Node,
   loading: boolean,
   type: string,
+  activeUri?: string,
   empty?: string,
   defaultSort?: boolean,
   onScrollBottom?: (any) => void,
@@ -50,6 +51,7 @@ type Props = {
 
 export default function ClaimList(props: Props) {
   const {
+    activeUri,
     uris,
     headerAltControls,
     loading,
@@ -190,6 +192,7 @@ export default function ClaimList(props: Props) {
               <ClaimPreview
                 uri={uri}
                 type={type}
+                active={activeUri && uri === activeUri}
                 hideMenu={hideMenu}
                 includeSupportAction={includeSupportAction}
                 showUnresolvedClaim={showUnresolvedClaims}
diff --git a/ui/component/claimPreview/view.jsx b/ui/component/claimPreview/view.jsx
index c66974f3d..98c844475 100644
--- a/ui/component/claimPreview/view.jsx
+++ b/ui/component/claimPreview/view.jsx
@@ -36,6 +36,7 @@ const AbandonedChannelPreview = lazyImport(() =>
 type Props = {
   uri: string,
   claim: ?Claim,
+  active: boolean,
   obscureNsfw: boolean,
   showUserBlocked: boolean,
   claimIsMine: boolean,
@@ -113,6 +114,7 @@ const ClaimPreview = forwardRef<any, {}>((props: Props, ref: any) => {
     pending,
     empty,
     // modifiers
+    active,
     customShouldHide,
     showNullPlaceholder,
     // value from show mature content user setting
@@ -293,6 +295,7 @@ const ClaimPreview = forwardRef<any, {}>((props: Props, ref: any) => {
         'claim-preview__wrapper--inline': type === 'inline',
         'claim-preview__wrapper--small': type === 'small',
         'claim-preview__live': live,
+        'claim-preview__active': active,
       })}
     >
       <>
diff --git a/ui/component/collectionContentSidebar/index.js b/ui/component/collectionContentSidebar/index.js
index 9af808fc6..ffe8126a7 100644
--- a/ui/component/collectionContentSidebar/index.js
+++ b/ui/component/collectionContentSidebar/index.js
@@ -4,19 +4,19 @@ import {
   makeSelectUrlsForCollectionId,
   makeSelectNameForCollectionId,
   makeSelectCollectionForId,
-  makeSelectClaimForClaimId,
+  makeSelectClaimForUri,
   makeSelectClaimIsMine,
 } from 'lbry-redux';
 
 const select = (state, props) => {
-  const claim = makeSelectClaimForClaimId(props.id)(state);
+  const claim = makeSelectClaimForUri(props.uri)(state);
   const url = claim && claim.permanent_url;
 
   return {
+    url,
     collection: makeSelectCollectionForId(props.id)(state),
     collectionUrls: makeSelectUrlsForCollectionId(props.id)(state),
     collectionName: makeSelectNameForCollectionId(props.id)(state),
-    claim,
     isMine: makeSelectClaimIsMine(url)(state),
   };
 };
diff --git a/ui/component/collectionContentSidebar/view.jsx b/ui/component/collectionContentSidebar/view.jsx
index 49d932100..69d838ab1 100644
--- a/ui/component/collectionContentSidebar/view.jsx
+++ b/ui/component/collectionContentSidebar/view.jsx
@@ -9,18 +9,17 @@ import * as ICONS from 'constants/icons';
 import { COLLECTIONS_CONSTS } from 'lbry-redux';
 
 type Props = {
+  id: string,
+  url: string,
+  isMine: boolean,
   collectionUrls: Array<Claim>,
   collectionName: string,
   collection: any,
   createUnpublishedCollection: (string, Array<any>, ?string) => void,
-  id: string,
-  claim: Claim,
-  isMine: boolean,
 };
 
 export default function CollectionContent(props: Props) {
-  const { collectionUrls, collectionName, id } = props;
-
+  const { collectionUrls, collectionName, id, url } = props;
   return (
     <Card
       isBodyList
@@ -40,7 +39,16 @@ export default function CollectionContent(props: Props) {
           <Button label={'View List'} button="link" navigate={`/$/${PAGES.LIST}/${id}`} />
         </>
       }
-      body={<ClaimList isCardBody type="small" uris={collectionUrls} collectionId={id} empty={__('List is Empty')} />}
+      body={
+        <ClaimList
+          isCardBody
+          type="small"
+          activeUri={url}
+          uris={collectionUrls}
+          collectionId={id}
+          empty={__('List is Empty')}
+        />
+      }
     />
   );
 }
diff --git a/ui/scss/component/_claim-list.scss b/ui/scss/component/_claim-list.scss
index b029bc046..65db87481 100644
--- a/ui/scss/component/_claim-list.scss
+++ b/ui/scss/component/_claim-list.scss
@@ -705,6 +705,10 @@
   }
 }
 
+.claim-preview__active {
+  background-color: var(--color-card-background-highlighted);
+}
+
 .claim-preview__live {
   .claim-preview__file-property-overlay {
     opacity: 1; // The original 0.7 is not visible over bright thumbnails