Fix search screen, change header link to library

benkaiser · Jul 10, 2022 · e909962 · e909962
1 parent a21a6dd
commit e909962
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/src/js/views/mobile_header.jsx b/src/js/views/mobile_header.jsx
@@ -12,7 +12,7 @@ export default class MobileHeader extends React.Component {
       <Navbar collapseOnSelect fixedTop>
         <Navbar.Header>
           <Navbar.Brand>
-            <Link to='/' className='logoText'>Stretto</Link>
+            <Link to='/playlist/Library' className='logoText'>Stretto</Link>
           </Navbar.Brand>
           <Navbar.Toggle aria-controls='basic-nav' />
           <FilterMenu navbar />

diff --git a/src/js/views/search.jsx b/src/js/views/search.jsx
@@ -62,17 +62,23 @@ export default class Search extends PlaylistView {
   }
 
   songsText() {
-    const searchText = this.state.showLibrary ? 'Only showing library' : this.state.includesNotInLibrary ? 'Found more online' : 'Searching for more...';
-    const count = this._localPlaylist.songs.length;
-    return <p>{count} { count === 1 ? 'Song' : 'Songs' } in Library - {searchText}</p>;
+    if (this._localPlaylist) {
+      const searchText = this.state.showLibrary ? 'Only showing library' : this.state.includesNotInLibrary ? 'Found more online' : 'Searching for more...';
+      const count = this._localPlaylist.songs.length;
+      return <p>{count} { count === 1 ? 'Song' : 'Songs' } in Library - {searchText}</p>;
+    } else {
+      return '';
+    }
   }
 
   _showLibrary(showLibrary) {
     this.setState({
       showLibrary: showLibrary,
       playlist: this._localPlaylist
     }, () => {
-      if (!showLibrary) {
+      if (showLibrary) {
+        this._mounted && this.setState(this.determineStateForElementsToShow(0, window.innerHeight, this.state.playlist));
+      } else {
         this._itunesSearch();
       }
     });