From f2f19b7863171b24099a287427296cf3c3dc754f Mon Sep 17 00:00:00 2001
From: Dalton <dalton.hill2022@gmail.com>
Date: Thu, 23 Jan 2020 22:11:06 -0600
Subject: [PATCH] history works well but only for channel related pages - need
 to add title update hook for other pages

---
 ui/component/buttonNavigation/view.jsx | 40 ++++++++++++++------------
 ui/component/header/view.jsx           |  2 +-
 ui/page/show/view.jsx                  | 17 ++++++++++-
 ui/scss/component/_header.scss         |  2 ++
 ui/store.js                            |  7 -----
 5 files changed, 40 insertions(+), 28 deletions(-)

diff --git a/ui/component/buttonNavigation/view.jsx b/ui/component/buttonNavigation/view.jsx
index 0399ea0a4..df5e115a2 100644
--- a/ui/component/buttonNavigation/view.jsx
+++ b/ui/component/buttonNavigation/view.jsx
@@ -17,56 +17,58 @@ type Props = {
   },
 };
 
+// determines which slice of entries should make up the back or forward button drop-downs (isBackward vs !isBackward respectively)
+const sliceEntries = (currentIndex, entries, historyLength, isBackward) => {
+  const l = isBackward ? 0 : currentIndex + 1;
+  const r = isBackward ? currentIndex : historyLength;
+  return entries.slice(l, r);
+};
+
 const ButtonNavigation = (props: Props) => {
   const { isBackward, history } = props;
+  const { entries, go } = history;
+  const currentIndex = history.index;
+  const historyLength = history.length;
   const [showHistory, setShowHistory] = useState(false);
 
-  const makeEntrySlice = useCallback(() => {
-    const left = isBackward ? 1 : history.index + 1;
-    const right = isBackward ? history.index : history.length;
-    return history.entries.slice(left, right);
-  }, [history, isBackward]);
-
+  // creates an <li> intended for the button's <ul>
   const makeItem = useCallback(
     (entry, index) => {
-      const goArg = isBackward ? index - history.index : history.index - index;
-      console.log(`index: ${index}, currentIndex: ${history.index}, goArg: ${goArg}, title: ${entry.title}`);
+      // difference between the current index and the index of the entry
+      const goArg = isBackward ? index - currentIndex : index + 1;
       return (
         <li
           key={entry.key}
-          onClick={() => {
-            setShowHistory(!showHistory);
-            history.go(goArg);
+          onMouseDown={() => {
+            setShowHistory(false);
+            go(goArg);
           }}
         >
           {entry.title}
         </li>
       );
     },
-    [isBackward, history, showHistory]
+    [currentIndex, isBackward, go]
   );
-
+  const slicedEntries = sliceEntries(currentIndex, entries, historyLength, isBackward);
   return (
     <div>
       <Button
         className={`header__navigation-item header__navigation-item--${isBackward ? 'back' : 'forward'}`}
         description={isBackward ? __('Navigate back') : __('Navigate forward')}
+        onBlur={() => setShowHistory(false)}
         onClick={() => (isBackward ? history.goBack() : history.goForward())}
         onContextMenu={e => {
           setShowHistory(!showHistory);
           // the following three lines prevent the regular context menu (right click menu) from appearing
           e.preventDefault();
           e.stopPropagation();
-          return false; // returning false disables the regular context menu
+          return false;
         }}
         icon={isBackward ? ICONS.ARROW_LEFT : ICONS.ARROW_RIGHT}
         iconSize={18}
       />
-      {showHistory && (
-        <ul className={'header__navigaiton-dropdown'} style={{ position: 'absolute' }}>
-          {makeEntrySlice().map(makeItem)}
-        </ul>
-      )}
+      {showHistory && <ul className={'header__navigaiton-dropdown'}>{slicedEntries.map(makeItem)}</ul>}
     </div>
   );
 };
diff --git a/ui/component/header/view.jsx b/ui/component/header/view.jsx
index 85cd3bf34..7d4005c3a 100644
--- a/ui/component/header/view.jsx
+++ b/ui/component/header/view.jsx
@@ -115,7 +115,7 @@ const Header = (props: Props) => {
           {!authHeader && (
             <div className="header__navigation-arrows">
               <ButtonNavigation isBackward history={history} />
-              <ButtonNavigation history={history} />
+              <ButtonNavigation isBackward={false} history={history} />
             </div>
           )}
           {/* @endif */}
diff --git a/ui/page/show/view.jsx b/ui/page/show/view.jsx
index 151a5999c..e487fb230 100644
--- a/ui/page/show/view.jsx
+++ b/ui/page/show/view.jsx
@@ -25,6 +25,17 @@ type Props = {
   }>,
   title: string,
   claimIsMine: Boolean,
+  history: {
+    entries: { title: string }[],
+    goBack: () => void,
+    goForward: () => void,
+    index: number,
+    length: number,
+    location: { pathname: string },
+    push: string => void,
+    state: {},
+    replaceState: ({}, string, string) => void,
+  },
 };
 
 function ShowPage(props: Props) {
@@ -38,8 +49,11 @@ function ShowPage(props: Props) {
     title,
     claimIsMine,
     isSubscribed,
+    history,
   } = props;
   const { channelName, streamName } = parseURI(uri);
+  const { entries } = history;
+  const entryIndex = history.index;
   const signingChannel = claim && claim.signing_channel;
   const canonicalUrl = claim && claim.canonical_url;
   const claimExists = claim !== null && claim !== undefined;
@@ -71,10 +85,11 @@ function ShowPage(props: Props) {
       document.title = IS_WEB ? SITE_TITLE : 'LBRY';
     }
 
+    entries[entryIndex].title = document.title;
     return () => {
       document.title = IS_WEB ? SITE_TITLE : 'LBRY';
     };
-  }, [title, channelName, streamName]);
+  }, [channelName, entries, entryIndex, streamName, title]);
 
   // Don't navigate directly to repost urls
   // Always redirect to the actual content
diff --git a/ui/scss/component/_header.scss b/ui/scss/component/_header.scss
index 699f93ea2..da750bf7a 100644
--- a/ui/scss/component/_header.scss
+++ b/ui/scss/component/_header.scss
@@ -149,8 +149,10 @@
 }
 
 .header__navigaiton-dropdown {
+  position: absolute;
   list-style-type: none;
   background-color: var(--color-header-background);
+  margin-top: 5px;
 
   li {
     margin: 0;
diff --git a/ui/store.js b/ui/store.js
index 2911f2cb4..af642c6cc 100644
--- a/ui/store.js
+++ b/ui/store.js
@@ -102,13 +102,6 @@ history = createMemoryHistory();
 history = createBrowserHistory();
 // @endif
 
-history.listen((l, a) => {
-  console.log('document.title: ', document.title);
-  console.log('history: ', history);
-  document.oncontextmenu = () => false;
-  l.title = document.title;
-});
-
 const triggerSharedStateActions = [
   ACTIONS.CHANNEL_SUBSCRIBE,
   ACTIONS.CHANNEL_UNSUBSCRIBE,