From 0405d406cca4fdc7b9e7f924cd1671510f13cd23 Mon Sep 17 00:00:00 2001
From: davy-c <d.castel33@gmail.com>
Date: Thu, 19 Dec 2019 12:09:20 +0900
Subject: [PATCH] fix

---
 .../NotePage/NoteDetail/NoteDetail.tsx        | 60 ++++++++++++-------
 src/components/NotePage/NotePage.tsx          |  3 +-
 2 files changed, 39 insertions(+), 24 deletions(-)

diff --git a/src/components/NotePage/NoteDetail/NoteDetail.tsx b/src/components/NotePage/NoteDetail/NoteDetail.tsx
index f3b99de281..d049d63ac7 100644
--- a/src/components/NotePage/NoteDetail/NoteDetail.tsx
+++ b/src/components/NotePage/NoteDetail/NoteDetail.tsx
@@ -447,29 +447,43 @@ export default class NoteDetail extends React.Component<
           <>
             <div className='breadCrumbs'>
               <div className='wrapper'>
-                {this.props.breadCrumbs != null &&
-                  this.props.breadCrumbs
-                    .map(breadCrumb => (
-                      <div
-                        onClick={this.handleBreadCrumbsClick(
-                          breadCrumb.folderPathname
-                        )}
-                        className={cc([
-                          'folderLink',
-                          breadCrumb.folderIsActive && 'active'
-                        ])}
-                        key={breadCrumb.folderLabel}
-                      >
-                        {breadCrumb.folderLabel}
-                      </div>
-                    ))
-                    .reduce((prev, curr) => (
-                      <>
-                        {prev}
-                        <div className='separator'>&frasl;</div>
-                        {curr}
-                      </>
-                    ))}
+                <div
+                  onClick={this.handleBreadCrumbsClick('/')}
+                  className={cc([
+                    'folderLink',
+                    'allNotesLink',
+                    this.props.breadCrumbs == null && 'active'
+                  ])}
+                >
+                  All Notes
+                </div>
+                {this.props.breadCrumbs != null && (
+                  <>
+                    <div className='separator'>&frasl;</div>
+                    {this.props.breadCrumbs
+                      .map(breadCrumb => (
+                        <div
+                          onClick={this.handleBreadCrumbsClick(
+                            breadCrumb.folderPathname
+                          )}
+                          className={cc([
+                            'folderLink',
+                            breadCrumb.folderIsActive && 'active'
+                          ])}
+                          key={breadCrumb.folderLabel}
+                        >
+                          {breadCrumb.folderLabel}
+                        </div>
+                      ))
+                      .reduce((prev, curr) => (
+                        <>
+                          {prev}
+                          <div className='separator'>&frasl;</div>
+                          {curr}
+                        </>
+                      ))}
+                  </>
+                )}
               </div>
             </div>
             <div className='titleSection'>
diff --git a/src/components/NotePage/NotePage.tsx b/src/components/NotePage/NotePage.tsx
index 1d4f64dd27..b726eac8b9 100644
--- a/src/components/NotePage/NotePage.tsx
+++ b/src/components/NotePage/NotePage.tsx
@@ -141,7 +141,8 @@ export default () => {
   }, [db, routeParams, storageId, setLastCreatedNoteId])
 
   const breadCrumbs = useMemo(() => {
-    if (currentNote == null) return undefined
+    if (currentNote == null || currentNote.folderPathname === '/')
+      return undefined
     const folders = currentNote.folderPathname.substring(1).split('/')
     const thread = folders.map((folder, index) => {
       const folderPathname = `/${folders.slice(0, index + 1).join('/')}`